Revert "Formatting"

This reverts commit 32150d3ee32f8ac27118af7c792794b538c78a2f.

1 files changed, 342 insertions, 263 deletions

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 961d706c4..10a768a27 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
@@ -17,6 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.servlet.admin;
 
+
 import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Hashtable;
@@ -43,12 +44,14 @@ import com.netscape.certsrv.policy.IPolicyProcessor;
 import com.netscape.certsrv.policy.IPolicyRule;
 import com.netscape.certsrv.ra.IRegistrationAuthority;
 
+
 /**
  * This class is an administration servlet for policy management.
- * 
- * Each service (CA, KRA, RA) should be responsible for registering an instance
- * of this with the remote administration subsystem.
- * 
+ *
+ * Each service (CA, KRA, RA) should be responsible
+ * for registering an instance of this with the remote
+ * administration subsystem.
+ *
  * @version $Revision$, $Date$
  */
 public class PolicyAdminServlet extends AdminServlet {
@@ -60,7 +63,8 @@ public class PolicyAdminServlet extends AdminServlet {
     public final static String PROP_AUTHORITY = "authority";
 
     private final static String INFO = "PolicyAdminServlet";
-    private final static String PW_PASSWORD_CACHE_ADD = "PASSWORD_CACHE_ADD";
+    private final static String PW_PASSWORD_CACHE_ADD = 
+        "PASSWORD_CACHE_ADD";
 
     public final static String PROP_PREDICATE = "predicate";
     private IPolicyProcessor mProcessor = null;
@@ -80,7 +84,8 @@ public class PolicyAdminServlet extends AdminServlet {
     public static String COMMA = ",";
     public static String MISSING_POLICY_ORDERING = "Missing policy ordering";
 
-    private final static String LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY = "LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY_3";
+    private final static String LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY =
+        "LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY_3";
 
     /**
      * Constructs administration servlet.
@@ -97,7 +102,7 @@ public class PolicyAdminServlet extends AdminServlet {
         String authority = config.getInitParameter(PROP_AUTHORITY);
         String policyStatus = null;
 
-        CMS.debug("PolicyAdminServlet: In Policy Admin Servlet init!");
+        CMS.debug( "PolicyAdminServlet: In Policy Admin Servlet init!" );
 
         // CMS 6.1 began utilizing the "Certificate Profiles" framework
         // instead of the legacy "Certificate Policies" framework.
@@ -107,89 +112,89 @@ public class PolicyAdminServlet extends AdminServlet {
         // that this legacy "Certificate Policies" framework would be
         // deprecated and disabled by default (see Bugzilla Bug #472597).
         //
-        // NOTE: The "Certificate Policies" framework ONLY applied to
-        // to CA, KRA, and legacy RA (pre-CMS 7.0) subsystems.
+        // NOTE:  The "Certificate Policies" framework ONLY applied to
+        //        to CA, KRA, and legacy RA (pre-CMS 7.0) subsystems.
         //
-        // Further, the "PolicyAdminServlet.java" servlet is ONLY used
-        // by the CA Console for the following:
+        //        Further, the "PolicyAdminServlet.java" servlet is ONLY used 
+        //        by the CA Console for the following:
         //
-        // SERVLET-NAME URL-PATTERN
-        // ====================================================
-        // capolicy ca/capolicy
+        //            SERVLET-NAME           URL-PATTERN
+        //            ====================================================
+        //            capolicy               ca/capolicy
         //
-        // Finally, the "PolicyAdminServlet.java" servlet is ONLY used
-        // by the KRA Console for the following:
+        //        Finally, the "PolicyAdminServlet.java" servlet is ONLY used 
+        //        by the KRA Console for the following:
         //
-        // SERVLET-NAME URL-PATTERN
-        // ====================================================
-        // krapolicy kra/krapolicy
+        //            SERVLET-NAME           URL-PATTERN
+        //            ====================================================
+        //            krapolicy              kra/krapolicy
         //
         if (authority != null)
             mAuthority = (IAuthority) CMS.getSubsystem(authority);
         if (mAuthority != null)
             if (mAuthority instanceof ICertificateAuthority) {
-                mProcessor = ((ICertificateAuthority) mAuthority)
-                        .getPolicyProcessor();
+                mProcessor = ((ICertificateAuthority) mAuthority).getPolicyProcessor();
                 try {
-                    policyStatus = ICertificateAuthority.ID + "." + "Policy"
-                            + "." + IPolicyProcessor.PROP_ENABLE;
-                    if (mConfig.getBoolean(policyStatus, true) == true) {
-                        // NOTE: If "ca.Policy.enable=<boolean>" is missing,
-                        // then the referenced instance existed prior
-                        // to this name=value pair existing in its
-                        // 'CS.cfg' file, and thus we err on the
-                        // side that the user may still need to
-                        // use the policy framework.
-                        CMS.debug("PolicyAdminServlet::init "
-                                + "Certificate Policy Framework (deprecated) "
-                                + "is ENABLED");
+                    policyStatus = ICertificateAuthority.ID
+                                 + "." + "Policy"
+                                 + "." + IPolicyProcessor.PROP_ENABLE;
+                    if( mConfig.getBoolean( policyStatus, true ) == true ) {
+                        // NOTE:  If "ca.Policy.enable=<boolean>" is missing,
+                        //        then the referenced instance existed prior
+                        //        to this name=value pair existing in its
+                        //        'CS.cfg' file, and thus we err on the
+                        //        side that the user may still need to
+                        //        use the policy framework.
+                        CMS.debug( "PolicyAdminServlet::init "
+                                 + "Certificate Policy Framework (deprecated) "
+                                 + "is ENABLED" );
                     } else {
-                        // CS 8.1 Default: ca.Policy.enable=false
-                        CMS.debug("PolicyAdminServlet::init "
-                                + "Certificate Policy Framework (deprecated) "
-                                + "is DISABLED");
-                        return;
+                        // CS 8.1 Default:  ca.Policy.enable=false
+                        CMS.debug( "PolicyAdminServlet::init "
+                                 + "Certificate Policy Framework (deprecated) "
+                                 + "is DISABLED" );
+                        return; 
                     }
-                } catch (EBaseException e) {
-                    throw new ServletException(authority + " does not have a "
-                            + "master policy switch called '" + policyStatus
-                            + "'");
+                } catch( EBaseException e ) {
+                    throw new ServletException( authority
+                                              + " does not have a "
+                                              + "master policy switch called '"
+                                              + policyStatus + "'" );
                 }
             } else if (mAuthority instanceof IRegistrationAuthority) {
                 // this refers to the legacy RA (pre-CMS 7.0)
-                mProcessor = ((IRegistrationAuthority) mAuthority)
-                        .getPolicyProcessor();
+                mProcessor = ((IRegistrationAuthority) mAuthority).getPolicyProcessor();
             } else if (mAuthority instanceof IKeyRecoveryAuthority) {
-                mProcessor = ((IKeyRecoveryAuthority) mAuthority)
-                        .getPolicyProcessor();
+                mProcessor = ((IKeyRecoveryAuthority) mAuthority).getPolicyProcessor();
                 try {
-                    policyStatus = IKeyRecoveryAuthority.ID + "." + "Policy"
-                            + "." + IPolicyProcessor.PROP_ENABLE;
-                    if (mConfig.getBoolean(policyStatus, true) == true) {
-                        // NOTE: If "kra.Policy.enable=<boolean>" is missing,
-                        // then the referenced instance existed prior
-                        // to this name=value pair existing in its
-                        // 'CS.cfg' file, and thus we err on the
-                        // side that the user may still need to
-                        // use the policy framework.
-                        CMS.debug("PolicyAdminServlet::init "
-                                + "Certificate Policy Framework (deprecated) "
-                                + "is ENABLED");
+                   policyStatus = IKeyRecoveryAuthority.ID
+                                + "." + "Policy"
+                                + "." + IPolicyProcessor.PROP_ENABLE;
+                    if( mConfig.getBoolean( policyStatus, true ) == true ) {
+                        // NOTE:  If "kra.Policy.enable=<boolean>" is missing,
+                        //        then the referenced instance existed prior
+                        //        to this name=value pair existing in its
+                        //        'CS.cfg' file, and thus we err on the
+                        //        side that the user may still need to
+                        //        use the policy framework.
+                        CMS.debug( "PolicyAdminServlet::init "
+                                 + "Certificate Policy Framework (deprecated) "
+                                 + "is ENABLED" );
                     } else {
-                        // CS 8.1 Default: kra.Policy.enable=false
-                        CMS.debug("PolicyAdminServlet::init "
-                                + "Certificate Policy Framework (deprecated) "
-                                + "is DISABLED");
-                        return;
+                        // CS 8.1 Default:  kra.Policy.enable=false
+                        CMS.debug( "PolicyAdminServlet::init "
+                                 + "Certificate Policy Framework (deprecated) "
+                                 + "is DISABLED" );
+                        return; 
                     }
-                } catch (EBaseException e) {
-                    throw new ServletException(authority + " does not have a "
-                            + "master policy switch called '" + policyStatus
-                            + "'");
+                } catch( EBaseException e ) {
+                    throw new ServletException( authority
+                                              + " does not have a "
+                                              + "master policy switch called '"
+                                              + policyStatus + "'" );
                 }
-            } else
-                throw new ServletException(authority
-                        + "  does not have policy processor!");
+            } else 
+                throw new ServletException(authority + "  does not have policy processor!"); 
     }
 
     /**
@@ -199,15 +204,15 @@ public class PolicyAdminServlet extends AdminServlet {
         return INFO;
     }
 
-    /**
-     * retrieve extended plugin info such as brief description, type info from
-     * policy, authentication, need to add: listener, mapper and publishing
-     * plugins
+    /** 
+     * retrieve extended plugin info such as brief description, type info
+     * from policy, authentication, 
+     *   need to add: listener, mapper and publishing plugins
      */
     private void getExtendedPluginInfo(HttpServletRequest req,
-            HttpServletResponse resp) throws ServletException, IOException,
-            EBaseException {
-
+        HttpServletResponse resp) throws ServletException,
+            IOException, EBaseException {
+       
         if (!readAuthorize(req, resp))
             return;
         String id = req.getParameter(Constants.RS_ID);
@@ -224,16 +229,14 @@ public class PolicyAdminServlet extends AdminServlet {
         if (colon > -1) {
             implName = implName1.substring(0, colon);
             instName = implName1.substring(colon + 1);
-            params = getExtendedPluginInfo(getLocale(req), implType, implName,
-                    instName);
+            params = getExtendedPluginInfo(getLocale(req), implType, implName, instName);
         } else {
             params = getExtendedPluginInfo(getLocale(req), implType, implName);
         }
         sendResponse(SUCCESS, null, params, resp);
     }
 
-    private NameValuePairs getExtendedPluginInfo(Locale locale,
-            String implType, String implName) {
+    private NameValuePairs getExtendedPluginInfo(Locale locale, String implType, String implName) {
         IExtendedPluginInfo ext_info = null;
         Object impl = null;
         IPolicyRule policy = mProcessor.getPolicyImpl(implName);
@@ -245,27 +248,27 @@ public class PolicyAdminServlet extends AdminServlet {
                 ext_info = (IExtendedPluginInfo) impl;
             }
         }
-
+		
         NameValuePairs nvps = null;
-
+		
         if (ext_info == null) {
             nvps = new NameValuePairs();
         } else {
-            nvps = convertStringArrayToNVPairs(ext_info
-                    .getExtendedPluginInfo(locale));
+            nvps = convertStringArrayToNVPairs(ext_info.getExtendedPluginInfo(locale));
         }
-
+		
         return nvps;
     }
 
-    public NameValuePairs getExtendedPluginInfo(Locale locale,
-            String pluginType, String implName, String instName) {
+    public NameValuePairs getExtendedPluginInfo(Locale locale, String pluginType,
+        String implName,
+        String instName) {
         IExtendedPluginInfo ext_info = null;
 
         Object impl = null;
 
         IPolicyRule policy = mProcessor.getPolicyInstance(instName);
-
+		
         impl = policy;
         if (impl == null) {
             impl = mProcessor.getPolicyImpl(implName);
@@ -281,8 +284,7 @@ public class PolicyAdminServlet extends AdminServlet {
         if (ext_info == null) {
             nvps = new NameValuePairs();
         } else {
-            nvps = convertStringArrayToNVPairs(ext_info
-                    .getExtendedPluginInfo(locale));
+            nvps = convertStringArrayToNVPairs(ext_info.getExtendedPluginInfo(locale));
 
         }
 
@@ -299,12 +301,10 @@ public class PolicyAdminServlet extends AdminServlet {
 
         if (ext_info instanceof IPolicyRule) {
             if (nvps.getPair(IPolicyRule.PROP_ENABLE) == null) {
-                nvps.add(IPolicyRule.PROP_ENABLE,
-                        "boolean;Enable this policy rule");
+                nvps.add(IPolicyRule.PROP_ENABLE, "boolean;Enable this policy rule");
             }
             if (nvps.getPair(PROP_PREDICATE) == null) {
-                nvps.add(PROP_PREDICATE,
-                        "string;Rules describing when this policy should run.");
+                nvps.add(PROP_PREDICATE, "string;Rules describing when this policy should run.");
             }
         }
     }
@@ -312,8 +312,9 @@ public class PolicyAdminServlet extends AdminServlet {
     /**
      * Serves HTTP admin request.
      */
-    public void service(HttpServletRequest req, HttpServletResponse resp)
-            throws ServletException, IOException {
+    public void service(HttpServletRequest req,
+        HttpServletResponse resp)
+        throws ServletException, IOException {
         super.service(req, resp);
 
         super.authenticate(req);
@@ -331,28 +332,30 @@ public class PolicyAdminServlet extends AdminServlet {
             } catch (EBaseException e) {
                 sendResponse(ERROR, e.toString(getLocale(req)), null, resp);
                 return;
-            }
+            } 
         } else
             sendResponse(ERROR, INVALID_POLICY_SCOPE, null, resp);
     }
 
-    private boolean readAuthorize(HttpServletRequest req,
-            HttpServletResponse resp) throws IOException {
+    private boolean readAuthorize(HttpServletRequest req, 
+        HttpServletResponse resp) throws IOException {
         mOp = "read";
         if ((mToken = super.authorize(req)) == null) {
-            sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
-                    "CMS_ADMIN_SRVLT_AUTHZ_FAILED"), null, resp);
+            sendResponse(ERROR,
+                CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_AUTHZ_FAILED"),
+                null, resp);
             return false;
         }
         return true;
     }
 
-    private boolean modifyAuthorize(HttpServletRequest req,
-            HttpServletResponse resp) throws IOException {
+    private boolean modifyAuthorize(HttpServletRequest req, 
+        HttpServletResponse resp) throws IOException {
         mOp = "modify";
         if ((mToken = super.authorize(req)) == null) {
-            sendResponse(ERROR, CMS.getUserMessage(getLocale(req),
-                    "CMS_ADMIN_SRVLT_AUTHZ_FAILED"), null, resp);
+            sendResponse(ERROR,
+                CMS.getUserMessage(getLocale(req), "CMS_ADMIN_SRVLT_AUTHZ_FAILED"),
+                null, resp);
             return false;
         }
         return true;
@@ -362,7 +365,8 @@ public class PolicyAdminServlet extends AdminServlet {
      * Process Policy Implementation Management.
      */
     public void processPolicyImplMgmt(HttpServletRequest req,
-            HttpServletResponse resp) throws ServletException, IOException {
+        HttpServletResponse resp)
+        throws ServletException, IOException {
         // Get operation type
         String op = req.getParameter(Constants.OP_TYPE);
 
@@ -383,11 +387,13 @@ public class PolicyAdminServlet extends AdminServlet {
                 return;
             addPolicyImpl(req, resp);
         } else
-            sendResponse(ERROR, INVALID_POLICY_IMPL_OP, null, resp);
+            sendResponse(ERROR, INVALID_POLICY_IMPL_OP,
+                null, resp);
     }
 
     public void processPolicyRuleMgmt(HttpServletRequest req,
-            HttpServletResponse resp) throws ServletException, IOException {
+        HttpServletResponse resp)
+        throws ServletException, IOException {
         // Get operation type
         String op = req.getParameter(Constants.OP_TYPE);
 
@@ -417,15 +423,18 @@ public class PolicyAdminServlet extends AdminServlet {
             else
                 modifyPolicyInstance(req, resp);
         } else
-            sendResponse(ERROR, INVALID_POLICY_IMPL_OP, null, resp);
+            sendResponse(ERROR, INVALID_POLICY_IMPL_OP,
+                null, resp);
     }
 
-    public void listPolicyImpls(HttpServletRequest req, HttpServletResponse resp)
-            throws ServletException, IOException {
+    public void listPolicyImpls(HttpServletRequest req,
+        HttpServletResponse resp)
+        throws ServletException, IOException {
         Enumeration policyImplNames = mProcessor.getPolicyImplsInfo();
         Enumeration policyImpls = mProcessor.getPolicyImpls();
 
-        if (policyImplNames == null || policyImpls == null) {
+        if (policyImplNames == null ||
+            policyImpls == null) {
             sendResponse(ERROR, INVALID_POLICY_IMPL_CONFIG, null, resp);
             return;
         }
@@ -433,11 +442,13 @@ public class PolicyAdminServlet extends AdminServlet {
         // Assemble a name value pair;
         NameValuePairs nvp = new NameValuePairs();
 
-        while (policyImplNames.hasMoreElements()
-                && policyImpls.hasMoreElements()) {
+        while (policyImplNames.hasMoreElements() &&
+            policyImpls.hasMoreElements()) {
             String id = (String) policyImplNames.nextElement();
-            IPolicyRule impl = (IPolicyRule) policyImpls.nextElement();
-            String className = impl.getClass().getName();
+            IPolicyRule impl = (IPolicyRule)
+                policyImpls.nextElement();
+            String className =
+                impl.getClass().getName();
             String desc = impl.getDescription();
 
             nvp.add(id, className + "," + desc);
@@ -446,7 +457,8 @@ public class PolicyAdminServlet extends AdminServlet {
     }
 
     public void listPolicyInstances(HttpServletRequest req,
-            HttpServletResponse resp) throws ServletException, IOException {
+        HttpServletResponse resp)
+        throws ServletException, IOException {
         Enumeration instancesInfo = mProcessor.getPolicyInstancesInfo();
 
         if (instancesInfo == null) {
@@ -463,7 +475,7 @@ public class PolicyAdminServlet extends AdminServlet {
             int i = info.indexOf(";");
 
             nvp.add(info.substring(0, i), info.substring(i + 1));
-
+			
         }
         sendResponse(SUCCESS, null, nvp, resp);
     }
@@ -471,19 +483,19 @@ public class PolicyAdminServlet extends AdminServlet {
     /**
      * Delete policy implementation
      * <P>
-     * 
+     *
      * <ul>
      * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when
      * configuring cert policy constraints and extensions
      * </ul>
-     * 
      * @param req HTTP servlet request
      * @param resp HTTP servlet response
      * @exception ServletException a servlet error has occurred
      * @exception IOException an input/output error has occurred
      */
     public void deletePolicyImpl(HttpServletRequest req,
-            HttpServletResponse resp) throws ServletException, IOException {
+        HttpServletResponse resp)
+        throws ServletException, IOException {
         String auditMessage = null;
         String auditSubjectID = auditSubjectID();
 
@@ -496,8 +508,10 @@ public class PolicyAdminServlet extends AdminServlet {
             if (id == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.FAILURE, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.FAILURE,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -510,19 +524,23 @@ public class PolicyAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.SUCCESS, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.SUCCESS,
+                            auditParams(req));
 
                 audit(auditMessage);
 
                 sendResponse(SUCCESS, null, null, resp);
             } catch (Exception e) {
-                // e.printStackTrace();
+                //e.printStackTrace();
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.FAILURE, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.FAILURE,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -531,30 +549,33 @@ public class PolicyAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                    LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, auditSubjectID,
-                    ILogger.FAILURE, auditParams(req));
+                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                        auditSubjectID,
+                        ILogger.FAILURE,
+                        auditParams(req));
 
             audit(auditMessage);
 
             // rethrow the specific exception to be handled later
             throw eAudit1;
             // } catch( ServletException eAudit2 ) {
-            // // store a message in the signed audit log file
-            // auditMessage = CMS.getLogMessage(
-            // LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-            // auditSubjectID,
-            // ILogger.FAILURE,
-            // auditParams( req ) );
+            //     // store a message in the signed audit log file
+            //     auditMessage = CMS.getLogMessage(
+            //                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+            //                        auditSubjectID,
+            //                        ILogger.FAILURE,
+            //                        auditParams( req ) );
             //
-            // audit( auditMessage );
+            //     audit( auditMessage );
             //
-            // // rethrow the specific exception to be handled later
-            // throw eAudit2;
+            //     // rethrow the specific exception to be handled later
+            //     throw eAudit2;
         }
     }
 
     public void getPolicyImplConfig(HttpServletRequest req,
-            HttpServletResponse resp) throws ServletException, IOException {
+        HttpServletResponse resp)
+        throws ServletException, IOException {
         // Get the policy impl id.
         String id = req.getParameter(Constants.RS_ID);
 
@@ -583,19 +604,19 @@ public class PolicyAdminServlet extends AdminServlet {
     /**
      * Add policy implementation
      * <P>
-     * 
+     *
      * <ul>
      * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when
      * configuring cert policy constraints and extensions
      * </ul>
-     * 
      * @param req HTTP servlet request
      * @param resp HTTP servlet response
      * @exception ServletException a servlet error has occurred
      * @exception IOException an input/output error has occurred
      */
-    public void addPolicyImpl(HttpServletRequest req, HttpServletResponse resp)
-            throws ServletException, IOException {
+    public void addPolicyImpl(HttpServletRequest req,
+        HttpServletResponse resp)
+        throws ServletException, IOException {
         String auditMessage = null;
         String auditSubjectID = auditSubjectID();
 
@@ -608,8 +629,10 @@ public class PolicyAdminServlet extends AdminServlet {
             if (id == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.FAILURE, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.FAILURE,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -622,8 +645,10 @@ public class PolicyAdminServlet extends AdminServlet {
             if (classPath == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.FAILURE, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.FAILURE,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -635,8 +660,10 @@ public class PolicyAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.SUCCESS, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.SUCCESS,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -644,8 +671,10 @@ public class PolicyAdminServlet extends AdminServlet {
             } catch (Exception e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.FAILURE, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.FAILURE,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -654,44 +683,46 @@ public class PolicyAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                    LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, auditSubjectID,
-                    ILogger.FAILURE, auditParams(req));
+                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                        auditSubjectID,
+                        ILogger.FAILURE,
+                        auditParams(req));
 
             audit(auditMessage);
 
             // rethrow the specific exception to be handled later
             throw eAudit1;
             // } catch( ServletException eAudit2 ) {
-            // // store a message in the signed audit log file
-            // auditMessage = CMS.getLogMessage(
-            // LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-            // auditSubjectID,
-            // ILogger.FAILURE,
-            // auditParams( req ) );
+            //     // store a message in the signed audit log file
+            //     auditMessage = CMS.getLogMessage(
+            //                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+            //                        auditSubjectID,
+            //                        ILogger.FAILURE,
+            //                        auditParams( req ) );
             //
-            // audit( auditMessage );
+            //     audit( auditMessage );
             //
-            // // rethrow the specific exception to be handled later
-            // throw eAudit2;
+            //     // rethrow the specific exception to be handled later
+            //     throw eAudit2;
         }
     }
 
     /**
      * Delete policy instance
      * <P>
-     * 
+     *
      * <ul>
      * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when
      * configuring cert policy constraints and extensions
      * </ul>
-     * 
      * @param req HTTP servlet request
      * @param resp HTTP servlet response
      * @exception ServletException a servlet error has occurred
      * @exception IOException an input/output error has occurred
      */
     public void deletePolicyInstance(HttpServletRequest req,
-            HttpServletResponse resp) throws ServletException, IOException {
+        HttpServletResponse resp)
+        throws ServletException, IOException {
         String auditMessage = null;
         String auditSubjectID = auditSubjectID();
 
@@ -704,8 +735,10 @@ public class PolicyAdminServlet extends AdminServlet {
             if (id == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.FAILURE, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.FAILURE,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -718,19 +751,23 @@ public class PolicyAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.SUCCESS, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.SUCCESS,
+                            auditParams(req));
 
                 audit(auditMessage);
 
                 sendResponse(SUCCESS, null, null, resp);
             } catch (Exception e) {
-                // e.printStackTrace();
+                //e.printStackTrace();
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.FAILURE, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.FAILURE,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -739,30 +776,33 @@ public class PolicyAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                    LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, auditSubjectID,
-                    ILogger.FAILURE, auditParams(req));
+                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                        auditSubjectID,
+                        ILogger.FAILURE,
+                        auditParams(req));
 
             audit(auditMessage);
 
             // rethrow the specific exception to be handled later
             throw eAudit1;
             // } catch( ServletException eAudit2 ) {
-            // // store a message in the signed audit log file
-            // auditMessage = CMS.getLogMessage(
-            // LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-            // auditSubjectID,
-            // ILogger.FAILURE,
-            // auditParams( req ) );
+            //     // store a message in the signed audit log file
+            //     auditMessage = CMS.getLogMessage(
+            //                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+            //                        auditSubjectID,
+            //                        ILogger.FAILURE,
+            //                        auditParams( req ) );
             //
-            // audit( auditMessage );
+            //     audit( auditMessage );
             //
-            // // rethrow the specific exception to be handled later
-            // throw eAudit2;
+            //     // rethrow the specific exception to be handled later
+            //     throw eAudit2;
         }
     }
 
     public void getPolicyInstanceConfig(HttpServletRequest req,
-            HttpServletResponse resp) throws ServletException, IOException {
+        HttpServletResponse resp)
+        throws ServletException, IOException {
         // Get the policy rule id.
         String id = req.getParameter(Constants.RS_ID).trim();
 
@@ -795,7 +835,8 @@ public class PolicyAdminServlet extends AdminServlet {
         sendResponse(SUCCESS, null, nvp, resp);
     }
 
-    public void putUserPWPair(String combo) {
+    public void
+    putUserPWPair(String combo) {
         int semicolon;
 
         semicolon = combo.indexOf(";");
@@ -808,19 +849,19 @@ public class PolicyAdminServlet extends AdminServlet {
     /**
      * Add policy instance
      * <P>
-     * 
+     *
      * <ul>
      * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when
      * configuring cert policy constraints and extensions
      * </ul>
-     * 
      * @param req HTTP servlet request
      * @param resp HTTP servlet response
      * @exception ServletException a servlet error has occurred
      * @exception IOException an input/output error has occurred
      */
     public void addPolicyInstance(HttpServletRequest req,
-            HttpServletResponse resp) throws ServletException, IOException {
+        HttpServletResponse resp)
+        throws ServletException, IOException {
         String auditMessage = null;
         String auditSubjectID = auditSubjectID();
 
@@ -833,8 +874,10 @@ public class PolicyAdminServlet extends AdminServlet {
             if (id == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.FAILURE, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.FAILURE,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -848,8 +891,10 @@ public class PolicyAdminServlet extends AdminServlet {
             if (implName == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.FAILURE, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.FAILURE,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -879,8 +924,10 @@ public class PolicyAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.FAILURE, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.FAILURE,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -908,8 +955,10 @@ public class PolicyAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.SUCCESS, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.SUCCESS,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -917,8 +966,10 @@ public class PolicyAdminServlet extends AdminServlet {
             } catch (Exception e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.FAILURE, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.FAILURE,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -927,57 +978,62 @@ public class PolicyAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                    LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, auditSubjectID,
-                    ILogger.FAILURE, auditParams(req));
+                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                        auditSubjectID,
+                        ILogger.FAILURE,
+                        auditParams(req));
 
             audit(auditMessage);
 
             // rethrow the specific exception to be handled later
             throw eAudit1;
             // } catch( ServletException eAudit2 ) {
-            // // store a message in the signed audit log file
-            // auditMessage = CMS.getLogMessage(
-            // LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-            // auditSubjectID,
-            // ILogger.FAILURE,
-            // auditParams( req ) );
+            //     // store a message in the signed audit log file
+            //     auditMessage = CMS.getLogMessage(
+            //                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+            //                        auditSubjectID,
+            //                        ILogger.FAILURE,
+            //                        auditParams( req ) );
             //
-            // audit( auditMessage );
+            //     audit( auditMessage );
             //
-            // // rethrow the specific exception to be handled later
-            // throw eAudit2;
+            //     // rethrow the specific exception to be handled later
+            //     throw eAudit2;
         }
     }
 
     /**
      * Change ordering of policy instances
      * <P>
-     * 
+     *
      * <ul>
      * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when
      * configuring cert policy constraints and extensions
      * </ul>
-     * 
      * @param req HTTP servlet request
      * @param resp HTTP servlet response
      * @exception ServletException a servlet error has occurred
      * @exception IOException an input/output error has occurred
      */
     public void changePolicyInstanceOrdering(HttpServletRequest req,
-            HttpServletResponse resp) throws ServletException, IOException {
+        HttpServletResponse resp)
+        throws ServletException, IOException {
         String auditMessage = null;
         String auditSubjectID = auditSubjectID();
 
         // ensure that any low-level exceptions are reported
         // to the signed audit log and stored as failures
         try {
-            String policyOrder = req.getParameter(Constants.PR_POLICY_ORDER);
+            String policyOrder =
+                req.getParameter(Constants.PR_POLICY_ORDER);
 
             if (policyOrder == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.FAILURE, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.FAILURE,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -989,8 +1045,10 @@ public class PolicyAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.SUCCESS, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.SUCCESS,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -998,8 +1056,10 @@ public class PolicyAdminServlet extends AdminServlet {
             } catch (Exception e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.FAILURE, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.FAILURE,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -1008,44 +1068,46 @@ public class PolicyAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                    LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, auditSubjectID,
-                    ILogger.FAILURE, auditParams(req));
+                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                        auditSubjectID,
+                        ILogger.FAILURE,
+                        auditParams(req));
 
             audit(auditMessage);
 
             // rethrow the specific exception to be handled later
             throw eAudit1;
             // } catch( ServletException eAudit2 ) {
-            // // store a message in the signed audit log file
-            // auditMessage = CMS.getLogMessage(
-            // LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-            // auditSubjectID,
-            // ILogger.FAILURE,
-            // auditParams( req ) );
+            //     // store a message in the signed audit log file
+            //     auditMessage = CMS.getLogMessage(
+            //                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+            //                        auditSubjectID,
+            //                        ILogger.FAILURE,
+            //                        auditParams( req ) );
             //
-            // audit( auditMessage );
+            //     audit( auditMessage );
             //
-            // // rethrow the specific exception to be handled later
-            // throw eAudit2;
+            //     // rethrow the specific exception to be handled later
+            //     throw eAudit2;
         }
     }
 
     /**
      * Modify policy instance
      * <P>
-     * 
+     *
      * <ul>
      * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when
      * configuring cert policy constraints and extensions
      * </ul>
-     * 
      * @param req HTTP servlet request
      * @param resp HTTP servlet response
      * @exception ServletException a servlet error has occurred
      * @exception IOException an input/output error has occurred
      */
     public void modifyPolicyInstance(HttpServletRequest req,
-            HttpServletResponse resp) throws ServletException, IOException {
+        HttpServletResponse resp)
+        throws ServletException, IOException {
         String auditMessage = null;
         String auditSubjectID = auditSubjectID();
 
@@ -1058,8 +1120,10 @@ public class PolicyAdminServlet extends AdminServlet {
             if (id == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.FAILURE, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.FAILURE,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -1068,14 +1132,15 @@ public class PolicyAdminServlet extends AdminServlet {
             }
 
             // Get the default config params for the implementation.
-            String implName = req.getParameter(IPolicyRule.PROP_IMPLNAME)
-                    .trim();
+            String implName = req.getParameter(IPolicyRule.PROP_IMPLNAME).trim();
 
             if (implName == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.FAILURE, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.FAILURE,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -1104,15 +1169,17 @@ public class PolicyAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.FAILURE, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.FAILURE,
+                            auditParams(req));
 
                 audit(auditMessage);
 
                 sendResponse(ERROR, INVALID_POLICY_IMPL_ID, null, resp);
                 return;
             }
-            // XXX
+            // XXX 
             for (Enumeration n = req.getParameterNames(); n.hasMoreElements();) {
                 String p = (String) n.nextElement();
                 String l = (String) req.getParameter(p);
@@ -1122,10 +1189,15 @@ public class PolicyAdminServlet extends AdminServlet {
             }
 
             /*
-             * for(Enumeration e = v.elements(); e.hasMoreElements(); ) { String
-             * nv = (String)e.nextElement(); int index = nv.indexOf("="); String
-             * key = nv.substring(0, index); val = req.getParameter(key); if
-             * (val != null) ht.put(key, val); }
+             for(Enumeration e = v.elements(); e.hasMoreElements(); )
+             {
+             String nv = (String)e.nextElement();
+             int index = nv.indexOf("=");
+             String key = nv.substring(0, index);
+             val = req.getParameter(key);
+             if (val != null)
+             ht.put(key, val);
+             }
              */
 
             try {
@@ -1133,8 +1205,10 @@ public class PolicyAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.SUCCESS, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.SUCCESS,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -1142,8 +1216,10 @@ public class PolicyAdminServlet extends AdminServlet {
             } catch (Exception e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-                        auditSubjectID, ILogger.FAILURE, auditParams(req));
+                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            auditSubjectID,
+                            ILogger.FAILURE,
+                            auditParams(req));
 
                 audit(auditMessage);
 
@@ -1152,25 +1228,28 @@ public class PolicyAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                    LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, auditSubjectID,
-                    ILogger.FAILURE, auditParams(req));
+                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                        auditSubjectID,
+                        ILogger.FAILURE,
+                        auditParams(req));
 
             audit(auditMessage);
 
             // rethrow the specific exception to be handled later
             throw eAudit1;
             // } catch( ServletException eAudit2 ) {
-            // // store a message in the signed audit log file
-            // auditMessage = CMS.getLogMessage(
-            // LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
-            // auditSubjectID,
-            // ILogger.FAILURE,
-            // auditParams( req ) );
+            //     // store a message in the signed audit log file
+            //     auditMessage = CMS.getLogMessage(
+            //                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+            //                        auditSubjectID,
+            //                        ILogger.FAILURE,
+            //                        auditParams( req ) );
             //
-            // audit( auditMessage );
+            //     audit( auditMessage );
             //
-            // // rethrow the specific exception to be handled later
-            // throw eAudit2;
+            //     // rethrow the specific exception to be handled later
+            //     throw eAudit2;
         }
     }
 }
+