hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1172301 [3/3] - in /httpcomponents/httpclient/trunk: ./ httpclient-cache/src/main/java/org/apache/http/client/cache/ httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ httpclient-cache/src/main/java/org/apache/http/impl/clie...
Date Sun, 18 Sep 2011 16:20:22 GMT
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectStrategy.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectStrategy.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectStrategy.java
Sun Sep 18 16:20:20 2011
@@ -78,4 +78,4 @@ public interface RedirectStrategy {
             HttpResponse response,
             HttpContext context) throws ProtocolException;
 
-}
\ No newline at end of file
+}

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ServiceUnavailableRetryStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ServiceUnavailableRetryStrategy.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ServiceUnavailableRetryStrategy.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ServiceUnavailableRetryStrategy.java
Sun Sep 18 16:20:20 2011
@@ -57,4 +57,4 @@ public interface ServiceUnavailableRetry
      */
     long getRetryInterval();
 
-}
\ No newline at end of file
+}

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Idn.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Idn.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Idn.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Idn.java
Sun Sep 18 16:20:20 2011
@@ -43,4 +43,4 @@ public interface Idn {
      * @return the Unicode domain name
      */
     String toUnicode(String punycode);
-}
\ No newline at end of file
+}

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=1172301&r1=1172300&r2=1172301&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
Sun Sep 18 16:20:20 2011
@@ -72,4 +72,4 @@ public class JdkIdn implements Idn {
         }
     }
 
-}
\ No newline at end of file
+}

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=1172301&r1=1172300&r2=1172301&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
Sun Sep 18 16:20:20 2011
@@ -123,4 +123,4 @@ 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/conn/DnsResolver.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/DnsResolver.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/DnsResolver.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/DnsResolver.java
Sun Sep 18 16:20:20 2011
@@ -49,4 +49,4 @@ public interface DnsResolver {
      */
     InetAddress[] resolve(String host) throws UnknownHostException;
 
-}
\ No newline at end of file
+}

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/ClientCookie.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/ClientCookie.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/ClientCookie.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/ClientCookie.java
Sun Sep 18 16:20:20 2011
@@ -59,4 +59,4 @@ public interface ClientCookie extends Co
 
     boolean containsAttribute(String name);
 
-}
\ No newline at end of file
+}

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java
Sun Sep 18 16:20:20 2011
@@ -44,7 +44,7 @@ import org.apache.http.protocol.HttpCont
 import org.apache.http.client.*;
 
 /**
- * {@link HttpClient} implementation that can automatically retry the request in case of

+ * {@link HttpClient} implementation that can automatically retry the request in case of
  * a non-2xx response using the {@link ServiceUnavailableRetryStrategy} interface.
  *
  * @since 4.2
@@ -174,4 +174,4 @@ public class AutoRetryHttpClient impleme
         return backend.getParams();
     }
 
-}
\ No newline at end of file
+}

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
Sun Sep 18 16:20:20 2011
@@ -110,11 +110,11 @@ public class DefaultHttpRequestRetryHand
 
         HttpRequest request = (HttpRequest)
             context.getAttribute(ExecutionContext.HTTP_REQUEST);
-        
+
         if(requestIsAborted(request)){
-        	return false;
+            return false;
         }
-        
+
         if (handleAsIdempotent(request)) {
             // Retry if the request is considered idempotent
             return true;
@@ -154,7 +154,7 @@ public class DefaultHttpRequestRetryHand
     protected boolean handleAsIdempotent(final HttpRequest request) {
         return !(request instanceof HttpEntityEnclosingRequest);
     }
-    
+
     protected boolean requestIsAborted(final HttpRequest request) {
         return (request instanceof HttpUriRequest && ((HttpUriRequest)request).isAborted());
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java
Sun Sep 18 16:20:20 2011
@@ -211,4 +211,4 @@ public class DefaultRedirectStrategy imp
         }
     }
 
-}
\ No newline at end of file
+}

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java
Sun Sep 18 16:20:20 2011
@@ -37,7 +37,7 @@ import org.apache.http.protocol.HttpCont
  * Default implementation of the {@link ServiceUnavailableRetryStrategy} interface.
  * that retries <code>503</code> (Service Unavailable) responses for a fixed
number of times
  * at a fixed interval.
- * 
+ *
  * @since 4.2
  */
 @Immutable

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/InMemoryDnsResolver.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/InMemoryDnsResolver.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/InMemoryDnsResolver.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/InMemoryDnsResolver.java
Sun Sep 18 16:20:20 2011
@@ -92,4 +92,4 @@ public class InMemoryDnsResolver impleme
         return resolvedAddresses;
     }
 
-}
\ No newline at end of file
+}

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpec.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpec.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpec.java
Sun Sep 18 16:20:20 2011
@@ -218,4 +218,4 @@ public class BestMatchSpec implements Co
         return "best-match";
     }
 
-}
\ No newline at end of file
+}

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.java
Sun Sep 18 16:20:20 2011
@@ -64,4 +64,4 @@ public class RFC2965CommentUrlAttributeH
           return true;
       }
 
-  }
\ No newline at end of file
+  }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.java
Sun Sep 18 16:20:20 2011
@@ -64,4 +64,4 @@ public class RFC2965DiscardAttributeHand
           return true;
       }
 
-  }
\ No newline at end of file
+  }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java
Sun Sep 18 16:20:20 2011
@@ -191,4 +191,4 @@ public class RFC2965DomainAttributeHandl
         return effectiveHostWithoutDomain.indexOf('.') == -1;
     }
 
-}
\ No newline at end of file
+}

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.java
Sun Sep 18 16:20:20 2011
@@ -95,4 +95,4 @@ public class RFC2965VersionAttributeHand
         return true;
     }
 
-}
\ No newline at end of file
+}

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAddCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAddCookies.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAddCookies.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAddCookies.java
Sun Sep 18 16:20:20 2011
@@ -512,9 +512,9 @@ public class TestRequestAddCookies {
     // Test for ordering adapted from test in Commons HC 3.1
     public void testCookieOrder() throws Exception {
         HttpRequest request = new BasicHttpRequest("GET", "/foobar/yada/yada");
-        
+
         this.cookieStore.clear();
-        
+
         cookieStore.addCookie(makeCookie("nomatch", "value", "localhost.local", "/noway"));
         cookieStore.addCookie(makeCookie("name2",   "value", "localhost.local", "/foobar/yada"));
         cookieStore.addCookie(makeCookie("name3",   "value", "localhost.local", "/foobar"));

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURIUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURIUtils.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURIUtils.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURIUtils.java
Sun Sep 18 16:20:20 2011
@@ -327,10 +327,10 @@ public class TestURIUtils {
     public void testHTTPCLIENT_911() throws Exception{
         Assert.assertEquals(new HttpHost("localhost"),URIUtils.extractHost(new URI("http://localhost/abcd")));
         Assert.assertEquals(new HttpHost("localhost"),URIUtils.extractHost(new URI("http://localhost/abcd%3A")));
-        
+
         Assert.assertEquals(new HttpHost("local_host"),URIUtils.extractHost(new URI("http://local_host/abcd")));
         Assert.assertEquals(new HttpHost("local_host"),URIUtils.extractHost(new URI("http://local_host/abcd%3A")));
-        
+
         Assert.assertEquals(new HttpHost("localhost",8),URIUtils.extractHost(new URI("http://localhost:8/abcd")));
         Assert.assertEquals(new HttpHost("local_host",8),URIUtils.extractHost(new URI("http://local_host:8/abcd")));
 
@@ -345,5 +345,5 @@ public class TestURIUtils {
         Assert.assertEquals(new HttpHost("local_host",8080),URIUtils.extractHost(new URI("http://@local_host:8080/abcd")));
 
     }
-    
+
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURLEncodedUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURLEncodedUtils.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURLEncodedUtils.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURLEncodedUtils.java
Sun Sep 18 16:20:20 2011
@@ -207,4 +207,4 @@ public class TestURLEncodedUtils {
         Assert.assertEquals(parameter.getValue(), expectedValue);
     }
 
-}
\ No newline at end of file
+}

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java
Sun Sep 18 16:20:20 2011
@@ -267,7 +267,7 @@ public class TestHostnameVerifier {
 
         checkMatching(bhv, "s.a.b.c", cns, alt, false); // OK
         checkMatching(shv, "s.a.b.c", cns, alt, true); // subdomain not OK
-        
+
         cns = new String []{};
         alt = new String []{"dummy", "*.b.c"}; // check matches against all alts
         checkMatching(bhv, "a.b.c", cns, alt, false); // OK
@@ -275,28 +275,28 @@ public class TestHostnameVerifier {
 
         checkMatching(bhv, "s.a.b.c", cns, alt, false); // OK
         checkMatching(shv, "s.a.b.c", cns, alt, true); // subdomain not OK
-        
+
         alt = new String []{"*.gov.uk"};
         checkMatching(bhv, "a.gov.uk", cns, alt, true); // Bad 2TLD
         checkMatching(shv, "a.gov.uk", cns, alt, true); // Bad 2TLD
 
         checkMatching(bhv, "s.a.gov.uk", cns, alt, true); // Bad 2TLD
         checkMatching(shv, "s.a.gov.uk", cns, alt, true); // Bad 2TLD/no subdomain allowed
-        
+
         alt = new String []{"*.gov.com"};
         checkMatching(bhv, "a.gov.com", cns, alt, false); // OK, gov not 2TLD here
         checkMatching(shv, "a.gov.com", cns, alt, false); // OK, gov not 2TLD here
 
         checkMatching(bhv, "s.a.gov.com", cns, alt, false); // OK, gov not 2TLD here
         checkMatching(shv, "s.a.gov.com", cns, alt, true); // no subdomain allowed
-        
+
         cns = new String []{"a*.gov.uk"}; // 2TLD check applies to wildcards
         checkMatching(bhv, "a.gov.uk", cns, alt, true); // Bad 2TLD
         checkMatching(shv, "a.gov.uk", cns, alt, true); // Bad 2TLD
 
         checkMatching(bhv, "s.a.gov.uk", cns, alt, true); // Bad 2TLD
         checkMatching(shv, "s.a.gov.uk", cns, alt, true); // Bad 2TLD/no subdomain allowed
-        
+
     }
 
     @Test
@@ -305,7 +305,7 @@ public class TestHostnameVerifier {
         String alt[] = {};
         X509HostnameVerifier bhv = new BrowserCompatHostnameVerifier();
         X509HostnameVerifier shv = new StrictHostnameVerifier();
-    
+
         cns = new String []{"a*.b.c"}; // component part
         checkMatching(bhv, "a.b.c", cns, alt, false); // OK
         checkMatching(shv, "a.b.c", cns, alt, false); // OK
@@ -317,10 +317,10 @@ public class TestHostnameVerifier {
         checkWildcard("s*.gov.uk", false); // 2 character TLD, invalid 2TLD
         checkWildcard("s*.gouv.uk", false); // 2 character TLD, invalid 2TLD
     }
-    
+
     // Helper
     private void checkWildcard(String host, boolean isOK) {
-        Assert.assertTrue(host+" should be "+isOK, isOK==AbstractVerifier.acceptableCountryWildcard(host));
       
+        Assert.assertTrue(host+" should be "+isOK, isOK==AbstractVerifier.acceptableCountryWildcard(host));
     }
 
     @Test

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockClock.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockClock.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockClock.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockClock.java
Sun Sep 18 16:20:20 2011
@@ -28,11 +28,11 @@ package org.apache.http.impl.client;
 public class MockClock implements Clock {
 
     private long t = System.currentTimeMillis();
-    
+
     public long getCurrentTime() {
         return t;
     }
-    
+
     public void setCurrentTime(long now) {
         t = now;
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestAIMDBackoffManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestAIMDBackoffManager.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestAIMDBackoffManager.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestAIMDBackoffManager.java
Sun Sep 18 16:20:20 2011
@@ -52,33 +52,33 @@ public class TestAIMDBackoffManager {
         impl = new AIMDBackoffManager(connPerRoute, clock);
         impl.setPerHostConnectionCap(10);
     }
-    
+
     @Test
     public void isABackoffManager() {
         assertTrue(impl instanceof BackoffManager);
     }
-    
+
     @Test
     public void halvesConnectionsOnBackoff() {
         connPerRoute.setMaxForRoute(route, 4);
         impl.backOff(route);
         assertEquals(2, connPerRoute.getMaxForRoute(route));
     }
-    
+
     @Test
     public void doesNotBackoffBelowOneConnection() {
         connPerRoute.setMaxForRoute(route, 1);
         impl.backOff(route);
-        assertEquals(1, connPerRoute.getMaxForRoute(route));        
+        assertEquals(1, connPerRoute.getMaxForRoute(route));
     }
-    
+
     @Test
     public void increasesByOneOnProbe() {
         connPerRoute.setMaxForRoute(route, 2);
         impl.probe(route);
-        assertEquals(3, connPerRoute.getMaxForRoute(route));        
+        assertEquals(3, connPerRoute.getMaxForRoute(route));
     }
-    
+
     @Test
     public void doesNotIncreaseBeyondPerHostMaxOnProbe() {
         connPerRoute.setDefaultMaxPerRoute(5);
@@ -87,7 +87,7 @@ public class TestAIMDBackoffManager {
         impl.probe(route);
         assertEquals(5, connPerRoute.getMaxForRoute(route));
     }
-    
+
     @Test
     public void backoffDoesNotAdjustDuringCoolDownPeriod() {
         connPerRoute.setMaxForRoute(route, 4);
@@ -99,7 +99,7 @@ public class TestAIMDBackoffManager {
         impl.backOff(route);
         assertEquals(max, connPerRoute.getMaxForRoute(route));
     }
-    
+
     @Test
     public void backoffStillAdjustsAfterCoolDownPeriod() {
         connPerRoute.setMaxForRoute(route, 8);
@@ -111,9 +111,9 @@ public class TestAIMDBackoffManager {
         impl.backOff(route);
         assertTrue(max == 1 || max > connPerRoute.getMaxForRoute(route));
     }
-    
+
     @Test
-    public void probeDoesNotAdjustDuringCooldownPeriod() {        
+    public void probeDoesNotAdjustDuringCooldownPeriod() {
         connPerRoute.setMaxForRoute(route, 4);
         long now = System.currentTimeMillis();
         clock.setCurrentTime(now);
@@ -135,7 +135,7 @@ public class TestAIMDBackoffManager {
         impl.probe(route);
         assertTrue(max < connPerRoute.getMaxForRoute(route));
     }
-    
+
     @Test
     public void willBackoffImmediatelyEvenAfterAProbe() {
         connPerRoute.setMaxForRoute(route, 8);
@@ -147,7 +147,7 @@ public class TestAIMDBackoffManager {
         impl.backOff(route);
         assertTrue(connPerRoute.getMaxForRoute(route) < max);
     }
-    
+
     @Test
     public void backOffFactorIsConfigurable() {
         connPerRoute.setMaxForRoute(route, 10);
@@ -155,7 +155,7 @@ public class TestAIMDBackoffManager {
         impl.backOff(route);
         assertEquals(9, connPerRoute.getMaxForRoute(route));
     }
-    
+
     @Test
     public void coolDownPeriodIsConfigurable() {
         long cd = new Random().nextLong() / 2;

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultBackoffStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultBackoffStrategy.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultBackoffStrategy.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultBackoffStrategy.java
Sun Sep 18 16:20:20 2011
@@ -48,34 +48,34 @@ public class TestDefaultBackoffStrategy 
     public void setUp() {
         impl = new DefaultBackoffStrategy();
     }
-    
+
     @Test
     public void isABackoffStrategy() {
         assertTrue(impl instanceof ConnectionBackoffStrategy);
     }
-    
+
     @Test
     public void backsOffForSocketTimeouts() {
         assertTrue(impl.shouldBackoff(new SocketTimeoutException()));
     }
-    
+
     @Test
     public void backsOffForConnectionTimeouts() {
         assertTrue(impl.shouldBackoff(new ConnectException()));
     }
-    
+
     @Test
     public void doesNotBackOffForConnectionManagerTimeout() {
         assertFalse(impl.shouldBackoff(new ConnectionPoolTimeoutException()));
     }
-    
+
     @Test
     public void backsOffForServiceUnavailable() {
         HttpResponse resp = new BasicHttpResponse(HttpVersion.HTTP_1_1,
                 HttpStatus.SC_SERVICE_UNAVAILABLE, "Service Unavailable");
         assertTrue(impl.shouldBackoff(resp));
     }
-    
+
     @Test
     public void doesNotBackOffForNon503StatusCodes() {
         for(int i = 100; i <= 599; i++) {

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultHttpRequestRetryHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultHttpRequestRetryHandler.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultHttpRequestRetryHandler.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultHttpRequestRetryHandler.java
Sun Sep 18 16:20:20 2011
@@ -40,73 +40,73 @@ import org.junit.Test;
 
 
 public class TestDefaultHttpRequestRetryHandler {
-    
+
     @Test
     public void noRetryOnConnectTimeout() throws Exception {
         HttpContext context = mock(HttpContext.class);
         HttpUriRequest request = mock(HttpUriRequest.class);
-        
+
         DefaultHttpRequestRetryHandler retryHandler = new DefaultHttpRequestRetryHandler();
         Assert.assertEquals(3, retryHandler.getRetryCount());
-        
+
         when(request.isAborted()).thenReturn(Boolean.FALSE);
         when(context.getAttribute(ExecutionContext.HTTP_REQUEST)).thenReturn(request);
-        
+
         Assert.assertFalse(retryHandler.retryRequest(new ConnectTimeoutException(), 1, context));
     }
-    
+
     @Test
     public void noRetryOnUnknownHost() throws Exception {
         HttpContext context = mock(HttpContext.class);
         HttpUriRequest request = mock(HttpUriRequest.class);
-        
+
         DefaultHttpRequestRetryHandler retryHandler = new DefaultHttpRequestRetryHandler();
-        
+
         when(request.isAborted()).thenReturn(Boolean.FALSE);
         when(context.getAttribute(ExecutionContext.HTTP_REQUEST)).thenReturn(request);
-        
+
         Assert.assertFalse(retryHandler.retryRequest(new UnknownHostException(), 1, context));
     }
-    
+
     @Test
     public void noRetryOnAbortedRequests() throws Exception{
         HttpContext context = mock(HttpContext.class);
         HttpUriRequest request = mock(HttpUriRequest.class);
-        
+
         DefaultHttpRequestRetryHandler retryHandler = new DefaultHttpRequestRetryHandler();
-        
+
         when(request.isAborted()).thenReturn(Boolean.TRUE);
         when(context.getAttribute(ExecutionContext.HTTP_REQUEST)).thenReturn(request);
-        
+
         Assert.assertFalse(retryHandler.retryRequest(new IOException(),3,context));
     }
-    
+
     @Test
     public void retryOnNonAbortedRequests() throws Exception{
-        
+
         HttpContext context = mock(HttpContext.class);
         HttpUriRequest request = mock(HttpUriRequest.class);
-        
+
         DefaultHttpRequestRetryHandler retryHandler = new DefaultHttpRequestRetryHandler();
-        
+
         when(request.isAborted()).thenReturn(Boolean.FALSE);
         when(context.getAttribute(ExecutionContext.HTTP_REQUEST)).thenReturn(request);
-        
+
         Assert.assertTrue(retryHandler.retryRequest(new IOException(),3,context));
     }
-    
+
     @Test
     public void noRetryOnConnectionTimeout() throws Exception{
-        
+
         HttpContext context = mock(HttpContext.class);
         HttpUriRequest request = mock(HttpUriRequest.class);
-        
+
         DefaultHttpRequestRetryHandler retryHandler = new DefaultHttpRequestRetryHandler();
-        
+
         when(request.isAborted()).thenReturn(false);
         when(context.getAttribute(ExecutionContext.HTTP_REQUEST)).thenReturn(request);
-        
+
         Assert.assertFalse(retryHandler.retryRequest(new ConnectTimeoutException(),3,context));
     }
-    
-}
\ No newline at end of file
+
+}

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestNullBackoffStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestNullBackoffStrategy.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestNullBackoffStrategy.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestNullBackoffStrategy.java
Sun Sep 18 16:20:20 2011
@@ -43,12 +43,12 @@ public class TestNullBackoffStrategy {
     public void setUp() {
         impl = new NullBackoffStrategy();
     }
-    
+
     @Test
     public void doesNotBackoffForThrowables() {
         assertFalse(impl.shouldBackoff(new Exception()));
     }
-    
+
     @Test
     public void doesNotBackoffForResponses() {
         HttpResponse resp = new BasicHttpResponse(HttpVersion.HTTP_1_1,

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/ConnPoolBench.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/ConnPoolBench.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/ConnPoolBench.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/ConnPoolBench.java
Sun Sep 18 16:20:20 2011
@@ -54,7 +54,7 @@ public class ConnPoolBench {
         oldPool(c, reps);
         newPool(c, reps);
     }
-    
+
     public static void newPool(int c, long reps) throws Exception {
         Log log = LogFactory.getLog(ConnPoolBench.class);
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultClientConnectOperator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultClientConnectOperator.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultClientConnectOperator.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultClientConnectOperator.java
Sun Sep 18 16:20:20 2011
@@ -82,4 +82,4 @@ public class TestDefaultClientConnectOpe
         return new InetAddress[] { InetAddress.getByAddress(byteIpAddress) };
     }
 
-}
\ No newline at end of file
+}

Modified: httpcomponents/httpclient/trunk/httpmime/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/pom.xml?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpmime/pom.xml Sun Sep 18 16:20:20 2011
@@ -44,7 +44,6 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
-      <version>${httpcore.version}</version>
       <scope>compile</scope>
     </dependency>
     <!-- Not currently used

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/HttpMultipart.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/HttpMultipart.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/HttpMultipart.java
(original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/HttpMultipart.java
Sun Sep 18 16:20:20 2011
@@ -103,7 +103,7 @@ public class HttpMultipart {
 
     /**
      * Creates an instance with the specified settings.
-     * 
+     *
      * @param subType mime subtype - must not be {@code null}
      * @param charset the character set to use. May be {@code null}, in which case {@link
MIME#DEFAULT_CHARSET} - i.e. US-ASCII - is used.
      * @param boundary to use  - must not be {@code null}
@@ -128,7 +128,7 @@ public class HttpMultipart {
     /**
      * Creates an instance with the specified settings.
      * Mode is set to {@link HttpMultipartMode#STRICT}
-     * 
+     *
      * @param subType mime subtype - must not be {@code null}
      * @param charset the character set to use. May be {@code null}, in which case {@link
MIME#DEFAULT_CHARSET} - i.e. US-ASCII - is used.
      * @param boundary to use  - must not be {@code null}

Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/StringBody.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/StringBody.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/StringBody.java
(original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/StringBody.java
Sun Sep 18 16:20:20 2011
@@ -78,7 +78,7 @@ public class StringBody extends Abstract
 
     /**
      * Create a StringBody from the specified text, mime type and character set.
-     * 
+     *
      * @param text to be used for the body, not {@code null}
      * @param mimeType the mime type, not {@code null}
      * @param charset the character set, may be {@code null}, in which case the US-ASCII
charset is used
@@ -103,7 +103,7 @@ public class StringBody extends Abstract
     /**
      * Create a StringBody from the specified text and character set.
      * The mime type is set to "text/plain".
-     * 
+     *
      * @param text to be used for the body, not {@code null}
      * @param charset the character set, may be {@code null}, in which case the US-ASCII
charset is used
      * @throws UnsupportedEncodingException
@@ -117,7 +117,7 @@ public class StringBody extends Abstract
      * Create a StringBody from the specified text.
      * The mime type is set to "text/plain".
      * The hosts default charset is used.
-     * 
+     *
      * @param text to be used for the body, not {@code null}
      * @throws UnsupportedEncodingException
      * @throws IllegalArgumentException if the {@code text} parameter is null

Modified: httpcomponents/httpclient/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/pom.xml?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/pom.xml (original)
+++ httpcomponents/httpclient/trunk/pom.xml Sun Sep 18 16:20:20 2011
@@ -32,7 +32,6 @@
     <relativePath>../project/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.httpcomponents</groupId>
   <artifactId>httpcomponents-client</artifactId>
   <name>HttpComponents Client</name>
   <version>4.2-alpha1-SNAPSHOT</version>



Mime
View raw message