From 3035ff2e770e7ee588f9ab2be201369b9d29ed39 Mon Sep 17 00:00:00 2001
From: Roland Weber <rolandw@apache.org>
Date: Sun, 16 Sep 2007 11:50:41 +0000
Subject: [PATCH] parameter names in interfaces, part 3

git-svn-id: https://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk@576078 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/http/auth/params/AuthPNames.java   |  2 +-
 .../org/apache/http/client/params/AllClientPNames.java |  3 +++
 .../java/org/apache/http/impl/auth/DigestScheme.java   |  2 +-
 .../org/apache/http/localserver/LocalTestServer.java   | 10 +++++-----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/module-client/src/main/java/org/apache/http/auth/params/AuthPNames.java b/module-client/src/main/java/org/apache/http/auth/params/AuthPNames.java
index 1c8b7a2a1..51a671249 100644
--- a/module-client/src/main/java/org/apache/http/auth/params/AuthPNames.java
+++ b/module-client/src/main/java/org/apache/http/auth/params/AuthPNames.java
@@ -50,7 +50,7 @@ public interface AuthPNames {
      * <p>
      * This parameter expects a value of type {@link String}.
      * If not defined, then
-     * {@link org.apache.http.params.HttpProtocolParams#HTTP_ELEMENT_CHARSET
+     * {@link org.apache.http.params.CoreProtocolPNames#HTTP_ELEMENT_CHARSET
      *        HttpProtocolParams.HTTP_ELEMENT_CHARSET}
      * should be used.
      * </p>
diff --git a/module-client/src/main/java/org/apache/http/client/params/AllClientPNames.java b/module-client/src/main/java/org/apache/http/client/params/AllClientPNames.java
index 643f80756..557eaeaa2 100644
--- a/module-client/src/main/java/org/apache/http/client/params/AllClientPNames.java
+++ b/module-client/src/main/java/org/apache/http/client/params/AllClientPNames.java
@@ -31,6 +31,8 @@
 package org.apache.http.client.params;
 
 
+import org.apache.http.params.CoreConnectionPNames;
+import org.apache.http.params.CoreProtocolPNames;
 import org.apache.http.auth.params.AuthPNames;
 import org.apache.http.cookie.params.CookieSpecPNames;
 import org.apache.http.conn.params.ConnManagerPNames;
@@ -54,6 +56,7 @@ import org.apache.http.conn.params.ConnRoutePNames;
  * @since 4.0
  */
 public interface AllClientPNames extends
+    CoreConnectionPNames, CoreProtocolPNames,
     ClientPNames, AuthPNames, CookieSpecPNames,
     ConnConnectionPNames, ConnManagerPNames, ConnRoutePNames {
 
diff --git a/module-client/src/main/java/org/apache/http/impl/auth/DigestScheme.java b/module-client/src/main/java/org/apache/http/impl/auth/DigestScheme.java
index 7741da6c3..932fb219b 100644
--- a/module-client/src/main/java/org/apache/http/impl/auth/DigestScheme.java
+++ b/module-client/src/main/java/org/apache/http/impl/auth/DigestScheme.java
@@ -63,7 +63,7 @@ import org.apache.http.util.EncodingUtils;
  * Since the digest username is included as clear text in the generated 
  * Authentication header, the charset of the username must be compatible
  * with the 
- * {@link org.apache.http.params.HttpProtocolParams#HTTP_ELEMENT_CHARSET
+ * {@link org.apache.http.params.CoreProtocolPNames#HTTP_ELEMENT_CHARSET
  *        http element charset}.
  * </p>
  * 
diff --git a/module-client/src/test/java/org/apache/http/localserver/LocalTestServer.java b/module-client/src/test/java/org/apache/http/localserver/LocalTestServer.java
index 69c55aaac..a8e60f59b 100644
--- a/module-client/src/test/java/org/apache/http/localserver/LocalTestServer.java
+++ b/module-client/src/test/java/org/apache/http/localserver/LocalTestServer.java
@@ -46,7 +46,7 @@ import org.apache.http.impl.DefaultConnectionReuseStrategy;
 import org.apache.http.impl.DefaultHttpResponseFactory;
 import org.apache.http.impl.DefaultHttpServerConnection;
 import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.CoreConnectionPNames;
 import org.apache.http.params.HttpParams;
 import org.apache.http.params.CoreProtocolPNames;
 import org.apache.http.protocol.BasicHttpProcessor;
@@ -148,13 +148,13 @@ public class LocalTestServer {
     public static HttpParams newDefaultParams() {
         HttpParams params = new BasicHttpParams(null);
         params
-            .setIntParameter(HttpConnectionParams.SO_TIMEOUT,
+            .setIntParameter(CoreConnectionPNames.SO_TIMEOUT,
                              5000)
-            .setIntParameter(HttpConnectionParams.SOCKET_BUFFER_SIZE,
+            .setIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE,
                              8 * 1024)
-            .setBooleanParameter(HttpConnectionParams.STALE_CONNECTION_CHECK,
+            .setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK,
                                  false)
-            .setBooleanParameter(HttpConnectionParams.TCP_NODELAY,
+            .setBooleanParameter(CoreConnectionPNames.TCP_NODELAY,
                                  true)
             .setParameter(CoreProtocolPNames.ORIGIN_SERVER,
                           "Jakarta-HttpComponents-LocalTestServer/1.1");