From 7c7b9d023cd466c1771068badc020dab36beb553 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Thu, 5 Apr 2012 14:49:11 -0500 Subject: Removed whitespaces from Java code. Whitespaces in Java code have been removed with the following command: find . -not -path .git -name *.java -exec sed -i 's/[[:blank:]]\+$//' {} \; Ticket #134 --- .../cms/servlet/admin/ACLAdminServlet.java | 20 +++---- .../netscape/cms/servlet/admin/AdminResources.java | 2 +- .../netscape/cms/servlet/admin/AdminServlet.java | 42 ++++++------- .../cms/servlet/admin/AuthAdminServlet.java | 32 +++++----- .../cms/servlet/admin/AuthCredentials.java | 12 ++-- .../netscape/cms/servlet/admin/CAAdminServlet.java | 30 +++++----- .../cms/servlet/admin/CMSAdminServlet.java | 56 +++++++++--------- .../cms/servlet/admin/JobsAdminServlet.java | 8 +-- .../cms/servlet/admin/KRAAdminServlet.java | 8 +-- .../cms/servlet/admin/LogAdminServlet.java | 30 +++++----- .../cms/servlet/admin/OCSPAdminServlet.java | 14 ++--- .../cms/servlet/admin/PolicyAdminServlet.java | 34 +++++------ .../cms/servlet/admin/ProfileAdminServlet.java | 64 ++++++++++---------- .../cms/servlet/admin/PublisherAdminServlet.java | 22 +++---- .../netscape/cms/servlet/admin/RAAdminServlet.java | 6 +- .../cms/servlet/admin/RegistryAdminServlet.java | 2 +- .../admin/SystemCertificateResourceService.java | 4 +- .../cms/servlet/admin/UsrGrpAdminServlet.java | 68 +++++++++++----------- 18 files changed, 227 insertions(+), 227 deletions(-) (limited to 'base/common/src/com/netscape/cms/servlet/admin') diff --git a/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java index 12575675c..7a08ce966 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.usrgrp.IUGSubsystem; /** * Manage Access Control List configuration - * + * * @version $Revision$, $Date$ */ public class ACLAdminServlet extends AdminServlet { @@ -80,7 +80,7 @@ public class ACLAdminServlet extends AdminServlet { *
  • "evaluatorTypes" ACL evaluators. * * - * + * * @param config servlet configuration, read from the web.xml file */ public void init(ServletConfig config) throws ServletException { @@ -97,7 +97,7 @@ public class ACLAdminServlet extends AdminServlet { /** * Process the HTTP request. - * + * * @param req the object holding the request information * @param resp the object holding the response information */ @@ -320,11 +320,11 @@ public class ACLAdminServlet extends AdminServlet { /** * modify acls information for a resource *

    - * + * *

    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -484,11 +484,11 @@ public class ACLAdminServlet extends AdminServlet { /** * add access evaluators *

    - * + * *

    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this ACL evaluator's @@ -721,11 +721,11 @@ public class ACLAdminServlet extends AdminServlet { /** * remove access evaluators *

    - * + * *

    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this ACL evaluator's @@ -876,7 +876,7 @@ public class ACLAdminServlet extends AdminServlet { */ /* - private void getACLs(HttpServletRequest req, + private void getACLs(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException, EBaseException { NameValuePairs params = new NameValuePairs(); diff --git a/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java b/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java index a36c859d9..19b537854 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java +++ b/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java @@ -21,7 +21,7 @@ import java.util.ListResourceBundle; /** * A class represents a resource bundle for the remote admin. - * + * * @version $Revision$, $Date$ * @see java.util.ListResourceBundle */ diff --git a/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java index ce4c966ad..5e6e7889f 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java @@ -62,27 +62,27 @@ import com.netscape.cmsutil.util.Utils; * A class represents an administration servlet that * is responsible to serve administrative * operation such as configuration parameter updates. - * + * * Since each administration servlet needs to perform * authentication information parsing and response * formulation, it makes sense to encapsulate the * commonalities into this class. - * + * * By extending this serlvet, the subclass does not * need to re-implement the request parsing code * (i.e. authentication information parsing). - * + * * If a subsystem needs to expose configuration * parameters management, it should create an * administration servlet (i.e. CAAdminServlet) * and register it to RemoteAdmin subsystem. - * + * * * public class CAAdminServlet extends AdminServlet { * ... * } * - * + * * @version $Revision$, $Date$ */ public class AdminServlet extends HttpServlet { @@ -214,7 +214,7 @@ public class AdminServlet extends HttpServlet { while (paramNames.hasMoreElements()) { String pn = paramNames.nextElement(); // added this facility so that password can be hidden, - // all sensitive parameters should be prefixed with + // all sensitive parameters should be prefixed with // __ (double underscores); however, in the event that // a security parameter slips through, we perform multiple // additional checks to insure that it is NOT displayed @@ -280,13 +280,13 @@ public class AdminServlet extends HttpServlet { * Authenticates to the identity scope with the given * userid and password via identity manager. *

    - * + * *

    - * + * * @exception IOException an input/output error has occurred */ protected void authenticate(HttpServletRequest req) throws @@ -611,14 +611,14 @@ public class AdminServlet extends HttpServlet { /** * Authorize must occur after Authenticate *

    - * + * *

    - * + * * @param req HTTP servlet request * @return the authorization token */ @@ -773,7 +773,7 @@ public class AdminServlet extends HttpServlet { /** * Sends response. - * + * * @param returnCode return code * @param errorMsg localized error message * @param params result parameters @@ -1007,11 +1007,11 @@ public class AdminServlet extends HttpServlet { /** * FileConfigStore functionality - * + * * The original config file is moved to .. * Commits the current properties to the configuration file. *

    - * + * * @param createBackup true if a backup file should be created */ protected void commit(boolean createBackup) throws EBaseException { @@ -1027,11 +1027,11 @@ public class AdminServlet extends HttpServlet { /** * Signed Audit Log - * + * * This method is inherited by all extended admin servlets * and is called to store messages to the signed audit log. *

    - * + * * @param msg signed audit log message */ protected void audit(String msg) { @@ -1051,12 +1051,12 @@ public class AdminServlet extends HttpServlet { /** * Signed Audit Log Subject ID - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to obtain the "SubjectID" for * a signed audit log message. *

    - * + * * @return id string containing the signed audit log message SubjectID */ protected String auditSubjectID() { @@ -1088,13 +1088,13 @@ public class AdminServlet extends HttpServlet { /** * Signed Audit Parameters - * + * * This method is inherited by all extended admin servlets and * is called to extract parameters from the HttpServletRequest * and return a string of name;;value pairs separated by a '+' * if more than one name;;value pair exists. *

    - * + * * @param req HTTP servlet request * @return a delimited string of one or more delimited name/value pairs */ @@ -1213,11 +1213,11 @@ public class AdminServlet extends HttpServlet { /** * Signed Audit Groups - * + * * This method is called to extract all "groups" associated * with the "auditSubjectID()". *

    - * + * * @param SubjectID string containing the signed audit log message SubjectID * @return a delimited string of groups associated * with the "auditSubjectID()" diff --git a/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java index cacd0b5d0..6ccfcdca9 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java @@ -49,8 +49,8 @@ import com.netscape.certsrv.logging.ILogger; * A class representing an administration servlet for the * Authentication Management subsystem. This servlet is responsible * to serve configuration requests for the Auths Management subsystem. - * - * + * + * * @version $Revision$, $Date$ */ public class AuthAdminServlet extends AdminServlet { @@ -198,7 +198,7 @@ public class AuthAdminServlet extends AdminServlet { null, resp); return; } - // for the rest + // for the rest try { super.authenticate(req); if (op.equals(OpDef.OP_AUTH)) { // for admin authentication only @@ -354,11 +354,11 @@ public class AuthAdminServlet extends AdminServlet { /** * Add authentication manager plug-in *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_AUTH used when configuring authentication *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this authentication @@ -611,11 +611,11 @@ public class AuthAdminServlet extends AdminServlet { /** * Add authentication manager instance *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_AUTH used when configuring authentication *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this authentication @@ -960,11 +960,11 @@ public class AuthAdminServlet extends AdminServlet { /** * Delete authentication manager plug-in *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_AUTH used when configuring authentication *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this authentication @@ -1132,11 +1132,11 @@ public class AuthAdminServlet extends AdminServlet { /** * Delete authentication manager instance *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_AUTH used when configuring authentication *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this authentication @@ -1203,7 +1203,7 @@ public class AuthAdminServlet extends AdminServlet { // only remove from memory // cannot shutdown because we don't keep track of whether it's - // being used. + // being used. mAuths.getInstances().remove(id); // remove the configuration. @@ -1382,11 +1382,11 @@ public class AuthAdminServlet extends AdminServlet { * The old instance is left running, so this is very expensive. * Restart of server recommended. *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_AUTH used when configuring authentication *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this authentication @@ -1469,7 +1469,7 @@ public class AuthAdminServlet extends AdminServlet { return; } - // get plugin for implementation + // get plugin for implementation AuthMgrPlugin plugin = (AuthMgrPlugin) mAuths.getPlugins().get(implname); @@ -1491,7 +1491,7 @@ public class AuthAdminServlet extends AdminServlet { return; } - // save old instance substore params in case new one fails. + // save old instance substore params in case new one fails. IAuthManager oldinst = (IAuthManager) mAuths.get(id); diff --git a/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java b/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java index 69cfd9aaf..42c8da175 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java +++ b/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.base.IArgBlock; /** * Authentication Credentials as input to the authMgr *

    - * + * * @version $Revision$, $Date$ */ public class AuthCredentials implements IAuthCredentials { @@ -36,7 +36,7 @@ public class AuthCredentials implements IAuthCredentials { */ private static final long serialVersionUID = -6938644716486895814L; private Hashtable authCreds = null; - // Inserted by bskim + // Inserted by bskim private IArgBlock argblk = null; // Insert end @@ -47,7 +47,7 @@ public class AuthCredentials implements IAuthCredentials { /** * sets a credential with credential name and the credential - * + * * @param name credential name * @param cred credential * @exception com.netscape.certsrv.base.EBaseException NullPointerException @@ -63,7 +63,7 @@ public class AuthCredentials implements IAuthCredentials { /** * returns the credential to which the specified name is mapped in this * credential set - * + * * @param name credential name * @return the named authentication credential */ @@ -75,7 +75,7 @@ public class AuthCredentials implements IAuthCredentials { * removes the name and its corresponding credential from this * credential set. This method does nothing if the named * credential is not in the credential set. - * + * * @param name credential name */ public void delete(String name) { @@ -86,7 +86,7 @@ public class AuthCredentials implements IAuthCredentials { * returns an enumeration of the credential names in this credential * set. Use the Enumeration methods on the returned object to * fetch the elements sequentially. - * + * * @return an enumeration of the names in this credential set * @see java.util.Enumeration */ diff --git a/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java index e7b32e844..27cd91c30 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java @@ -48,7 +48,7 @@ import com.netscape.cmsutil.util.Utils; * Authority. This servlet is responsible to serve CA * administrative operations such as configuration parameter * updates. - * + * * @version $Revision$, $Date$ */ public class CAAdminServlet extends AdminServlet { @@ -514,12 +514,12 @@ public class CAAdminServlet extends AdminServlet { /** * Add CRL issuing points configuration *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE used when configuring CRL profile (extensions, * frequency, CRL format) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -670,12 +670,12 @@ public class CAAdminServlet extends AdminServlet { /** * Set CRL issuing points configuration *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE used when configuring CRL profile (extensions, * frequency, CRL format) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -831,12 +831,12 @@ public class CAAdminServlet extends AdminServlet { /** * Delete CRL issuing points configuration *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE used when configuring CRL profile (extensions, * frequency, CRL format) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -974,12 +974,12 @@ public class CAAdminServlet extends AdminServlet { /** * Delete CRL extensions configuration *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE used when configuring CRL profile (extensions, * frequency, CRL format) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1193,12 +1193,12 @@ public class CAAdminServlet extends AdminServlet { /** * Set CRL configuration *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE used when configuring CRL profile (extensions, * frequency, CRL format) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1472,11 +1472,11 @@ public class CAAdminServlet extends AdminServlet { String value = "false"; /* - ISubsystem eeGateway = + ISubsystem eeGateway = SubsystemRegistry.getInstance().get("eeGateway"); if (eeGateway != null) { IConfigStore eeConfig = eeGateway.getConfigStore(); - if (eeConfig != null) + if (eeConfig != null) value = eeConfig.getString("enabled", "true"); String ocspValue = "true"; ocspValue = eeConfig.getString("enableOCSP", "true"); @@ -1529,7 +1529,7 @@ public class CAAdminServlet extends AdminServlet { IOException, EBaseException { /* - ISubsystem eeGateway = + ISubsystem eeGateway = SubsystemRegistry.getInstance().get("eeGateway"); */ @@ -1547,7 +1547,7 @@ public class CAAdminServlet extends AdminServlet { /* if (eeConfig != null) { if (((EEGateway)eeGateway).isEnabled() && - value.equals("false") || + value.equals("false") || !((EEGateway)eeGateway).isEnabled() && value.equals("true")) { restart=true;; diff --git a/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java index 3a2ae0a11..5aa422730 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java @@ -85,7 +85,7 @@ import com.netscape.symkey.SessionKey; * servlet is responsible to serve Certificate Server * level administrative operations such as configuration * parameter updates. - * + * * @version $Revision$, $Date$ */ public final class CMSAdminServlet extends AdminServlet { @@ -505,12 +505,12 @@ public final class CMSAdminServlet extends AdminServlet { /** * Modify encryption configuration *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION used when configuring encryption (cert settings and SSL * cipher preferences) *
    - * + * * @exception ServletException a servlet error has occurred * @exception IOException an input/output error has occurred * @exception EBaseException failed to modify encryption configuration @@ -935,7 +935,7 @@ public final class CMSAdminServlet extends AdminServlet { } } } - // String symKeys = new String("key1,key2"); + // String symKeys = new String("key1,key2"); String symKeys = SessionKey.ListSymmetricKeys(selectedToken); params.put(Constants.PR_TOKEN_LIST, symKeys); @@ -1072,11 +1072,11 @@ public final class CMSAdminServlet extends AdminServlet { /** * Retrieve a certificate request *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_KEY_GEN_ASYMMETRIC used when asymmetric keys are generated *
    - * + * * @exception ServletException a servlet error has occurred * @exception IOException an input/output error has occurred * @exception EBaseException failed to retrieve certificate request @@ -1444,12 +1444,12 @@ public final class CMSAdminServlet extends AdminServlet { /** * Issue import certificate *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY used when "Certificate Setup Wizard" is used to * import CA certs into the certificate database *
    - * + * * @exception ServletException a servlet error has occurred * @exception IOException an input/output error has occurred * @exception EBaseException failed to issue an import certificate @@ -1860,12 +1860,12 @@ public final class CMSAdminServlet extends AdminServlet { /** * Install certificates *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY used when "Certificate Setup Wizard" is used to * import CA certs into the certificate database *
    - * + * * @exception ServletException a servlet error has occurred * @exception IOException an input/output error has occurred * @exception EBaseException failed to install a certificate @@ -2018,15 +2018,15 @@ public final class CMSAdminServlet extends AdminServlet { // 600124 - renewal of SSL crash the server // we now do not delete previously installed certificates. - // Same Subject | Same Nickname | Same Key | Legal - // ----------------------------------------------------------- - // 1. Yes Yes No Yes - // 2. Yes Yes Yes Yes - // 3. No No Yes Yes - // 4. No No No Yes - // 5. No Yes Yes No - // 6. No Yes No No - // 7. Yes No Yes No + // Same Subject | Same Nickname | Same Key | Legal + // ----------------------------------------------------------- + // 1. Yes Yes No Yes + // 2. Yes Yes Yes Yes + // 3. No No Yes Yes + // 4. No No No Yes + // 5. No Yes Yes No + // 6. No Yes No No + // 7. Yes No Yes No // 8. Yes No No No // Based on above table, the following cases are permitted: @@ -2280,12 +2280,12 @@ public final class CMSAdminServlet extends AdminServlet { * For "importing" cross-signed cert into internal db for further * cross pair matching and publishing *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY used when "Certificate Setup Wizard" is used to * import a CA cross-signed certificate into the database *
    - * + * * @exception ServletException a servlet error has occurred * @exception IOException an input/output error has occurred * @exception EBaseException failed to import a cross-certificate pair @@ -2809,7 +2809,7 @@ public final class CMSAdminServlet extends AdminServlet { nickname = value.substring(0, index); date = value.substring(index + 1); - // cant use this one now since jss doesnt have the interface to + // cant use this one now since jss doesnt have the interface to // do it. jssSubSystem.deleteCert(nickname, date); // jssSubsystem.deleteCACert(nickname, date); @@ -2997,12 +2997,12 @@ public final class CMSAdminServlet extends AdminServlet { /** * Establish trust of a CA certificate *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY used when "Manage Certificate" is used to edit * the trustness of certs and deletion of certs *
    - * + * * @exception ServletException a servlet error has occurred * @exception IOException an input/output error has occurred * @exception EBaseException failed to establish CA certificate trust @@ -3092,11 +3092,11 @@ public final class CMSAdminServlet extends AdminServlet { /** * Execute all self tests specified to be run on demand. *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION used when self tests are run on demand *
    - * + * * @exception EMissingSelfTestException a self test plugin instance * property name was missing * @exception ESelfTestException a self test is missing a required @@ -3394,11 +3394,11 @@ public final class CMSAdminServlet extends AdminServlet { /** * Signed Audit Log Public Key - * + * * This method is called to obtain the public key from the passed in * "KeyPair" object for a signed audit log message. *

    - * + * * @param object a Key Pair Object * @return key string containing the public key */ diff --git a/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java index 42ff32ebe..a89933c69 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.logging.ILogger; /** * A class representing an administration servlet for the * Jobs Scheduler and it's scheduled jobs. - * + * * @version $Revision$, $Date$ */ public class JobsAdminServlet extends AdminServlet { @@ -639,7 +639,7 @@ public class JobsAdminServlet extends AdminServlet { // only remove from memory // cannot shutdown because we don't keep track of whether it's - // being used. + // being used. mJobsSched.getInstances().remove(id); // remove the configuration. @@ -791,7 +791,7 @@ public class JobsAdminServlet extends AdminServlet { return; } - // get plugin for implementation + // get plugin for implementation JobPlugin plugin = (JobPlugin) mJobsSched.getPlugins().get(implname); @@ -803,7 +803,7 @@ public class JobsAdminServlet extends AdminServlet { return; } - // save old instance substore params in case new one fails. + // save old instance substore params in case new one fails. IJob oldinst = (IJob) mJobsSched.getInstances().get((Object) id); diff --git a/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java index eaa5a95c4..c6e6f9e1c 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java @@ -39,7 +39,7 @@ import com.netscape.certsrv.logging.ILogger; * Recovery Authority. This servlet is responsible to serve * KRA administrative operation such as configuration * parameter updates. - * + * * @version $Revision$, $Date$ */ public class KRAAdminServlet extends AdminServlet { @@ -71,7 +71,7 @@ public class KRAAdminServlet extends AdminServlet { /** * Returns serlvet information. - * + * * @return name of this servlet */ public String getServletInfo() { @@ -80,7 +80,7 @@ public class KRAAdminServlet extends AdminServlet { /** * Serves HTTP admin request. - * + * * @param req HTTP request * @param resp HTTP response */ @@ -153,7 +153,7 @@ public class KRAAdminServlet extends AdminServlet { } else if (scope.equals(ScopeDef.SC_NOTIFICATION_RIQ)) { setNotificationRIQConfig(req, resp); return; - } else + } else */ if (scope.equals(ScopeDef.SC_GENERAL)) { setGeneralConfig(req, resp); diff --git a/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java index 1b32018bc..fb73cec98 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java @@ -49,7 +49,7 @@ import com.netscape.certsrv.logging.LogPlugin; * subsystem. This servlet is responsible to serve * logging administrative operation such as configuration * parameter updates and log retriever. - * + * * @version $Revision$, $Date$ */ public class LogAdminServlet extends AdminServlet { @@ -407,11 +407,11 @@ public class LogAdminServlet extends AdminServlet { /** * Add log plug-in *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT used when configuring signedAudit *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of the log's substore @@ -680,11 +680,11 @@ public class LogAdminServlet extends AdminServlet { /** * Add log instance *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT used when configuring signedAudit *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of the log's substore @@ -1072,11 +1072,11 @@ public class LogAdminServlet extends AdminServlet { /** * Delete log instance *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT used when configuring signedAudit *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of the log's substore @@ -1146,7 +1146,7 @@ public class LogAdminServlet extends AdminServlet { // only remove from memory // cannot shutdown because we don't keep track of whether it's - // being used. + // being used. mSys.getLogInsts().remove(id); // remove the configuration. @@ -1234,11 +1234,11 @@ public class LogAdminServlet extends AdminServlet { /** * Delete log plug-in *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT used when configuring signedAudit *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of the log's substore @@ -1415,7 +1415,7 @@ public class LogAdminServlet extends AdminServlet { /** * Modify log instance *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT used when configuring signedAudit *
    • signed.audit LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE used when log file name (including any path changes) for @@ -1424,7 +1424,7 @@ public class LogAdminServlet extends AdminServlet { *
    • signed.audit LOGGING_SIGNED_AUDIT_LOG_EXPIRATION_CHANGE used when log expiration time change is attempted * (authorization should not allow, but make sure it's written after the attempt) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of the log's substore @@ -1716,7 +1716,7 @@ public class LogAdminServlet extends AdminServlet { newExpirationTime = val; if (!val.equals(origVal.trim())) { if (id.equals(SIGNED_AUDIT_LOG_TYPE)) { - AUTHZ_RES_NAME = + AUTHZ_RES_NAME = "certServer.log.configuration.signedAudit.expirationTime"; } mOp = "modify"; @@ -2284,10 +2284,10 @@ public class LogAdminServlet extends AdminServlet { /** * Signed Audit Check Log Path - * + * * This method is called to extract the log file path. *

    - * + * * @param req http servlet request * @return a string containing the log file path */ diff --git a/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java index 0e6784413..4149fae94 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.ocsp.IOCSPStore; * Authority. This servlet is responsible to serve OCSP * administrative operations such as configuration parameter * updates. - * + * * @version $Revision$, $Date$ */ public class OCSPAdminServlet extends AdminServlet { @@ -227,12 +227,12 @@ public class OCSPAdminServlet extends AdminServlet { /** * Set default OCSP store *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE used when configuring OCSP profile (everything under * Online Certificate Status Manager) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -317,12 +317,12 @@ public class OCSPAdminServlet extends AdminServlet { /** * Set OCSP store configuration *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE used when configuring OCSP profile (everything under * Online Certificate Status Manager) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -467,12 +467,12 @@ public class OCSPAdminServlet extends AdminServlet { /** * Set general OCSP configuration *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE used when configuring OCSP profile (everything under * Online Certificate Status Manager) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred diff --git a/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java index 0bcb962ea..c1da868c8 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java @@ -45,11 +45,11 @@ 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. - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -114,14 +114,14 @@ public class PolicyAdminServlet extends AdminServlet { // 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 + // Further, the "PolicyAdminServlet.java" servlet is ONLY used // by the CA Console for the following: // // SERVLET-NAME URL-PATTERN // ==================================================== // capolicy ca/capolicy // - // Finally, the "PolicyAdminServlet.java" servlet is ONLY used + // Finally, the "PolicyAdminServlet.java" servlet is ONLY used // by the KRA Console for the following: // // SERVLET-NAME URL-PATTERN @@ -480,12 +480,12 @@ public class PolicyAdminServlet extends AdminServlet { /** * Delete policy implementation *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when configuring cert policy constraints and * extensions *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -602,12 +602,12 @@ public class PolicyAdminServlet extends AdminServlet { /** * Add policy implementation *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when configuring cert policy constraints and * extensions *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -709,12 +709,12 @@ public class PolicyAdminServlet extends AdminServlet { /** * Delete policy instance *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when configuring cert policy constraints and * extensions *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -849,12 +849,12 @@ public class PolicyAdminServlet extends AdminServlet { /** * Add policy instance *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when configuring cert policy constraints and * extensions *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1006,12 +1006,12 @@ public class PolicyAdminServlet extends AdminServlet { /** * Change ordering of policy instances *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when configuring cert policy constraints and * extensions *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1097,12 +1097,12 @@ public class PolicyAdminServlet extends AdminServlet { /** * Modify policy instance *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when configuring cert policy constraints and * extensions *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1182,7 +1182,7 @@ public class PolicyAdminServlet extends AdminServlet { sendResponse(ERROR, INVALID_POLICY_IMPL_ID, null, resp); return; } - // XXX + // XXX for (@SuppressWarnings("unchecked") Enumeration n = req.getParameterNames(); n.hasMoreElements();) { String p = n.nextElement(); diff --git a/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java index 94235f532..3ca222135 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java @@ -54,11 +54,11 @@ import com.netscape.cms.profile.common.ProfilePolicy; /** * 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. - * + * * @version $Revision$, $Date$ */ public class ProfileAdminServlet extends AdminServlet { @@ -396,12 +396,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Add policy profile *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -539,12 +539,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Add profile input *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -665,12 +665,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Add profile output *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -792,12 +792,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Delete policy profile *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -913,12 +913,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Delete profile input *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1031,12 +1031,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Delete profile output *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1149,12 +1149,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Add default policy profile configuration *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1286,12 +1286,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Add policy constraints profile configuration *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1425,12 +1425,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Modify default policy profile configuration *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1557,12 +1557,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Modify profile input configuration *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1677,12 +1677,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Modify profile output configuration *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1798,12 +1798,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Modify policy constraints profile configuration *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -2272,12 +2272,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Delete profile instance *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -2410,12 +2410,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Add profile instance *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -2573,12 +2573,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Modify profile instance *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred diff --git a/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java index 483ac42ef..8daadbce0 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java @@ -71,7 +71,7 @@ import com.netscape.cmsutil.password.IPasswordStore; * A class representing an publishing servlet for the * Publishing subsystem. This servlet is responsible * to serve configuration requests for the Publishing subsystem. - * + * * @version $Revision$, $Date$ */ public class PublisherAdminServlet extends AdminServlet { @@ -138,7 +138,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - // for the rest + // for the rest try { super.authenticate(req); @@ -571,7 +571,7 @@ public class PublisherAdminServlet extends AdminServlet { commit(true); - /* Do a "PUT" of the new pw to the watchdog" + /* Do a "PUT" of the new pw to the watchdog" ** do not remove - cfu if (pwd != null) CMS.putPasswordCache(PW_TAG_CA_LDAP_PUBLISHING, pwd); @@ -921,7 +921,7 @@ public class PublisherAdminServlet extends AdminServlet { CMS.debug("PublisherAdminServlet: testSetLDAPDest(): authInfo null"); */ } - //params.add(Constants.PR_SAVE_OK, + //params.add(Constants.PR_SAVE_OK, // "\n \nConfiguration changes are now committed."); mProcessor.shutdown(); @@ -1322,7 +1322,7 @@ public class PublisherAdminServlet extends AdminServlet { // only remove from memory // cannot shutdown because we don't keep track of whether it's - // being used. + // being used. mProcessor.getMapperInsts().remove(id); // remove the configuration. @@ -2014,7 +2014,7 @@ public class PublisherAdminServlet extends AdminServlet { // only remove from memory // cannot shutdown because we don't keep track of whether it's - // being used. + // being used. mProcessor.getRuleInsts().remove(id); // remove the configuration. @@ -2140,7 +2140,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - // get plugin for implementation + // get plugin for implementation RulePlugin plugin = (RulePlugin) mProcessor.getRulePlugins().get(implname); @@ -2152,7 +2152,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - // save old instance substore params in case new one fails. + // save old instance substore params in case new one fails. ILdapRule oldinst = (ILdapRule) mProcessor.getRuleInsts().get((Object) id); @@ -2666,7 +2666,7 @@ public class PublisherAdminServlet extends AdminServlet { // only remove from memory // cannot shutdown because we don't keep track of whether it's - // being used. + // being used. mProcessor.getPublisherInsts().remove(id); // remove the configuration. @@ -2818,7 +2818,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - // get plugin for implementation + // get plugin for implementation PublisherPlugin plugin = (PublisherPlugin) mProcessor.getPublisherPlugins().get(implname); @@ -2831,7 +2831,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - // save old instance substore params in case new one fails. + // save old instance substore params in case new one fails. ILdapPublisher oldinst = mProcessor.getPublisherInstance(id); Vector oldConfigParms = oldinst.getInstanceParams(); diff --git a/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java index 5bdb14177..b2e271236 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java @@ -40,7 +40,7 @@ import com.netscape.certsrv.request.IRequestListener; * Authority. This servlet is responsible to serve RA * administrative operations such as configuration parameter * updates. - * + * * @version $Revision$, $Date$ */ public class RAAdminServlet extends AdminServlet { @@ -571,10 +571,10 @@ public class RAAdminServlet extends AdminServlet { while (enum.hasMoreElements()) { String key = (String)enum.nextElement(); if (key.equals(Constants.PR_EE_ENABLED)) { - if (eeConfig != null) + if (eeConfig != null) eeConfig.putString("enabled", req.getParameter(Constants.PR_EE_ENABLED)); - } + } } */ diff --git a/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java index 4bebe85d3..4f5afbb20 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java @@ -40,7 +40,7 @@ import com.netscape.certsrv.registry.IPluginRegistry; /** * This implements the administration servlet for registry subsystem. - * + * * @version $Revision$, $Date$ */ public class RegistryAdminServlet extends AdminServlet { diff --git a/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java b/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java index 4dccb141f..72106a903 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java @@ -31,9 +31,9 @@ import com.netscape.cms.servlet.cert.model.CertificateData; /** * This is the class used to list, retrieve and modify system certificates for all Java subsystems. - * + * * @author alee - * + * */ public class SystemCertificateResourceService extends CMSResourceService implements SystemCertificateResource { diff --git a/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java index e5a6dd3c4..90dc92221 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java @@ -63,10 +63,10 @@ import com.netscape.cmsutil.util.Utils; * User/Group Manager. It communicates with client * SDK to allow remote administration of User/Group * manager. - * + * * This servlet will be registered to remote * administration subsystem by usrgrp manager. - * + * * @version $Revision$, $Date$ */ public class UsrGrpAdminServlet extends AdminServlet { @@ -167,11 +167,11 @@ public class UsrGrpAdminServlet extends AdminServlet { log(ILogger.LL_FAILURE, CMS.getLogMessage("ADMIN_SRVLT_FAIL_AUTHS")); - sendResponse(ERROR, + sendResponse(ERROR, MessageFormatter.getLocalizedString( getLocale(req), AdminResources.class.getName(), - AdminResources.SRVLT_FAIL_AUTHS), + AdminResources.SRVLT_FAIL_AUTHS), null, resp); return; } @@ -333,7 +333,7 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Searches for users in LDAP directory. List uids only - * + * * Request/Response Syntax: * http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin @@ -381,7 +381,7 @@ public class UsrGrpAdminServlet extends AdminServlet { * List user information. Certificates covered in a separate * protocol for findUserCerts(). List of group memberships are * also provided. - * + * * Request/Response Syntax: * http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin @@ -462,7 +462,7 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * List user certificate(s) - * + * * Request/Response Syntax: * http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin @@ -542,7 +542,7 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Searchess for groups in LDAP server - * + * * Request/Response Syntax: * http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#group @@ -648,16 +648,16 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Adds a new user to LDAP server *

    - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -973,16 +973,16 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Adds a certificate to a user *

    - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1327,19 +1327,19 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Removes a certificate for a user *

    - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin *

    - * + * * In this method, "certDN" is actually a combination of version, serialNumber, issuerDN, and SubjectDN. *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1473,16 +1473,16 @@ public class UsrGrpAdminServlet extends AdminServlet { * any group he/she belongs to before trying to remove the user * itself. *

    - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1643,16 +1643,16 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Adds a new group in local scope. *

    - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#group *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1783,16 +1783,16 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * removes a group *

    - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#group *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1886,18 +1886,18 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * modifies a group *

    - * + * * last person of the super power group "Certificate Server Administrators" can never be removed. *

    - * + * * http://warp.mcom.com/server/certificate/columbo/design/ ui/admin-protocol-definition.html#group *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -2126,16 +2126,16 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Modifies an existing user in local scope. *

    - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin *

    - * + * *

      *
    • signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) *
    - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred -- cgit