Added policy deprecations

Many of the policy deprecation warnings come from classes that probably ought to
be deprecated as part of the deprecated policy framework as well.  Making these
as deprecated removes the deprecation warnings - and we can really see where
we make sure of deprecated policy code elsewhere.

Also removed some URLEncoder, Decoder deprecations

5 files changed, 14 insertions, 7 deletions

diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java
index 80abd5f77..600bbd110 100644
--- a/pki/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java
+++ b/pki/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java
@@ -237,9 +237,9 @@ public class OCSPPublisher implements ILdapPublisher, IExtendedPluginInfo {
 
             StringBuffer query = new StringBuffer();
             query.append("crl=");
-            query.append(URLEncoder.encode("-----BEGIN CERTIFICATE REVOCATION LIST-----\n"));
-            query.append(URLEncoder.encode(CMS.BtoA(crl.getEncoded())));
-            query.append(URLEncoder.encode("\n-----END CERTIFICATE REVOCATION LIST-----"));
+            query.append(URLEncoder.encode("-----BEGIN CERTIFICATE REVOCATION LIST-----\n", "UTF-8"));
+            query.append(URLEncoder.encode(CMS.BtoA(crl.getEncoded()), "UTF-8"));
+            query.append(URLEncoder.encode("\n-----END CERTIFICATE REVOCATION LIST-----", "UTF-8"));
             query.append("&noui=true");
 
             Socket socket = null;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
index dbcba085d..ce4c966ad 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
@@ -798,9 +798,9 @@ public class AdminServlet extends HttpServlet {
                 for (Iterator<String> i = names.iterator(); i.hasNext(); ) {
                     String name = i.next();
                     String value = java.net.URLEncoder.encode(
-                            params.get(name));
+                            params.get(name), "UTF-8");
 
-                    buf.append(java.net.URLEncoder.encode(name) +
+                    buf.append(java.net.URLEncoder.encode(name, "UTF-8") +
                             "=" + value);
                     if (i.hasNext())
                         buf.append("&");
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java
index f656cbd44..0bcb962ea 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java
@@ -50,6 +50,7 @@ import com.netscape.certsrv.ra.IRegistrationAuthority;
  * for registering an instance of this with the remote
  * administration subsystem.
  * 
+ * @deprecated
  * @version $Revision$, $Date$
  */
 public class PolicyAdminServlet extends AdminServlet {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
index 663435cba..6d0e92618 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
@@ -849,7 +849,7 @@ public class DonePanel extends WizardPanelBase {
                             + "&ca.connector.KRA.port="
                             + ownagentsport
                             + "&ca.connector.KRA.transportCert="
-                            + URLEncoder.encode(transportCert)
+                            + URLEncoder.encode(transportCert, "UTF-8")
                             + "&sessionID="
                             + session_id;
 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java
index 3d5e93a56..3ab20141c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java
@@ -21,6 +21,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 
 import javax.servlet.ServletConfig;
@@ -124,7 +125,12 @@ public class OCSPServlet extends CMSServlet {
         CMS.debug("RequestURI=" + httpReq.getRequestURI());
         String pathInfo = httpReq.getPathInfo();
         if (pathInfo != null && pathInfo.indexOf('%') != -1) {
-            pathInfo = URLDecoder.decode(pathInfo);
+            try {
+                pathInfo = URLDecoder.decode(pathInfo, "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+                throw new EBaseException("OCSPServlet: Unsupported encoding" + e);
+            }
         }
         CMS.debug("PathInfo=" + pathInfo);