hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1681460 [1/2] - in /httpcomponents/httpclient/trunk: ./ fluent-hc/ fluent-hc/src/main/java/org/apache/http/client/fluent/ httpclient-cache/ httpclient-cache/src/main/java-deprecated/ httpclient-cache/src/main/java/org/apache/http/impl/clie...
Date Sun, 24 May 2015 14:12:44 GMT
Author: olegk
Date: Sun May 24 14:12:43 2015
New Revision: 1681460

URL: http://svn.apache.org/r1681460
Log:
Removed deprecated code

Removed:
    httpcomponents/httpclient/trunk/httpclient-cache/src/main/java-deprecated/
    httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeFactory.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/ContextAwareAuthScheme.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbortableHttpRequest.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionManager.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionRequest.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpInetSocketAddress.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpRoutedConnection.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ManagedClientConnection.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/X509HostnameVerifier.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpecFactory.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java
    httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java
    httpcomponents/httpclient/trunk/httpmime/src/main/java-deprecated/
Modified:
    httpcomponents/httpclient/trunk/fluent-hc/pom.xml
    httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java
    httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java
    httpcomponents/httpclient/trunk/httpclient-cache/pom.xml
    httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheConfig.java
    httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheValidityPolicy.java
    httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.java
    httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/OptionsHttp11Response.java
    httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java
    httpcomponents/httpclient/trunk/httpclient-osgi/pom.xml
    httpcomponents/httpclient/trunk/httpclient-win/pom.xml
    httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java
    httpcomponents/httpclient/trunk/httpclient/pom.xml
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpClient.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/config/CookieSpecs.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/config/RequestConfig.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbstractExecutionAwareRequest.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/HttpAuthenticator.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosSchemeFactory.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMSchemeFactory.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoSchemeFactory.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/InternalHttpClient.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ProxyClient.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/AbstractCookieSpec.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/MainClientExec.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ProtocolExec.java
    httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestHttpAuthenticator.java
    httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestRFC2617Scheme.java
    httpcomponents/httpclient/trunk/httpmime/pom.xml
    httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/FormBodyPart.java
    httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder.java
    httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/MultipartFormEntity.java
    httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/AbstractContentBody.java
    httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/ByteArrayBody.java
    httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/FileBody.java
    httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/InputStreamBody.java
    httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/StringBody.java
    httpcomponents/httpclient/trunk/pom.xml

Modified: httpcomponents/httpclient/trunk/fluent-hc/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/pom.xml?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/pom.xml (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/pom.xml Sun May 24 14:12:43 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-client</artifactId>
-    <version>4.5-alpha1-SNAPSHOT</version>
+    <version>5.0-alpha1-SNAPSHOT</version>
   </parent>
   <artifactId>fluent-hc</artifactId>
   <name>Apache HttpClient Fluent API</name>

Modified: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java Sun May 24 14:12:43 2015
@@ -232,20 +232,6 @@ public class Executor {
     }
 
     /**
-     * @deprecated (4.3) do not use.
-     */
-    @Deprecated
-    public static void registerScheme(final org.apache.http.conn.scheme.Scheme scheme) {
-    }
-
-    /**
-     * @deprecated (4.3) do not use.
-     */
-    @Deprecated
-    public static void unregisterScheme(final String name) {
-    }
-
-    /**
      * Closes all idle persistent connections used by the internal pool.
      * @since 4.4
      */

Modified: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java Sun May 24 14:12:43 2015
@@ -252,26 +252,6 @@ public class Request {
         return this;
     }
 
-    /**
-     * This method has no effect. Do not use.
-     *
-     * @deprecated (4.3)
-     */
-    @Deprecated
-    public Request config(final String param, final Object object) {
-        return this;
-    }
-
-    /**
-     * This method has no effect. Do not use.
-     *
-     * @deprecated (4.3)
-     */
-    @Deprecated
-    public Request removeConfig(final String param) {
-        return this;
-    }
-
     //// HTTP protocol parameter operations
 
     public Request version(final HttpVersion version) {
@@ -279,19 +259,6 @@ public class Request {
         return this;
     }
 
-    /**
-     * This parameter can no longer be used at the request level.
-     * <p>
-     * This method has no effect. Do not use.
-     * </p>
-     *
-     * @deprecated (4.3)
-     */
-    @Deprecated
-    public Request elementCharset(final String charset) {
-        return this;
-    }
-
     public Request useExpectContinue() {
         this.useExpectContinue = Boolean.TRUE;
         return this;
@@ -314,16 +281,6 @@ public class Request {
         return this;
     }
 
-    /**
-     * This method has no effect. Do not use.
-     *
-     * @deprecated (4.4)
-     */
-    @Deprecated
-    public Request staleConnectionCheck(final boolean b) {
-        return this;
-    }
-
     //// HTTP connection route operations
 
     public Request viaProxy(final HttpHost proxy) {

Modified: httpcomponents/httpclient/trunk/httpclient-cache/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/pom.xml?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/pom.xml Sun May 24 14:12:43 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-client</artifactId>
-    <version>4.5-alpha1-SNAPSHOT</version>
+    <version>5.0-alpha1-SNAPSHOT</version>
   </parent>
   <artifactId>httpclient-cache</artifactId>
   <name>Apache HttpClient Cache</name>
@@ -110,25 +110,6 @@
     </resources>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.8</version>
-        <executions>
-          <execution>
-            <id>add-source</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>src/main/java-deprecated</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheConfig.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheConfig.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheConfig.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheConfig.java Sun May 24 14:12:43 2015
@@ -29,8 +29,8 @@ package org.apache.http.impl.client.cach
 import org.apache.http.util.Args;
 
 /**
- * <p>Java Beans-style configuration for a {@link CachingHttpClient}. Any class
- * in the caching module that has configuration options should take a
+ * <p>Java Beans-style configuration for caching {@link org.apache.http.client.HttpClient}.
+ * Any class in the caching module that has configuration options should take a
  * {@link CacheConfig} argument in one of its constructors. A
  * {@code CacheConfig} instance has sane and conservative defaults, so the
  * easiest way to specify options is to get an instance and then set just
@@ -78,10 +78,10 @@ import org.apache.http.util.Args;
  * This behavior is off by default, but you may want to turn this on if you
  * are working with an origin that doesn't set proper headers but where you
  * still want to cache the responses. You will want to {@link
- * CacheConfig#setHeuristicCachingEnabled(boolean) enable heuristic caching},
+ * CacheConfig#isHeuristicCachingEnabled()} enable heuristic caching},
  * then specify either a {@link CacheConfig#getHeuristicDefaultLifetime()
  * default freshness lifetime} and/or a {@link
- * CacheConfig#setHeuristicCoefficient(float) fraction of the time since
+ * CacheConfig#getHeuristicCoefficient() fraction of the time since
  * the resource was last modified}. See Sections
  * <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.2.2">
  * 13.2.2</a> and <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.2.4">
@@ -160,42 +160,20 @@ public class CacheConfig implements Clon
 
     public static final CacheConfig DEFAULT = new Builder().build();
 
-    // TODO: make final
-    private long maxObjectSize;
-    private int maxCacheEntries;
-    private int maxUpdateRetries;
-    private boolean allow303Caching;
-    private boolean weakETagOnPutDeleteAllowed;
-    private boolean heuristicCachingEnabled;
-    private float heuristicCoefficient;
-    private long heuristicDefaultLifetime;
-    private boolean isSharedCache;
-    private int asynchronousWorkersMax;
-    private int asynchronousWorkersCore;
-    private int asynchronousWorkerIdleLifetimeSecs;
-    private int revalidationQueueSize;
-    private boolean neverCacheHTTP10ResponsesWithQuery;
-
-    /**
-     * @deprecated (4.3) use {@link Builder}.
-     */
-    @Deprecated
-    public CacheConfig() {
-        super();
-        this.maxObjectSize = DEFAULT_MAX_OBJECT_SIZE_BYTES;
-        this.maxCacheEntries = DEFAULT_MAX_CACHE_ENTRIES;
-        this.maxUpdateRetries = DEFAULT_MAX_UPDATE_RETRIES;
-        this.allow303Caching = DEFAULT_303_CACHING_ENABLED;
-        this.weakETagOnPutDeleteAllowed = DEFAULT_WEAK_ETAG_ON_PUTDELETE_ALLOWED;
-        this.heuristicCachingEnabled = DEFAULT_HEURISTIC_CACHING_ENABLED;
-        this.heuristicCoefficient = DEFAULT_HEURISTIC_COEFFICIENT;
-        this.heuristicDefaultLifetime = DEFAULT_HEURISTIC_LIFETIME;
-        this.isSharedCache = true;
-        this.asynchronousWorkersMax = DEFAULT_ASYNCHRONOUS_WORKERS_MAX;
-        this.asynchronousWorkersCore = DEFAULT_ASYNCHRONOUS_WORKERS_CORE;
-        this.asynchronousWorkerIdleLifetimeSecs = DEFAULT_ASYNCHRONOUS_WORKER_IDLE_LIFETIME_SECS;
-        this.revalidationQueueSize = DEFAULT_REVALIDATION_QUEUE_SIZE;
-    }
+    private final long maxObjectSize;
+    private final int maxCacheEntries;
+    private final int maxUpdateRetries;
+    private final boolean allow303Caching;
+    private final boolean weakETagOnPutDeleteAllowed;
+    private final boolean heuristicCachingEnabled;
+    private final float heuristicCoefficient;
+    private final long heuristicDefaultLifetime;
+    private final boolean isSharedCache;
+    private final int asynchronousWorkersMax;
+    private final int asynchronousWorkersCore;
+    private final int asynchronousWorkerIdleLifetimeSecs;
+    private final int revalidationQueueSize;
+    private final boolean neverCacheHTTP10ResponsesWithQuery;
 
     CacheConfig(
             final long maxObjectSize,
@@ -226,32 +204,7 @@ public class CacheConfig implements Clon
         this.asynchronousWorkersCore = asynchronousWorkersCore;
         this.asynchronousWorkerIdleLifetimeSecs = asynchronousWorkerIdleLifetimeSecs;
         this.revalidationQueueSize = revalidationQueueSize;
-    }
-
-    /**
-     * Returns the current maximum response body size that will be cached.
-     * @return size in bytes
-     *
-     * @deprecated (4.2)  use {@link #getMaxObjectSize()}
-     */
-    @Deprecated
-    public int getMaxObjectSizeBytes() {
-        return maxObjectSize > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) maxObjectSize;
-    }
-
-    /**
-     * Specifies the maximum response body size that will be eligible for caching.
-     * @param maxObjectSizeBytes size in bytes
-     *
-     * @deprecated (4.2)  use {@link Builder}.
-     */
-    @Deprecated
-    public void setMaxObjectSizeBytes(final int maxObjectSizeBytes) {
-        if (maxObjectSizeBytes > Integer.MAX_VALUE) {
-            this.maxObjectSize = Integer.MAX_VALUE;
-        } else {
-            this.maxObjectSize = maxObjectSizeBytes;
-        }
+        this.neverCacheHTTP10ResponsesWithQuery = neverCacheHTTP10ResponsesWithQuery;
     }
 
     /**
@@ -265,19 +218,6 @@ public class CacheConfig implements Clon
     }
 
     /**
-     * Specifies the maximum response body size that will be eligible for caching.
-     * @param maxObjectSize size in bytes
-     *
-     * @since 4.2
-     *
-     * @deprecated (4.3) use {@link Builder}.
-     */
-    @Deprecated
-    public void setMaxObjectSize(final long maxObjectSize) {
-        this.maxObjectSize = maxObjectSize;
-    }
-
-    /**
      * Returns whether the cache will never cache HTTP 1.0 responses with a query string or not.
      * @return {@code true} to not cache query string responses, {@code false} to cache if explicit cache headers are
      * found
@@ -294,16 +234,6 @@ public class CacheConfig implements Clon
     }
 
     /**
-     * Sets the maximum number of cache entries the cache will retain.
-     *
-     * @deprecated (4.3) use {@link Builder}.
-     */
-    @Deprecated
-    public void setMaxCacheEntries(final int maxCacheEntries) {
-        this.maxCacheEntries = maxCacheEntries;
-    }
-
-    /**
      * Returns the number of times to retry a cache update on failure
      */
     public int getMaxUpdateRetries(){
@@ -311,16 +241,6 @@ public class CacheConfig implements Clon
     }
 
     /**
-     * Sets the number of times to retry a cache update on failure
-     *
-     * @deprecated (4.3) use {@link Builder}.
-     */
-    @Deprecated
-    public void setMaxUpdateRetries(final int maxUpdateRetries){
-        this.maxUpdateRetries = maxUpdateRetries;
-    }
-
-    /**
      * Returns whether 303 caching is enabled.
      * @return {@code true} if it is enabled.
      */
@@ -345,18 +265,6 @@ public class CacheConfig implements Clon
     }
 
     /**
-     * Enables or disables heuristic caching.
-     * @param heuristicCachingEnabled should be {@code true} to
-     *   permit heuristic caching, {@code false} to disable it.
-     *
-     * @deprecated (4.3) use {@link Builder}.
-     */
-    @Deprecated
-    public void setHeuristicCachingEnabled(final boolean heuristicCachingEnabled) {
-        this.heuristicCachingEnabled = heuristicCachingEnabled;
-    }
-
-    /**
      * Returns lifetime coefficient used in heuristic freshness caching.
      */
     public float getHeuristicCoefficient() {
@@ -364,21 +272,6 @@ public class CacheConfig implements Clon
     }
 
     /**
-     * Sets coefficient to be used in heuristic freshness caching. This is
-     * interpreted as the fraction of the time between the {@code Last-Modified}
-     * and {@code Date} headers of a cached response during which the cached
-     * response will be considered heuristically fresh.
-     * @param heuristicCoefficient should be between {@code 0.0} and
-     *   {@code 1.0}.
-     *
-     * @deprecated (4.3) use {@link Builder}.
-     */
-    @Deprecated
-    public void setHeuristicCoefficient(final float heuristicCoefficient) {
-        this.heuristicCoefficient = heuristicCoefficient;
-    }
-
-    /**
      * Get the default lifetime to be used if heuristic freshness calculation is
      * not possible.
      */
@@ -387,24 +280,6 @@ public class CacheConfig implements Clon
     }
 
     /**
-     * Sets default lifetime in seconds to be used if heuristic freshness
-     * calculation is not possible. Explicit cache control directives on
-     * either the request or origin response will override this, as will
-     * the heuristic {@code Last-Modified} freshness calculation if it is
-     * available.
-     * @param heuristicDefaultLifetimeSecs is the number of seconds to
-     *   consider a cache-eligible response fresh in the absence of other
-     *   information. Set this to {@code 0} to disable this style of
-     *   heuristic caching.
-     *
-     * @deprecated (4.3) use {@link Builder}.
-     */
-    @Deprecated
-    public void setHeuristicDefaultLifetime(final long heuristicDefaultLifetimeSecs) {
-        this.heuristicDefaultLifetime = heuristicDefaultLifetimeSecs;
-    }
-
-    /**
      * Returns whether the cache will behave as a shared cache or not.
      * @return {@code true} for a shared cache, {@code false} for a non-
      * shared (private) cache
@@ -414,19 +289,6 @@ public class CacheConfig implements Clon
     }
 
     /**
-     * Sets whether the cache should behave as a shared cache or not.
-     * @param isSharedCache true to behave as a shared cache, false to
-     * behave as a non-shared (private) cache. To have the cache
-     * behave like a browser cache, you want to set this to {@code false}.
-     *
-     * @deprecated (4.3) use {@link Builder}.
-     */
-    @Deprecated
-    public void setSharedCache(final boolean isSharedCache) {
-        this.isSharedCache = isSharedCache;
-    }
-
-    /**
      * Returns the maximum number of threads to allow for background
      * revalidations due to the {@code stale-while-revalidate} directive. A
      * value of 0 means background revalidations are disabled.
@@ -436,19 +298,6 @@ public class CacheConfig implements Clon
     }
 
     /**
-     * Sets the maximum number of threads to allow for background
-     * revalidations due to the {@code stale-while-revalidate} directive.
-     * @param max number of threads; a value of 0 disables background
-     * revalidations.
-     *
-     * @deprecated (4.3) use {@link Builder}.
-     */
-    @Deprecated
-    public void setAsynchronousWorkersMax(final int max) {
-        this.asynchronousWorkersMax = max;
-    }
-
-    /**
      * Returns the minimum number of threads to keep alive for background
      * revalidations due to the {@code stale-while-revalidate} directive.
      */
@@ -457,19 +306,6 @@ public class CacheConfig implements Clon
     }
 
     /**
-     * Sets the minimum number of threads to keep alive for background
-     * revalidations due to the {@code stale-while-revalidate} directive.
-     * @param min should be greater than zero and less than or equal
-     *   to {@code getAsynchronousWorkersMax()}
-     *
-     * @deprecated (4.3) use {@link Builder}.
-     */
-    @Deprecated
-    public void setAsynchronousWorkersCore(final int min) {
-        this.asynchronousWorkersCore = min;
-    }
-
-    /**
      * Returns the current maximum idle lifetime in seconds for a
      * background revalidation worker thread. If a worker thread is idle
      * for this long, and there are more than the core number of worker
@@ -480,36 +316,12 @@ public class CacheConfig implements Clon
     }
 
     /**
-     * Sets the current maximum idle lifetime in seconds for a
-     * background revalidation worker thread. If a worker thread is idle
-     * for this long, and there are more than the core number of worker
-     * threads alive, the worker will be reclaimed.
-     * @param secs idle lifetime in seconds
-     *
-     * @deprecated (4.3) use {@link Builder}.
-     */
-    @Deprecated
-    public void setAsynchronousWorkerIdleLifetimeSecs(final int secs) {
-        this.asynchronousWorkerIdleLifetimeSecs = secs;
-    }
-
-    /**
      * Returns the current maximum queue size for background revalidations.
      */
     public int getRevalidationQueueSize() {
         return revalidationQueueSize;
     }
 
-    /**
-     * Sets the current maximum queue size for background revalidations.
-     *
-     * @deprecated (4.3) use {@link Builder}.
-     */
-    @Deprecated
-    public void setRevalidationQueueSize(final int size) {
-        this.revalidationQueueSize = size;
-    }
-
     @Override
     protected CacheConfig clone() throws CloneNotSupportedException {
         return (CacheConfig) super.clone();

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheValidityPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheValidityPolicy.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheValidityPolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheValidityPolicy.java Sun May 24 14:12:43 2015
@@ -171,16 +171,6 @@ class CacheValidityPolicy {
         return result;
     }
 
-    /**
-     * @deprecated (4.3) use {@link HttpCacheEntry#getDate()}.
-     * @param entry
-     * @return
-     */
-    @Deprecated
-    protected Date getDateValue(final HttpCacheEntry entry) {
-        return entry.getDate();
-    }
-
     protected Date getLastModifiedValue(final HttpCacheEntry entry) {
         final Header dateHdr = entry.getFirstHeader(HeaderConstants.LAST_MODIFIED);
         if (dateHdr == null) {

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.java Sun May 24 14:12:43 2015
@@ -162,25 +162,4 @@ public class ExponentialBackOffSchedulin
         }
     }
 
-    /**
-     * @deprecated Use {@link org.apache.http.util.Args#notNull(Object, String)}
-     */
-    @Deprecated
-    protected static <T> T checkNotNull(final String parameterName, final T value) {
-        if (value == null) {
-            throw new IllegalArgumentException(parameterName + " may not be null");
-        }
-        return value;
-    }
-
-    /**
-     * @deprecated Use {@link org.apache.http.util.Args#notNegative(long, String)}
-     */
-    @Deprecated
-    protected static long checkNotNegative(final String parameterName, final long value) {
-        if (value < 0) {
-            throw new IllegalArgumentException(parameterName + " may not be negative");
-        }
-        return value;
-    }
 }

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/OptionsHttp11Response.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/OptionsHttp11Response.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/OptionsHttp11Response.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/OptionsHttp11Response.java Sun May 24 14:12:43 2015
@@ -45,7 +45,6 @@ import org.apache.http.params.HttpParams
 /**
  * @since 4.1
  */
-@SuppressWarnings("deprecation")
 @Immutable
 final class OptionsHttp11Response extends AbstractHttpMessage implements HttpResponse {
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java Sun May 24 14:12:43 2015
@@ -29,21 +29,20 @@ package org.apache.http.impl.client.cach
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
-import net.spy.memcached.CASResponse;
-import net.spy.memcached.CASValue;
-import net.spy.memcached.MemcachedClient;
-import net.spy.memcached.MemcachedClientIF;
-import net.spy.memcached.OperationTimeoutException;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.cache.HttpCacheEntrySerializer;
 import org.apache.http.client.cache.HttpCacheStorage;
 import org.apache.http.client.cache.HttpCacheUpdateCallback;
 import org.apache.http.client.cache.HttpCacheUpdateException;
 import org.apache.http.impl.client.cache.CacheConfig;
 
+import net.spy.memcached.CASResponse;
+import net.spy.memcached.CASValue;
+import net.spy.memcached.MemcachedClient;
+import net.spy.memcached.MemcachedClientIF;
+import net.spy.memcached.OperationTimeoutException;
+
 /**
  * <p>
  * This class is a storage backend that uses an external <i>memcached</i>
@@ -122,30 +121,6 @@ public class MemcachedHttpCacheStorage i
                 new SHA256KeyHashingScheme());
     }
 
-    /**
-     * Create a storage backend using the given <i>memcached</i> client and
-     * applying the given cache configuration and cache entry serialization
-     * mechanism. <b>Deprecation note:</b> In the process of fixing a bug
-     * based on the need to hash logical storage keys onto memcached cache
-     * keys, the serialization process was revamped. This constructor still
-     * works, but the serializer argument will be ignored and default
-     * implementations of the new framework will be used. You can still
-     * provide custom serialization by using the
-     * {@link #MemcachedHttpCacheStorage(MemcachedClientIF, CacheConfig,
-     * MemcachedCacheEntryFactory, KeyHashingScheme)} constructor.
-     * @param client how to talk to <i>memcached</i>
-     * @param config apply HTTP cache-related options
-     * @param serializer <b>ignored</b>
-     *
-     * @deprecated (4.2) do not use
-     */
-    @Deprecated
-    public MemcachedHttpCacheStorage(final MemcachedClientIF client, final CacheConfig config,
-            final HttpCacheEntrySerializer serializer) {
-        this(client, config, new MemcachedCacheEntryFactoryImpl(),
-                new SHA256KeyHashingScheme());
-    }
-
     /**
      * Create a storage backend using the given <i>memcached</i> client and
      * applying the given cache configuration, serialization, and hashing

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/pom.xml?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/pom.xml Sun May 24 14:12:43 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-client</artifactId>
-    <version>4.5-alpha1-SNAPSHOT</version>
+    <version>5.0-alpha1-SNAPSHOT</version>
   </parent>
   <artifactId>httpclient-osgi</artifactId>
   <name>Apache HttpClient OSGi bundle</name>

Modified: httpcomponents/httpclient/trunk/httpclient-win/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/pom.xml?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/pom.xml Sun May 24 14:12:43 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-client</artifactId>
-    <version>4.5-alpha1-SNAPSHOT</version>
+    <version>5.0-alpha1-SNAPSHOT</version>
   </parent>
   <artifactId>httpclient-win</artifactId>
   <name>Apache HttpClient Windows features</name>

Modified: httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java Sun May 24 14:12:43 2015
@@ -298,12 +298,4 @@ public class WindowsNegotiateScheme exte
         return !continueNeeded;
     }
 
-    @Override
-    @Deprecated
-    public Header authenticate(
-            final Credentials credentials,
-            final HttpRequest request) throws AuthenticationException {
-        return authenticate(credentials, request, null);
-    }
-
 }

Modified: httpcomponents/httpclient/trunk/httpclient/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/pom.xml?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient/pom.xml Sun May 24 14:12:43 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-client</artifactId>
-    <version>4.5-alpha1-SNAPSHOT</version>
+    <version>5.0-alpha1-SNAPSHOT</version>
   </parent>
   <artifactId>httpclient</artifactId>
   <name>Apache HttpClient</name>
@@ -78,25 +78,6 @@
     </resources>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.8</version>
-        <executions>
-          <execution>
-            <id>add-source</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>src/main/java-deprecated</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <groupId>com.googlecode.maven-download-plugin</groupId>
         <artifactId>download-maven-plugin</artifactId>
         <version>1.2.0</version>

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java Sun May 24 14:12:43 2015
@@ -28,6 +28,7 @@ package org.apache.http.auth;
 
 import org.apache.http.Header;
 import org.apache.http.HttpRequest;
+import org.apache.http.protocol.HttpContext;
 
 /**
  * This interface represents an abstract challenge-response oriented
@@ -48,9 +49,6 @@ import org.apache.http.HttpRequest;
  * <p>
  * Authentication schemes may be stateful involving a series of
  * challenge-response exchanges.
- * <p>
- * IMPORTANT: implementations of this interface MUST also implement {@link ContextAwareAuthScheme}
- * interface in order to remain API compatible with newer versions of HttpClient.
  *
  * @since 4.0
  */
@@ -112,19 +110,22 @@ public interface AuthScheme {
     boolean isComplete();
 
     /**
-     * Produces an authorization string for the given set of {@link Credentials}.
+     * Produces an authorization string for the given set of
+     * {@link Credentials}.
      *
      * @param credentials The set of credentials to be used for athentication
      * @param request The request being authenticated
+     * @param context HTTP context
      * @throws AuthenticationException if authorization string cannot
      *   be generated due to an authentication failure
      *
      * @return the authorization string
      *
-     * @deprecated (4.1)  Use {@link ContextAwareAuthScheme#authenticate(Credentials, HttpRequest, org.apache.http.protocol.HttpContext)}
+     * @since 5.0
      */
-    @Deprecated
-    Header authenticate(Credentials credentials, HttpRequest request)
-            throws AuthenticationException;
+    Header authenticate(
+            Credentials credentials,
+            HttpRequest request,
+            HttpContext context) throws AuthenticationException;
 
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java Sun May 24 14:12:43 2015
@@ -45,9 +45,6 @@ public class AuthState {
     /** Actual authentication scheme */
     private AuthScheme authScheme;
 
-    /** Actual authentication scope */
-    private AuthScope authScope;
-
     /** Credentials selected for authentication */
     private Credentials credentials;
 
@@ -68,7 +65,6 @@ public class AuthState {
         this.state = AuthProtocolState.UNCHALLENGED;
         this.authOptions = null;
         this.authScheme = null;
-        this.authScope = null;
         this.credentials = null;
     }
 
@@ -149,76 +145,6 @@ public class AuthState {
         this.credentials = null;
     }
 
-    /**
-     * Invalidates the authentication state by resetting its parameters.
-     *
-     * @deprecated (4.2)  use {@link #reset()}
-     */
-    @Deprecated
-    public void invalidate() {
-        reset();
-    }
-
-    /**
-     * @deprecated (4.2) do not use
-     */
-    @Deprecated
-    public boolean isValid() {
-        return this.authScheme != null;
-    }
-
-    /**
-     * Assigns the given {@link AuthScheme authentication scheme}.
-     *
-     * @param authScheme the {@link AuthScheme authentication scheme}
-     *
-     * @deprecated (4.2)  use {@link #update(AuthScheme, Credentials)}
-     */
-    @Deprecated
-    public void setAuthScheme(final AuthScheme authScheme) {
-        if (authScheme == null) {
-            reset();
-            return;
-        }
-        this.authScheme = authScheme;
-    }
-
-    /**
-     * Sets user {@link Credentials} to be used for authentication
-     *
-     * @param credentials User credentials
-     *
-     * @deprecated (4.2)  use {@link #update(AuthScheme, Credentials)}
-     */
-    @Deprecated
-    public void setCredentials(final Credentials credentials) {
-        this.credentials = credentials;
-    }
-
-    /**
-     * Returns actual {@link AuthScope} if available
-     *
-     * @return actual authentication scope if available, {@code null} otherwise
-     *
-     * @deprecated (4.2)  do not use.
-     */
-    @Deprecated
-    public AuthScope getAuthScope() {
-        return this.authScope;
-    }
-
-    /**
-     * Sets actual {@link AuthScope}.
-     *
-     * @param authScope Authentication scope
-     *
-     * @deprecated (4.2)  do not use.
-     */
-    @Deprecated
-    public void setAuthScope(final AuthScope authScope) {
-        this.authScope = authScope;
-    }
-
     @Override
     public String toString() {
         final StringBuilder buffer = new StringBuilder();

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpClient.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpClient.java Sun May 24 14:12:43 2015
@@ -27,16 +27,14 @@
 
 package org.apache.http.client;
 
+import java.io.IOException;
+
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.conn.ClientConnectionManager;
-import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HttpContext;
 
-import java.io.IOException;
-
 /**
  * This interface represents only the most basic contract for HTTP request
  * execution. It imposes no restrictions or particular details on the request
@@ -45,35 +43,8 @@ import java.io.IOException;
  *
  * @since 4.0
  */
-@SuppressWarnings("deprecation")
 public interface HttpClient {
 
-
-    /**
-     * Obtains the parameters for this client.
-     * These parameters will become defaults for all requests being
-     * executed with this client, and for the parameters of
-     * dependent objects in this client.
-     *
-     * @return  the default parameters
-     *
-     * @deprecated (4.3) use
-     *   {@link org.apache.http.client.config.RequestConfig}.
-     */
-    @Deprecated
-    HttpParams getParams();
-
-    /**
-     * Obtains the connection manager used by this client.
-     *
-     * @return  the connection manager
-     *
-     * @deprecated (4.3) use
-     *   {@link org.apache.http.impl.client.HttpClientBuilder}.
-     */
-    @Deprecated
-    ClientConnectionManager getConnectionManager();
-
     /**
      * Executes HTTP request using the default context.
      *

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/config/CookieSpecs.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/config/CookieSpecs.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/config/CookieSpecs.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/config/CookieSpecs.java Sun May 24 14:12:43 2015
@@ -38,15 +38,6 @@ import org.apache.http.annotation.Immuta
 public final class CookieSpecs {
 
     /**
-     * The policy that provides high degree of compatibility
-     * with common cookie management of popular HTTP agents.
-     *
-     * @deprecated (4.4) use {link #DEFAULT}.
-     */
-    @Deprecated
-    public static final String BROWSER_COMPATIBILITY = "compatibility";
-
-    /**
      * The Netscape cookie draft compliant policy.
      */
     public static final String NETSCAPE = "netscape";
@@ -64,14 +55,6 @@ public final class CookieSpecs {
     public static final String STANDARD_STRICT = "standard-strict";
 
     /**
-     * The default 'best match' policy.
-     *
-     * @deprecated (4.4) use {link #DEFAULT}.
-     */
-    @Deprecated
-    public static final String BEST_MATCH = "best-match";
-
-    /**
      * The default policy. This policy provides a higher degree of compatibility
      * with common cookie management of popular HTTP agents for non-standard
      * (Netscape style) cookies.

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/config/RequestConfig.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/config/RequestConfig.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/config/RequestConfig.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/config/RequestConfig.java Sun May 24 14:12:43 2015
@@ -46,7 +46,6 @@ public class RequestConfig implements Cl
     private final boolean expectContinueEnabled;
     private final HttpHost proxy;
     private final InetAddress localAddress;
-    private final boolean staleConnectionCheckEnabled;
     private final String cookieSpec;
     private final boolean redirectsEnabled;
     private final boolean relativeRedirectsAllowed;
@@ -88,7 +87,6 @@ public class RequestConfig implements Cl
         this.expectContinueEnabled = expectContinueEnabled;
         this.proxy = proxy;
         this.localAddress = localAddress;
-        this.staleConnectionCheckEnabled = staleConnectionCheckEnabled;
         this.cookieSpec = cookieSpec;
         this.redirectsEnabled = redirectsEnabled;
         this.relativeRedirectsAllowed = relativeRedirectsAllowed;
@@ -155,23 +153,6 @@ public class RequestConfig implements Cl
     }
 
     /**
-     * Determines whether stale connection check is to be used. The stale
-     * connection check can cause up to 30 millisecond overhead per request and
-     * should be used only when appropriate. For performance critical
-     * operations this check should be disabled.
-     * <p>
-     * Default: {@code false} since 4.4
-     * </p>
-     *
-     * @deprecated (4.4) Use {@link
-     *   org.apache.http.impl.conn.PoolingHttpClientConnectionManager#getValidateAfterInactivity()}
-     */
-    @Deprecated
-    public boolean isStaleConnectionCheckEnabled() {
-        return staleConnectionCheckEnabled;
-    }
-
-    /**
      * Determines the name of the cookie specification to be used for HTTP state
      * management.
      * <p>
@@ -349,13 +330,11 @@ public class RequestConfig implements Cl
         return new Builder();
     }
 
-    @SuppressWarnings("deprecation")
     public static RequestConfig.Builder copy(final RequestConfig config) {
         return new Builder()
             .setExpectContinueEnabled(config.isExpectContinueEnabled())
             .setProxy(config.getProxy())
             .setLocalAddress(config.getLocalAddress())
-            .setStaleConnectionCheckEnabled(config.isStaleConnectionCheckEnabled())
             .setCookieSpec(config.getCookieSpec())
             .setRedirectsEnabled(config.isRedirectsEnabled())
             .setRelativeRedirectsAllowed(config.isRelativeRedirectsAllowed())
@@ -417,16 +396,6 @@ public class RequestConfig implements Cl
             return this;
         }
 
-        /**
-         * @deprecated (4.4) Use {@link
-         *   org.apache.http.impl.conn.PoolingHttpClientConnectionManager#setValidateAfterInactivity(int)}
-         */
-        @Deprecated
-        public Builder setStaleConnectionCheckEnabled(final boolean staleConnectionCheckEnabled) {
-            this.staleConnectionCheckEnabled = staleConnectionCheckEnabled;
-            return this;
-        }
-
         public Builder setCookieSpec(final String cookieSpec) {
             this.cookieSpec = cookieSpec;
             return this;

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbstractExecutionAwareRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbstractExecutionAwareRequest.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbstractExecutionAwareRequest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbstractExecutionAwareRequest.java Sun May 24 14:12:43 2015
@@ -26,20 +26,16 @@
  */
 package org.apache.http.client.methods;
 
-import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.http.HttpRequest;
 import org.apache.http.client.utils.CloneUtils;
 import org.apache.http.concurrent.Cancellable;
-import org.apache.http.conn.ClientConnectionRequest;
-import org.apache.http.conn.ConnectionReleaseTrigger;
 import org.apache.http.message.AbstractHttpMessage;
 
-@SuppressWarnings("deprecation")
 public abstract class AbstractExecutionAwareRequest extends AbstractHttpMessage implements
-        HttpExecutionAware, AbortableHttpRequest, Cloneable, HttpRequest {
+        HttpExecutionAware, Cloneable, HttpRequest {
 
     private final AtomicBoolean aborted;
     private final AtomicReference<Cancellable> cancellableRef;
@@ -50,39 +46,6 @@ public abstract class AbstractExecutionA
         this.cancellableRef = new AtomicReference<Cancellable>(null);
     }
 
-    @Override
-    @Deprecated
-    public void setConnectionRequest(final ClientConnectionRequest connRequest) {
-        setCancellable(new Cancellable() {
-
-            @Override
-            public boolean cancel() {
-                connRequest.abortRequest();
-                return true;
-            }
-
-        });
-    }
-
-    @Override
-    @Deprecated
-    public void setReleaseTrigger(final ConnectionReleaseTrigger releaseTrigger) {
-        setCancellable(new Cancellable() {
-
-            @Override
-            public boolean cancel() {
-                try {
-                    releaseTrigger.abortConnection();
-                    return true;
-                } catch (final IOException ex) {
-                    return false;
-                }
-            }
-
-        });
-    }
-
-    @Override
     public void abort() {
         if (this.aborted.compareAndSet(false, true)) {
             final Cancellable cancellable = this.cancellableRef.getAndSet(null);
@@ -111,7 +74,6 @@ public abstract class AbstractExecutionA
     public Object clone() throws CloneNotSupportedException {
         final AbstractExecutionAwareRequest clone = (AbstractExecutionAwareRequest) super.clone();
         clone.headergroup = CloneUtils.cloneObject(this.headergroup);
-        clone.params = CloneUtils.cloneObject(this.params);
         return clone;
     }
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java Sun May 24 14:12:43 2015
@@ -41,7 +41,6 @@ import org.apache.http.params.HttpProtoc
  *
  * @since 4.0
  */
-@SuppressWarnings("deprecation")
 @NotThreadSafe
 public abstract class HttpRequestBase extends AbstractExecutionAwareRequest
     implements HttpUriRequest, Configurable {

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java Sun May 24 14:12:43 2015
@@ -39,7 +39,6 @@ import org.apache.http.RequestLine;
 import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.message.AbstractHttpMessage;
 import org.apache.http.message.BasicRequestLine;
-import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.util.Args;
 
@@ -49,7 +48,6 @@ import org.apache.http.util.Args;
  *
  * @since 4.3
  */
-@SuppressWarnings("deprecation")
 @NotThreadSafe
 public class HttpRequestWrapper extends AbstractHttpMessage implements HttpUriRequest {
 
@@ -192,17 +190,4 @@ public class HttpRequestWrapper extends
         }
     }
 
-    /**
-     * @deprecated (4.3) use
-     *   {@link org.apache.http.client.config.RequestConfig}.
-     */
-    @Override
-    @Deprecated
-    public HttpParams getParams() {
-        if (this.params == null) {
-            this.params = original.getParams().copy();
-        }
-        return this.params;
-    }
-
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java Sun May 24 14:12:43 2015
@@ -35,7 +35,6 @@ import org.apache.http.HttpException;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestInterceptor;
 import org.apache.http.annotation.Immutable;
-import org.apache.http.client.params.ClientPNames;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.Args;
 
@@ -44,7 +43,6 @@ import org.apache.http.util.Args;
  *
  * @since 4.0
  */
-@SuppressWarnings("deprecation")
 @Immutable
 public class RequestDefaultHeaders implements HttpRequestInterceptor {
 
@@ -72,16 +70,8 @@ public class RequestDefaultHeaders imple
             return;
         }
 
-        // Add default headers
-        @SuppressWarnings("unchecked")
-        Collection<? extends Header> defHeaders = (Collection<? extends Header>)
-            request.getParams().getParameter(ClientPNames.DEFAULT_HEADERS);
-        if (defHeaders == null) {
-            defHeaders = this.defaultHeaders;
-        }
-
-        if (defHeaders != null) {
-            for (final Header defHeader : defHeaders) {
+        if (this.defaultHeaders != null) {
+            for (final Header defHeader : this.defaultHeaders) {
                 request.addHeader(defHeader);
             }
         }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java Sun May 24 14:12:43 2015
@@ -269,24 +269,6 @@ public class URIBuilder {
     }
 
     /**
-     * Sets URI query.
-     * <p>
-     * The value is expected to be encoded form data.
-     *
-     * @deprecated (4.3) use {@link #setParameters(List)} or {@link #setParameters(NameValuePair...)}
-     *
-     * @see URLEncodedUtils#parse
-     */
-    @Deprecated
-    public URIBuilder setQuery(final String query) {
-        this.queryParams = parseQuery(query, this.charset != null ? this.charset : Consts.UTF_8);
-        this.query = null;
-        this.encodedQuery = null;
-        this.encodedSchemeSpecificPart = null;
-        return this;
-    }
-
-    /**
      * Sets URI query parameters. The parameter name / values are expected to be unescaped
      * and may contain non ASCII characters.
      * <p>

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java Sun May 24 14:12:43 2015
@@ -47,71 +47,6 @@ import org.apache.http.util.TextUtils;
 @Immutable
 public class URIUtils {
 
-     /**
-         * Constructs a {@link URI} using all the parameters. This should be
-         * used instead of
-         * {@link URI#URI(String, String, String, int, String, String, String)}
-         * or any of the other URI multi-argument URI constructors.
-         *
-         * @param scheme
-         *            Scheme name
-         * @param host
-         *            Host name
-         * @param port
-         *            Port number
-         * @param path
-         *            Path
-         * @param query
-         *            Query
-         * @param fragment
-         *            Fragment
-         *
-         * @throws URISyntaxException
-         *             If both a scheme and a path are given but the path is
-         *             relative, if the URI string constructed from the given
-         *             components violates RFC&nbsp;2396, or if the authority
-         *             component of the string is present but cannot be parsed
-         *             as a server-based authority
-         *
-         * @deprecated (4.2) use {@link URIBuilder}.
-         */
-    @Deprecated
-    public static URI createURI(
-            final String scheme,
-            final String host,
-            final int port,
-            final String path,
-            final String query,
-            final String fragment) throws URISyntaxException {
-        final StringBuilder buffer = new StringBuilder();
-        if (host != null) {
-            if (scheme != null) {
-                buffer.append(scheme);
-                buffer.append("://");
-            }
-            buffer.append(host);
-            if (port > 0) {
-                buffer.append(':');
-                buffer.append(port);
-            }
-        }
-        if (path == null || !path.startsWith("/")) {
-            buffer.append('/');
-        }
-        if (path != null) {
-            buffer.append(path);
-        }
-        if (query != null) {
-            buffer.append('?');
-            buffer.append(query);
-        }
-        if (fragment != null) {
-            buffer.append('#');
-            buffer.append(fragment);
-        }
-        return new URI(buffer.toString());
-    }
-
     /**
      * A convenience method for creating a new {@link URI} whose scheme, host
      * and port are taken from the target host, but whose path, query and

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java Sun May 24 14:12:43 2015
@@ -39,7 +39,6 @@ import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.Collections;
 import java.util.List;
-import java.util.Scanner;
 
 import org.apache.http.Consts;
 import org.apache.http.Header;
@@ -156,70 +155,6 @@ public class URLEncodedUtils {
     }
 
     /**
-     * Adds all parameters within the Scanner to the list of {@code parameters}, as encoded by
-     * {@code encoding}. For example, a scanner containing the string {@code a=1&b=2&c=3} would add the
-     * {@link NameValuePair NameValuePairs} a=1, b=2, and c=3 to the list of parameters. By convention, {@code '&'} and
-     * {@code ';'} are accepted as parameter separators.
-     *
-     * @param parameters
-     *            List to add parameters to.
-     * @param scanner
-     *            Input that contains the parameters to parse.
-     * @param charset
-     *            Encoding to use when decoding the parameters.
-     *
-     * @deprecated (4.4) use {@link #parse(String, java.nio.charset.Charset)}
-     */
-    @Deprecated
-    public static void parse(
-            final List<NameValuePair> parameters,
-            final Scanner scanner,
-            final String charset) {
-        parse(parameters, scanner, "[" + QP_SEP_A + QP_SEP_S + "]", charset);
-    }
-
-    /**
-     * Adds all parameters within the Scanner to the list of
-     * {@code parameters}, as encoded by {@code encoding}. For
-     * example, a scanner containing the string {@code a=1&b=2&c=3} would
-     * add the {@link NameValuePair NameValuePairs} a=1, b=2, and c=3 to the
-     * list of parameters.
-     *
-     * @param parameters
-     *            List to add parameters to.
-     * @param scanner
-     *            Input that contains the parameters to parse.
-     * @param parameterSepartorPattern
-     *            The Pattern string for parameter separators, by convention {@code "[&;]"}
-     * @param charset
-     *            Encoding to use when decoding the parameters.
-     *
-     * @deprecated (4.4) use {@link #parse(org.apache.http.util.CharArrayBuffer, java.nio.charset.Charset, char...)}
-     */
-    @Deprecated
-    public static void parse(
-            final List <NameValuePair> parameters,
-            final Scanner scanner,
-            final String parameterSepartorPattern,
-            final String charset) {
-        scanner.useDelimiter(parameterSepartorPattern);
-        while (scanner.hasNext()) {
-            final String name;
-            final String value;
-            final String token = scanner.next();
-            final int i = token.indexOf(NAME_VALUE_SEPARATOR);
-            if (i != -1) {
-                name = decodeFormFields(token.substring(0, i).trim(), charset);
-                value = decodeFormFields(token.substring(i + 1).trim(), charset);
-            } else {
-                name = decodeFormFields(token.trim(), charset);
-                value = null;
-            }
-            parameters.add(new BasicNameValuePair(name, value));
-        }
-    }
-
-    /**
      * Returns a list of {@link NameValuePair NameValuePairs} as parsed from the given string using the given character
      * encoding. By convention, {@code '&'} and {@code ';'} are accepted as parameter separators.
      *

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java Sun May 24 14:12:43 2015
@@ -48,15 +48,6 @@ public class HttpHostConnectException ex
     private final HttpHost host;
 
     /**
-     * @deprecated (4.3) use {@link #HttpHostConnectException(java.io.IOException, org.apache.http.HttpHost,
-     *   java.net.InetAddress...)}
-     */
-    @Deprecated
-    public HttpHostConnectException(final HttpHost host, final ConnectException cause) {
-        this(cause, host, (InetAddress[]) null);
-    }
-
-    /**
      * Creates a HttpHostConnectException based on original {@link java.io.IOException}.
      *
      * @since 4.3

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java Sun May 24 14:12:43 2015
@@ -133,24 +133,11 @@ import org.apache.http.util.TextUtils;
  *
  * @since 4.3
  */
-@ThreadSafe @SuppressWarnings("deprecation")
+@ThreadSafe
 public class SSLConnectionSocketFactory implements LayeredConnectionSocketFactory {
 
     public static final String TLS   = "TLS";
     public static final String SSL   = "SSL";
-    public static final String SSLV2 = "SSLv2";
-
-    @Deprecated
-    public static final X509HostnameVerifier ALLOW_ALL_HOSTNAME_VERIFIER
-        = AllowAllHostnameVerifier.INSTANCE;
-
-    @Deprecated
-    public static final X509HostnameVerifier BROWSER_COMPATIBLE_HOSTNAME_VERIFIER
-        = BrowserCompatHostnameVerifier.INSTANCE;
-
-    @Deprecated
-    public static final X509HostnameVerifier STRICT_HOSTNAME_VERIFIER
-        = StrictHostnameVerifier.INSTANCE;
 
     private final Log log = LogFactory.getLog(getClass());
 
@@ -205,55 +192,6 @@ public class SSLConnectionSocketFactory
     }
 
     /**
-     * @deprecated (4.4) Use {@link #SSLConnectionSocketFactory(javax.net.ssl.SSLContext,
-     *   javax.net.ssl.HostnameVerifier)}
-     */
-    @Deprecated
-    public SSLConnectionSocketFactory(
-            final SSLContext sslContext, final X509HostnameVerifier hostnameVerifier) {
-        this(Args.notNull(sslContext, "SSL context").getSocketFactory(),
-                null, null, hostnameVerifier);
-    }
-
-    /**
-     * @deprecated (4.4) Use {@link #SSLConnectionSocketFactory(javax.net.ssl.SSLContext,
-     *   String[], String[], javax.net.ssl.HostnameVerifier)}
-     */
-    @Deprecated
-    public SSLConnectionSocketFactory(
-            final SSLContext sslContext,
-            final String[] supportedProtocols,
-            final String[] supportedCipherSuites,
-            final X509HostnameVerifier hostnameVerifier) {
-        this(Args.notNull(sslContext, "SSL context").getSocketFactory(),
-                supportedProtocols, supportedCipherSuites, hostnameVerifier);
-    }
-
-    /**
-     * @deprecated (4.4) Use {@link #SSLConnectionSocketFactory(javax.net.ssl.SSLSocketFactory,
-     *   javax.net.ssl.HostnameVerifier)}
-     */
-    @Deprecated
-    public SSLConnectionSocketFactory(
-            final javax.net.ssl.SSLSocketFactory socketfactory,
-            final X509HostnameVerifier hostnameVerifier) {
-        this(socketfactory, null, null, hostnameVerifier);
-    }
-
-    /**
-     * @deprecated (4.4) Use {@link #SSLConnectionSocketFactory(javax.net.ssl.SSLSocketFactory,
-     *   String[], String[], javax.net.ssl.HostnameVerifier)}
-     */
-    @Deprecated
-    public SSLConnectionSocketFactory(
-            final javax.net.ssl.SSLSocketFactory socketfactory,
-            final String[] supportedProtocols,
-            final String[] supportedCipherSuites,
-            final X509HostnameVerifier hostnameVerifier) {
-        this(socketfactory, supportedProtocols, supportedCipherSuites, (HostnameVerifier) hostnameVerifier);
-    }
-
-    /**
      * @since 4.4
      */
     public SSLConnectionSocketFactory(

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java Sun May 24 14:12:43 2015
@@ -30,16 +30,12 @@ import java.util.Locale;
 
 import org.apache.http.FormattedHeader;
 import org.apache.http.Header;
-import org.apache.http.HttpRequest;
 import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.auth.AUTH;
-import org.apache.http.auth.AuthenticationException;
+import org.apache.http.auth.AuthScheme;
 import org.apache.http.auth.ChallengeState;
-import org.apache.http.auth.ContextAwareAuthScheme;
-import org.apache.http.auth.Credentials;
 import org.apache.http.auth.MalformedChallengeException;
 import org.apache.http.protocol.HTTP;
-import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.Args;
 import org.apache.http.util.CharArrayBuffer;
 
@@ -54,24 +50,10 @@ import org.apache.http.util.CharArrayBuf
  * @since 4.0
  */
 @NotThreadSafe
-public abstract class AuthSchemeBase implements ContextAwareAuthScheme {
+public abstract class AuthSchemeBase implements AuthScheme {
 
     protected ChallengeState challengeState;
 
-    /**
-     * Creates an instance of {@code AuthSchemeBase} with the given challenge
-     * state.
-     *
-     * @since 4.2
-     *
-     * @deprecated (4.3) do not use.
-     */
-    @Deprecated
-    public AuthSchemeBase(final ChallengeState challengeState) {
-        super();
-        this.challengeState = challengeState;
-    }
-
     public AuthSchemeBase() {
         super();
     }
@@ -128,16 +110,6 @@ public abstract class AuthSchemeBase imp
         parseChallenge(buffer, pos, buffer.length());
     }
 
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public Header authenticate(
-            final Credentials credentials,
-            final HttpRequest request,
-            final HttpContext context) throws AuthenticationException {
-        return authenticate(credentials, request);
-    }
-
     protected abstract void parseChallenge(
             CharArrayBuffer buffer, int beginIndex, int endIndex) throws MalformedChallengeException;
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java Sun May 24 14:12:43 2015
@@ -35,11 +35,9 @@ import org.apache.http.HttpRequest;
 import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.auth.AUTH;
 import org.apache.http.auth.AuthenticationException;
-import org.apache.http.auth.ChallengeState;
 import org.apache.http.auth.Credentials;
 import org.apache.http.auth.MalformedChallengeException;
 import org.apache.http.message.BufferedHeader;
-import org.apache.http.protocol.BasicHttpContext;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.Args;
 import org.apache.http.util.CharArrayBuffer;
@@ -66,19 +64,6 @@ public class BasicScheme extends RFC2617
         this.complete = false;
     }
 
-    /**
-     * Creates an instance of {@code BasicScheme} with the given challenge
-     * state.
-     *
-     * @since 4.2
-     *
-     * @deprecated (4.3) do not use.
-     */
-    @Deprecated
-    public BasicScheme(final ChallengeState challengeState) {
-        super(challengeState);
-    }
-
     public BasicScheme() {
         this(Consts.ASCII);
     }
@@ -130,17 +115,6 @@ public class BasicScheme extends RFC2617
     }
 
     /**
-     * @deprecated (4.2) Use {@link org.apache.http.auth.ContextAwareAuthScheme#authenticate(
-     *   Credentials, HttpRequest, org.apache.http.protocol.HttpContext)}
-     */
-    @Override
-    @Deprecated
-    public Header authenticate(
-            final Credentials credentials, final HttpRequest request) throws AuthenticationException {
-        return authenticate(credentials, request, new BasicHttpContext());
-    }
-
-    /**
      * Produces basic authorization header for the given set of {@link Credentials}.
      *
      * @param credentials The set of credentials to be used for authentication
@@ -174,45 +148,6 @@ public class BasicScheme extends RFC2617
             buffer.append(AUTH.PROXY_AUTH_RESP);
         } else {
             buffer.append(AUTH.WWW_AUTH_RESP);
-        }
-        buffer.append(": Basic ");
-        buffer.append(base64password, 0, base64password.length);
-
-        return new BufferedHeader(buffer);
-    }
-
-    /**
-     * Returns a basic {@code Authorization} header value for the given
-     * {@link Credentials} and charset.
-     *
-     * @param credentials The credentials to encode.
-     * @param charset The charset to use for encoding the credentials
-     *
-     * @return a basic authorization header
-     *
-     * @deprecated (4.3) use {@link #authenticate(Credentials, HttpRequest, HttpContext)}.
-     */
-    @Deprecated
-    public static Header authenticate(
-            final Credentials credentials,
-            final String charset,
-            final boolean proxy) {
-        Args.notNull(credentials, "Credentials");
-        Args.notNull(charset, "charset");
-
-        final StringBuilder tmp = new StringBuilder();
-        tmp.append(credentials.getUserPrincipal().getName());
-        tmp.append(":");
-        tmp.append((credentials.getPassword() == null) ? "null" : credentials.getPassword());
-
-        final byte[] base64password = Base64.encodeBase64(
-                EncodingUtils.getBytes(tmp.toString(), charset), false);
-
-        final CharArrayBuffer buffer = new CharArrayBuffer(32);
-        if (proxy) {
-            buffer.append(AUTH.PROXY_AUTH_RESP);
-        } else {
-            buffer.append(AUTH.WWW_AUTH_RESP);
         }
         buffer.append(": Basic ");
         buffer.append(base64password, 0, base64password.length);

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java Sun May 24 14:12:43 2015
@@ -31,9 +31,7 @@ import java.nio.charset.Charset;
 
 import org.apache.http.annotation.Immutable;
 import org.apache.http.auth.AuthScheme;
-import org.apache.http.auth.AuthSchemeFactory;
 import org.apache.http.auth.AuthSchemeProvider;
-import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HttpContext;
 
 /**
@@ -43,8 +41,7 @@ import org.apache.http.protocol.HttpCont
  * @since 4.0
  */
 @Immutable
-@SuppressWarnings("deprecation")
-public class BasicSchemeFactory implements AuthSchemeFactory, AuthSchemeProvider {
+public class BasicSchemeFactory implements AuthSchemeProvider {
 
     private final Charset charset;
 
@@ -61,11 +58,6 @@ public class BasicSchemeFactory implemen
     }
 
     @Override
-    public AuthScheme newInstance(final HttpParams params) {
-        return new BasicScheme();
-    }
-
-    @Override
     public AuthScheme create(final HttpContext context) {
         return new BasicScheme(this.charset);
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java Sun May 24 14:12:43 2015
@@ -46,13 +46,11 @@ import org.apache.http.HttpRequest;
 import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.auth.AUTH;
 import org.apache.http.auth.AuthenticationException;
-import org.apache.http.auth.ChallengeState;
 import org.apache.http.auth.Credentials;
 import org.apache.http.auth.MalformedChallengeException;
 import org.apache.http.message.BasicHeaderValueFormatter;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.message.BufferedHeader;
-import org.apache.http.protocol.BasicHttpContext;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.Args;
 import org.apache.http.util.CharArrayBuffer;
@@ -110,19 +108,6 @@ public class DigestScheme extends RFC261
         this.complete = false;
     }
 
-    /**
-     * Creates an instance of {@code DigestScheme} with the given challenge
-     * state.
-     *
-     * @since 4.2
-     *
-     * @deprecated (4.3) do not use.
-     */
-    @Deprecated
-    public DigestScheme(final ChallengeState challengeState) {
-        super(challengeState);
-    }
-
     public DigestScheme() {
         this(Consts.ASCII);
     }
@@ -186,17 +171,6 @@ public class DigestScheme extends RFC261
     }
 
     /**
-     * @deprecated (4.2) Use {@link org.apache.http.auth.ContextAwareAuthScheme#authenticate(
-     *   Credentials, HttpRequest, org.apache.http.protocol.HttpContext)}
-     */
-    @Override
-    @Deprecated
-    public Header authenticate(
-            final Credentials credentials, final HttpRequest request) throws AuthenticationException {
-        return authenticate(credentials, request, new BasicHttpContext());
-    }
-
-    /**
      * Produces a digest authorization string for the given set of
      * {@link Credentials}, method name and URI.
      *

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java Sun May 24 14:12:43 2015
@@ -31,9 +31,7 @@ import java.nio.charset.Charset;
 
 import org.apache.http.annotation.Immutable;
 import org.apache.http.auth.AuthScheme;
-import org.apache.http.auth.AuthSchemeFactory;
 import org.apache.http.auth.AuthSchemeProvider;
-import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HttpContext;
 
 /**
@@ -43,8 +41,7 @@ import org.apache.http.protocol.HttpCont
  * @since 4.0
  */
 @Immutable
-@SuppressWarnings("deprecation")
-public class DigestSchemeFactory implements AuthSchemeFactory, AuthSchemeProvider {
+public class DigestSchemeFactory implements AuthSchemeProvider {
 
     private final Charset charset;
 
@@ -61,11 +58,6 @@ public class DigestSchemeFactory impleme
     }
 
     @Override
-    public AuthScheme newInstance(final HttpParams params) {
-        return new DigestScheme();
-    }
-
-    @Override
     public AuthScheme create(final HttpContext context) {
         return new DigestScheme(this.charset);
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java Sun May 24 14:12:43 2015
@@ -133,40 +133,16 @@ public abstract class GGSSchemeBase exte
     }
 
     /**
-     * @deprecated (4.4) Use {@link #generateToken(byte[], String, org.apache.http.auth.Credentials)}.
-     */
-    @Deprecated
-    protected byte[] generateToken(final byte[] input, final String authServer) throws GSSException {
-        return null;
-    }
-
-    /**
      * @since 4.4
      */
-    //TODO: make this method abstract
-    @SuppressWarnings("deprecation")
-    protected byte[] generateToken(
-            final byte[] input, final String authServer, final Credentials credentials) throws GSSException {
-        return generateToken(input, authServer);
-    }
+    protected abstract byte[] generateToken(
+            byte[] input, String authServer, Credentials credentials) throws GSSException;
 
     @Override
     public boolean isComplete() {
         return this.state == State.TOKEN_GENERATED || this.state == State.FAILED;
     }
 
-    /**
-     * @deprecated (4.2) Use {@link org.apache.http.auth.ContextAwareAuthScheme#authenticate(
-     *   Credentials, HttpRequest, org.apache.http.protocol.HttpContext)}
-     */
-    @Override
-    @Deprecated
-    public Header authenticate(
-            final Credentials credentials,
-            final HttpRequest request) throws AuthenticationException {
-        return authenticate(credentials, request, null);
-    }
-
     @Override
     public Header authenticate(
             final Credentials credentials,

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/HttpAuthenticator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/HttpAuthenticator.java?rev=1681460&r1=1681459&r2=1681460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/HttpAuthenticator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/HttpAuthenticator.java Sun May 24 14:12:43 2015
@@ -44,7 +44,6 @@ import org.apache.http.auth.AuthProtocol
 import org.apache.http.auth.AuthScheme;
 import org.apache.http.auth.AuthState;
 import org.apache.http.auth.AuthenticationException;
-import org.apache.http.auth.ContextAwareAuthScheme;
 import org.apache.http.auth.Credentials;
 import org.apache.http.auth.MalformedChallengeException;
 import org.apache.http.client.AuthenticationStrategy;
@@ -229,17 +228,12 @@ public class HttpAuthenticator {
         Asserts.notNull(authScheme, "Auth scheme");
     }
 
-    @SuppressWarnings("deprecation")
     private Header doAuth(
             final AuthScheme authScheme,
             final Credentials creds,
             final HttpRequest request,
             final HttpContext context) throws AuthenticationException {
-        if (authScheme instanceof ContextAwareAuthScheme) {
-            return ((ContextAwareAuthScheme) authScheme).authenticate(creds, request, context);
-        } else {
-            return authScheme.authenticate(creds, request);
-        }
+        return authScheme.authenticate(creds, request, context);
     }
 
 }



Mime
View raw message