hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r937479 [3/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/client/methods/HttpUriRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpUriRequest.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpUriRequest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpUriRequest.java Fri Apr 23 19:19:23 2010
@@ -32,7 +32,7 @@ import java.net.URI;
 import org.apache.http.HttpRequest;
 
 /**
- * Extended version of the {@link HttpRequest} interface that provides 
+ * Extended version of the {@link HttpRequest} interface that provides
  * convenience methods to access request properties such as request URI
  * and method type.
  *
@@ -41,7 +41,7 @@ import org.apache.http.HttpRequest;
  * @since 4.0
  */
 public interface HttpUriRequest extends HttpRequest {
-    
+
     /**
      * Returns the HTTP method this request uses, such as <code>GET</code>,
      * <code>PUT</code>, <code>POST</code>, or other.
@@ -51,32 +51,32 @@ public interface HttpUriRequest extends 
     /**
      * Returns the URI this request uses, such as
      * <code>http://example.org/path/to/file</code>.
-     * 
+     *
      * Implementations are encouraged to return
      * the URI that was initially requested.
-     * 
+     *
      * To find the final URI after any redirects have been processed,
-     * please see the section entitled 
+     * please see the section entitled
      * <a href="http://hc.apache.org/httpcomponents-client/tutorial/html/fundamentals.html#d4e205">HTTP execution context</a>
-     * in the 
+     * in the
      * <a href="http://hc.apache.org/httpcomponents-client/tutorial/html">HttpClient Tutorial</a>
      */
     URI getURI();
-    
+
     /**
-     * Aborts execution of the request. 
-     * 
-     * @throws UnsupportedOperationException if the abort operation 
+     * Aborts execution of the request.
+     *
+     * @throws UnsupportedOperationException if the abort operation
      *   is not supported / cannot be implemented.
      */
     void abort() throws UnsupportedOperationException;
-    
+
     /**
      * Tests if the request execution has been aborted.
-     * 
+     *
      * @return <code>true</code> if the request execution has been aborted,
      *   <code>false</code> otherwise.
      */
     boolean isAborted();
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/package.html?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/package.html (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/package.html Fri Apr 23 19:19:23 2010
@@ -32,14 +32,14 @@
 <body>
 The API for client-side HTTP communication.
 <p/>
-The usual execution flow can be demonstrated by the 
+The usual execution flow can be demonstrated by the
 code snippet below:
 
 <PRE>
 HttpClient httpclient = new DefaultHttpClient();
 
 // Prepare a request object
-HttpGet httpget = new HttpGet("http://www.apache.org/"); 
+HttpGet httpget = new HttpGet("http://www.apache.org/");
 
 // Execute the request
 HttpResponse response = httpclient.execute(httpget);
@@ -55,31 +55,31 @@ HttpEntity entity = response.getEntity()
 if (entity != null) {
     InputStream instream = entity.getContent();
     try {
-        
+
         BufferedReader reader = new BufferedReader(
                 new InputStreamReader(instream));
         // do something useful with the response
         System.out.println(reader.readLine());
-        
+
     } catch (IOException ex) {
 
         // In case of an IOException the connection will be released
         // back to the connection manager automatically
         throw ex;
-        
+
     } catch (RuntimeException ex) {
 
         // In case of an unexpected exception you may want to abort
-        // the HTTP request in order to shut down the underlying 
+        // the HTTP request in order to shut down the underlying
         // connection and release it back to the connection manager.
         httpget.abort();
         throw ex;
-        
+
     } finally {
 
         // Closing the input stream will trigger connection release
         instream.close();
-        
+
     }
 }
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/AuthPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/AuthPolicy.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/AuthPolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/AuthPolicy.java Fri Apr 23 19:19:23 2010
@@ -30,7 +30,7 @@ package org.apache.http.client.params;
 import org.apache.http.annotation.Immutable;
 
 /**
- * Standard authentication schemes supported by HttpClient. 
+ * Standard authentication schemes supported by HttpClient.
  *
  * @since 4.0
  */
@@ -40,30 +40,30 @@ public final class AuthPolicy {
     private AuthPolicy() {
         super();
     }
-    
+
     /**
-     * The NTLM scheme is a proprietary Microsoft Windows Authentication 
-     * protocol (considered to be the most secure among currently supported 
+     * The NTLM scheme is a proprietary Microsoft Windows Authentication
+     * protocol (considered to be the most secure among currently supported
      * authentication schemes).
      */
     public static final String NTLM = "NTLM";
-    
-    /** 
+
+    /**
      * Digest authentication scheme as defined in RFC2617.
      */
     public static final String DIGEST = "Digest";
 
-    /** 
+    /**
      * Basic authentication scheme as defined in RFC2617 (considered inherently
      * insecure, but most widely supported)
      */
     public static final String BASIC = "Basic";
-    
-    /** 
+
+    /**
      * SPNEGO/Kerberos Authentication scheme.
-     * 
+     *
      * @since 4.1
      */
     public static final String SPNEGO = "negotiate";
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientPNames.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientPNames.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientPNames.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientPNames.java Fri Apr 23 19:19:23 2010
@@ -28,7 +28,7 @@ package org.apache.http.client.params;
 
 /**
  * Parameter names for HTTP client parameters.
- * 
+ *
  * @since 4.0
  */
 public interface ClientPNames {
@@ -38,16 +38,16 @@ public interface ClientPNames {
      * <p>
      * This parameter expects a value of type {@link String}.
      * </p>
-     */ 
+     */
     public static final String CONNECTION_MANAGER_FACTORY_CLASS_NAME = "http.connection-manager.factory-class-name";
-    
+
     /**
      * @deprecated use #CONNECTION_MANAGER_FACTORY_CLASS_NAME
      */
     @Deprecated
     public static final String CONNECTION_MANAGER_FACTORY = "http.connection-manager.factory-object";
-    
-    /** 
+
+    /**
      * Defines whether redirects should be handled automatically
      * <p>
      * This parameter expects a value of type {@link Boolean}.
@@ -56,26 +56,26 @@ public interface ClientPNames {
     public static final String HANDLE_REDIRECTS = "http.protocol.handle-redirects";
 
     /**
-     * Defines whether relative redirects should be rejected. HTTP specification 
+     * Defines whether relative redirects should be rejected. HTTP specification
      * requires the location value be an absolute URI.
      * <p>
      * This parameter expects a value of type {@link Boolean}.
      * </p>
      */
-    public static final String REJECT_RELATIVE_REDIRECT = "http.protocol.reject-relative-redirect"; 
+    public static final String REJECT_RELATIVE_REDIRECT = "http.protocol.reject-relative-redirect";
 
-    /** 
-     * Defines the maximum number of redirects to be followed. 
-     * The limit on number of redirects is intended to prevent infinite loops. 
+    /**
+     * Defines the maximum number of redirects to be followed.
+     * The limit on number of redirects is intended to prevent infinite loops.
      * <p>
      * This parameter expects a value of type {@link Integer}.
      * </p>
      */
     public static final String MAX_REDIRECTS = "http.protocol.max-redirects";
 
-    /** 
-     * Defines whether circular redirects (redirects to the same location) should be allowed. 
-     * The HTTP spec is not sufficiently clear whether circular redirects are permitted, 
+    /**
+     * Defines whether circular redirects (redirects to the same location) should be allowed.
+     * The HTTP spec is not sufficiently clear whether circular redirects are permitted,
      * therefore optionally they can be enabled
      * <p>
      * This parameter expects a value of type {@link Boolean}.
@@ -98,25 +98,25 @@ public interface ClientPNames {
      * </p>
      */
     public static final String COOKIE_POLICY = "http.protocol.cookie-policy";
-    
+
     /**
-     * Defines the virtual host name to be used in the <code>Host</code> 
+     * Defines the virtual host name to be used in the <code>Host</code>
      * request header instead of the physical host name.
      * <p>
-     * This parameter expects a value of type {@link org.apache.http.HttpHost}. 
+     * This parameter expects a value of type {@link org.apache.http.HttpHost}.
      * </p>
      */
-    public static final String VIRTUAL_HOST = "http.virtual-host"; 
+    public static final String VIRTUAL_HOST = "http.virtual-host";
 
     /**
      * Defines the request headers to be sent per default with each request.
      * <p>
-     * This parameter expects a value of type {@link java.util.Collection}. The 
-     * collection is expected to contain {@link org.apache.http.Header}s. 
+     * This parameter expects a value of type {@link java.util.Collection}. The
+     * collection is expected to contain {@link org.apache.http.Header}s.
      * </p>
      */
-    public static final String DEFAULT_HEADERS = "http.default-headers"; 
-    
+    public static final String DEFAULT_HEADERS = "http.default-headers";
+
     /**
      * Defines the default host. The default value will be used if the target host is
      * not explicitly specified in the request URI.

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientParamBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientParamBean.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientParamBean.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientParamBean.java Fri Apr 23 19:19:23 2010
@@ -38,8 +38,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 HTTP client parameters using 
+ * This is a Java Bean class that can be used to wrap an instance of
+ * {@link HttpParams} and manipulate HTTP client parameters using
  * Java Beans conventions.
  *
  * @since 4.0
@@ -54,7 +54,7 @@ public class ClientParamBean extends Htt
     public void setConnectionManagerFactoryClassName (final String factory) {
         params.setParameter(ClientPNames.CONNECTION_MANAGER_FACTORY_CLASS_NAME, factory);
     }
-    
+
     @Deprecated
     public void setConnectionManagerFactory(ClientConnectionManagerFactory factory) {
         params.setParameter(ClientPNames.CONNECTION_MANAGER_FACTORY, factory);
@@ -95,5 +95,5 @@ public class ClientParamBean extends Htt
     public void setDefaultHost (final HttpHost host) {
         params.setParameter(ClientPNames.DEFAULT_HOST, host);
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/CookiePolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/CookiePolicy.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/CookiePolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/CookiePolicy.java Fri Apr 23 19:19:23 2010
@@ -30,7 +30,7 @@ package org.apache.http.client.params;
 import org.apache.http.annotation.Immutable;
 
 /**
- * Standard cookie specifications supported by HttpClient. 
+ * Standard cookie specifications supported by HttpClient.
  *
  * @since 4.0
  */
@@ -38,18 +38,18 @@ import org.apache.http.annotation.Immuta
 public final class CookiePolicy {
 
     /**
-     * The policy that provides high degree of compatibilty 
+     * The policy that provides high degree of compatibilty
      * with common cookie management of popular HTTP agents.
      */
     public static final String BROWSER_COMPATIBILITY = "compatibility";
-    
-    /** 
-     * The Netscape cookie draft compliant policy. 
+
+    /**
+     * The Netscape cookie draft compliant policy.
      */
     public static final String NETSCAPE = "netscape";
 
-    /** 
-     * The RFC 2109 compliant policy. 
+    /**
+     * The RFC 2109 compliant policy.
      */
     public static final String RFC_2109 = "rfc2109";
 
@@ -66,5 +66,5 @@ public final class CookiePolicy {
     private CookiePolicy() {
         super();
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java Fri Apr 23 19:19:23 2010
@@ -32,7 +32,7 @@ import org.apache.http.params.HttpParams
 
 /**
  * An adaptor for manipulating HTTP client parameters in {@link HttpParams}.
- * 
+ *
  * @since 4.0
  */
 @Immutable
@@ -47,7 +47,7 @@ public class HttpClientParams {
             throw new IllegalArgumentException("HTTP parameters may not be null");
         }
         return params.getBooleanParameter
-            (ClientPNames.HANDLE_REDIRECTS, true); 
+            (ClientPNames.HANDLE_REDIRECTS, true);
     }
 
     public static void setRedirecting(final HttpParams params, boolean value) {
@@ -55,15 +55,15 @@ public class HttpClientParams {
             throw new IllegalArgumentException("HTTP parameters may not be null");
         }
         params.setBooleanParameter
-            (ClientPNames.HANDLE_REDIRECTS, value); 
+            (ClientPNames.HANDLE_REDIRECTS, value);
     }
-    
+
     public static boolean isAuthenticating(final HttpParams params) {
         if (params == null) {
             throw new IllegalArgumentException("HTTP parameters may not be null");
         }
         return params.getBooleanParameter
-            (ClientPNames.HANDLE_AUTHENTICATION, true); 
+            (ClientPNames.HANDLE_AUTHENTICATION, true);
     }
 
     public static void setAuthenticating(final HttpParams params, boolean value) {
@@ -71,10 +71,10 @@ public class HttpClientParams {
             throw new IllegalArgumentException("HTTP parameters may not be null");
         }
         params.setBooleanParameter
-            (ClientPNames.HANDLE_AUTHENTICATION, value); 
+            (ClientPNames.HANDLE_AUTHENTICATION, value);
     }
-    
-    public static String getCookiePolicy(final HttpParams params) { 
+
+    public static String getCookiePolicy(final HttpParams params) {
         if (params == null) {
             throw new IllegalArgumentException("HTTP parameters may not be null");
         }
@@ -85,7 +85,7 @@ public class HttpClientParams {
         }
         return cookiePolicy;
     }
-    
+
     public static void setCookiePolicy(final HttpParams params, final String cookiePolicy) {
         if (params == null) {
             throw new IllegalArgumentException("HTTP parameters may not be null");

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContext.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContext.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContext.java Fri Apr 23 19:19:23 2010
@@ -28,68 +28,68 @@
 package org.apache.http.client.protocol;
 
 /**
- * {@link org.apache.http.protocol.HttpContext} attribute names for 
+ * {@link org.apache.http.protocol.HttpContext} attribute names for
  * client side HTTP protocol processing.
  *
  * @since 4.0
  */
 public interface ClientContext {
-    
+
     /**
-     * Attribute name of a {@link org.apache.http.conn.scheme.Scheme} 
+     * Attribute name of a {@link org.apache.http.conn.scheme.Scheme}
      * object that represents the actual protocol scheme registry.
      */
-    public static final String SCHEME_REGISTRY   = "http.scheme-registry"; 
+    public static final String SCHEME_REGISTRY   = "http.scheme-registry";
     /**
-     * Attribute name of a {@link org.apache.http.cookie.CookieSpecRegistry} 
+     * Attribute name of a {@link org.apache.http.cookie.CookieSpecRegistry}
      * object that represents the actual cookie specification registry.
      */
-    public static final String COOKIESPEC_REGISTRY   = "http.cookiespec-registry"; 
+    public static final String COOKIESPEC_REGISTRY   = "http.cookiespec-registry";
 
     /**
-     * Attribute name of a {@link org.apache.http.cookie.CookieSpec} 
+     * Attribute name of a {@link org.apache.http.cookie.CookieSpec}
      * object that represents the actual cookie specification.
      */
-    public static final String COOKIE_SPEC           = "http.cookie-spec"; 
+    public static final String COOKIE_SPEC           = "http.cookie-spec";
 
     /**
-     * Attribute name of a {@link org.apache.http.cookie.CookieOrigin} 
+     * Attribute name of a {@link org.apache.http.cookie.CookieOrigin}
      * object that represents the actual details of the origin server.
      */
-    public static final String COOKIE_ORIGIN         = "http.cookie-origin"; 
-    
+    public static final String COOKIE_ORIGIN         = "http.cookie-origin";
+
     /**
-     * Attribute name of a {@link org.apache.http.client.CookieStore} 
+     * Attribute name of a {@link org.apache.http.client.CookieStore}
      * object that represents the actual cookie store.
      */
-    public static final String COOKIE_STORE          = "http.cookie-store"; 
+    public static final String COOKIE_STORE          = "http.cookie-store";
 
     /**
-     * Attribute name of a {@link org.apache.http.auth.AuthSchemeRegistry} 
+     * Attribute name of a {@link org.apache.http.auth.AuthSchemeRegistry}
      * object that represents the actual authentication scheme registry.
      */
-    public static final String AUTHSCHEME_REGISTRY   = "http.authscheme-registry"; 
+    public static final String AUTHSCHEME_REGISTRY   = "http.authscheme-registry";
 
     /**
-     * Attribute name of a {@link org.apache.http.client.CredentialsProvider} 
+     * Attribute name of a {@link org.apache.http.client.CredentialsProvider}
      * object that represents the actual credentials provider.
      */
-    public static final String CREDS_PROVIDER        = "http.auth.credentials-provider"; 
+    public static final String CREDS_PROVIDER        = "http.auth.credentials-provider";
 
     /**
-     * Attribute name of a {@link org.apache.http.client.AuthCache} object 
+     * Attribute name of a {@link org.apache.http.client.AuthCache} object
      * that represents the auth scheme cache.
      */
-    public static final String AUTH_CACHE            = "http.auth.auth-cache"; 
+    public static final String AUTH_CACHE            = "http.auth.auth-cache";
 
     /**
-     * Attribute name of a {@link org.apache.http.auth.AuthState} 
+     * Attribute name of a {@link org.apache.http.auth.AuthState}
      * object that represents the actual target authentication state.
      */
-    public static final String TARGET_AUTH_STATE     = "http.auth.target-scope"; 
+    public static final String TARGET_AUTH_STATE     = "http.auth.target-scope";
 
     /**
-     * Attribute name of a {@link org.apache.http.auth.AuthState} 
+     * Attribute name of a {@link org.apache.http.auth.AuthState}
      * object that represents the actual proxy authentication state.
      */
     public static final String PROXY_AUTH_STATE      = "http.auth.proxy-scope";
@@ -99,11 +99,11 @@ public interface ClientContext {
      */
     @Deprecated
     public static final String AUTH_SCHEME_PREF      = "http.auth.scheme-pref";
-    
+
     /**
-     * Attribute name of a {@link java.lang.Object} object that represents 
+     * Attribute name of a {@link java.lang.Object} object that represents
      * the actual user identity such as user {@link java.security.Principal}.
      */
     public static final String USER_TOKEN            = "http.user-token";
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContextConfigurer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContextConfigurer.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContextConfigurer.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContextConfigurer.java Fri Apr 23 19:19:23 2010
@@ -44,7 +44,7 @@ import org.apache.http.protocol.HttpCont
  */
 @NotThreadSafe
 public class ClientContextConfigurer implements ClientContext {
-    
+
     private final HttpContext context;
 
     public ClientContextConfigurer (final HttpContext context) {
@@ -56,11 +56,11 @@ public class ClientContextConfigurer imp
     public void setCookieSpecRegistry(final CookieSpecRegistry registry) {
         this.context.setAttribute(COOKIESPEC_REGISTRY, registry);
     }
-    
+
     public void setAuthSchemeRegistry(final AuthSchemeRegistry registry) {
         this.context.setAttribute(AUTHSCHEME_REGISTRY, registry);
     }
-    
+
     public void setCookieStore(final CookieStore store) {
         this.context.setAttribute(COOKIE_STORE, store);
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAcceptEncoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAcceptEncoding.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAcceptEncoding.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAcceptEncoding.java Fri Apr 23 19:19:23 2010
@@ -36,23 +36,23 @@ import org.apache.http.protocol.HttpCont
  * Class responsible for handling Content Encoding requests in HTTP.
  * <p>
  * Instances of this class are stateless, therefore they're thread-safe and immutable.
- * 
+ *
  * @see "http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.5"
- * 
+ *
  * @since 4.1
  */
 @Immutable
 public class RequestAcceptEncoding implements HttpRequestInterceptor {
-    
+
     /**
      * {@inheritDoc}
      */
     public void process(
-            final HttpRequest request, 
+            final HttpRequest request,
             final HttpContext context) throws HttpException, IOException {
 
         /* Signal support for Accept-Encoding transfer encodings. */
-        request.addHeader("Accept-Encoding", "gzip,deflate");    
+        request.addHeader("Accept-Encoding", "gzip,deflate");
     }
 
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java Fri Apr 23 19:19:23 2010
@@ -60,29 +60,29 @@ import org.apache.http.protocol.Executio
 
 /**
  * Request interceptor that matches cookies available in the current
- * {@link CookieStore} to the request being executed and generates 
+ * {@link CookieStore} to the request being executed and generates
  * corresponding <code>Cookie</code> request headers.
  * <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.cookie.params.CookieSpecPNames#DATE_PATTERNS}</li>
  *  <li>{@link org.apache.http.cookie.params.CookieSpecPNames#SINGLE_COOKIE_HEADER}</li>
  *  <li>{@link org.apache.http.client.params.ClientPNames#COOKIE_POLICY}</li>
  * </ul>
- * 
+ *
  * @since 4.0
  */
 @Immutable
 public class RequestAddCookies implements HttpRequestInterceptor {
 
     private final Log log = LogFactory.getLog(getClass());
-    
+
     public RequestAddCookies() {
         super();
     }
-    
-    public void process(final HttpRequest request, final HttpContext context) 
+
+    public void process(final HttpRequest request, final HttpContext context)
             throws HttpException, IOException {
         if (request == null) {
             throw new IllegalArgumentException("HTTP request may not be null");
@@ -90,12 +90,12 @@ public class RequestAddCookies implement
         if (context == null) {
             throw new IllegalArgumentException("HTTP context may not be null");
         }
-        
+
         String method = request.getRequestLine().getMethod();
         if (method.equalsIgnoreCase("CONNECT")) {
             return;
         }
-        
+
         // Obtain cookie store
         CookieStore cookieStore = (CookieStore) context.getAttribute(
                 ClientContext.COOKIE_STORE);
@@ -103,7 +103,7 @@ public class RequestAddCookies implement
             this.log.info("Cookie store not available in HTTP context");
             return;
         }
-        
+
         // Obtain the registry of cookie specs
         CookieSpecRegistry registry = (CookieSpecRegistry) context.getAttribute(
                 ClientContext.COOKIESPEC_REGISTRY);
@@ -111,14 +111,14 @@ public class RequestAddCookies implement
             this.log.info("CookieSpec registry not available in HTTP context");
             return;
         }
-        
+
         // Obtain the target host (required)
         HttpHost targetHost = (HttpHost) context.getAttribute(
                 ExecutionContext.HTTP_TARGET_HOST);
         if (targetHost == null) {
             throw new IllegalStateException("Target host not specified in HTTP context");
         }
-        
+
         // Obtain the client connection (required)
         ManagedClientConnection conn = (ManagedClientConnection) context.getAttribute(
                 ExecutionContext.HTTP_CONNECTION);
@@ -130,7 +130,7 @@ public class RequestAddCookies implement
         if (this.log.isDebugEnabled()) {
             this.log.debug("CookieSpec selected: " + policy);
         }
-        
+
         URI requestURI;
         if (request instanceof HttpUriRequest) {
             requestURI = ((HttpUriRequest) request).getURI();
@@ -138,11 +138,11 @@ public class RequestAddCookies implement
             try {
                 requestURI = new URI(request.getRequestLine().getUri());
             } catch (URISyntaxException ex) {
-                throw new ProtocolException("Invalid request URI: " + 
+                throw new ProtocolException("Invalid request URI: " +
                         request.getRequestLine().getUri(), ex);
             }
         }
-        
+
         String hostName = targetHost.getHostName();
         int port = targetHost.getPort();
         if (port < 0) {
@@ -157,13 +157,13 @@ public class RequestAddCookies implement
                 port = conn.getRemotePort();
             }
         }
-        
+
         CookieOrigin cookieOrigin = new CookieOrigin(
-                hostName, 
-                port, 
+                hostName,
+                port,
                 requestURI.getPath(),
                 conn.isSecure());
-        
+
         // Get an instance of the selected cookie policy
         CookieSpec cookieSpec = registry.getCookieSpec(policy, request.getParams());
         // Get all cookies available in the HTTP state
@@ -192,7 +192,7 @@ public class RequestAddCookies implement
                 request.addHeader(header);
             }
         }
-        
+
         int ver = cookieSpec.getVersion();
         if (ver > 0) {
             boolean needVersionHeader = false;
@@ -210,11 +210,11 @@ public class RequestAddCookies implement
                 }
             }
         }
-        
+
         // Stick the CookieSpec and CookieOrigin instances to the HTTP context
         // so they could be obtained by the response interceptor
         context.setAttribute(ClientContext.COOKIE_SPEC, cookieSpec);
         context.setAttribute(ClientContext.COOKIE_ORIGIN, cookieOrigin);
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java Fri Apr 23 19:19:23 2010
@@ -47,22 +47,22 @@ import org.apache.http.protocol.Executio
 import org.apache.http.protocol.HttpContext;
 
 /**
- * Request interceptor that can preemptively authenticate against known hosts, 
- * if there is a cached {@link AuthScheme} instance in the local 
+ * Request interceptor that can preemptively authenticate against known hosts,
+ * if there is a cached {@link AuthScheme} instance in the local
  * {@link AuthCache} associated with the given target or proxy host.
- * 
+ *
  * @since 4.1
  */
 @Immutable
 public class RequestAuthCache implements HttpRequestInterceptor {
 
     private final Log log = LogFactory.getLog(getClass());
-    
+
     public RequestAuthCache() {
         super();
     }
-    
-    public void process(final HttpRequest request, final HttpContext context) 
+
+    public void process(final HttpRequest request, final HttpContext context)
             throws HttpException, IOException {
         if (request == null) {
             throw new IllegalArgumentException("HTTP request may not be null");
@@ -75,18 +75,18 @@ public class RequestAuthCache implements
         if (authCache == null) {
             context.setAttribute(ClientContext.AUTH_CACHE, new BasicAuthCache());
         } else {
-            
+
             CredentialsProvider credsProvider = (CredentialsProvider) context.getAttribute(
                     ClientContext.CREDS_PROVIDER);
-            
+
             HttpHost target = (HttpHost) context.getAttribute(ExecutionContext.HTTP_TARGET_HOST);
             if (target != null) {
                 AuthScheme authScheme = authCache.get(target);
                 if (authScheme != null) {
                     doPreemptiveAuth(
-                            target, 
-                            authScheme,                     
-                            (AuthState) context.getAttribute(ClientContext.TARGET_AUTH_STATE), 
+                            target,
+                            authScheme,
+                            (AuthState) context.getAttribute(ClientContext.TARGET_AUTH_STATE),
                             credsProvider);
                 }
             }
@@ -96,9 +96,9 @@ public class RequestAuthCache implements
                 AuthScheme authScheme = authCache.get(proxy);
                 if (authScheme != null) {
                     doPreemptiveAuth(
-                            proxy, 
-                            authScheme,                     
-                            (AuthState) context.getAttribute(ClientContext.PROXY_AUTH_STATE), 
+                            proxy,
+                            authScheme,
+                            (AuthState) context.getAttribute(ClientContext.PROXY_AUTH_STATE),
                             credsProvider);
                 }
             }
@@ -106,18 +106,18 @@ public class RequestAuthCache implements
     }
 
     private void doPreemptiveAuth(
-            final HttpHost host, 
-            final AuthScheme authScheme, 
+            final HttpHost host,
+            final AuthScheme authScheme,
             final AuthState authState,
             final CredentialsProvider credsProvider) {
         String schemeName = authScheme.getSchemeName();
         if (this.log.isDebugEnabled()) {
             this.log.debug("Re-using cached '" + schemeName + "' auth scheme for " + host);
         }
-        
+
         Credentials creds = credsProvider.getCredentials(
                 new AuthScope(host.getHostName(), host.getPort(), schemeName));
-        
+
         if (creds != null) {
             authState.setAuthScheme(authScheme);
             authState.setCredentials(creds);
@@ -125,5 +125,5 @@ public class RequestAuthCache implements
             this.log.debug("No credentials for preemptive authentication");
         }
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestClientConnControl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestClientConnControl.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestClientConnControl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestClientConnControl.java Fri Apr 23 19:19:23 2010
@@ -41,22 +41,22 @@ import org.apache.http.protocol.HTTP;
 import org.apache.http.protocol.HttpContext;
 
 /**
- * This protocol interceptor is responsible for adding <code>Connection</code> 
- * or <code>Proxy-Connection</code> headers to the outgoing requests, which 
- * is essential for managing persistence of <code>HTTP/1.0</code> connections. 
- * 
+ * This protocol interceptor is responsible for adding <code>Connection</code>
+ * or <code>Proxy-Connection</code> headers to the outgoing requests, which
+ * is essential for managing persistence of <code>HTTP/1.0</code> connections.
+ *
  * @since 4.0
  */
 @Immutable
 public class RequestClientConnControl implements HttpRequestInterceptor {
 
     private static final String PROXY_CONN_DIRECTIVE = "Proxy-Connection";
-    
+
     public RequestClientConnControl() {
         super();
     }
-    
-    public void process(final HttpRequest request, final HttpContext context) 
+
+    public void process(final HttpRequest request, final HttpContext context)
             throws HttpException, IOException {
         if (request == null) {
             throw new IllegalArgumentException("HTTP request may not be null");
@@ -67,7 +67,7 @@ public class RequestClientConnControl im
             request.setHeader(PROXY_CONN_DIRECTIVE, HTTP.CONN_KEEP_ALIVE);
             return;
         }
-        
+
         // Obtain the client connection (required)
         ManagedClientConnection conn = (ManagedClientConnection) context.getAttribute(
                 ExecutionContext.HTTP_CONNECTION);
@@ -76,7 +76,7 @@ public class RequestClientConnControl im
         }
 
         HttpRoute route = conn.getRoute();
-        
+
         if (route.getHopCount() == 1 || route.isTunnelled()) {
             if (!request.containsHeader(HTTP.CONN_DIRECTIVE)) {
                 request.addHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_KEEP_ALIVE);
@@ -88,5 +88,5 @@ public class RequestClientConnControl im
             }
         }
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java Fri Apr 23 19:19:23 2010
@@ -41,7 +41,7 @@ import org.apache.http.protocol.HttpCont
 
 /**
  * Request interceptor that adds default request headers.
- * 
+ *
  * @since 4.0
  */
 @Immutable
@@ -50,18 +50,18 @@ public class RequestDefaultHeaders imple
     public RequestDefaultHeaders() {
         super();
     }
-    
-    public void process(final HttpRequest request, final HttpContext context) 
+
+    public void process(final HttpRequest request, final HttpContext context)
             throws HttpException, IOException {
         if (request == null) {
             throw new IllegalArgumentException("HTTP request may not be null");
         }
-        
+
         String method = request.getRequestLine().getMethod();
         if (method.equalsIgnoreCase("CONNECT")) {
             return;
         }
-        
+
         // Add default headers
         @SuppressWarnings("unchecked")
         Collection<Header> defHeaders = (Collection<Header>) request.getParams().getParameter(
@@ -73,5 +73,5 @@ public class RequestDefaultHeaders imple
             }
         }
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java Fri Apr 23 19:19:23 2010
@@ -46,22 +46,22 @@ import org.apache.http.auth.Credentials;
 import org.apache.http.protocol.HttpContext;
 
 /**
- * Generates authentication header for the proxy host, if required, 
- * based on the actual state of the HTTP authentication context.   
- * 
+ * Generates authentication header for the proxy host, if required,
+ * based on the actual state of the HTTP authentication context.
+ *
  * @since 4.0
  */
 @Immutable
 public class RequestProxyAuthentication implements HttpRequestInterceptor {
 
     private final Log log = LogFactory.getLog(getClass());
-    
+
     public RequestProxyAuthentication() {
         super();
     }
-    
+
     @SuppressWarnings("deprecation")
-    public void process(final HttpRequest request, final HttpContext context) 
+    public void process(final HttpRequest request, final HttpContext context)
             throws HttpException, IOException {
         if (request == null) {
             throw new IllegalArgumentException("HTTP request may not be null");
@@ -73,7 +73,7 @@ public class RequestProxyAuthentication 
         if (request.containsHeader(AUTH.PROXY_AUTH_RESP)) {
             return;
         }
-        
+
         // Obtain authentication state
         AuthState authState = (AuthState) context.getAttribute(
                 ClientContext.PROXY_AUTH_STATE);
@@ -85,7 +85,7 @@ public class RequestProxyAuthentication 
         if (authScheme == null) {
             return;
         }
-        
+
         Credentials creds = authState.getCredentials();
         if (creds == null) {
             this.log.debug("User credentials not available");
@@ -108,5 +108,5 @@ public class RequestProxyAuthentication 
             }
         }
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java Fri Apr 23 19:19:23 2010
@@ -46,22 +46,22 @@ import org.apache.http.auth.Credentials;
 import org.apache.http.protocol.HttpContext;
 
 /**
- * Generates authentication header for the target host, if required, 
- * based on the actual state of the HTTP authentication context.   
- * 
+ * Generates authentication header for the target host, if required,
+ * based on the actual state of the HTTP authentication context.
+ *
  * @since 4.0
  */
 @Immutable
 public class RequestTargetAuthentication implements HttpRequestInterceptor {
 
     private final Log log = LogFactory.getLog(getClass());
-    
+
     public RequestTargetAuthentication() {
         super();
     }
-    
+
     @SuppressWarnings("deprecation")
-    public void process(final HttpRequest request, final HttpContext context) 
+    public void process(final HttpRequest request, final HttpContext context)
             throws HttpException, IOException {
         if (request == null) {
             throw new IllegalArgumentException("HTTP request may not be null");
@@ -74,11 +74,11 @@ public class RequestTargetAuthentication
         if (method.equalsIgnoreCase("CONNECT")) {
             return;
         }
-        
+
         if (request.containsHeader(AUTH.WWW_AUTH_RESP)) {
             return;
         }
-        
+
         // Obtain authentication state
         AuthState authState = (AuthState) context.getAttribute(
                 ClientContext.TARGET_AUTH_STATE);
@@ -90,7 +90,7 @@ public class RequestTargetAuthentication
         if (authScheme == null) {
             return;
         }
-        
+
         Credentials creds = authState.getCredentials();
         if (creds == null) {
             this.log.debug("User credentials not available");
@@ -114,5 +114,5 @@ public class RequestTargetAuthentication
             }
         }
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java Fri Apr 23 19:19:23 2010
@@ -45,22 +45,22 @@ import org.apache.http.protocol.HttpCont
 
 /**
  * Response interceptor that adds successfully completed {@link AuthScheme}s
- * to the local {@link AuthCache} instance. Cached {@link AuthScheme}s can be 
- * re-used when executing requests against known hosts, thus avoiding 
- * additional authentication round-trips. 
- * 
+ * to the local {@link AuthCache} instance. Cached {@link AuthScheme}s can be
+ * re-used when executing requests against known hosts, thus avoiding
+ * additional authentication round-trips.
+ *
  * @since 4.1
  */
 @Immutable
 public class ResponseAuthCache implements HttpResponseInterceptor {
 
     private final Log log = LogFactory.getLog(getClass());
-    
+
     public ResponseAuthCache() {
         super();
     }
-    
-    public void process(final HttpResponse response, final HttpContext context) 
+
+    public void process(final HttpResponse response, final HttpContext context)
             throws HttpException, IOException {
         if (response == null) {
             throw new IllegalArgumentException("HTTP request may not be null");
@@ -70,31 +70,31 @@ public class ResponseAuthCache implement
         }
         AuthCache authCache = (AuthCache) context.getAttribute(ClientContext.AUTH_CACHE);
         if (authCache != null) {
-            cache(authCache, 
+            cache(authCache,
                     (HttpHost) context.getAttribute(ExecutionContext.HTTP_TARGET_HOST),
                     (AuthState) context.getAttribute(ClientContext.TARGET_AUTH_STATE));
-            cache(authCache, 
+            cache(authCache,
                     (HttpHost) context.getAttribute(ExecutionContext.HTTP_PROXY_HOST),
                     (AuthState) context.getAttribute(ClientContext.PROXY_AUTH_STATE));
         }
     }
-    
+
     private void cache(final AuthCache authCache, final HttpHost host, final AuthState authState) {
         if (authState == null) {
             return;
         }
-        
+
         AuthScheme authScheme = authState.getAuthScheme();
         if (authScheme == null || !authScheme.isComplete()) {
             return;
         }
-        
+
         String schemeName = authScheme.getSchemeName();
-        if (!schemeName.equalsIgnoreCase(AuthPolicy.BASIC) && 
+        if (!schemeName.equalsIgnoreCase(AuthPolicy.BASIC) &&
                 !schemeName.equalsIgnoreCase(AuthPolicy.DIGEST)) {
             return;
         }
-        
+
         if (authState.getAuthScope() != null) {
             if (authState.getCredentials() != null) {
                 if (this.log.isDebugEnabled()) {
@@ -106,5 +106,5 @@ public class ResponseAuthCache implement
             }
         }
     }
-     
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java Fri Apr 23 19:19:23 2010
@@ -40,11 +40,11 @@ import org.apache.http.client.entity.Gzi
 import org.apache.http.protocol.HttpContext;
 
 /**
- * {@link HttpResponseInterceptor} responsible for processing Content-Encoding 
+ * {@link HttpResponseInterceptor} responsible for processing Content-Encoding
  * responses.
  * <p>
  * Instances of this class are stateless and immutable, therefore threadsafe.
- * 
+ *
  * @since 4.1
  *
  */
@@ -55,12 +55,12 @@ public class ResponseContentEncoding imp
      * {@inheritDoc}
      */
     public void process(
-            final HttpResponse response, 
+            final HttpResponse response,
             final HttpContext context) throws HttpException, IOException {
         HttpEntity entity = response.getEntity();
 
         // It wasn't a 304 Not Modified response, 204 No Content or similar
-        if (entity != null) { 
+        if (entity != null) {
             Header ceheader = entity.getContentEncoding();
             if (ceheader != null) {
                 HeaderElement[] codecs = ceheader.getElements();
@@ -72,7 +72,7 @@ public class ResponseContentEncoding imp
                         response.setEntity(new DeflateDecompressingEntity(response.getEntity()));
                         return;
                     } else if ("identity".equalsIgnoreCase(codec.getName())) {
-                        
+
                         /* Don't need to transform the content - no-op */
                         return;
                     } else {

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java Fri Apr 23 19:19:23 2010
@@ -48,21 +48,21 @@ import org.apache.http.cookie.SM;
 import org.apache.http.protocol.HttpContext;
 
 /**
- * Response interceptor that populates the current {@link CookieStore} with data 
+ * Response interceptor that populates the current {@link CookieStore} with data
  * contained in response cookies received in the given the HTTP response.
- * 
+ *
  * @since 4.0
  */
 @Immutable
 public class ResponseProcessCookies implements HttpResponseInterceptor {
 
     private final Log log = LogFactory.getLog(getClass());
-    
+
     public ResponseProcessCookies() {
         super();
     }
-    
-    public void process(final HttpResponse response, final HttpContext context) 
+
+    public void process(final HttpResponse response, final HttpContext context)
             throws HttpException, IOException {
         if (response == null) {
             throw new IllegalArgumentException("HTTP request may not be null");
@@ -70,7 +70,7 @@ public class ResponseProcessCookies impl
         if (context == null) {
             throw new IllegalArgumentException("HTTP context may not be null");
         }
-        
+
         // Obtain actual CookieSpec instance
         CookieSpec cookieSpec = (CookieSpec) context.getAttribute(
                 ClientContext.COOKIE_SPEC);
@@ -93,7 +93,7 @@ public class ResponseProcessCookies impl
         }
         HeaderIterator it = response.headerIterator(SM.SET_COOKIE);
         processCookies(it, cookieSpec, cookieOrigin, cookieStore);
-        
+
         // see if the cookie spec supports cookie versioning.
         if (cookieSpec.getVersion() > 0) {
             // process set-cookie2 headers.
@@ -102,9 +102,9 @@ public class ResponseProcessCookies impl
             processCookies(it, cookieSpec, cookieOrigin, cookieStore);
         }
     }
-     
+
     private void processCookies(
-            final HeaderIterator iterator, 
+            final HeaderIterator iterator,
             final CookieSpec cookieSpec,
             final CookieOrigin cookieOrigin,
             final CookieStore cookieStore) {
@@ -136,5 +136,5 @@ public class ResponseProcessCookies impl
             }
         }
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/package.html?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/package.html (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/package.html Fri Apr 23 19:19:23 2010
@@ -30,7 +30,7 @@
 -->
 </head>
 <body>
-Additional request and response interceptors for HTTP state and 
+Additional request and response interceptors for HTTP state and
 authentication management.
 </body>
 </html>

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/CloneUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/CloneUtils.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/CloneUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/CloneUtils.java Fri Apr 23 19:19:23 2010
@@ -59,7 +59,7 @@ public class CloneUtils {
             } catch (InvocationTargetException ex) {
                 Throwable cause = ex.getCause();
                 if (cause instanceof CloneNotSupportedException) {
-                    throw ((CloneNotSupportedException) cause); 
+                    throw ((CloneNotSupportedException) cause);
                 } else {
                     throw new Error("Unexpected exception", cause);
                 }
@@ -70,7 +70,7 @@ public class CloneUtils {
             throw new CloneNotSupportedException();
         }
     }
-    
+
     /**
      * This class should not be instantiated.
      */

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java Fri Apr 23 19:19:23 2010
@@ -45,7 +45,7 @@ public class JdkIdn implements Idn {
     private final Method toUnicode;
 
     /**
-     * 
+     *
      * @throws ClassNotFoundException if java.net.IDN is not available
      */
     public JdkIdn() throws ClassNotFoundException {
@@ -71,5 +71,5 @@ public class JdkIdn implements Idn {
             throw new RuntimeException(t.getMessage(), t);
         }
     }
-    
+
 }
\ No newline at end of file

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Punycode.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Punycode.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Punycode.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Punycode.java Fri Apr 23 19:19:23 2010
@@ -50,9 +50,9 @@ public class Punycode {
         }
         impl = _impl;
     }
-    
+
     public static String toUnicode(String punycode) {
         return impl.toUnicode(punycode);
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java Fri Apr 23 19:19:23 2010
@@ -50,7 +50,7 @@ public class Rfc3492Idn implements Idn {
     private static final int initial_n = 128;
     private static final char delimiter = '-';
     private static final String ACE_PREFIX = "xn--";
-    
+
     private int adapt(int delta, int numpoints, boolean firsttime) {
         if (firsttime) delta = delta / damp;
         else delta = delta / 2;
@@ -62,7 +62,7 @@ public class Rfc3492Idn implements Idn {
         }
         return k + (((base - tmin + 1) * delta) / (delta + skew));
     }
-    
+
     private int digit(char c) {
         if ((c >= 'A') && (c <= 'Z')) return (c - 'A');
         if ((c >= 'a') && (c <= 'z')) return (c - 'a');
@@ -81,7 +81,7 @@ public class Rfc3492Idn implements Idn {
         }
         return unicode.toString();
     }
-    
+
     protected String decode(String input) {
         int n = initial_n;
         int i = 0;
@@ -122,5 +122,5 @@ public class Rfc3492Idn implements Idn {
         }
         return output.toString();
     }
-    
+
 }
\ No newline at end of file

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java Fri Apr 23 19:19:23 2010
@@ -48,7 +48,7 @@ public class URIUtils {
          * used instead of
          * {@link URI#URI(String, String, String, int, String, String, String)}
          * or any of the other URI multi-argument URI constructors.
-         * 
+         *
          * @param scheme
          *            Scheme name
          * @param host
@@ -61,7 +61,7 @@ public class URIUtils {
          *            Query
          * @param fragment
          *            Fragment
-         * 
+         *
          * @throws URISyntaxException
          *             If both a scheme and a path are given but the path is
          *             relative, if the URI string constructed from the given
@@ -76,7 +76,7 @@ public class URIUtils {
             final String path,
             final String query,
             final String fragment) throws URISyntaxException {
-        
+
         StringBuilder buffer = new StringBuilder();
         if (host != null) {
             if (scheme != null) {
@@ -111,19 +111,19 @@ public class URIUtils {
      * and port are taken from the target host, but whose path, query and
      * fragment are taken from the existing URI. The fragment is only used if
      * dropFragment is false.
-     * 
+     *
      * @param uri
      *            Contains the path, query and fragment to use.
      * @param target
      *            Contains the scheme, host and port to use.
      * @param dropFragment
      *            True if the fragment should not be copied.
-     * 
+     *
      * @throws URISyntaxException
      *             If the resulting URI is invalid.
      */
     public static URI rewriteURI(
-            final URI uri, 
+            final URI uri,
             final HttpHost target,
             boolean dropFragment) throws URISyntaxException {
         if (uri == null) {
@@ -131,23 +131,23 @@ public class URIUtils {
         }
         if (target != null) {
             return URIUtils.createURI(
-                    target.getSchemeName(), 
-                    target.getHostName(), 
-                    target.getPort(), 
-                    normalizePath(uri.getRawPath()), 
-                    uri.getRawQuery(), 
+                    target.getSchemeName(),
+                    target.getHostName(),
+                    target.getPort(),
+                    normalizePath(uri.getRawPath()),
+                    uri.getRawQuery(),
                     dropFragment ? null : uri.getRawFragment());
         } else {
             return URIUtils.createURI(
-                    null, 
-                    null, 
-                    -1, 
-                    normalizePath(uri.getRawPath()), 
-                    uri.getRawQuery(), 
+                    null,
+                    null,
+                    -1,
+                    normalizePath(uri.getRawPath()),
+                    uri.getRawQuery(),
                     dropFragment ? null : uri.getRawFragment());
         }
     }
-    
+
     private static String normalizePath(final String path) {
         if (path == null) {
             return null;
@@ -168,18 +168,18 @@ public class URIUtils {
         }
         return buffer.toString();
     }
-    
+
     /**
      * A convenience method for
      * {@link URIUtils#rewriteURI(URI, HttpHost, boolean)} that always keeps the
      * fragment.
      */
     public static URI rewriteURI(
-            final URI uri, 
+            final URI uri,
             final HttpHost target) throws URISyntaxException {
         return rewriteURI(uri, target, false);
     }
-    
+
     /**
      * Resolves a URI reference against a base URI. Work-around for bug in
      * java.net.URI (<http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4708535>)
@@ -226,7 +226,7 @@ public class URIUtils {
 
     /**
      * Resolves a reference starting with a query string.
-     * 
+     *
      * @param baseURI the base URI
      * @param reference the URI reference starting with a query string
      * @return the resulting URI
@@ -241,7 +241,7 @@ public class URIUtils {
 
     /**
      * Removes dot segments according to RFC 3986, section 5.2.4
-     * 
+     *
      * @param uri the original URI
      * @return the URI without dot segments
      */

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java Fri Apr 23 19:19:23 2010
@@ -66,7 +66,7 @@ public class URLEncodedUtils {
      * NameValuePairs, one for a=1, one for b=2, and one for c=3.
      * <p>
      * This is typically useful while parsing an HTTP PUT.
-     * 
+     *
      * @param uri
      *            uri to parse
      * @param encoding
@@ -88,7 +88,7 @@ public class URLEncodedUtils {
      * Content-Encoding header.
      * <p>
      * This is typically used while parsing an HTTP POST.
-     * 
+     *
      * @param entity
      *            The entity to parse
      * @throws IOException
@@ -97,10 +97,10 @@ public class URLEncodedUtils {
     public static List <NameValuePair> parse (
             final HttpEntity entity) throws IOException {
         List <NameValuePair> result = Collections.emptyList();
-        
+
         String contentType = null;
         String charset = null;
-        
+
         Header h = entity.getContentType();
         if (h != null) {
             HeaderElement[] elems = h.getElements();
@@ -113,7 +113,7 @@ public class URLEncodedUtils {
                 }
             }
         }
-        
+
         if (contentType != null && contentType.equalsIgnoreCase(CONTENT_TYPE)) {
             final String content = EntityUtils.toString(entity, HTTP.ASCII);
             if (content != null && content.length() > 0) {
@@ -149,7 +149,7 @@ public class URLEncodedUtils {
      * example, a scanner containing the string <code>a=1&b=2&c=3</code> would
      * add the {@link NameValuePair NameValuePairs} a=1, b=2, and c=3 to the
      * list of parameters.
-     * 
+     *
      * @param parameters
      *            List to add parameters to.
      * @param scanner
@@ -158,8 +158,8 @@ public class URLEncodedUtils {
      *            Encoding to use when decoding the parameters.
      */
     public static void parse (
-            final List <NameValuePair> parameters, 
-            final Scanner scanner, 
+            final List <NameValuePair> parameters,
+            final Scanner scanner,
             final String encoding) {
         scanner.useDelimiter(PARAMETER_SEPARATOR);
         while (scanner.hasNext()) {
@@ -178,12 +178,12 @@ public class URLEncodedUtils {
     /**
      * Returns a String that is suitable for use as an <code>application/x-www-form-urlencoded</code>
      * list of parameters in an HTTP PUT or HTTP POST.
-     * 
+     *
      * @param parameters  The parameters to include.
      * @param encoding The encoding to use.
      */
     public static String format (
-            final List <? extends NameValuePair> parameters, 
+            final List <? extends NameValuePair> parameters,
             final String encoding) {
         final StringBuilder result = new StringBuilder();
         for (final NameValuePair parameter : parameters) {
@@ -201,7 +201,7 @@ public class URLEncodedUtils {
 
     private static String decode (final String content, final String encoding) {
         try {
-            return URLDecoder.decode(content, 
+            return URLDecoder.decode(content,
                     encoding != null ? encoding : HTTP.DEFAULT_CONTENT_CHARSET);
         } catch (UnsupportedEncodingException problem) {
             throw new IllegalArgumentException(problem);
@@ -210,11 +210,11 @@ public class URLEncodedUtils {
 
     private static String encode (final String content, final String encoding) {
         try {
-            return URLEncoder.encode(content, 
+            return URLEncoder.encode(content,
                     encoding != null ? encoding : HTTP.DEFAULT_CONTENT_CHARSET);
         } catch (UnsupportedEncodingException problem) {
             throw new IllegalArgumentException(problem);
         }
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java Fri Apr 23 19:19:23 2010
@@ -33,7 +33,7 @@ import java.io.IOException;
 import org.apache.http.annotation.NotThreadSafe;
 
 /**
- * Basic implementation of {@link EofSensorWatcher}. The underlying connection 
+ * Basic implementation of {@link EofSensorWatcher}. The underlying connection
  * is released on close or EOF.
  *
  * @since 4.0

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionManager.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionManager.java Fri Apr 23 19:19:23 2010
@@ -33,14 +33,14 @@ import org.apache.http.conn.routing.Http
 import org.apache.http.conn.scheme.SchemeRegistry;
 
 /**
- * Management interface for {@link ManagedClientConnection client connections}. 
- * The purpose of an HTTP connection manager is to serve as a factory for new 
- * HTTP connections, manage persistent connections and synchronize access to 
- * persistent connections making sure that only one thread of execution can 
+ * Management interface for {@link ManagedClientConnection client connections}.
+ * The purpose of an HTTP connection manager is to serve as a factory for new
+ * HTTP connections, manage persistent connections and synchronize access to
+ * persistent connections making sure that only one thread of execution can
  * have access to a connection at a time.
  * <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
@@ -53,7 +53,7 @@ public interface ClientConnectionManager
      * @return  the scheme registry, never <code>null</code>
      */
     SchemeRegistry getSchemeRegistry();
-    
+
     /**
      * Returns a new {@link ClientConnectionRequest}, from which a
      * {@link ManagedClientConnection} can be obtained or the request can be
@@ -67,14 +67,14 @@ public interface ClientConnectionManager
      * to be reused.  Values <= 0 are considered to be valid forever.
      * If the connection is not marked as reusable, the connection will
      * not be reused regardless of the valid duration.
-     * 
+     *
      * If the connection has been released before,
      * the call will be ignored.
      *
      * @param conn      the connection to release
      * @param validDuration the duration of time this connection is valid for reuse
      * @param timeUnit the unit of time validDuration is measured in
-     * 
+     *
      * @see #closeExpiredConnections()
      */
     void releaseConnection(ManagedClientConnection conn, long validDuration, TimeUnit timeUnit);
@@ -85,12 +85,12 @@ public interface ClientConnectionManager
      * timespan given by the argument will be closed.
      * Currently allocated connections are not subject to this method.
      * Times will be checked with milliseconds precision
-     * 
+     *
      * All expired connections will also be closed.
-     * 
+     *
      * @param idletime  the idle time of connections to be closed
      * @param tunit     the unit for the <code>idletime</code>
-     * 
+     *
      * @see #closeExpiredConnections()
      */
     void closeIdleConnections(long idletime, TimeUnit tunit);

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionManagerFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionManagerFactory.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionManagerFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionManagerFactory.java Fri Apr 23 19:19:23 2010
@@ -32,14 +32,14 @@ import org.apache.http.params.HttpParams
 
 /**
  * A factory for creating new {@link ClientConnectionManager} instances.
- * 
+ *
  *
  * @since 4.0
  */
-public interface ClientConnectionManagerFactory {    
+public interface ClientConnectionManagerFactory {
 
     ClientConnectionManager newInstance(
-            HttpParams params, 
+            HttpParams params,
             SchemeRegistry schemeRegistry);
 
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionOperator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionOperator.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionOperator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionOperator.java Fri Apr 23 19:19:23 2010
@@ -37,9 +37,9 @@ import org.apache.http.params.HttpParams
 import org.apache.http.protocol.HttpContext;
 
 /**
- * ClientConnectionOperator represents a strategy for creating 
- * {@link OperatedClientConnection} instances and updating the underlying 
- * {@link Socket} of those objects. Implementations will most likely make use 
+ * ClientConnectionOperator represents a strategy for creating
+ * {@link OperatedClientConnection} instances and updating the underlying
+ * {@link Socket} of those objects. Implementations will most likely make use
  * of {@link SchemeSocketFactory}s to create {@link Socket} instances.
  * <p>
  * The methods in this interface allow the creation of plain and layered
@@ -47,7 +47,7 @@ import org.apache.http.protocol.HttpCont
  * is not within the scope of the operator.
  * <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

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionRequest.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionRequest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionRequest.java Fri Apr 23 19:19:23 2010
@@ -35,18 +35,18 @@ import java.util.concurrent.TimeUnit;
  * @since 4.0
  */
 public interface ClientConnectionRequest {
-    
+
     /**
      * Obtains a connection within a given time.
      * This method will block until a connection becomes available,
      * the timeout expires, or the connection manager is
      * {@link ClientConnectionManager#shutdown() shut down}.
      * Timeouts are handled with millisecond precision.
-     * 
+     *
      * If {@link #abortRequest()} is called while this is blocking or
      * before this began, an {@link InterruptedException} will
      * be thrown.
-     * 
+     *
      * @param timeout   the timeout, 0 or negative for no timeout
      * @param tunit     the unit for the <code>timeout</code>,
      *                  may be <code>null</code> only if there is no timeout
@@ -59,9 +59,9 @@ public interface ClientConnectionRequest
      * @throws InterruptedException
      *         if the calling thread is interrupted while waiting
      */
-    ManagedClientConnection getConnection(long timeout, TimeUnit tunit) 
+    ManagedClientConnection getConnection(long timeout, TimeUnit tunit)
         throws InterruptedException, ConnectionPoolTimeoutException;
-    
+
     /**
      * Aborts the call to {@link #getConnection(long, TimeUnit)},
      * causing it to throw an {@link InterruptedException}.

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectTimeoutException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectTimeoutException.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectTimeoutException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectTimeoutException.java Fri Apr 23 19:19:23 2010
@@ -34,8 +34,8 @@ import org.apache.http.annotation.Immuta
 /**
  * A timeout while connecting to an HTTP server or waiting for an
  * available connection from an HttpConnectionManager.
- * 
- * 
+ *
+ *
  * @since 4.0
  */
 @Immutable
@@ -52,8 +52,8 @@ public class ConnectTimeoutException ext
 
     /**
      * Creates a ConnectTimeoutException with the specified detail message.
-     * 
-     * @param message The exception detail message 
+     *
+     * @param message The exception detail message
      */
     public ConnectTimeoutException(final String message) {
         super(message);

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionKeepAliveStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionKeepAliveStrategy.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionKeepAliveStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionKeepAliveStrategy.java Fri Apr 23 19:19:23 2010
@@ -35,32 +35,32 @@ import org.apache.http.protocol.HttpCont
  * idle before being reused.
  * <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 ConnectionKeepAliveStrategy {
-    
+
     /**
      * Returns the duration of time which this connection can be safely kept
      * idle. If the connection is left idle for longer than this period of time,
      * it MUST not reused. A value of 0 or less may be returned to indicate that
      * there is no suitable suggestion.
-     * 
+     *
      * When coupled with a {@link ConnectionReuseStrategy}, if
      * {@link ConnectionReuseStrategy#keepAlive(HttpResponse, HttpContext)}
      * returns true, this allows you to control how long the reuse will last. If
      * keepAlive returns false, this should have no meaningful impact
-     * 
+     *
      * @param response
      *            The last response received over the connection.
      * @param context
      *            the context in which the connection is being used.
-     * 
+     *
      * @return the duration in ms for which it is safe to keep the connection
      *         idle, or <=0 if no suggested duration.
      */
     long getKeepAliveDuration(HttpResponse response, HttpContext context);
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java Fri Apr 23 19:19:23 2010
@@ -30,10 +30,10 @@ package org.apache.http.conn;
 import org.apache.http.annotation.Immutable;
 
 /**
- * A timeout while waiting for an available connection 
+ * A timeout while waiting for an available connection
  * from a connection manager.
- * 
- * 
+ *
+ *
  * @since 4.0
  */
 @Immutable
@@ -50,8 +50,8 @@ public class ConnectionPoolTimeoutExcept
 
     /**
      * Creates a ConnectTimeoutException with the specified detail message.
-     * 
-     * @param message The exception detail message 
+     *
+     * @param message The exception detail message
      */
     public ConnectionPoolTimeoutException(String message) {
         super(message);

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionReleaseTrigger.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionReleaseTrigger.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionReleaseTrigger.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionReleaseTrigger.java Fri Apr 23 19:19:23 2010
@@ -29,7 +29,7 @@ package org.apache.http.conn;
 import java.io.IOException;
 
 /**
- * Interface for releasing a connection. This can be implemented by various 
+ * Interface for releasing a connection. This can be implemented by various
  * "trigger" objects which are associated with a connection, for example
  * a {@link EofSensorInputStream stream} or an {@link BasicManagedEntity entity}
  * or the {@link ManagedClientConnection connection} itself.
@@ -48,7 +48,7 @@ public interface ConnectionReleaseTrigge
      * remainder of a response entity. Use
      * {@link #abortConnection abortConnection} for a hard release. The
      * connection may be reused as specified by the duration.
-     * 
+     *
      * @throws IOException
      *             in case of an IO problem. The connection will be released
      *             anyway.

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java Fri Apr 23 19:19:23 2010
@@ -62,7 +62,7 @@ public class EofSensorInputStream extend
      * Indicates whether this stream itself is closed.
      * If it isn't, but {@link #wrappedStream wrappedStream}
      * is <code>null</code>, we're running in EOF mode.
-     * All read operations will indicate EOF without accessing 
+     * All read operations will indicate EOF without accessing
      * the underlying stream. After closing this stream, read
      * operations will trigger an {@link IOException IOException}.
      *

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorWatcher.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorWatcher.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorWatcher.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorWatcher.java Fri Apr 23 19:19:23 2010
@@ -30,7 +30,7 @@ import java.io.InputStream;
 import java.io.IOException;
 
 /**
- * A watcher for {@link EofSensorInputStream}. Each stream will notify its 
+ * A watcher for {@link EofSensorInputStream}. Each stream will notify its
  * watcher at most once.
  *
  * @since 4.0
@@ -77,7 +77,7 @@ public interface EofSensorWatcher {
      * before aborting. Otherwise, {@link #eofDetected eofDetected} is called.
      * <p/>
      * This method will also be invoked when an input operation causes an
-     * IOException to be thrown to make sure the input stream gets shut down. 
+     * IOException to be thrown to make sure the input stream gets shut down.
      *
      * @param wrapped   the underlying stream which has not reached EOF
      *

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java Fri Apr 23 19:19:23 2010
@@ -44,7 +44,7 @@ public class HttpHostConnectException ex
     private static final long serialVersionUID = -3194482710275220224L;
 
     private final HttpHost host;
-    
+
     public HttpHostConnectException(final HttpHost host, final ConnectException cause) {
         super("Connection to " + host + " refused");
         this.host = host;
@@ -54,5 +54,5 @@ public class HttpHostConnectException ex
     public HttpHost getHost() {
         return this.host;
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ManagedClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ManagedClientConnection.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ManagedClientConnection.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ManagedClientConnection.java Fri Apr 23 19:19:23 2010
@@ -199,21 +199,21 @@ public interface ManagedClientConnection
      */
     boolean isMarkedReusable();
 
-    /** 
-     * Assigns a state object to this connection. Connection managers may make 
+    /**
+     * Assigns a state object to this connection. Connection managers may make
      * use of the connection state when allocating persistent connections.
-     *  
+     *
      * @param state The state object
      */
     void setState(Object state);
-    
+
     /**
      * Returns the state object associated with this connection.
-     * 
+     *
      * @return The state object
      */
     Object getState();
-    
+
     /**
      * Sets the duration that this connection can remain idle before it is
      * reused. The connection should not be used again if this time elapses. The



Mime
View raw message