hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1573532 [3/5] - in /httpcomponents/httpclient-android/branches/4.3.3-android/src/main: ./ java/org/apache/http/auth/ java/org/apache/http/client/entity/ java/org/apache/http/client/methods/ java/org/apache/http/client/params/ java/org/apac...
Date Mon, 03 Mar 2014 12:10:18 GMT
Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java Mon Mar  3 12:10:15 2014
@@ -57,13 +57,13 @@ import org.apache.http.client.config.Aut
 import org.apache.http.client.config.CookieSpecs;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.protocol.RequestAcceptEncoding;
-import org.apache.http.client.protocol.RequestAddCookies;
+import org.apache.http.client.protocol.RequestAddCookiesHC4;
 import org.apache.http.client.protocol.RequestAuthCache;
 import org.apache.http.client.protocol.RequestClientConnControl;
-import org.apache.http.client.protocol.RequestDefaultHeaders;
+import org.apache.http.client.protocol.RequestDefaultHeadersHC4;
 import org.apache.http.client.protocol.RequestExpectContinue;
 import org.apache.http.client.protocol.ResponseContentEncoding;
-import org.apache.http.client.protocol.ResponseProcessCookies;
+import org.apache.http.client.protocol.ResponseProcessCookiesHC4;
 import org.apache.http.config.ConnectionConfig;
 import org.apache.http.config.Lookup;
 import org.apache.http.config.RegistryBuilder;
@@ -79,24 +79,22 @@ import org.apache.http.conn.ssl.SSLConne
 import org.apache.http.conn.ssl.SSLContexts;
 import org.apache.http.conn.ssl.X509HostnameVerifier;
 import org.apache.http.cookie.CookieSpecProvider;
-import org.apache.http.impl.DefaultConnectionReuseStrategy;
-import org.apache.http.impl.NoConnectionReuseStrategy;
-import org.apache.http.impl.auth.BasicSchemeFactory;
-import org.apache.http.impl.auth.DigestSchemeFactory;
-import org.apache.http.impl.auth.KerberosSchemeFactory;
+import org.apache.http.impl.DefaultConnectionReuseStrategyHC4;
+import org.apache.http.impl.NoConnectionReuseStrategyHC4;
+import org.apache.http.impl.auth.BasicSchemeFactoryHC4;
+import org.apache.http.impl.auth.DigestSchemeFactoryHC4;
 import org.apache.http.impl.auth.NTLMSchemeFactory;
-import org.apache.http.impl.auth.SPNegoSchemeFactory;
 import org.apache.http.impl.conn.DefaultProxyRoutePlanner;
 import org.apache.http.impl.conn.DefaultRoutePlanner;
 import org.apache.http.impl.conn.DefaultSchemePortResolver;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.impl.conn.SystemDefaultRoutePlanner;
-import org.apache.http.impl.cookie.BestMatchSpecFactory;
-import org.apache.http.impl.cookie.BrowserCompatSpecFactory;
+import org.apache.http.impl.cookie.BestMatchSpecFactoryHC4;
+import org.apache.http.impl.cookie.BrowserCompatSpecFactoryHC4;
 import org.apache.http.impl.cookie.IgnoreSpecFactory;
-import org.apache.http.impl.cookie.NetscapeDraftSpecFactory;
-import org.apache.http.impl.cookie.RFC2109SpecFactory;
-import org.apache.http.impl.cookie.RFC2965SpecFactory;
+import org.apache.http.impl.cookie.NetscapeDraftSpecFactoryHC4;
+import org.apache.http.impl.cookie.RFC2109SpecFactoryHC4;
+import org.apache.http.impl.cookie.RFC2965SpecFactoryHC4;
 import org.apache.http.impl.execchain.BackoffStrategyExec;
 import org.apache.http.impl.execchain.ClientExecChain;
 import org.apache.http.impl.execchain.MainClientExec;
@@ -107,11 +105,11 @@ import org.apache.http.impl.execchain.Se
 import org.apache.http.protocol.HttpProcessor;
 import org.apache.http.protocol.HttpProcessorBuilder;
 import org.apache.http.protocol.HttpRequestExecutor;
-import org.apache.http.protocol.RequestContent;
-import org.apache.http.protocol.RequestTargetHost;
-import org.apache.http.protocol.RequestUserAgent;
+import org.apache.http.protocol.RequestContentHC4;
+import org.apache.http.protocol.RequestTargetHostHC4;
+import org.apache.http.protocol.RequestUserAgentHC4;
 import org.apache.http.util.TextUtils;
-import org.apache.http.util.VersionInfo;
+import org.apache.http.util.VersionInfoHC4;
 
 /**
  * Builder for {@link CloseableHttpClient} instances.
@@ -201,10 +199,10 @@ public class HttpClientBuilder {
 
     static final String DEFAULT_USER_AGENT;
     static {
-        final VersionInfo vi = VersionInfo.loadVersionInfo
+        final VersionInfoHC4 vi = VersionInfoHC4.loadVersionInfo
                 ("org.apache.http.client", HttpClientBuilder.class.getClassLoader());
         final String release = (vi != null) ?
-                vi.getRelease() : VersionInfo.UNAVAILABLE;
+                vi.getRelease() : VersionInfoHC4.UNAVAILABLE;
         DEFAULT_USER_AGENT = "Apache-HttpClient/" + release + " (java 1.5)";
     }
 
@@ -756,17 +754,17 @@ public class HttpClientBuilder {
             if (systemProperties) {
                 final String s = System.getProperty("http.keepAlive", "true");
                 if ("true".equalsIgnoreCase(s)) {
-                    reuseStrategy = DefaultConnectionReuseStrategy.INSTANCE;
+                    reuseStrategy = DefaultConnectionReuseStrategyHC4.INSTANCE;
                 } else {
-                    reuseStrategy = NoConnectionReuseStrategy.INSTANCE;
+                    reuseStrategy = NoConnectionReuseStrategyHC4.INSTANCE;
                 }
             } else {
-                reuseStrategy = DefaultConnectionReuseStrategy.INSTANCE;
+                reuseStrategy = DefaultConnectionReuseStrategyHC4.INSTANCE;
             }
         }
         ConnectionKeepAliveStrategy keepAliveStrategy = this.keepAliveStrategy;
         if (keepAliveStrategy == null) {
-            keepAliveStrategy = DefaultConnectionKeepAliveStrategy.INSTANCE;
+            keepAliveStrategy = DefaultConnectionKeepAliveStrategyHC4.INSTANCE;
         }
         AuthenticationStrategy targetAuthStrategy = this.targetAuthStrategy;
         if (targetAuthStrategy == null) {
@@ -779,7 +777,7 @@ public class HttpClientBuilder {
         UserTokenHandler userTokenHandler = this.userTokenHandler;
         if (userTokenHandler == null) {
             if (!connectionStateDisabled) {
-                userTokenHandler = DefaultUserTokenHandler.INSTANCE;
+                userTokenHandler = DefaultUserTokenHandlerHC4.INSTANCE;
             } else {
                 userTokenHandler = NoopUserTokenHandler.INSTANCE;
             }
@@ -820,14 +818,14 @@ public class HttpClientBuilder {
                 }
             }
             b.addAll(
-                    new RequestDefaultHeaders(defaultHeaders),
-                    new RequestContent(),
-                    new RequestTargetHost(),
+                    new RequestDefaultHeadersHC4(defaultHeaders),
+                    new RequestContentHC4(),
+                    new RequestTargetHostHC4(),
                     new RequestClientConnControl(),
-                    new RequestUserAgent(userAgent),
+                    new RequestUserAgentHC4(userAgent),
                     new RequestExpectContinue());
             if (!cookieManagementDisabled) {
-                b.add(new RequestAddCookies());
+                b.add(new RequestAddCookiesHC4());
             }
             if (!contentCompressionDisabled) {
                 b.add(new RequestAcceptEncoding());
@@ -836,7 +834,7 @@ public class HttpClientBuilder {
                 b.add(new RequestAuthCache());
             }
             if (!cookieManagementDisabled) {
-                b.add(new ResponseProcessCookies());
+                b.add(new ResponseProcessCookiesHC4());
             }
             if (!contentCompressionDisabled) {
                 b.add(new ResponseContentEncoding());
@@ -861,7 +859,7 @@ public class HttpClientBuilder {
         if (!automaticRetriesDisabled) {
             HttpRequestRetryHandler retryHandler = this.retryHandler;
             if (retryHandler == null) {
-                retryHandler = DefaultHttpRequestRetryHandler.INSTANCE;
+                retryHandler = DefaultHttpRequestRetryHandlerHC4.INSTANCE;
             }
             execChain = new RetryExec(execChain, retryHandler);
         }
@@ -905,29 +903,27 @@ public class HttpClientBuilder {
         Lookup<AuthSchemeProvider> authSchemeRegistry = this.authSchemeRegistry;
         if (authSchemeRegistry == null) {
             authSchemeRegistry = RegistryBuilder.<AuthSchemeProvider>create()
-                .register(AuthSchemes.BASIC, new BasicSchemeFactory())
-                .register(AuthSchemes.DIGEST, new DigestSchemeFactory())
+                .register(AuthSchemes.BASIC, new BasicSchemeFactoryHC4())
+                .register(AuthSchemes.DIGEST, new DigestSchemeFactoryHC4())
                 .register(AuthSchemes.NTLM, new NTLMSchemeFactory())
-                .register(AuthSchemes.SPNEGO, new SPNegoSchemeFactory())
-                .register(AuthSchemes.KERBEROS, new KerberosSchemeFactory())
                 .build();
         }
         Lookup<CookieSpecProvider> cookieSpecRegistry = this.cookieSpecRegistry;
         if (cookieSpecRegistry == null) {
             cookieSpecRegistry = RegistryBuilder.<CookieSpecProvider>create()
-                .register(CookieSpecs.BEST_MATCH, new BestMatchSpecFactory())
-                .register(CookieSpecs.STANDARD, new RFC2965SpecFactory())
-                .register(CookieSpecs.BROWSER_COMPATIBILITY, new BrowserCompatSpecFactory())
-                .register(CookieSpecs.NETSCAPE, new NetscapeDraftSpecFactory())
+                .register(CookieSpecs.BEST_MATCH, new BestMatchSpecFactoryHC4())
+                .register(CookieSpecs.STANDARD, new RFC2965SpecFactoryHC4())
+                .register(CookieSpecs.BROWSER_COMPATIBILITY, new BrowserCompatSpecFactoryHC4())
+                .register(CookieSpecs.NETSCAPE, new NetscapeDraftSpecFactoryHC4())
                 .register(CookieSpecs.IGNORE_COOKIES, new IgnoreSpecFactory())
-                .register("rfc2109", new RFC2109SpecFactory())
-                .register("rfc2965", new RFC2965SpecFactory())
+                .register("rfc2109", new RFC2109SpecFactoryHC4())
+                .register("rfc2965", new RFC2965SpecFactoryHC4())
                 .build();
         }
 
         CookieStore defaultCookieStore = this.cookieStore;
         if (defaultCookieStore == null) {
-            defaultCookieStore = new BasicCookieStore();
+            defaultCookieStore = new BasicCookieStoreHC4();
         }
 
         CredentialsProvider defaultCredentialsProvider = this.credentialsProvider;
@@ -935,7 +931,7 @@ public class HttpClientBuilder {
             if (systemProperties) {
                 defaultCredentialsProvider = new SystemDefaultCredentialsProvider();
             } else {
-                defaultCredentialsProvider = new BasicCredentialsProvider();
+                defaultCredentialsProvider = new BasicCredentialsProviderHC4();
             }
         }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/InternalHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/InternalHttpClient.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/InternalHttpClient.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/InternalHttpClient.java Mon Mar  3 12:10:15 2014
@@ -39,7 +39,7 @@ import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
 import org.apache.http.annotation.ThreadSafe;
 import org.apache.http.auth.AuthSchemeProvider;
-import org.apache.http.auth.AuthState;
+import org.apache.http.auth.AuthStateHC4;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.CookieStore;
 import org.apache.http.client.CredentialsProvider;
@@ -63,7 +63,7 @@ import org.apache.http.cookie.CookieSpec
 import org.apache.http.impl.execchain.ClientExecChain;
 import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpParamsNames;
-import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.BasicHttpContextHC4;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.Args;
 import org.apache.http.util.Asserts;
@@ -128,10 +128,10 @@ class InternalHttpClient extends Closeab
 
     private void setupContext(final HttpClientContext context) {
         if (context.getAttribute(HttpClientContext.TARGET_AUTH_STATE) == null) {
-            context.setAttribute(HttpClientContext.TARGET_AUTH_STATE, new AuthState());
+            context.setAttribute(HttpClientContext.TARGET_AUTH_STATE, new AuthStateHC4());
         }
         if (context.getAttribute(HttpClientContext.PROXY_AUTH_STATE) == null) {
-            context.setAttribute(HttpClientContext.PROXY_AUTH_STATE, new AuthState());
+            context.setAttribute(HttpClientContext.PROXY_AUTH_STATE, new AuthStateHC4());
         }
         if (context.getAttribute(HttpClientContext.AUTHSCHEME_REGISTRY) == null) {
             context.setAttribute(HttpClientContext.AUTHSCHEME_REGISTRY, this.authSchemeRegistry);
@@ -163,7 +163,7 @@ class InternalHttpClient extends Closeab
         try {
             final HttpRequestWrapper wrapper = HttpRequestWrapper.wrap(request);
             final HttpClientContext localcontext = HttpClientContext.adapt(
-                    context != null ? context : new BasicHttpContext());
+                    context != null ? context : new BasicHttpContextHC4());
             RequestConfig config = null;
             if (request instanceof Configurable) {
                 config = ((Configurable) request).getConfig();

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/LaxRedirectStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/LaxRedirectStrategy.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/LaxRedirectStrategy.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/LaxRedirectStrategy.java Mon Mar  3 12:10:15 2014
@@ -28,9 +28,9 @@
 package org.apache.http.impl.client;
 
 import org.apache.http.annotation.Immutable;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpHead;
-import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpGetHC4;
+import org.apache.http.client.methods.HttpHeadHC4;
+import org.apache.http.client.methods.HttpPostHC4;
 
 /**
  * Lax {@link org.apache.http.client.RedirectStrategy} implementation
@@ -47,9 +47,9 @@ public class LaxRedirectStrategy extends
      * Redirectable methods.
      */
     private static final String[] REDIRECT_METHODS = new String[] {
-        HttpGet.METHOD_NAME,
-        HttpPost.METHOD_NAME,
-        HttpHead.METHOD_NAME
+        HttpGetHC4.METHOD_NAME,
+        HttpPostHC4.METHOD_NAME,
+        HttpHeadHC4.METHOD_NAME
     };
 
     @Override

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java Mon Mar  3 12:10:15 2014
@@ -47,11 +47,11 @@ import org.apache.http.conn.HttpClientCo
 import org.apache.http.conn.ManagedClientConnection;
 import org.apache.http.conn.routing.HttpRoute;
 import org.apache.http.conn.scheme.SchemeRegistry;
-import org.apache.http.impl.DefaultConnectionReuseStrategy;
+import org.apache.http.impl.DefaultConnectionReuseStrategyHC4;
 import org.apache.http.impl.execchain.MinimalClientExec;
 import org.apache.http.params.BasicHttpParams;
 import org.apache.http.params.HttpParams;
-import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.BasicHttpContextHC4;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpRequestExecutor;
 import org.apache.http.util.Args;
@@ -76,8 +76,8 @@ class MinimalHttpClient extends Closeabl
         this.requestExecutor = new MinimalClientExec(
                 new HttpRequestExecutor(),
                 connManager,
-                DefaultConnectionReuseStrategy.INSTANCE,
-                DefaultConnectionKeepAliveStrategy.INSTANCE);
+                DefaultConnectionReuseStrategyHC4.INSTANCE,
+                DefaultConnectionKeepAliveStrategyHC4.INSTANCE);
         this.params = new BasicHttpParams();
     }
 
@@ -95,7 +95,7 @@ class MinimalHttpClient extends Closeabl
         try {
             final HttpRequestWrapper wrapper = HttpRequestWrapper.wrap(request);
             final HttpClientContext localcontext = HttpClientContext.adapt(
-                context != null ? context : new BasicHttpContext());
+                context != null ? context : new BasicHttpContextHC4());
             final HttpRoute route = new HttpRoute(target);
             RequestConfig config = null;
             if (request instanceof Configurable) {

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/ProxyClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/ProxyClient.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/ProxyClient.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/ProxyClient.java Mon Mar  3 12:10:15 2014
@@ -40,7 +40,7 @@ import org.apache.http.HttpVersion;
 import org.apache.http.auth.AUTH;
 import org.apache.http.auth.AuthSchemeRegistry;
 import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.AuthState;
+import org.apache.http.auth.AuthStateHC4;
 import org.apache.http.auth.Credentials;
 import org.apache.http.client.config.AuthSchemes;
 import org.apache.http.client.config.RequestConfig;
@@ -53,30 +53,28 @@ import org.apache.http.conn.ManagedHttpC
 import org.apache.http.conn.routing.HttpRoute;
 import org.apache.http.conn.routing.RouteInfo.LayerType;
 import org.apache.http.conn.routing.RouteInfo.TunnelType;
-import org.apache.http.entity.BufferedHttpEntity;
-import org.apache.http.impl.DefaultConnectionReuseStrategy;
-import org.apache.http.impl.auth.BasicSchemeFactory;
-import org.apache.http.impl.auth.DigestSchemeFactory;
+import org.apache.http.entity.BufferedHttpEntityHC4;
+import org.apache.http.impl.DefaultConnectionReuseStrategyHC4;
+import org.apache.http.impl.auth.BasicSchemeFactoryHC4;
+import org.apache.http.impl.auth.DigestSchemeFactoryHC4;
 import org.apache.http.impl.auth.HttpAuthenticator;
-import org.apache.http.impl.auth.KerberosSchemeFactory;
 import org.apache.http.impl.auth.NTLMSchemeFactory;
-import org.apache.http.impl.auth.SPNegoSchemeFactory;
 import org.apache.http.impl.conn.ManagedHttpClientConnectionFactory;
 import org.apache.http.impl.execchain.TunnelRefusedException;
 import org.apache.http.message.BasicHttpRequest;
 import org.apache.http.params.BasicHttpParams;
 import org.apache.http.params.HttpParamConfig;
 import org.apache.http.params.HttpParams;
-import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.BasicHttpContextHC4;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpCoreContext;
 import org.apache.http.protocol.HttpProcessor;
 import org.apache.http.protocol.HttpRequestExecutor;
 import org.apache.http.protocol.ImmutableHttpProcessor;
-import org.apache.http.protocol.RequestTargetHost;
-import org.apache.http.protocol.RequestUserAgent;
+import org.apache.http.protocol.RequestTargetHostHC4;
+import org.apache.http.protocol.RequestUserAgentHC4;
 import org.apache.http.util.Args;
-import org.apache.http.util.EntityUtils;
+import org.apache.http.util.EntityUtilsHC4;
 
 /**
  * ProxyClient can be used to establish a tunnel via an HTTP proxy.
@@ -91,7 +89,7 @@ public class ProxyClient {
     private final HttpRequestExecutor requestExec;
     private final ProxyAuthenticationStrategy proxyAuthStrategy;
     private final HttpAuthenticator authenticator;
-    private final AuthState proxyAuthState;
+    private final AuthStateHC4 proxyAuthState;
     private final AuthSchemeRegistry authSchemeRegistry;
     private final ConnectionReuseStrategy reuseStrategy;
 
@@ -107,18 +105,16 @@ public class ProxyClient {
         this.connectionConfig = connectionConfig != null ? connectionConfig : ConnectionConfig.DEFAULT;
         this.requestConfig = requestConfig != null ? requestConfig : RequestConfig.DEFAULT;
         this.httpProcessor = new ImmutableHttpProcessor(
-                new RequestTargetHost(), new RequestClientConnControl(), new RequestUserAgent());
+                new RequestTargetHostHC4(), new RequestClientConnControl(), new RequestUserAgentHC4());
         this.requestExec = new HttpRequestExecutor();
         this.proxyAuthStrategy = new ProxyAuthenticationStrategy();
         this.authenticator = new HttpAuthenticator();
-        this.proxyAuthState = new AuthState();
+        this.proxyAuthState = new AuthStateHC4();
         this.authSchemeRegistry = new AuthSchemeRegistry();
-        this.authSchemeRegistry.register(AuthSchemes.BASIC, new BasicSchemeFactory());
-        this.authSchemeRegistry.register(AuthSchemes.DIGEST, new DigestSchemeFactory());
+        this.authSchemeRegistry.register(AuthSchemes.BASIC, new BasicSchemeFactoryHC4());
+        this.authSchemeRegistry.register(AuthSchemes.DIGEST, new DigestSchemeFactoryHC4());
         this.authSchemeRegistry.register(AuthSchemes.NTLM, new NTLMSchemeFactory());
-        this.authSchemeRegistry.register(AuthSchemes.SPNEGO, new SPNegoSchemeFactory());
-        this.authSchemeRegistry.register(AuthSchemes.KERBEROS, new KerberosSchemeFactory());
-        this.reuseStrategy = new DefaultConnectionReuseStrategy();
+        this.reuseStrategy = new DefaultConnectionReuseStrategyHC4();
     }
 
     /**
@@ -176,14 +172,14 @@ public class ProxyClient {
 
         final ManagedHttpClientConnection conn = this.connFactory.create(
                 route, this.connectionConfig);
-        final HttpContext context = new BasicHttpContext();
+        final HttpContext context = new BasicHttpContextHC4();
         HttpResponse response;
 
         final HttpRequest connect = new BasicHttpRequest(
                 "CONNECT", host.toHostString(), HttpVersion.HTTP_1_1);
 
-        final BasicCredentialsProvider credsProvider = new BasicCredentialsProvider();
-        credsProvider.setCredentials(new AuthScope(proxy), credentials);
+        final BasicCredentialsProviderHC4 credsProvider = new BasicCredentialsProviderHC4();
+        credsProvider.setCredentials(new AuthScope(proxy.getHostName(), proxy.getPort()), credentials);
 
         // Populate the execution context
         context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, target);
@@ -220,7 +216,7 @@ public class ProxyClient {
                     if (this.reuseStrategy.keepAlive(response, context)) {
                         // Consume response content
                         final HttpEntity entity = response.getEntity();
-                        EntityUtils.consume(entity);
+                        EntityUtilsHC4.consume(entity);
                     } else {
                         conn.close();
                     }
@@ -241,7 +237,7 @@ public class ProxyClient {
             // Buffer response content
             final HttpEntity entity = response.getEntity();
             if (entity != null) {
-                response.setEntity(new BufferedHttpEntity(entity));
+                response.setEntity(new BufferedHttpEntityHC4(entity));
             }
 
             conn.close();

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/RedirectLocationsHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/RedirectLocationsHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/RedirectLocationsHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/RedirectLocationsHC4.java Mon Mar  3 12:10:15 2014
@@ -44,12 +44,12 @@ import org.apache.http.annotation.NotThr
  * @since 4.0
  */
 @NotThreadSafe // HashSet/ArrayList are not synch.
-public class RedirectLocations extends AbstractList<Object> {
+public class RedirectLocationsHC4 extends AbstractList<Object> {
 
     private final Set<URI> unique;
     private final List<URI> all;
 
-    public RedirectLocations() {
+    public RedirectLocationsHC4() {
         super();
         this.unique = new HashSet<URI>();
         this.all = new ArrayList<URI>();

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/StandardHttpRequestRetryHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/StandardHttpRequestRetryHandler.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/StandardHttpRequestRetryHandler.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/StandardHttpRequestRetryHandler.java Mon Mar  3 12:10:15 2014
@@ -45,7 +45,7 @@ import org.apache.http.annotation.Immuta
  * @since 4.2
  */
 @Immutable
-public class StandardHttpRequestRetryHandler extends DefaultHttpRequestRetryHandler {
+public class StandardHttpRequestRetryHandler extends DefaultHttpRequestRetryHandlerHC4 {
 
     private final Map<String, Boolean> idempotentMethods;
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/SystemDefaultCredentialsProvider.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/SystemDefaultCredentialsProvider.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/SystemDefaultCredentialsProvider.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/SystemDefaultCredentialsProvider.java Mon Mar  3 12:10:15 2014
@@ -69,14 +69,14 @@ public class SystemDefaultCredentialsPro
         return s != null ? s : key;
     }
 
-    private final BasicCredentialsProvider internal;
+    private final BasicCredentialsProviderHC4 internal;
 
     /**
      * Default constructor.
      */
     public SystemDefaultCredentialsProvider() {
         super();
-        this.internal = new BasicCredentialsProvider();
+        this.internal = new BasicCredentialsProviderHC4();
     }
 
     public void setCredentials(final AuthScope authscope, final Credentials credentials) {

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/package-info.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/package-info.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/client/package-info.java Mon Mar  3 12:10:15 2014
@@ -32,14 +32,14 @@
  * <pre>
  * CloseableHttpClient httpclient = HttpClients.createDefault();
  * try {
- *      HttpGet httpGet = new HttpGet("http://targethost/homepage");
+ *      HttpGetHC4 httpGet = new HttpGetHC4("http://targethost/homepage");
  *      CloseableHttpResponse response = httpclient.execute(httpGet);
  *      try {
  *          System.out.println(response.getStatusLine());
  *          HttpEntity entity = response.getEntity();
  *          // do something useful with the response body
  *          // and ensure it is fully consumed
- *          EntityUtils.consume(entity);
+ *          EntityUtilsHC4.consume(entity);
  *      } finally {
  *          response.close();
  *      }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java Mon Mar  3 12:10:15 2014
@@ -314,7 +314,7 @@ public class BasicHttpClientConnectionMa
         } else {
             host = route.getTargetHost();
         }
-        final InetSocketAddress localAddress = route.getLocalSocketAddress();
+        final InetSocketAddress localAddress = route.getLocalAddress() != null ? new InetSocketAddress(route.getLocalAddress(), 0) : null;;
         this.connectionOperator.connect(this.conn, host, localAddress,
                 connectTimeout, this.socketConfig, context);
     }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java Mon Mar  3 12:10:15 2014
@@ -39,8 +39,8 @@ import org.apache.http.ProtocolException
 import org.apache.http.StatusLine;
 import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.config.MessageConstraints;
-import org.apache.http.impl.DefaultHttpResponseFactory;
-import org.apache.http.impl.io.AbstractMessageParser;
+import org.apache.http.impl.DefaultHttpResponseFactoryHC4;
+import org.apache.http.impl.io.AbstractMessageParserHC4;
 import org.apache.http.io.SessionInputBuffer;
 import org.apache.http.message.LineParser;
 import org.apache.http.message.ParserCursor;
@@ -56,7 +56,7 @@ import org.apache.http.util.CharArrayBuf
  */
 @SuppressWarnings("deprecation")
 @NotThreadSafe
-public class DefaultHttpResponseParser extends AbstractMessageParser<HttpResponse> {
+public class DefaultHttpResponseParser extends AbstractMessageParserHC4<HttpResponse> {
 
     private final Log log = LogFactory.getLog(getClass());
 
@@ -84,9 +84,9 @@ public class DefaultHttpResponseParser e
      *
      * @param buffer the session input buffer.
      * @param lineParser the line parser. If <code>null</code>
-     *   {@link org.apache.http.message.BasicLineParser#INSTANCE} will be used.
+     *   {@link org.apache.http.message.BasicLineParserHC4#INSTANCE} will be used.
      * @param responseFactory HTTP response factory. If <code>null</code>
-     *   {@link DefaultHttpResponseFactory#INSTANCE} will be used.
+     *   {@link DefaultHttpResponseFactoryHC4#INSTANCE} will be used.
      * @param constraints the message constraints. If <code>null</code>
      *   {@link MessageConstraints#DEFAULT} will be used.
      *
@@ -99,7 +99,7 @@ public class DefaultHttpResponseParser e
             final MessageConstraints constraints) {
         super(buffer, lineParser, constraints);
         this.responseFactory = responseFactory != null ? responseFactory :
-                DefaultHttpResponseFactory.INSTANCE;
+                DefaultHttpResponseFactoryHC4.INSTANCE;
         this.lineBuf = new CharArrayBuffer(128);
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.java Mon Mar  3 12:10:15 2014
@@ -31,11 +31,11 @@ import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseFactory;
 import org.apache.http.annotation.Immutable;
 import org.apache.http.config.MessageConstraints;
-import org.apache.http.impl.DefaultHttpResponseFactory;
+import org.apache.http.impl.DefaultHttpResponseFactoryHC4;
 import org.apache.http.io.HttpMessageParser;
 import org.apache.http.io.HttpMessageParserFactory;
 import org.apache.http.io.SessionInputBuffer;
-import org.apache.http.message.BasicLineParser;
+import org.apache.http.message.BasicLineParserHC4;
 import org.apache.http.message.LineParser;
 
 /**
@@ -55,9 +55,9 @@ public class DefaultHttpResponseParserFa
             final LineParser lineParser,
             final HttpResponseFactory responseFactory) {
         super();
-        this.lineParser = lineParser != null ? lineParser : BasicLineParser.INSTANCE;
+        this.lineParser = lineParser != null ? lineParser : BasicLineParserHC4.INSTANCE;
         this.responseFactory = responseFactory != null ? responseFactory
-                : DefaultHttpResponseFactory.INSTANCE;
+                : DefaultHttpResponseFactoryHC4.INSTANCE;
     }
 
     public DefaultHttpResponseParserFactory(
@@ -69,7 +69,7 @@ public class DefaultHttpResponseParserFa
         this(null, null);
     }
 
-    public HttpMessageParser<HttpResponse> create(final SessionInputBuffer buffer,
+    public HttpMessageParser create(final SessionInputBuffer buffer,
             final MessageConstraints constraints) {
         return new DefaultHttpResponseParser(buffer, lineParser, responseFactory, constraints);
     }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/HttpClientConnectionOperator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/HttpClientConnectionOperator.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/HttpClientConnectionOperator.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/HttpClientConnectionOperator.java Mon Mar  3 12:10:15 2014
@@ -32,6 +32,7 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
+import java.util.Arrays;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -85,6 +86,19 @@ class HttpClientConnectionOperator {
         return reg;
     }
 
+    private static String getConnectTimeoutMessage(
+            final IOException cause,
+            final HttpHost host,
+            final InetAddress... remoteAddresses) {
+        return "Connect to " +
+                (host != null ? host.toHostString() : "remote host") +
+                (remoteAddresses != null && remoteAddresses .length > 0 ?
+                        " " + Arrays.asList(remoteAddresses) : "") +
+                ((cause != null && cause.getMessage() != null) ?
+                        " failed: " + cause.getMessage() : " timed out");
+    }
+
+
     public void connect(
             final ManagedHttpClientConnection conn,
             final HttpHost host,
@@ -129,15 +143,20 @@ class HttpClientConnectionOperator {
                 return;
             } catch (final SocketTimeoutException ex) {
                 if (last) {
-                    throw new ConnectTimeoutException(ex, host, addresses);
+                    final ConnectTimeoutException cex = new ConnectTimeoutException(
+                            getConnectTimeoutMessage(ex, host, addresses));
+                    cex.initCause(ex);
                 }
             } catch (final ConnectException ex) {
                 if (last) {
                     final String msg = ex.getMessage();
                     if ("Connection timed out".equals(msg)) {
-                        throw new ConnectTimeoutException(ex, host, addresses);
+                        final ConnectTimeoutException cex = new ConnectTimeoutException(
+                                getConnectTimeoutMessage(ex, host, addresses));
+                        cex.initCause(ex);
+                        throw cex;
                     } else {
-                        throw new HttpHostConnectException(ex, host, addresses);
+                        throw new HttpHostConnectException(host, ex);
                     }
                 }
             }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/LoggingInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/LoggingInputStream.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/LoggingInputStream.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/LoggingInputStream.java Mon Mar  3 12:10:15 2014
@@ -41,9 +41,9 @@ import java.io.InputStream;
 class LoggingInputStream extends InputStream {
 
     private final InputStream in;
-    private final Wire wire;
+    private final WireHC4 wire;
 
-    public LoggingInputStream(final InputStream in, final Wire wire) {
+    public LoggingInputStream(final InputStream in, final WireHC4 wire) {
         super();
         this.in = in;
         this.wire = wire;

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/LoggingManagedHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/LoggingManagedHttpClientConnection.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/LoggingManagedHttpClientConnection.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/LoggingManagedHttpClientConnection.java Mon Mar  3 12:10:15 2014
@@ -49,7 +49,7 @@ class LoggingManagedHttpClientConnection
 
     private final Log log;
     private final Log headerlog;
-    private final Wire wire;
+    private final WireHC4 wire;
 
     public LoggingManagedHttpClientConnection(
             final String id,
@@ -70,7 +70,7 @@ class LoggingManagedHttpClientConnection
                 requestWriterFactory, responseParserFactory);
         this.log = log;
         this.headerlog = headerlog;
-        this.wire = new Wire(wirelog, id);
+        this.wire = new WireHC4(wirelog, id);
     }
 
     @Override

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/LoggingOutputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/LoggingOutputStream.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/LoggingOutputStream.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/LoggingOutputStream.java Mon Mar  3 12:10:15 2014
@@ -41,9 +41,9 @@ import java.io.OutputStream;
 class LoggingOutputStream extends OutputStream {
 
     private final OutputStream out;
-    private final Wire wire;
+    private final WireHC4 wire;
 
-    public LoggingOutputStream(final OutputStream out, final Wire wire) {
+    public LoggingOutputStream(final OutputStream out, final WireHC4 wire) {
         super();
         this.out = out;
         this.wire = wire;

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java Mon Mar  3 12:10:15 2014
@@ -303,7 +303,7 @@ public class PoolingHttpClientConnection
         } else {
             host = route.getTargetHost();
         }
-        final InetSocketAddress localAddress = route.getLocalSocketAddress();
+        final InetSocketAddress localAddress = route.getLocalAddress() != null ? new InetSocketAddress(route.getLocalAddress(), 0) : null;;
         SocketConfig socketConfig = this.configData.getSocketConfig(host);
         if (socketConfig == null) {
             socketConfig = this.configData.getDefaultSocketConfig();

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/WireHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/WireHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/WireHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/conn/WireHC4.java Mon Mar  3 12:10:15 2014
@@ -41,7 +41,7 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @Immutable
-public class Wire {
+public class WireHC4 {
 
     private final Log log;
     private final String id;
@@ -49,12 +49,12 @@ public class Wire {
     /**
      * @since 4.3
      */
-    public Wire(final Log log, final String id) {
+    public WireHC4(final Log log, final String id) {
         this.log = log;
         this.id = id;
     }
 
-    public Wire(final Log log) {
+    public WireHC4(final Log log) {
         this(log, "");
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandlerHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandlerHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandlerHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandlerHC4.java Mon Mar  3 12:10:15 2014
@@ -37,7 +37,7 @@ import org.apache.http.cookie.MalformedC
  * @since 4.0
  */
 @Immutable
-public abstract class AbstractCookieAttributeHandler implements CookieAttributeHandler {
+public abstract class AbstractCookieAttributeHandlerHC4 implements CookieAttributeHandler {
 
     public void validate(final Cookie cookie, final CookieOrigin origin)
             throws MalformedCookieException {

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/AbstractCookieSpecHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/AbstractCookieSpecHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/AbstractCookieSpecHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/AbstractCookieSpecHC4.java Mon Mar  3 12:10:15 2014
@@ -45,7 +45,7 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @NotThreadSafe // HashMap is not thread-safe
-public abstract class AbstractCookieSpec implements CookieSpec {
+public abstract class AbstractCookieSpecHC4 implements CookieSpec {
 
     /**
     * Stores attribute name -> attribute handler mappings
@@ -55,7 +55,7 @@ public abstract class AbstractCookieSpec
     /**
      * Default constructor
      * */
-    public AbstractCookieSpec() {
+    public AbstractCookieSpecHC4() {
         super();
         this.attribHandlerMap = new HashMap<String, CookieAttributeHandler>(10);
     }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2HC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2HC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2HC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2HC4.java Mon Mar  3 12:10:15 2014
@@ -38,7 +38,7 @@ import org.apache.http.cookie.SetCookie2
  * @since 4.0
  */
 @NotThreadSafe
-public class BasicClientCookie2 extends BasicClientCookie implements SetCookie2 {
+public class BasicClientCookie2HC4 extends BasicClientCookieHC4 implements SetCookie2 {
 
     private static final long serialVersionUID = -7744598295706617057L;
 
@@ -52,7 +52,7 @@ public class BasicClientCookie2 extends 
      * @param name The name.
      * @param value The value.
      */
-    public BasicClientCookie2(final String name, final String value) {
+    public BasicClientCookie2HC4(final String name, final String value) {
         super(name, value);
     }
 
@@ -90,7 +90,7 @@ public class BasicClientCookie2 extends 
 
     @Override
     public Object clone() throws CloneNotSupportedException {
-        final BasicClientCookie2 clone = (BasicClientCookie2) super.clone();
+        final BasicClientCookie2HC4 clone = (BasicClientCookie2HC4) super.clone();
         if (this.ports != null) {
             clone.ports = this.ports.clone();
         }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicClientCookieHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicClientCookieHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicClientCookieHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicClientCookieHC4.java Mon Mar  3 12:10:15 2014
@@ -44,7 +44,7 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @NotThreadSafe
-public class BasicClientCookie implements SetCookie, ClientCookie, Cloneable, Serializable {
+public class BasicClientCookieHC4 implements SetCookie, ClientCookie, Cloneable, Serializable {
 
     private static final long serialVersionUID = -3869795591041535538L;
 
@@ -54,7 +54,7 @@ public class BasicClientCookie implement
      * @param name The name.
      * @param value The value.
      */
-    public BasicClientCookie(final String name, final String value) {
+    public BasicClientCookieHC4(final String name, final String value) {
         super();
         Args.notNull(name, "Name");
         this.name = name;
@@ -299,7 +299,7 @@ public class BasicClientCookie implement
 
     @Override
     public Object clone() throws CloneNotSupportedException {
-        final BasicClientCookie clone = (BasicClientCookie) super.clone();
+        final BasicClientCookieHC4 clone = (BasicClientCookieHC4) super.clone();
         clone.attribs = new HashMap<String, String>(this.attribs);
         return clone;
     }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicCommentHandlerHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicCommentHandlerHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicCommentHandlerHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicCommentHandlerHC4.java Mon Mar  3 12:10:15 2014
@@ -36,9 +36,9 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @Immutable
-public class BasicCommentHandler extends AbstractCookieAttributeHandler {
+public class BasicCommentHandlerHC4 extends AbstractCookieAttributeHandlerHC4 {
 
-    public BasicCommentHandler() {
+    public BasicCommentHandlerHC4() {
         super();
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicDomainHandlerHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicDomainHandlerHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicDomainHandlerHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicDomainHandlerHC4.java Mon Mar  3 12:10:15 2014
@@ -40,9 +40,9 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @Immutable
-public class BasicDomainHandler implements CookieAttributeHandler {
+public class BasicDomainHandlerHC4 implements CookieAttributeHandler {
 
-    public BasicDomainHandler() {
+    public BasicDomainHandlerHC4() {
         super();
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandlerHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandlerHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandlerHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandlerHC4.java Mon Mar  3 12:10:15 2014
@@ -39,12 +39,12 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @Immutable
-public class BasicExpiresHandler extends AbstractCookieAttributeHandler {
+public class BasicExpiresHandlerHC4 extends AbstractCookieAttributeHandlerHC4 {
 
     /** Valid date patterns */
     private final String[] datepatterns;
 
-    public BasicExpiresHandler(final String[] datepatterns) {
+    public BasicExpiresHandlerHC4(final String[] datepatterns) {
         Args.notNull(datepatterns, "Array of date patterns");
         this.datepatterns = datepatterns;
     }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicMaxAgeHandlerHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicMaxAgeHandlerHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicMaxAgeHandlerHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicMaxAgeHandlerHC4.java Mon Mar  3 12:10:15 2014
@@ -38,9 +38,9 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @Immutable
-public class BasicMaxAgeHandler extends AbstractCookieAttributeHandler {
+public class BasicMaxAgeHandlerHC4 extends AbstractCookieAttributeHandlerHC4 {
 
-    public BasicMaxAgeHandler() {
+    public BasicMaxAgeHandlerHC4() {
         super();
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicPathHandlerHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicPathHandlerHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicPathHandlerHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicPathHandlerHC4.java Mon Mar  3 12:10:15 2014
@@ -41,9 +41,9 @@ import org.apache.http.util.TextUtils;
  * @since 4.0
  */
 @Immutable
-public class BasicPathHandler implements CookieAttributeHandler {
+public class BasicPathHandlerHC4 implements CookieAttributeHandler {
 
-    public BasicPathHandler() {
+    public BasicPathHandlerHC4() {
         super();
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicSecureHandlerHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicSecureHandlerHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicSecureHandlerHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BasicSecureHandlerHC4.java Mon Mar  3 12:10:15 2014
@@ -38,9 +38,9 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @Immutable
-public class BasicSecureHandler extends AbstractCookieAttributeHandler {
+public class BasicSecureHandlerHC4 extends AbstractCookieAttributeHandlerHC4 {
 
-    public BasicSecureHandler() {
+    public BasicSecureHandlerHC4() {
         super();
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactoryHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactoryHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactoryHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactoryHC4.java Mon Mar  3 12:10:15 2014
@@ -45,18 +45,18 @@ import org.apache.http.protocol.HttpCont
  */
 @Immutable
 @SuppressWarnings("deprecation")
-public class BestMatchSpecFactory implements CookieSpecFactory, CookieSpecProvider {
+public class BestMatchSpecFactoryHC4 implements CookieSpecFactory, CookieSpecProvider {
 
     private final String[] datepatterns;
     private final boolean oneHeader;
 
-    public BestMatchSpecFactory(final String[] datepatterns, final boolean oneHeader) {
+    public BestMatchSpecFactoryHC4(final String[] datepatterns, final boolean oneHeader) {
         super();
         this.datepatterns = datepatterns;
         this.oneHeader = oneHeader;
     }
 
-    public BestMatchSpecFactory() {
+    public BestMatchSpecFactoryHC4() {
         this(null, false);
     }
 
@@ -73,14 +73,14 @@ public class BestMatchSpecFactory implem
             final boolean singleHeader = params.getBooleanParameter(
                     CookieSpecPNames.SINGLE_COOKIE_HEADER, false);
 
-            return new BestMatchSpec(patterns, singleHeader);
+            return new BestMatchSpecHC4(patterns, singleHeader);
         } else {
-            return new BestMatchSpec();
+            return new BestMatchSpecHC4();
         }
     }
 
     public CookieSpec create(final HttpContext context) {
-        return new BestMatchSpec(this.datepatterns, this.oneHeader);
+        return new BestMatchSpecHC4(this.datepatterns, this.oneHeader);
     }
 
 }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BestMatchSpecHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BestMatchSpecHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BestMatchSpecHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BestMatchSpecHC4.java Mon Mar  3 12:10:15 2014
@@ -50,43 +50,43 @@ import org.apache.http.util.CharArrayBuf
  * @since 4.0
  */
 @NotThreadSafe // CookieSpec fields are @NotThreadSafe
-public class BestMatchSpec implements CookieSpec {
+public class BestMatchSpecHC4 implements CookieSpec {
 
     private final String[] datepatterns;
     private final boolean oneHeader;
 
     // Cached values of CookieSpec instances
-    private RFC2965Spec strict; // @NotThreadSafe
-    private RFC2109Spec obsoleteStrict; // @NotThreadSafe
-    private BrowserCompatSpec compat; // @NotThreadSafe
+    private RFC2965SpecHC4 strict; // @NotThreadSafe
+    private RFC2109SpecHC4 obsoleteStrict; // @NotThreadSafe
+    private BrowserCompatSpecHC4 compat; // @NotThreadSafe
 
-    public BestMatchSpec(final String[] datepatterns, final boolean oneHeader) {
+    public BestMatchSpecHC4(final String[] datepatterns, final boolean oneHeader) {
         super();
         this.datepatterns = datepatterns == null ? null : datepatterns.clone();
         this.oneHeader = oneHeader;
     }
 
-    public BestMatchSpec() {
+    public BestMatchSpecHC4() {
         this(null, false);
     }
 
-    private RFC2965Spec getStrict() {
+    private RFC2965SpecHC4 getStrict() {
         if (this.strict == null) {
-             this.strict = new RFC2965Spec(this.datepatterns, this.oneHeader);
+             this.strict = new RFC2965SpecHC4(this.datepatterns, this.oneHeader);
         }
         return strict;
     }
 
-    private RFC2109Spec getObsoleteStrict() {
+    private RFC2109SpecHC4 getObsoleteStrict() {
         if (this.obsoleteStrict == null) {
-             this.obsoleteStrict = new RFC2109Spec(this.datepatterns, this.oneHeader);
+             this.obsoleteStrict = new RFC2109SpecHC4(this.datepatterns, this.oneHeader);
         }
         return obsoleteStrict;
     }
 
-    private BrowserCompatSpec getCompat() {
+    private BrowserCompatSpecHC4 getCompat() {
         if (this.compat == null) {
-            this.compat = new BrowserCompatSpec(this.datepatterns);
+            this.compat = new BrowserCompatSpecHC4(this.datepatterns);
         }
         return compat;
     }
@@ -110,7 +110,7 @@ public class BestMatchSpec implements Co
         if (netscape || !versioned) {
             // Need to parse the header again, because Netscape style cookies do not correctly
             // support multiple header elements (comma cannot be treated as an element separator)
-            final NetscapeDraftHeaderParser parser = NetscapeDraftHeaderParser.DEFAULT;
+            final NetscapeDraftHeaderParserHC4 parser = NetscapeDraftHeaderParserHC4.DEFAULT;
             final CharArrayBuffer buffer;
             final ParserCursor cursor;
             if (header instanceof FormattedHeader) {

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactoryHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactoryHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactoryHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactoryHC4.java Mon Mar  3 12:10:15 2014
@@ -45,7 +45,7 @@ import org.apache.http.protocol.HttpCont
  */
 @Immutable
 @SuppressWarnings("deprecation")
-public class BrowserCompatSpecFactory implements CookieSpecFactory, CookieSpecProvider {
+public class BrowserCompatSpecFactoryHC4 implements CookieSpecFactory, CookieSpecProvider {
 
     public enum SecurityLevel {
         SECURITYLEVEL_DEFAULT,
@@ -55,17 +55,17 @@ public class BrowserCompatSpecFactory im
     private final String[] datepatterns;
     private final SecurityLevel securityLevel;
 
-    public BrowserCompatSpecFactory(final String[] datepatterns, final SecurityLevel securityLevel) {
+    public BrowserCompatSpecFactoryHC4(final String[] datepatterns, final SecurityLevel securityLevel) {
         super();
         this.datepatterns = datepatterns;
         this.securityLevel = securityLevel;
     }
 
-    public BrowserCompatSpecFactory(final String[] datepatterns) {
+    public BrowserCompatSpecFactoryHC4(final String[] datepatterns) {
         this(null, SecurityLevel.SECURITYLEVEL_DEFAULT);
     }
 
-    public BrowserCompatSpecFactory() {
+    public BrowserCompatSpecFactoryHC4() {
         this(null, SecurityLevel.SECURITYLEVEL_DEFAULT);
     }
 
@@ -79,14 +79,14 @@ public class BrowserCompatSpecFactory im
                 patterns = new String[param.size()];
                 patterns = param.toArray(patterns);
             }
-            return new BrowserCompatSpec(patterns, securityLevel);
+            return new BrowserCompatSpecHC4(patterns, securityLevel);
         } else {
-            return new BrowserCompatSpec(null, securityLevel);
+            return new BrowserCompatSpecHC4(null, securityLevel);
         }
     }
 
     public CookieSpec create(final HttpContext context) {
-        return new BrowserCompatSpec(this.datepatterns);
+        return new BrowserCompatSpecHC4(this.datepatterns);
     }
 
 }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecHC4.java Mon Mar  3 12:10:15 2014
@@ -41,7 +41,7 @@ import org.apache.http.cookie.CookieOrig
 import org.apache.http.cookie.MalformedCookieException;
 import org.apache.http.cookie.SM;
 import org.apache.http.message.BasicHeaderElement;
-import org.apache.http.message.BasicHeaderValueFormatter;
+import org.apache.http.message.BasicHeaderValueFormatterHC4;
 import org.apache.http.message.BufferedHeader;
 import org.apache.http.message.ParserCursor;
 import org.apache.http.util.Args;
@@ -57,7 +57,7 @@ import org.apache.http.util.CharArrayBuf
  * @since 4.0
  */
 @NotThreadSafe // superclass is @NotThreadSafe
-public class BrowserCompatSpec extends CookieSpecBase {
+public class BrowserCompatSpecHC4 extends CookieSpecBaseHC4 {
 
 
     private static final String[] DEFAULT_DATE_PATTERNS = new String[] {
@@ -80,7 +80,7 @@ public class BrowserCompatSpec extends C
     private final String[] datepatterns;
 
     /** Default constructor */
-    public BrowserCompatSpec(final String[] datepatterns, final BrowserCompatSpecFactory.SecurityLevel securityLevel) {
+    public BrowserCompatSpecHC4(final String[] datepatterns, final BrowserCompatSpecFactoryHC4.SecurityLevel securityLevel) {
         super();
         if (datepatterns != null) {
             this.datepatterns = datepatterns.clone();
@@ -89,10 +89,10 @@ public class BrowserCompatSpec extends C
         }
         switch (securityLevel) {
             case SECURITYLEVEL_DEFAULT:
-                registerAttribHandler(ClientCookie.PATH_ATTR, new BasicPathHandler());
+                registerAttribHandler(ClientCookie.PATH_ATTR, new BasicPathHandlerHC4());
                 break;
             case SECURITYLEVEL_IE_MEDIUM:
-                registerAttribHandler(ClientCookie.PATH_ATTR, new BasicPathHandler() {
+                registerAttribHandler(ClientCookie.PATH_ATTR, new BasicPathHandlerHC4() {
                         @Override
                         public void validate(final Cookie cookie, final CookieOrigin origin) throws MalformedCookieException {
                             // No validation
@@ -104,23 +104,23 @@ public class BrowserCompatSpec extends C
                 throw new RuntimeException("Unknown security level");
         }
 
-        registerAttribHandler(ClientCookie.DOMAIN_ATTR, new BasicDomainHandler());
-        registerAttribHandler(ClientCookie.MAX_AGE_ATTR, new BasicMaxAgeHandler());
-        registerAttribHandler(ClientCookie.SECURE_ATTR, new BasicSecureHandler());
-        registerAttribHandler(ClientCookie.COMMENT_ATTR, new BasicCommentHandler());
-        registerAttribHandler(ClientCookie.EXPIRES_ATTR, new BasicExpiresHandler(
+        registerAttribHandler(ClientCookie.DOMAIN_ATTR, new BasicDomainHandlerHC4());
+        registerAttribHandler(ClientCookie.MAX_AGE_ATTR, new BasicMaxAgeHandlerHC4());
+        registerAttribHandler(ClientCookie.SECURE_ATTR, new BasicSecureHandlerHC4());
+        registerAttribHandler(ClientCookie.COMMENT_ATTR, new BasicCommentHandlerHC4());
+        registerAttribHandler(ClientCookie.EXPIRES_ATTR, new BasicExpiresHandlerHC4(
                 this.datepatterns));
         registerAttribHandler(ClientCookie.VERSION_ATTR, new BrowserCompatVersionAttributeHandler());
     }
 
     /** Default constructor */
-    public BrowserCompatSpec(final String[] datepatterns) {
-        this(datepatterns, BrowserCompatSpecFactory.SecurityLevel.SECURITYLEVEL_DEFAULT);
+    public BrowserCompatSpecHC4(final String[] datepatterns) {
+        this(datepatterns, BrowserCompatSpecFactoryHC4.SecurityLevel.SECURITYLEVEL_DEFAULT);
     }
 
     /** Default constructor */
-    public BrowserCompatSpec() {
-        this(null, BrowserCompatSpecFactory.SecurityLevel.SECURITYLEVEL_DEFAULT);
+    public BrowserCompatSpecHC4() {
+        this(null, BrowserCompatSpecFactoryHC4.SecurityLevel.SECURITYLEVEL_DEFAULT);
     }
 
     public List<Cookie> parse(final Header header, final CookieOrigin origin)
@@ -146,7 +146,7 @@ public class BrowserCompatSpec extends C
         if (netscape || !versioned) {
             // Need to parse the header again, because Netscape style cookies do not correctly
             // support multiple header elements (comma cannot be treated as an element separator)
-            final NetscapeDraftHeaderParser parser = NetscapeDraftHeaderParser.DEFAULT;
+            final NetscapeDraftHeaderParserHC4 parser = NetscapeDraftHeaderParserHC4.DEFAULT;
             final CharArrayBuffer buffer;
             final ParserCursor cursor;
             if (header instanceof FormattedHeader) {
@@ -185,7 +185,7 @@ public class BrowserCompatSpec extends C
             final String cookieName = cookie.getName();
             final String cookieValue = cookie.getValue();
             if (cookie.getVersion() > 0 && !isQuoteEnclosed(cookieValue)) {
-                BasicHeaderValueFormatter.INSTANCE.formatHeaderElement(
+                BasicHeaderValueFormatterHC4.INSTANCE.formatHeaderElement(
                         buffer,
                         new BasicHeaderElement(cookieName, cookieValue),
                         false);

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.java Mon Mar  3 12:10:15 2014
@@ -39,7 +39,7 @@ import org.apache.http.util.Args;
  */
 @Immutable
 public class BrowserCompatVersionAttributeHandler extends
-        AbstractCookieAttributeHandler {
+        AbstractCookieAttributeHandlerHC4 {
 
     public BrowserCompatVersionAttributeHandler() {
         super();

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/CookieSpecBaseHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/CookieSpecBaseHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/CookieSpecBaseHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/CookieSpecBaseHC4.java Mon Mar  3 12:10:15 2014
@@ -46,8 +46,8 @@ import org.apache.http.util.Args;
  *
  * @since 4.0
  */
-@NotThreadSafe // AbstractCookieSpec is not thread-safe
-public abstract class CookieSpecBase extends AbstractCookieSpec {
+@NotThreadSafe // AbstractCookieSpecHC4 is not thread-safe
+public abstract class CookieSpecBaseHC4 extends AbstractCookieSpecHC4 {
 
     protected static String getDefaultPath(final CookieOrigin origin) {
         String defaultPath = origin.getPath();
@@ -76,7 +76,7 @@ public abstract class CookieSpecBase ext
                 throw new MalformedCookieException("Cookie name may not be empty");
             }
 
-            final BasicClientCookie cookie = new BasicClientCookie(name, value);
+            final BasicClientCookieHC4 cookie = new BasicClientCookieHC4(name, value);
             cookie.setPath(getDefaultPath(origin));
             cookie.setDomain(getDefaultDomain(origin));
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/IgnoreSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/IgnoreSpec.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/IgnoreSpec.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/IgnoreSpec.java Mon Mar  3 12:10:15 2014
@@ -42,7 +42,7 @@ import org.apache.http.cookie.MalformedC
  * @since 4.1
  */
 @NotThreadSafe // superclass is @NotThreadSafe
-public class IgnoreSpec extends CookieSpecBase {
+public class IgnoreSpec extends CookieSpecBaseHC4 {
 
     public int getVersion() {
         return 0;

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandlerHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandlerHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandlerHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandlerHC4.java Mon Mar  3 12:10:15 2014
@@ -41,9 +41,9 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @Immutable
-public class NetscapeDomainHandler extends BasicDomainHandler {
+public class NetscapeDomainHandlerHC4 extends BasicDomainHandlerHC4 {
 
-    public NetscapeDomainHandler() {
+    public NetscapeDomainHandlerHC4() {
         super();
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDraftHeaderParserHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDraftHeaderParserHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDraftHeaderParserHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDraftHeaderParserHC4.java Mon Mar  3 12:10:15 2014
@@ -46,11 +46,11 @@ import org.apache.http.util.CharArrayBuf
  * @since 4.0
  */
 @Immutable
-public class NetscapeDraftHeaderParser {
+public class NetscapeDraftHeaderParserHC4 {
 
-    public final static NetscapeDraftHeaderParser DEFAULT = new NetscapeDraftHeaderParser();
+    public final static NetscapeDraftHeaderParserHC4 DEFAULT = new NetscapeDraftHeaderParserHC4();
 
-    public NetscapeDraftHeaderParser() {
+    public NetscapeDraftHeaderParserHC4() {
         super();
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactoryHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactoryHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactoryHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactoryHC4.java Mon Mar  3 12:10:15 2014
@@ -45,16 +45,16 @@ import org.apache.http.protocol.HttpCont
  */
 @Immutable
 @SuppressWarnings("deprecation")
-public class NetscapeDraftSpecFactory implements CookieSpecFactory, CookieSpecProvider {
+public class NetscapeDraftSpecFactoryHC4 implements CookieSpecFactory, CookieSpecProvider {
 
     private final String[] datepatterns;
 
-    public NetscapeDraftSpecFactory(final String[] datepatterns) {
+    public NetscapeDraftSpecFactoryHC4(final String[] datepatterns) {
         super();
         this.datepatterns = datepatterns;
     }
 
-    public NetscapeDraftSpecFactory() {
+    public NetscapeDraftSpecFactoryHC4() {
         this(null);
     }
 
@@ -68,14 +68,14 @@ public class NetscapeDraftSpecFactory im
                 patterns = new String[param.size()];
                 patterns = param.toArray(patterns);
             }
-            return new NetscapeDraftSpec(patterns);
+            return new NetscapeDraftSpecHC4(patterns);
         } else {
-            return new NetscapeDraftSpec();
+            return new NetscapeDraftSpecHC4();
         }
     }
 
     public CookieSpec create(final HttpContext context) {
-        return new NetscapeDraftSpec(this.datepatterns);
+        return new NetscapeDraftSpecHC4(this.datepatterns);
     }
 
 }

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecHC4.java Mon Mar  3 12:10:15 2014
@@ -53,31 +53,31 @@ import org.apache.http.util.CharArrayBuf
  * @since 4.0
  */
 @NotThreadSafe // superclass is @NotThreadSafe
-public class NetscapeDraftSpec extends CookieSpecBase {
+public class NetscapeDraftSpecHC4 extends CookieSpecBaseHC4 {
 
     protected static final String EXPIRES_PATTERN = "EEE, dd-MMM-yy HH:mm:ss z";
 
     private final String[] datepatterns;
 
     /** Default constructor */
-    public NetscapeDraftSpec(final String[] datepatterns) {
+    public NetscapeDraftSpecHC4(final String[] datepatterns) {
         super();
         if (datepatterns != null) {
             this.datepatterns = datepatterns.clone();
         } else {
             this.datepatterns = new String[] { EXPIRES_PATTERN };
         }
-        registerAttribHandler(ClientCookie.PATH_ATTR, new BasicPathHandler());
-        registerAttribHandler(ClientCookie.DOMAIN_ATTR, new NetscapeDomainHandler());
-        registerAttribHandler(ClientCookie.MAX_AGE_ATTR, new BasicMaxAgeHandler());
-        registerAttribHandler(ClientCookie.SECURE_ATTR, new BasicSecureHandler());
-        registerAttribHandler(ClientCookie.COMMENT_ATTR, new BasicCommentHandler());
-        registerAttribHandler(ClientCookie.EXPIRES_ATTR, new BasicExpiresHandler(
+        registerAttribHandler(ClientCookie.PATH_ATTR, new BasicPathHandlerHC4());
+        registerAttribHandler(ClientCookie.DOMAIN_ATTR, new NetscapeDomainHandlerHC4());
+        registerAttribHandler(ClientCookie.MAX_AGE_ATTR, new BasicMaxAgeHandlerHC4());
+        registerAttribHandler(ClientCookie.SECURE_ATTR, new BasicSecureHandlerHC4());
+        registerAttribHandler(ClientCookie.COMMENT_ATTR, new BasicCommentHandlerHC4());
+        registerAttribHandler(ClientCookie.EXPIRES_ATTR, new BasicExpiresHandlerHC4(
                 this.datepatterns));
     }
 
     /** Default constructor */
-    public NetscapeDraftSpec() {
+    public NetscapeDraftSpecHC4() {
         this(null);
     }
 
@@ -113,7 +113,7 @@ public class NetscapeDraftSpec extends C
             throw new MalformedCookieException("Unrecognized cookie header '"
                     + header.toString() + "'");
         }
-        final NetscapeDraftHeaderParser parser = NetscapeDraftHeaderParser.DEFAULT;
+        final NetscapeDraftHeaderParserHC4 parser = NetscapeDraftHeaderParserHC4.DEFAULT;
         final CharArrayBuffer buffer;
         final ParserCursor cursor;
         if (header instanceof FormattedHeader) {

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilterHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilterHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilterHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilterHC4.java Mon Mar  3 12:10:15 2014
@@ -47,12 +47,12 @@ import org.apache.http.cookie.SetCookie;
  *
  * @since 4.0
  */
-public class PublicSuffixFilter implements CookieAttributeHandler {
+public class PublicSuffixFilterHC4 implements CookieAttributeHandler {
     private final CookieAttributeHandler wrapped;
     private Set<String> exceptions;
     private Set<String> suffixes;
 
-    public PublicSuffixFilter(final CookieAttributeHandler wrapped) {
+    public PublicSuffixFilterHC4(final CookieAttributeHandler wrapped) {
         this.wrapped = wrapped;
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParserHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParserHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParserHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParserHC4.java Mon Mar  3 12:10:15 2014
@@ -36,16 +36,16 @@ import org.apache.http.annotation.Immuta
 
 /**
  * Parses the list from <a href="http://publicsuffix.org/">publicsuffix.org</a>
- * and configures a PublicSuffixFilter.
+ * and configures a PublicSuffixFilterHC4.
  *
  * @since 4.0
  */
 @Immutable
-public class PublicSuffixListParser {
+public class PublicSuffixListParserHC4 {
     private static final int MAX_LINE_LEN = 256;
-    private final PublicSuffixFilter filter;
+    private final PublicSuffixFilterHC4 filter;
 
-    PublicSuffixListParser(final PublicSuffixFilter filter) {
+    PublicSuffixListParserHC4(final PublicSuffixFilterHC4 filter) {
         this.filter = filter;
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandlerHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandlerHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandlerHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandlerHC4.java Mon Mar  3 12:10:15 2014
@@ -42,9 +42,9 @@ import org.apache.http.util.Args;
  * @since 4.0
  */
 @Immutable
-public class RFC2109DomainHandler implements CookieAttributeHandler {
+public class RFC2109DomainHandlerHC4 implements CookieAttributeHandler {
 
-    public RFC2109DomainHandler() {
+    public RFC2109DomainHandlerHC4() {
         super();
     }
 

Modified: httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactoryHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactoryHC4.java?rev=1573532&r1=1573531&r2=1573532&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactoryHC4.java (original)
+++ httpcomponents/httpclient-android/branches/4.3.3-android/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactoryHC4.java Mon Mar  3 12:10:15 2014
@@ -45,18 +45,18 @@ import org.apache.http.protocol.HttpCont
  */
 @Immutable
 @SuppressWarnings("deprecation")
-public class RFC2109SpecFactory implements CookieSpecFactory, CookieSpecProvider {
+public class RFC2109SpecFactoryHC4 implements CookieSpecFactory, CookieSpecProvider {
 
     private final String[] datepatterns;
     private final boolean oneHeader;
 
-    public RFC2109SpecFactory(final String[] datepatterns, final boolean oneHeader) {
+    public RFC2109SpecFactoryHC4(final String[] datepatterns, final boolean oneHeader) {
         super();
         this.datepatterns = datepatterns;
         this.oneHeader = oneHeader;
     }
 
-    public RFC2109SpecFactory() {
+    public RFC2109SpecFactoryHC4() {
         this(null, false);
     }
 
@@ -73,14 +73,14 @@ public class RFC2109SpecFactory implemen
             final boolean singleHeader = params.getBooleanParameter(
                     CookieSpecPNames.SINGLE_COOKIE_HEADER, false);
 
-            return new RFC2109Spec(patterns, singleHeader);
+            return new RFC2109SpecHC4(patterns, singleHeader);
         } else {
-            return new RFC2109Spec();
+            return new RFC2109SpecHC4();
         }
     }
 
     public CookieSpec create(final HttpContext context) {
-        return new RFC2109Spec(this.datepatterns, this.oneHeader);
+        return new RFC2109SpecHC4(this.datepatterns, this.oneHeader);
     }
 
 }



Mime
View raw message