Javadoc fixes

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1030510 13f79535-47bb-0310-9956-ffa450edef68

httpclient-cache/src/main/java/org/apache/http/client/cache/CacheResponseStatus.java

@@ -28,8 +28,8 @@ package org.apache.http.client.cache;
 
 /**
  * This enumeration represents the various ways a response can be generated
- * by the {@link CachingHttpClient}; if a request is executed with an
- * {@link org.apache.http.protocol.HttpContext}
+ * by the {@link org.apache.http.impl.client.cache.CachingHttpClient}; 
+ * if a request is executed with an {@link org.apache.http.protocol.HttpContext}
  * then a parameter with one of these values will be registered in the
  * context.
  */

httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCacheStorage.java

@@ -37,7 +37,7 @@ import org.apache.http.client.cache.HttpCacheUpdateCallback;
 /**
  * Basic {@link HttpCacheStorage} implementation backed by an instance of {@link LinkedHashMap}.
  * This cache does NOT deallocate resources associated with the cache entries. It is intended
- * for use with {@link MemCacheEntry} and similar.
+ * for use with {@link HeapResource} and similar.
  *
  * @since 4.1
  */

httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheConfig.java

@@ -104,7 +104,6 @@ public class CacheConfig {
 
     /**
      * Returns the maximum number of cache entries the cache will retain.
-     * @return int
      */
     public int getMaxCacheEntries() {
         return maxCacheEntries;
@@ -112,7 +111,6 @@ public class CacheConfig {
 
     /**
      * Sets the maximum number of cache entries the cache will retain.
-     * @param maxCacheEntries int
      */
     public void setMaxCacheEntries(int maxCacheEntries) {
         this.maxCacheEntries = maxCacheEntries;
@@ -120,7 +118,6 @@ public class CacheConfig {
 
     /**
      * Returns the number of times to retry a cache update on failure
-     * @return int
      */
     public int getMaxUpdateRetries(){
         return maxUpdateRetries;
@@ -128,7 +125,6 @@ public class CacheConfig {
 
     /**
      * Sets the number of times to retry a cache update on failure
-     * @param maxUpdateRetries int
      */
     public void setMaxUpdateRetries(int maxUpdateRetries){
         this.maxUpdateRetries = maxUpdateRetries;
@@ -136,7 +132,6 @@ public class CacheConfig {
 
     /**
      * Returns if heuristic freshness caching is in enabled
-     * @return
      */
     public boolean isHeuristicCachingEnabled() {
         return heuristicCachingEnabled;
@@ -144,7 +139,6 @@ public class CacheConfig {
 
     /**
      * Set if heuristic freshness caching is enabled
-     * @param heursiticCachingEnabled
      */
     public void setHeuristicCachingEnabled(boolean heuristicCachingEnabled) {
         this.heuristicCachingEnabled = heuristicCachingEnabled;
@@ -152,7 +146,6 @@ public class CacheConfig {
 
     /**
      * Returns coefficient used in heuristic freshness caching
-     * @return
      */
     public float getHeuristicCoefficient() {
         return heuristicCoefficient;
@@ -160,7 +153,6 @@ public class CacheConfig {
 
     /**
      * Set coefficient to be used in heuristic freshness caching
-     * @param heuristicCoefficient
      */
     public void setHeuristicCoefficient(float heuristicCoefficient) {
         this.heuristicCoefficient = heuristicCoefficient;
@@ -169,7 +161,6 @@ public class CacheConfig {
     /**
      * Get the default lifetime to be used if heuristic freshness calculation is
      * not possible
-     * @return
      */
     public long getHeuristicDefaultLifetime() {
         return heuristicDefaultLifetime;
@@ -177,7 +168,6 @@ public class CacheConfig {
 
     /**
      * Set default lifetime to be used if heuristic freshness calculation is not possible
-     * @param heuristicDefaultLifetime
      */
     public void setHeuristicDefaultLifetime(long heuristicDefaultLifetime) {
         this.heuristicDefaultLifetime = heuristicDefaultLifetime;

httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.java

@@ -47,7 +47,7 @@ import org.apache.http.client.cache.Resource;
  * resource deallocation. The cache can be permanently shut down using {@link #shutdown()}
  * method. All resources associated with the entries used by the cache will be deallocated.
  *
- * This {@link HttpCacheStorage} implementation is intended for use with {@link FileCacheEntry}
+ * This {@link HttpCacheStorage} implementation is intended for use with {@link FileResource}
  * and similar.
  *
  * @since 4.1

httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java

@@ -62,6 +62,7 @@ import org.apache.http.impl.DefaultConnectionReuseStrategy;
 import org.apache.http.impl.auth.BasicSchemeFactory;
 import org.apache.http.impl.auth.DigestSchemeFactory;
 import org.apache.http.impl.auth.NTLMSchemeFactory;
+import org.apache.http.impl.auth.NegotiateSchemeFactory;
 import org.apache.http.impl.conn.DefaultHttpRoutePlanner;
 import org.apache.http.impl.conn.SingleClientConnManager;
 import org.apache.http.impl.cookie.BestMatchSpecFactory;
@@ -300,6 +301,9 @@ public class DefaultHttpClient extends AbstractHttpClient {
         registry.register(
                 AuthPolicy.NTLM,
                 new NTLMSchemeFactory());
+        registry.register(
+                AuthPolicy.SPNEGO,
+                new NegotiateSchemeFactory());
         return registry;
     }
 

httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java

@@ -149,7 +149,7 @@ public class ThreadSafeClientConnManager implements ClientConnectionManager {
      *
      * @return  the connection pool to use
      *
-     * @deprecated use {@link #createConnectionPool()}
+     * @deprecated use #createConnectionPool(long, TimeUnit))
      */
     @Deprecated
     protected AbstractConnPool createConnectionPool(final HttpParams params) {