Removal of unused private methods

These methods are uncallable.

There might be some discussion about the private default constructores.  The Rules of Java are different from C++:  If there is any constructor defined, all the other defaults befome uncallable.  Thus,  the private default constructors are not needed.

https://bugzilla.redhat.com/show_bug.cgi?id=728303

Conflicts:

	pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java

1 files changed, 0 insertions, 663 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
index 2c780bb2a..e4138d745 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
@@ -20,9 +20,6 @@ package com.netscape.cms.servlet.admin;
 
 import java.io.IOException;
 import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-import java.util.Vector;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -31,17 +28,12 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
-import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.common.Constants;
 import com.netscape.certsrv.common.NameValuePairs;
 import com.netscape.certsrv.common.OpDef;
 import com.netscape.certsrv.common.ScopeDef;
-import com.netscape.certsrv.kra.EKRAException;
 import com.netscape.certsrv.kra.IKeyRecoveryAuthority;
 import com.netscape.certsrv.logging.ILogger;
-import com.netscape.certsrv.password.IPasswordCheck;
-import com.netscape.certsrv.security.Credential;
-import com.netscape.certsrv.security.IStorageKeyUnit;
 
 
 /**
@@ -240,659 +232,4 @@ public class KRAAdminServlet extends AdminServlet {
         else
             sendResponse(SUCCESS, null, null, resp);
     }
-
-    /**
-     * Changes M-N scheme.
-     * <P>
-     *
-     * <ul>
-     * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_DRM used when configuring
-     * DRM (Key recovery scheme, change of any secret component)
-     * </ul>
-     * @param req HTTP servlet request
-     * @param resp HTTP servlet response
-     * @exception EBaseException an error has occurred
-     */
-    private synchronized void changeMNScheme(HttpServletRequest req, 
-        HttpServletResponse resp) throws EBaseException {
-        String auditMessage = null;
-        String auditSubjectID = auditSubjectID();
-
-        // ensure that any low-level exceptions are reported
-        // to the signed audit log and stored as failures
-        try {
-            try {
-                NameValuePairs params = new NameValuePairs();
-                String recN = getParameter(req, 
-                        Constants.PR_RECOVERY_N);
-                String recM = getParameter(req, 
-                        Constants.PR_RECOVERY_M);
-                String oldAgents = getParameter(req, 
-                        Constants.PR_OLD_RECOVERY_AGENT);
-                String agents = getParameter(req, 
-                        Constants.PR_RECOVERY_AGENT);
-
-                if (recN == null) {
-                    // store a message in the signed audit log file
-                    auditMessage = CMS.getLogMessage(
-                                       LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                                       auditSubjectID,
-                                       ILogger.FAILURE,
-                                       auditParams(req));
-
-                    audit(auditMessage);
-
-                    throw new EKRAException(
-                                  CMS.getLogMessage("KRA_INVALID_N"));
-                }
-
-                if (recM == null) {
-                    // store a message in the signed audit log file
-                    auditMessage = CMS.getLogMessage(
-                                       LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                                       auditSubjectID,
-                                       ILogger.FAILURE,
-                                       auditParams(req));
-
-                    audit(auditMessage);
-
-                    throw new EKRAException(
-                                  CMS.getLogMessage("KRA_INVALID_M"));
-                }
-
-                if (recN != null && recM != null && oldAgents != null 
-                    && agents != null) {
-                    int nVal = Integer.parseInt(recN);
-
-                    int mVal = Integer.parseInt(recM);
-
-                    Credential oldcreds[] = 
-                        parseCredentialStr(oldAgents);
-
-                    if (oldcreds == null) {
-                        // store a message in the signed audit log file
-                        auditMessage = CMS.getLogMessage(
-                                    LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                                    auditSubjectID,
-                                    ILogger.FAILURE,
-                                    auditParams(req));
-
-                        audit(auditMessage);
-
-                        throw new EKRAException(	
-                                CMS.getLogMessage("KRA_INVALID_PASSWORD"));
-                    }
-
-                    Credential creds[] = 
-                        parseCredentialStr(agents);
-
-                    if (creds == null) {
-                        // store a message in the signed audit log file
-                        auditMessage = CMS.getLogMessage(
-                                    LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                                    auditSubjectID,
-                                    ILogger.FAILURE,
-                                    auditParams(req));
-
-                        audit(auditMessage);
-
-                        throw new EKRAException(	
-                                CMS.getLogMessage("KRA_INVALID_PASSWORD"));
-                    } else {
-                        for (int i = 0; i < creds.length; i++) {
-                            Credential credential = creds[i];
-                            String pass = credential.getPassword();
-                            IPasswordCheck checker = CMS.getPasswordChecker();
-
-                            if (!checker.isGoodPassword(pass)) {
-                                // store a message in the signed audit log file
-                                auditMessage = CMS.getLogMessage(
-                                            LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                                            auditSubjectID,
-                                            ILogger.FAILURE,
-                                            auditParams(req));
-
-                                audit(auditMessage);
-
-                                throw new EBaseException(checker.getReason(pass));
-                            }
-                        }
-                    }
-                    if (mKRA.getStorageKeyUnit().changeAgentMN(
-                            nVal, mVal, oldcreds, creds)) {
-                        // store a message in the signed audit log file
-                        auditMessage = CMS.getLogMessage(
-                                    LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                                    auditSubjectID,
-                                    ILogger.SUCCESS,
-                                    auditParams(req));
-
-                        audit(auditMessage);
-
-                        // successful operation
-                        sendResponse(SUCCESS, null, params, 
-                            resp);
-                        return;
-                    }
-                }
-            } catch (IOException e) {
-            }
-
-            // store a message in the signed audit log file
-            auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                        auditSubjectID,
-                        ILogger.FAILURE,
-                        auditParams(req));
-
-            audit(auditMessage);
-
-            throw new EBaseException(CMS.getLogMessage("BASE_INVALID_OPERATION"));
-        } catch (EBaseException eAudit1) {
-            // store a message in the signed audit log file
-            auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                        auditSubjectID,
-                        ILogger.FAILURE,
-                        auditParams(req));
-
-            audit(auditMessage);
-
-            // rethrow the specific exception to be handled later
-            throw eAudit1;
-        }
-    }
-
-    /**
-     * Changes recovery agent password.
-     * <P>
-     *
-     * <ul>
-     * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_DRM used when configuring
-     * DRM (Key recovery scheme, change of any secret component)
-     * </ul>
-     * @param req HTTP servlet request
-     * @param resp HTTP servlet response
-     * @exception EBaseException an error has occurred
-     */
-    private synchronized void changeAgentPwd(HttpServletRequest req, 
-        HttpServletResponse resp) throws EBaseException {
-        String auditMessage = null;
-        String auditSubjectID = auditSubjectID();
-
-        // ensure that any low-level exceptions are reported
-        // to the signed audit log and stored as failures
-        try {
-            try {
-                String id = getParameter(req, Constants.RS_ID);
-                String oldpwd = getParameter(req, 
-                        Constants.PR_OLD_AGENT_PWD);
-                String newpwd = getParameter(req, 
-                        Constants.PR_AGENT_PWD);
-                IPasswordCheck checker = CMS.getPasswordChecker();
-
-                if (!checker.isGoodPassword(newpwd)) {
-                    // store a message in the signed audit log file
-                    auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                                auditSubjectID,
-                                ILogger.FAILURE,
-                                auditParams(req));
-
-                    audit(auditMessage);
-
-                    throw new EBaseException(checker.getReason(newpwd));
-                }
-          
-                if (mKRA.getStorageKeyUnit().changeAgentPassword(id, 
-                        oldpwd, newpwd)) {
-                    NameValuePairs params = new NameValuePairs();
-
-                    // store a message in the signed audit log file
-                    auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                                auditSubjectID,
-                                ILogger.SUCCESS,
-                                auditParams(req));
-
-                    audit(auditMessage);
-
-                    sendResponse(SUCCESS, null, params, resp);
-                    return;
-                } else {
-                    // store a message in the signed audit log file
-                    auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                                auditSubjectID,
-                                ILogger.FAILURE,
-                                auditParams(req));
-
-                    audit(auditMessage);
-
-                    throw new EKRAException(	
-                            CMS.getLogMessage("KRA_INVALID_PASSWORD"));
-                }
-            } catch (IOException e) {
-            }
-
-            // store a message in the signed audit log file
-            auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                        auditSubjectID,
-                        ILogger.FAILURE,
-                        auditParams(req));
-
-            audit(auditMessage);
-
-            throw new EBaseException(CMS.getLogMessage("BASE_INVALID_OPERATION"));
-        } catch (EBaseException eAudit1) {
-            // store a message in the signed audit log file
-            auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                        auditSubjectID,
-                        ILogger.FAILURE,
-                        auditParams(req));
-
-            audit(auditMessage);
-
-            // rethrow the specific exception to be handled later
-            throw eAudit1;
-        }
-    }
-
-    /**
-     * Modifies auto recovery configuration.
-     * <P>
-     *
-     * <ul>
-     * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_DRM used when configuring
-     * DRM (Key recovery scheme, change of any secret component)
-     * </ul>
-     * @param req HTTP servlet request
-     * @param resp HTTP servlet response
-     * @exception EBaseException an error has occurred
-     */
-    private synchronized void modifyAutoRecoveryConfig(
-        HttpServletRequest req, HttpServletResponse resp) 
-        throws EBaseException {
-        String auditMessage = null;
-        String auditSubjectID = auditSubjectID();
-
-        // ensure that any low-level exceptions are reported
-        // to the signed audit log and stored as failures
-        try {
-            try {
-                NameValuePairs params = new NameValuePairs();
-                String autoOn = getParameter(req, 
-                        Constants.PR_AUTO_RECOVERY_ON);
-                String agents = getParameter(req, 
-                        Constants.PR_RECOVERY_AGENT);
-
-                if (autoOn.equals(Constants.TRUE)) {
-                    Credential creds[] = parseCredentialStr(
-                            agents);
-
-                    if (mKRA.setAutoRecoveryState(creds, true)) {
-                        // store a message in the signed audit log file
-                        auditMessage = CMS.getLogMessage(
-                                    LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                                    auditSubjectID,
-                                    ILogger.SUCCESS,
-                                    auditParams(req));
-
-                        audit(auditMessage);
-
-                        sendResponse(SUCCESS, null, params, 
-                            resp);
-                        return;
-                    }
-                } else if (autoOn.equals(Constants.FALSE)) {
-                    if (mKRA.setAutoRecoveryState(null, false)) {
-                        // store a message in the signed audit log file
-                        auditMessage = CMS.getLogMessage(
-                                    LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                                    auditSubjectID,
-                                    ILogger.SUCCESS,
-                                    auditParams(req));
-
-                        audit(auditMessage);
-
-                        sendResponse(SUCCESS, null, params, 
-                            resp);
-                        return;
-                    }
-                }
-            } catch (IOException e) {
-            }
-
-            // store a message in the signed audit log file
-            auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                        auditSubjectID,
-                        ILogger.FAILURE,
-                        auditParams(req));
-
-            audit(auditMessage);
-
-            throw new EBaseException(CMS.getLogMessage("BASE_INVALID_OPERATION"));
-        } catch (EBaseException eAudit1) {
-            // store a message in the signed audit log file
-            auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                        auditSubjectID,
-                        ILogger.FAILURE,
-                        auditParams(req));
-
-            audit(auditMessage);
-
-            // rethrow the specific exception to be handled later
-            throw eAudit1;
-        }
-    }
-
-    /**
-     * Reads auto recovery status.
-     *
-     * @param req HTTP request
-     * @param resp HTTP response
-     */
-    private synchronized void readAutoRecoveryConfig(
-        HttpServletRequest req, HttpServletResponse resp) 
-        throws EBaseException {
-        try {
-            NameValuePairs params = new NameValuePairs();
-
-            params.add(Constants.PR_AUTO_RECOVERY_ON, 
-                mKRA.getAutoRecoveryState() ?
-                Constants.TRUE : Constants.FALSE);
-            sendResponse(SUCCESS, null, params, resp);
-        } catch (IOException e) {
-            throw new EBaseException(
-                    CMS.getLogMessage("BASE_INVALID_OPERATION"));
-        }
-    }
-
-    /**
-     * Reads recovery configuration.
-     *
-     * @param req HTTP request
-     * @param resp HTTP response
-     */
-    private synchronized void readRecoveryConfig(
-        HttpServletRequest req, HttpServletResponse resp) 
-        throws EBaseException {
-        try {
-            IStorageKeyUnit sku = mKRA.getStorageKeyUnit();
-            NameValuePairs params = new NameValuePairs();
-
-            params.add(Constants.PR_RECOVERY_N, 
-                Integer.toString(sku.getNoOfAgents()));
-            params.add(Constants.PR_RECOVERY_M, 
-                Integer.toString(sku.getNoOfRequiredAgents()));
-            Enumeration e = sku.getAgentIdentifiers();
-            StringBuffer as = new StringBuffer();
-
-            while (e.hasMoreElements()) {
-                as.append((String)e.nextElement());
-                if (e.hasMoreElements()) {
-                    as.append(",");
-                }
-            }
-            params.add(Constants.PR_RECOVERY_AGENT, as.toString());
-            sendResponse(SUCCESS, null, params, resp);
-        } catch (IOException e) {
-            throw new EBaseException(
-                    CMS.getLogMessage("BASE_INVALID_OPERATION"));
-        }
-    }
-
-    /**
-     * Reads information about auto recovery agents.
-     *
-     * @param req HTTP request
-     * @param resp HTTP response
-     */
-    private synchronized void readAutoRecoveryAgents(
-        HttpServletRequest req, HttpServletResponse resp) 
-        throws EBaseException {
-        try {
-            // send the entire list anyway
-            NameValuePairs params = new NameValuePairs();
-            Enumeration e = mKRA.getAutoRecoveryIDs();
-            StringBuffer users = new StringBuffer();
-
-            while (e.hasMoreElements()) {
-                users.append((String) e.nextElement());
-                if (e.hasMoreElements()) {
-                    users.append(",");
-                }
-            }
-            params.add(Constants.PR_GROUP_USER, users.toString());
-            params.add(Constants.PR_GROUP_DESC, 
-                "Auto Recovery Agents"); // XXX - localized
-            sendResponse(SUCCESS, null, params, resp);
-        } catch (IOException e) {
-            throw new EBaseException(
-                    CMS.getLogMessage("BASE_INVALID_OPERATION"));
-        }
-    }
-
-    /**
-     * Modifies information about auto recovery agents.
-     *
-     * @param req HTTP request
-     * @param resp HTTP response
-     */
-    private synchronized void modifyAutoRecoveryAgents(
-        HttpServletRequest req, HttpServletResponse resp) 
-        throws EBaseException {
-        Vector v = new Vector();
-        String users = getParameter(req, 
-                Constants.PR_GROUP_USER);
-        StringTokenizer st = new StringTokenizer(users, ",");
-
-        while (st.hasMoreTokens()) {
-            v.addElement(st.nextToken());
-        }
-        String desc = getParameter(req, 
-                Constants.PR_GROUP_DESC);
-        String agents = getParameter(req, 
-                Constants.PR_RECOVERY_AGENT);
-        Credential creds[] = parseCredentialStr(
-                agents);
-        // XXX - check if the given password matched
-        // put ids into hashtable so that we can
-        // figure out what should be saved and deleted
-        Enumeration e = mKRA.getAutoRecoveryIDs();	
-        Hashtable h = new Hashtable();
-
-        while (e.hasMoreElements()) {
-            h.put(e.nextElement(), "");
-        }
-
-        // go through each of the user in the new list
-        for (int i = 0; i < v.size(); i++) {
-            String key = (String) v.elementAt(i);
-
-            if (h.containsKey(key)) {
-                h.remove(key);
-            } else {
-                mKRA.addAutoRecovery(key, creds);
-            }
-        }
-
-        // delete all the unreferenced
-        Enumeration dels = h.keys();
-
-        while (dels.hasMoreElements()) {
-            mKRA.removeAutoRecovery((String)
-                dels.nextElement());
-        }
-    }
-
-    /**
-     * Parses uid0=pwd0,uid1=pwd1,... into AgentCredential.
-     *
-     * @param s credential string
-     * @return a list of credentials
-     */
-    private Credential[] parseCredentialStr(String s) {
-        StringTokenizer st = new StringTokenizer(s, ",");
-        Vector v = new Vector();
-
-        while (st.hasMoreTokens()) {
-            String a = st.nextToken();
-            StringTokenizer st0 = new StringTokenizer(a, "=");
-
-            v.addElement(new Credential(st0.nextToken(),
-                    st0.nextToken()));
-        }
-        Credential ac[] = new Credential[v.size()];
-
-        v.copyInto(ac);
-        return ac;
-    }
-
-    /*
-     * handle getting request in queue notification config info
-     */
-    private void getNotificationRIQConfig(HttpServletRequest req,
-        HttpServletResponse resp) throws ServletException,
-            IOException, EBaseException {
-
-        NameValuePairs params = new NameValuePairs();
-
-        IConfigStore config = mKRA.getConfigStore();
-        IConfigStore nc =
-            config.getSubStore(mKRA.PROP_NOTIFY_SUBSTORE);
-
-        IConfigStore riq = nc.getSubStore(mKRA.PROP_REQ_IN_Q_SUBSTORE);
-
-        Enumeration e = req.getParameterNames();
-
-        while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
-
-            if (name.equals(Constants.OP_TYPE))
-                continue;
-            if (name.equals(Constants.RS_ID))
-                continue;
-            if (name.equals(Constants.OP_SCOPE))
-                continue;
-            if (name.equals(Constants.PR_ENABLE))
-                continue;
-            params.add(name, riq.getString(name, ""));
-        }
-
-        params.add(Constants.PR_ENABLE, 
-            riq.getString(PROP_ENABLED, Constants.FALSE));
-        //System.out.println("Send: "+params.toString());
-        sendResponse(SUCCESS, null, params, resp);
-    }
-
-    /**
-     * Handle setting request in queue notification config info
-     * <P>
-     *
-     * <ul>
-     * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_DRM used when configuring
-     * DRM (Key recovery scheme, change of any secret component)
-     * </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
-     * @exception EBaseException an error has occurred
-     */
-    private void setNotificationRIQConfig(HttpServletRequest req,
-        HttpServletResponse resp) throws ServletException,
-            IOException, EBaseException {
-        String auditMessage = null;
-        String auditSubjectID = auditSubjectID();
-
-        // ensure that any low-level exceptions are reported
-        // to the signed audit log and stored as failures
-        try {
-            IConfigStore config = mKRA.getConfigStore();
-            IConfigStore nc =
-                config.getSubStore(mKRA.PROP_NOTIFY_SUBSTORE);
-
-            IConfigStore riq = nc.getSubStore(mKRA.PROP_REQ_IN_Q_SUBSTORE);
-
-            //set rest of the parameters
-            Enumeration e = req.getParameterNames();
-
-            while (e.hasMoreElements()) {
-                String name = (String) e.nextElement();
-
-                if (name.equals(Constants.OP_TYPE))
-                    continue;
-                if (name.equals(Constants.RS_ID))
-                    continue;
-                if (name.equals(Constants.OP_SCOPE))
-                    continue;
-                if (name.equals(Constants.PR_ENABLE))
-                    continue;
-                String val = req.getParameter(name);
-
-                riq.putString(name, val);
-                mKRA.getRequestInQListener().set(name, val);
-            }
-
-            // set enable flag
-            String enabledString = req.getParameter(Constants.PR_ENABLE);
-
-            riq.putString(PROP_ENABLED, enabledString);
-            mKRA.getRequestInQListener().set(PROP_ENABLED, enabledString);
-
-            commit(true);
-
-            // store a message in the signed audit log file
-            auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                        auditSubjectID,
-                        ILogger.SUCCESS,
-                        auditParams(req));
-
-            audit(auditMessage);
-
-            sendResponse(SUCCESS, null, null, resp);
-        } catch (EBaseException eAudit1) {
-            // store a message in the signed audit log file
-            auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                        auditSubjectID,
-                        ILogger.FAILURE,
-                        auditParams(req));
-
-            audit(auditMessage);
-
-            // rethrow the specific exception to be handled later
-            throw eAudit1;
-        } catch (IOException eAudit2) {
-            // store a message in the signed audit log file
-            auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-                        auditSubjectID,
-                        ILogger.FAILURE,
-                        auditParams(req));
-
-            audit(auditMessage);
-
-            // rethrow the specific exception to be handled later
-            throw eAudit2;
-            // } catch( ServletException eAudit3 ) {
-            //     // store a message in the signed audit log file
-            //     auditMessage = CMS.getLogMessage(
-            //                        LOGGING_SIGNED_AUDIT_CONFIG_DRM,
-            //                        auditSubjectID,
-            //                        ILogger.FAILURE,
-            //                        auditParams( req ) );
-            //
-            //     audit( auditMessage );
-            //
-            //     // rethrow the specific exception to be handled later
-            //     throw eAudit3;
-        }
-    }
 }