diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-04-05 14:49:11 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-04-09 10:03:25 -0500 |
| commit | 7c7b9d023cd466c1771068badc020dab36beb553 (patch) | |
| tree | 178877eb83e25336be7577953945fbdb0b9e1a15 /base/common/src/com/netscape/cmscore | |
| parent | da1e6e2f49f66fd46c8039ff1aa4386309fba8f4 (diff) | |
| download | pki-7c7b9d023cd466c1771068badc020dab36beb553.tar.gz pki-7c7b9d023cd466c1771068badc020dab36beb553.tar.xz pki-7c7b9d023cd466c1771068badc020dab36beb553.zip | |
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
Diffstat (limited to 'base/common/src/com/netscape/cmscore')
154 files changed, 751 insertions, 751 deletions
diff --git a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java index e1981132d..2635541fa 100644 --- a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java +++ b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java @@ -200,7 +200,7 @@ public class CMSEngine implements ICMSEngine { private String mConfigSDSessionId = null; private Timer mSDTimer = null; - // static subsystems - must be singletons + // static subsystems - must be singletons private static SubsystemInfo[] mStaticSubsystems = { new SubsystemInfo( Debug.ID, Debug.getInstance()), @@ -218,16 +218,16 @@ public class CMSEngine implements ICMSEngine { OidLoaderSubsystem.ID, OidLoaderSubsystem.getInstance()), new SubsystemInfo( X500NameSubsystem.ID, X500NameSubsystem.getInstance()), - // skip TP subsystem; + // skip TP subsystem; // problem in needing dbsubsystem in constructor. and it's not used. new SubsystemInfo( RequestSubsystem.ID, RequestSubsystem.getInstance()), }; - // dynamic subsystems are loaded at init time, not neccessarily singletons. + // dynamic subsystems are loaded at init time, not neccessarily singletons. private static SubsystemInfo[] mDynSubsystems = null; - // final static subsystems - must be singletons. + // final static subsystems - must be singletons. private static SubsystemInfo[] mFinalSubsystems = { new SubsystemInfo( AuthSubsystem.ID, AuthSubsystem.getInstance()), @@ -328,7 +328,7 @@ public class CMSEngine implements ICMSEngine { /** * initialize all static, dynamic and final static subsystems. - * + * * @param owner null * @param config main config store. * @exception EBaseException if any error occur in subsystems during @@ -414,9 +414,9 @@ public class CMSEngine implements ICMSEngine { /** * Parse ACL resource attributes - * + * * @param resACLs same format as the resourceACLs attribute: - * + * * <PRE> * <resource name>:<permission1,permission2,...permissionn>: * <allow|deny> (<subset of the permission set>) <evaluator expression> @@ -878,7 +878,7 @@ public class CMSEngine implements ICMSEngine { throws EBaseException { IConfigStore ssconfig = mConfig.getSubStore(PROP_SUBSYSTEM); - // count number of dyn loaded subsystems. + // count number of dyn loaded subsystems. Enumeration<String> ssnames = ssconfig.getSubStoreNames(); int nsubsystems = 0; @@ -973,7 +973,7 @@ public class CMSEngine implements ICMSEngine { /** * Starts up all subsystems. subsystems must be initialized. - * + * * @exception EBaseException if any subsystem fails to startup. */ public void startup() throws EBaseException { @@ -982,7 +982,7 @@ public class CMSEngine implements ICMSEngine { startupSubsystems(mDynSubsystems); startupSubsystems(mFinalSubsystems); - // global admin servlet. (anywhere else more fit for this ?) + // global admin servlet. (anywhere else more fit for this ?) mStartupTime = System.currentTimeMillis(); @@ -1103,7 +1103,7 @@ public class CMSEngine implements ICMSEngine { while (in1.ready()) { line = in1.readLine(); if (line != null) - out1.println(lineParsing(line, newName)); + out1.println(lineParsing(line, newName)); } out1.close(); @@ -1601,7 +1601,7 @@ public class CMSEngine implements ICMSEngine { t1.setDaemon(true); t1.start(); - + // wait for command queue to emptied before proceeding to shutting down subsystems Date time = new Date(); long startTime = time.getTime(); @@ -1764,7 +1764,7 @@ public class CMSEngine implements ICMSEngine { /** * if (!version.equals("pre4.2")) * return; - * + * * Upgrade.perform(c); **/ } diff --git a/base/common/src/com/netscape/cmscore/apps/CommandQueue.java b/base/common/src/com/netscape/cmscore/apps/CommandQueue.java index 6604fea5b..f3963edb8 100644 --- a/base/common/src/com/netscape/cmscore/apps/CommandQueue.java +++ b/base/common/src/com/netscape/cmscore/apps/CommandQueue.java @@ -56,7 +56,7 @@ public class CommandQueue implements Runnable, ICommandQueue { * Overrides Thread.run(), calls batchPublish(). */ public void run() { - //int priority = Thread.MIN_PRIORITY; + //int priority = Thread.MIN_PRIORITY; //Thread.currentThread().setPriority(priority); /*------------------------------------------------- ** Loop until queue is empty diff --git a/base/common/src/com/netscape/cmscore/apps/PKIServerEvent.java b/base/common/src/com/netscape/cmscore/apps/PKIServerEvent.java index e815a9940..c49307a9e 100644 --- a/base/common/src/com/netscape/cmscore/apps/PKIServerEvent.java +++ b/base/common/src/com/netscape/cmscore/apps/PKIServerEvent.java @@ -20,7 +20,7 @@ package com.netscape.cmscore.apps; /** * A class represents a PKIServer event. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/apps/PKIServerListener.java b/base/common/src/com/netscape/cmscore/apps/PKIServerListener.java index bef70ce86..9cfcb1b31 100644 --- a/base/common/src/com/netscape/cmscore/apps/PKIServerListener.java +++ b/base/common/src/com/netscape/cmscore/apps/PKIServerListener.java @@ -21,7 +21,7 @@ package com.netscape.cmscore.apps; * A class represents a listener that listens to * PKIServer event. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/apps/Setup.java b/base/common/src/com/netscape/cmscore/apps/Setup.java index 3486ec40e..fecf024de 100644 --- a/base/common/src/com/netscape/cmscore/apps/Setup.java +++ b/base/common/src/com/netscape/cmscore/apps/Setup.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.base.IConfigStore; /** * Select certificate server serices. - * + * * @author thomask * @author nicolson * @version $Revision$, $Date$ diff --git a/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java b/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java index 64a09173f..5c27d8c6a 100644 --- a/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java +++ b/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java @@ -42,7 +42,7 @@ import com.netscape.cmscore.util.Debug; /** * Default authentication subsystem * <P> - * + * * @author cfu * @author lhsiao * @version $Revision$, $Date$ @@ -74,7 +74,7 @@ public class AuthSubsystem implements IAuthSubsystem { * Initializes the authentication subsystem from the config store. * Load Authentication manager plugins, create and initialize * initialize authentication manager instances. - * + * * @param owner The owner of this module. * @param config The configuration store. */ @@ -84,7 +84,7 @@ public class AuthSubsystem implements IAuthSubsystem { mLogger = CMS.getLogger(); mConfig = config; - // hardcode admin and agent plugins required for the server to be + // hardcode admin and agent plugins required for the server to be // functional. AuthMgrPlugin newPlugin = null; @@ -259,7 +259,7 @@ public class AuthSubsystem implements IAuthSubsystem { /** * Authenticate to the named authentication manager instance * <p> - * + * * @param authCred authentication credentials subject to the * requirements of each authentication manager * @param authMgrName name of the authentication manager instance @@ -309,7 +309,7 @@ public class AuthSubsystem implements IAuthSubsystem { /** * Gets configuration parameters for the given * authentication manager plugin. - * + * * @param implName Name of the authentication plugin. * @return Hashtable of required parameters. */ @@ -345,7 +345,7 @@ public class AuthSubsystem implements IAuthSubsystem { /** * Add an authentication manager instance. - * + * * @param name name of the authentication manager instance * @param authMgr the authentication manager instance to be added */ @@ -363,7 +363,7 @@ public class AuthSubsystem implements IAuthSubsystem { /** * Gets the authentication manager instance of the specified name. - * + * * @param name name of the authentication manager instance * @return the named authentication manager instance */ @@ -427,7 +427,7 @@ public class AuthSubsystem implements IAuthSubsystem { /** * Retrieves id (name) of this subsystem. - * + * * @return name of the authentication subsystem */ public String getId() { @@ -438,7 +438,7 @@ public class AuthSubsystem implements IAuthSubsystem { * Sets id string to this subsystem. * <p> * Use with caution. Should not do it when sharing with others - * + * * @param id name to be applied to an authentication sybsystem */ public void setId(String id) throws EBaseException { @@ -485,7 +485,7 @@ public class AuthSubsystem implements IAuthSubsystem { /** * Returns the root configuration storage of this system. * <P> - * + * * @return configuration store of this subsystem */ public IConfigStore getConfigStore() { @@ -494,7 +494,7 @@ public class AuthSubsystem implements IAuthSubsystem { /** * gets the named authentication manager - * + * * @param name of the authentication manager * @return the named authentication manager */ diff --git a/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java index 84807430f..e9fb6c891 100644 --- a/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java +++ b/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java @@ -42,7 +42,7 @@ import com.netscape.cmscore.usrgrp.User; * Maps a SSL client authenticate certificate to a user (agent) entry in the * internal database. * <P> - * + * * @author lhsiao * @author cfu * @version $Revision$, $Date$ @@ -80,7 +80,7 @@ public class CertUserDBAuthentication implements IAuthManager { * initializes the CertUserDBAuthentication auth manager * <p> * called by AuthSubsystem init() method, when initializing all available authentication managers. - * + * * @param owner - The authentication subsystem that hosts this * auth manager * @param config - The configuration store used by the @@ -129,11 +129,11 @@ public class CertUserDBAuthentication implements IAuthManager { * authenticates user(agent) by certificate * <p> * called by other subsystems or their servlets to authenticate users (agents) - * + * * @param authCred - authentication credential that contains * an usrgrp.Certificates of the user (agent) * @return the authentication token that contains the following - * + * * @exception com.netscape.certsrv.base.EAuthsException any * authentication failure or insufficient credentials * @see com.netscape.certsrv.authentication.AuthToken @@ -183,7 +183,7 @@ public class CertUserDBAuthentication implements IAuthManager { throw new EBaseException(CMS.getUserMessage("CMS_BASE_INTERNAL_ERROR", e.toString())); } - // any unexpected error occurs like internal db down, + // any unexpected error occurs like internal db down, // UGSubsystem only returns null for user. if (user == null) { CMS.debug("Authentication: cannot map certificate to user"); @@ -211,7 +211,7 @@ public class CertUserDBAuthentication implements IAuthManager { * the servlets that handle agent operations to authenticate its * users. It calls this method to know which are the * required credentials from the user (e.g. Javascript form data) - * + * * @return attribute names in Vector */ public String[] getRequiredCreds() { @@ -224,7 +224,7 @@ public class CertUserDBAuthentication implements IAuthManager { * the Certificate Server Console to display the table for * configuration purposes. CertUserDBAuthentication is currently not * exposed in this case, so this method is not to be used. - * + * * @return configuration parameter names in Hashtable of Vectors * where each hashtable entry's key is the substore name, value is a * Vector of parameter names. If no substore, the parameter name @@ -243,7 +243,7 @@ public class CertUserDBAuthentication implements IAuthManager { /** * gets the configuretion substore used by this authentication * manager - * + * * @return configuration store */ public IConfigStore getConfigStore() { diff --git a/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java index a7d5329c0..f40145938 100644 --- a/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java +++ b/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java @@ -53,7 +53,7 @@ import com.netscape.cmsutil.util.Utils; * internal database and further compares the challenge phrase with * that from the EE input. * <P> - * + * * @author cfu chrisho * @version $Revision$, $Date$ */ @@ -81,7 +81,7 @@ public class ChallengePhraseAuthentication implements IAuthManager { private String mRequestor = null; private MessageDigest mSHADigest = null; - // request attributes hacks + // request attributes hacks public static final String CHALLENGE_PHRASE = CRED_CHALLENGE; public static final String SUBJECTNAME = "subjectName"; public static final String SERIALNUMBER = "serialNumber"; @@ -94,7 +94,7 @@ public class ChallengePhraseAuthentication implements IAuthManager { * initializes the ChallengePhraseAuthentication auth manager * <p> * called by AuthSubsystem init() method, when initializing all available authentication managers. - * + * * @param name The name of this authentication manager instance. * @param implName The name of the authentication manager plugin. * @param config The configuration store for this authentication manager. @@ -132,11 +132,11 @@ public class ChallengePhraseAuthentication implements IAuthManager { * authenticates revocation of a certification by a challenge phrase * <p> * called by other subsystems or their servlets to authenticate a revocation request - * + * * @param authCred - authentication credential that contains * a Certificate to revoke * @return the authentication token that contains the request id - * + * * @exception EMissingCredential If a required credential for this * authentication manager is missing. * @exception EInvalidCredentials If credentials cannot be authenticated. @@ -155,10 +155,10 @@ public class ChallengePhraseAuthentication implements IAuthManager { AuthToken authToken = new AuthToken(this); /* - X509Certificate[] x509Certs = + X509Certificate[] x509Certs = (X509Certificate[]) authCred.get(CRED_CERT); if (x509Certs == null) { - log(ILogger.LL_FAILURE, + log(ILogger.LL_FAILURE, " missing cert credential."); throw new EMissingCredential(CRED_CERT_SERIAL); } @@ -201,7 +201,7 @@ public class ChallengePhraseAuthentication implements IAuthManager { /* maybe later if (mCertDB.isCertificateRevoked(cert) != null) { - log(ILogger.LL_FAILURE, + log(ILogger.LL_FAILURE, "Certificate has already been revoked."); // throw something else...cfu throw new EInvalidCredentials(); @@ -336,7 +336,7 @@ public class ChallengePhraseAuthentication implements IAuthManager { * the servlets that handle agent operations to authenticate its * users. It calls this method to know which are the * required credentials from the user (e.g. Javascript form data) - * + * * @return attribute names in Vector */ public String[] getRequiredCreds() { @@ -349,7 +349,7 @@ public class ChallengePhraseAuthentication implements IAuthManager { * the Certificate Server Console to display the table for * configuration purposes. ChallengePhraseAuthentication is currently not * exposed in this case, so this method is not to be used. - * + * * @return configuration parameter names in Hashtable of Vectors * where each hashtable entry's key is the substore name, value is a * Vector of parameter names. If no substore, the parameter name @@ -368,7 +368,7 @@ public class ChallengePhraseAuthentication implements IAuthManager { /** * gets the configuretion substore used by this authentication * manager - * + * * @return configuration store */ public IConfigStore getConfigStore() { diff --git a/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java index e124f1407..a7a1461cf 100644 --- a/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java +++ b/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java @@ -31,7 +31,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This authentication does nothing but just returns an empty authToken. * <P> - * + * * @author chrisho * @version $Revision$, $Date$ */ @@ -53,7 +53,7 @@ public class NullAuthentication implements IAuthManager { * initializes the NullAuthentication auth manager * <p> * called by AuthSubsystem init() method, when initializing all available authentication managers. - * + * * @param name - Name assigned to this authentication manager instance. * @param implName - Name of the authentication plugin. * @param config - The configuration store used by the @@ -72,7 +72,7 @@ public class NullAuthentication implements IAuthManager { * authenticates nothing * <p> * called by other subsystems or their servlets to authenticate administrators - * + * * @param authCred Authentication credentials. * "uid" and "pwd" are required. * @return the authentication token (authToken) that contains the following @@ -113,7 +113,7 @@ public class NullAuthentication implements IAuthManager { * required by this authentication manager. Generally used by * servlets that use this authentication manager, to retrieve * required credentials from the user (e.g. Javascript form data) - * + * * @return attribute names in Vector */ public String[] getRequiredCreds() { @@ -123,7 +123,7 @@ public class NullAuthentication implements IAuthManager { /** * Get the list of configuration parameter names * required by this authentication manager. In this case, an empty list. - * + * * @return String array of configuration parameters. */ public String[] getConfigParams() { @@ -139,7 +139,7 @@ public class NullAuthentication implements IAuthManager { /** * gets the configuration substore used by this authentication * manager - * + * * @return configuration store */ public IConfigStore getConfigStore() { @@ -148,7 +148,7 @@ public class NullAuthentication implements IAuthManager { /** * Log a message. - * + * * @param level The logging level. * @param msg The message to log. */ diff --git a/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java index f20bd5f07..5b6418c00 100644 --- a/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java +++ b/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java @@ -48,7 +48,7 @@ import com.netscape.cmscore.util.Debug; * Authentications by checking the uid and password against the * database. * <P> - * + * * @author lhsiao, cfu * @version $Revision$, $Date$ */ @@ -81,7 +81,7 @@ public class PasswdUserDBAuthentication implements IAuthManager { * initializes the PasswdUserDBAuthentication auth manager * <p> * called by AuthSubsystem init() method, when initializing all available authentication managers. - * + * * @param name - Name assigned to this authentication manager instance. * @param implName - Name of the authentication plugin. * @param config - The configuration store used by the @@ -110,7 +110,7 @@ public class PasswdUserDBAuthentication implements IAuthManager { * authenticates administratrators by LDAP uid/pwd * <p> * called by other subsystems or their servlets to authenticate administrators - * + * * @param authCred Authentication credentials. * "uid" and "pwd" are required. * @return the authentication token (authToken) that contains the following @@ -127,7 +127,7 @@ public class PasswdUserDBAuthentication implements IAuthManager { throws EMissingCredential, EInvalidCredentials, EBaseException { AuthToken authToken = new AuthToken(this); - // make sure the required credentials are provided + // make sure the required credentials are provided String uid = (String) authCred.get(CRED_UID); CMS.debug("Authentication: UID=" + uid); if (uid == null) { @@ -219,7 +219,7 @@ public class PasswdUserDBAuthentication implements IAuthManager { * required by this authentication manager. Generally used by * servlets that use this authentication manager, to retrieve * required credentials from the user (e.g. Javascript form data) - * + * * @return attribute names in Vector */ public String[] getRequiredCreds() { @@ -229,7 +229,7 @@ public class PasswdUserDBAuthentication implements IAuthManager { /** * Get the list of configuration parameter names * required by this authentication manager. In this case, an empty list. - * + * * @return String array of configuration parameters. */ public String[] getConfigParams() { @@ -252,7 +252,7 @@ public class PasswdUserDBAuthentication implements IAuthManager { /** * gets the configuretion substore used by this authentication * manager - * + * * @return configuration store */ public IConfigStore getConfigStore() { @@ -261,7 +261,7 @@ public class PasswdUserDBAuthentication implements IAuthManager { /** * Log a message. - * + * * @param level The logging level. * @param msg The message to log. */ diff --git a/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java index 3f0d7a87b..183cebcfb 100644 --- a/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java +++ b/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java @@ -49,7 +49,7 @@ import com.netscape.cmscore.util.Debug; /** * SSL client based authentication. * <P> - * + * * @author chrisho * @version $Revision$, $Date$ */ @@ -224,7 +224,7 @@ public class SSLClientCertAuthentication implements IAuthManager { * Returns a list of configuration parameter names. * The list is passed to the configuration console so instances of * this implementation can be configured through the console. - * + * * @return String array of configuration parameter names. */ public String[] getConfigParams() { @@ -233,7 +233,7 @@ public class SSLClientCertAuthentication implements IAuthManager { /** * Returns array of required credentials for this authentication manager. - * + * * @return Array of required credentials. */ public String[] getRequiredCreds() { @@ -268,7 +268,7 @@ public class SSLClientCertAuthentication implements IAuthManager { /** * Gets the configuration substore used by this authentication manager - * + * * @return configuration store */ public IConfigStore getConfigStore() { diff --git a/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java b/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java index 173d69f89..0ada86e75 100644 --- a/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java +++ b/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.apps.CMS; /** * class storing verified certificate. - * + * * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java b/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java index 52ce91fdf..01c455464 100644 --- a/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java +++ b/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java @@ -23,7 +23,7 @@ import netscape.security.x509.X509CertImpl; /** * class storing verified certificates. - * + * * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java b/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java index 16bc40e29..344de6cf9 100644 --- a/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java +++ b/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java @@ -40,7 +40,7 @@ import com.netscape.cmscore.util.Debug; /** * Default authorization subsystem * <P> - * + * * @author cfu * @version $Revision$, $Date$ */ @@ -71,7 +71,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { * Initializes the authorization subsystem from the config store. * Load Authorization manager plugins, create and initialize * initialize authorization manager instances. - * + * * @param owner The owner of this module. * @param config The configuration store. */ @@ -184,7 +184,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { * authMgrzAccessInit is for servlets who want to initialize their * own authorization information before full operation. It is supposed * to be called during the init() method of a servlet. - * + * * @param authzMgrName The authorization manager name * @param accessInfo the access information to be initialized. currently it's acl string in the format specified in * the authorization manager @@ -211,7 +211,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { /** * Authorization to the named authorization manager instance - * + * * @param authzMgrName The authorization manager name * @param authToken the authenticaton token associated with a user * @param resource the resource protected by the authorization system @@ -266,7 +266,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { /** * Gets configuration parameters for the given * authorization manager plugin. - * + * * @param implName Name of the authorization plugin. * @return Hashtable of required parameters. */ @@ -303,7 +303,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { /** * Add an authorization manager instance. - * + * * @param name name of the authorization manager instance * @param authzMgr the authorization manager instance to be added */ @@ -321,7 +321,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { /** * Gets the authorization manager instance of the specified name. - * + * * @param name name of the authorization manager instance * @return the named authorization manager instance */ @@ -385,7 +385,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { /** * Retrieves id (name) of this subsystem. - * + * * @return name of the authorization subsystem */ public String getId() { @@ -396,7 +396,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { * Sets id string to this subsystem. * <p> * Use with caution. Should not do it when sharing with others - * + * * @param id name to be applied to an authorization sybsystem */ public void setId(String id) throws EBaseException { @@ -444,7 +444,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { /** * Returns the root configuration storage of this system. * <P> - * + * * @return configuration store of this subsystem */ public IConfigStore getConfigStore() { @@ -453,7 +453,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { /** * gets the named authorization manager - * + * * @param name of the authorization manager * @return the named authorization manager */ diff --git a/base/common/src/com/netscape/cmscore/base/ArgBlock.java b/base/common/src/com/netscape/cmscore/base/ArgBlock.java index 62b5971a4..889ad123e 100644 --- a/base/common/src/com/netscape/cmscore/base/ArgBlock.java +++ b/base/common/src/com/netscape/cmscore/base/ArgBlock.java @@ -38,7 +38,7 @@ import com.netscape.cmsutil.util.Utils; * This class represents a set of indexed arguments. * Each argument is indexed by a key, which can be * used during the argument retrieval. - * + * * @version $Revision$, $Date$ */ public class ArgBlock implements IArgBlock { @@ -66,7 +66,7 @@ public class ArgBlock implements IArgBlock { *==========================================================*/ /** * Constructs an argument block with the given hashtable values. - * + * * @param realm the type of argblock - used for debugging the values */ public ArgBlock(String realm, Hashtable<String, String> httpReq) { @@ -76,7 +76,7 @@ public class ArgBlock implements IArgBlock { /** * Constructs an argument block with the given hashtable values. - * + * * @param httpReq hashtable keys and values */ public ArgBlock(Hashtable<String, String> httpReq) { @@ -109,7 +109,7 @@ public class ArgBlock implements IArgBlock { /** * Checks if this argument block contains the given key. - * + * * @param n key * @return true if key is present */ @@ -124,7 +124,7 @@ public class ArgBlock implements IArgBlock { /** * Adds string-based value into this argument block. - * + * * @param n key * @param v value * @return value @@ -139,7 +139,7 @@ public class ArgBlock implements IArgBlock { /** * Retrieves argument value as string. - * + * * @param n key * @return argument value as string * @exception EBaseException failed to retrieve value @@ -157,7 +157,7 @@ public class ArgBlock implements IArgBlock { /** * Retrieves argument value as string. - * + * * @param n key * @param def default value to be returned if key is not present * @return argument value as string @@ -175,7 +175,7 @@ public class ArgBlock implements IArgBlock { /** * Retrieves argument value as integer. - * + * * @param n key * @return argument value as int * @exception EBaseException failed to retrieve value @@ -197,7 +197,7 @@ public class ArgBlock implements IArgBlock { /** * Retrieves argument value as integer. - * + * * @param n key * @param def default value to be returned if key is not present * @return argument value as int @@ -217,7 +217,7 @@ public class ArgBlock implements IArgBlock { /** * Retrieves argument value as big integer. - * + * * @param n key * @return argument value as big integer * @exception EBaseException failed to retrieve value @@ -244,7 +244,7 @@ public class ArgBlock implements IArgBlock { /** * Retrieves argument value as big integer. - * + * * @param n key * @param def default value to be returned if key is not present * @return argument value as big integer @@ -259,7 +259,7 @@ public class ArgBlock implements IArgBlock { /** * Retrieves argument value as object - * + * * @param n key * @return argument value as object * @exception EBaseException failed to retrieve value @@ -274,7 +274,7 @@ public class ArgBlock implements IArgBlock { /** * Retrieves argument value as object - * + * * @param n key * @param def default value to be returned if key is not present * @return argument value as object @@ -289,7 +289,7 @@ public class ArgBlock implements IArgBlock { /** * Gets boolean value. They should be "true" or "false". - * + * * @param name name of the input type * @return boolean type: <code>true</code> or <code>false</code> * @exception EBaseException failed to retrieve value @@ -311,7 +311,7 @@ public class ArgBlock implements IArgBlock { /** * Gets boolean value. They should be "true" or "false". - * + * * @param name name of the input type * @return boolean type: <code>true</code> or <code>false</code> */ @@ -328,7 +328,7 @@ public class ArgBlock implements IArgBlock { /** * Gets KeyGenInfo - * + * * @param name name of the input type * @param verify true if signature validation is required * @exception EBaseException @@ -355,7 +355,7 @@ public class ArgBlock implements IArgBlock { /** * Gets PKCS10 request. This pkcs10 attribute does not * contain header information. - * + * * @param name name of the input type * @return pkcs10 request * @exception EBaseException failed to retrieve value @@ -389,7 +389,7 @@ public class ArgBlock implements IArgBlock { /** * Gets PKCS10 request. This pkcs10 attribute does not * contain header information. - * + * * @param name name of the input type * @param def default PKCS10 * @return pkcs10 request @@ -420,7 +420,7 @@ public class ArgBlock implements IArgBlock { /** * Retrieves PKCS10 - * + * * @param name name of the input type * @param checkheader true if header must be present * @return PKCS10 object @@ -454,7 +454,7 @@ public class ArgBlock implements IArgBlock { /** * Retrieves PKCS10 - * + * * @param name name of the input type * @param checkheader true if header must be present * @param def default PKCS10 @@ -489,7 +489,7 @@ public class ArgBlock implements IArgBlock { /** * Retrieves PKCS10 - * + * * @param name name of the input type * @param def default PKCS10 * @return PKCS10 object @@ -516,7 +516,7 @@ public class ArgBlock implements IArgBlock { /** * Sets argument into this block. - * + * * @param name key * @param ob value */ @@ -526,7 +526,7 @@ public class ArgBlock implements IArgBlock { /** * Retrieves argument. - * + * * @param name key * @return object value */ @@ -537,7 +537,7 @@ public class ArgBlock implements IArgBlock { /** * Deletes argument by the given key. - * + * * @param name key */ public void delete(String name) { @@ -546,7 +546,7 @@ public class ArgBlock implements IArgBlock { /** * Retrieves a list of argument keys. - * + * * @return a list of string-based keys */ public Enumeration<String> getElements() { @@ -555,7 +555,7 @@ public class ArgBlock implements IArgBlock { /** * Retrieves a list of argument keys. - * + * * @return a list of string-based keys */ public Enumeration<String> elements() { @@ -564,7 +564,7 @@ public class ArgBlock implements IArgBlock { /** * Adds long-type arguments to this block. - * + * * @param n key * @param v value * @return value @@ -575,7 +575,7 @@ public class ArgBlock implements IArgBlock { /** * Adds integer-type arguments to this block. - * + * * @param n key * @param v value * @return value @@ -586,7 +586,7 @@ public class ArgBlock implements IArgBlock { /** * Adds boolean-type arguments to this block. - * + * * @param n key * @param v value * @return value @@ -601,7 +601,7 @@ public class ArgBlock implements IArgBlock { /** * Adds integer-type arguments to this block. - * + * * @param n key * @param v value * @param radix radix @@ -617,7 +617,7 @@ public class ArgBlock implements IArgBlock { /** * Unwrap PKCS10 Package - * + * * @param request string formated PKCS10 request * @exception EBaseException * @return Base64Encoded PKCS10 request @@ -688,7 +688,7 @@ public class ArgBlock implements IArgBlock { /** * Decode Der encoded PKCS10 certifictae Request - * + * * @param base64Request Base64 Encoded Certificate Request * @exception Exception * @return PKCS10 diff --git a/base/common/src/com/netscape/cmscore/base/FileConfigStore.java b/base/common/src/com/netscape/cmscore/base/FileConfigStore.java index f0c52866e..393547f53 100644 --- a/base/common/src/com/netscape/cmscore/base/FileConfigStore.java +++ b/base/common/src/com/netscape/cmscore/base/FileConfigStore.java @@ -40,7 +40,7 @@ import com.netscape.cmsutil.util.Utils; * <P> * Note that a LdapConfigStore can be implemented so that it reads the configuration stores from the Ldap directory. * <P> - * + * * @version $Revision$, $Date$ * @see PropConfigStore */ @@ -56,7 +56,7 @@ public class FileConfigStore extends PropConfigStore implements /** * Constructs a file configuration store. * <P> - * + * * @param fileName file name * @exception EBaseException failed to create file configuration */ @@ -73,7 +73,7 @@ public class FileConfigStore extends PropConfigStore implements /** * Loads property file into memory. * <P> - * + * * @param fileName file name * @exception EBaseException failed to load configuration */ @@ -93,7 +93,7 @@ public class FileConfigStore extends PropConfigStore implements * <filename>.<current_time_in_milliseconds>. * Commits the current properties to the configuration file. * <P> - * + * * @param backup */ public void commit(boolean createBackup) throws EBaseException { @@ -151,7 +151,7 @@ public class FileConfigStore extends PropConfigStore implements * Note that the superclass's save is synchronized. It means no properties can be altered (inserted) at the saving * time. * <P> - * + * * @param fileName filename * @exception EBaseException failed to save configuration */ diff --git a/base/common/src/com/netscape/cmscore/base/PropConfigStore.java b/base/common/src/com/netscape/cmscore/base/PropConfigStore.java index 1e46d3ef3..ee4370053 100644 --- a/base/common/src/com/netscape/cmscore/base/PropConfigStore.java +++ b/base/common/src/com/netscape/cmscore/base/PropConfigStore.java @@ -44,18 +44,18 @@ import com.netscape.cmsutil.util.Utils; * property names. The current property prefix is kept in * mStoreName and the mSource usually points back to another * occurance of the same PropConfigStore, with longer mStoreName. IE - * + * * <PRE> * cms.ca0.http.service0 -> mSource=PropConfigStore -> * cms.ca0.http -> mSource=PropConfigStore -> * cms.ca0 -> mSource=PropConfigStore -> * cms -> mSource=SourceConfigStore -> Properties * </PRE> - * + * * The chain ends when the store name is reduced down to it's original * value. * <P> - * + * * @version $Revision$, $Date$ */ public class PropConfigStore implements IConfigStore, Cloneable { @@ -84,7 +84,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { * be a brand new store without properties. The subclass * must be a ISourceConfigStore. * <P> - * + * * @param storeName property store name * @exception EBaseException failed to create configuration */ @@ -99,7 +99,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { * that stores all the parameters. Each substore only * store a substore name, and a reference to the source. * <P> - * + * * @param storeName store name * @param prop list of properties * @exception EBaseException failed to create configuration @@ -112,7 +112,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Returns the name of this store. * <P> - * + * * @return store name */ public String getName() { @@ -122,7 +122,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Retrieves a property from the configuration file. * <P> - * + * * @param name property name * @return property value */ @@ -134,7 +134,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { * Retrieves a property from the configuration file. Does not prepend * the config store name to the property. * <P> - * + * * @param name property name * @return property value */ @@ -147,7 +147,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { * values wont be updated to the file until save * method is invoked. * <P> - * + * * @param name property name * @param value property value */ @@ -157,7 +157,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Removes a property from the configuration file. - * + * * @param name property name */ public void remove(String name) { @@ -167,7 +167,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Returns an enumeration of the config store's keys, hidding the store * name. - * + * * @see java.util.Hashtable#elements * @see java.util.Enumeration */ @@ -180,7 +180,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Retrieves the hashtable where all the properties are kept. - * + * * @return hashtable */ public Hashtable<String, Object> hashtable() { @@ -204,7 +204,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { * Fills the given hash table with all key/value pairs in the current * config store, removing the config store name prefix * <P> - * + * * @param h the hashtable */ private synchronized void enumerate(Hashtable<String, Object> h) { @@ -226,7 +226,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Reads a config store from an input stream. - * + * * @param in input stream where properties are located * @exception IOException failed to load */ @@ -236,7 +236,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Stores this config store to the specified output stream. - * + * * @param out outputstream where the properties are saved * @param header optional header information to be saved */ @@ -246,7 +246,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Retrieves a property value. - * + * * @param name property key * @return property value * @exception EBaseException failed to retrieve value @@ -258,7 +258,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { CMS.traceHashKey(mDebugType, getFullName(name), "<notpresent>"); throw new EPropertyNotFound(CMS.getUserMessage("CMS_BASE_GET_PROPERTY_FAILED", getName() + "." + name)); } - // should we check for empty string ? + // should we check for empty string ? // if (str.length() == 0) { // throw new EPropertyNotDefined(getName() + "." + name); // } @@ -276,7 +276,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Retrieves a String from the configuration file. * <P> - * + * * @param name property name * @param defval the default object to return if name does not exist * @return property value @@ -295,7 +295,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Puts property value into this configuration store. - * + * * @param name property key * @param value property value */ @@ -306,10 +306,10 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Retrieves a byte array from the configuration file. * <P> - * + * * @param name property name * @exception IllegalArgumentException if name is not set or is null. - * + * * @return property value */ public byte[] getByteArray(String name) throws EBaseException { @@ -325,11 +325,11 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Retrieves a byte array from the configuration file. * <P> - * + * * @param name property name * @param defval the default byte array to return if name does * not exist - * + * * @return property value */ public byte[] getByteArray(String name, byte defval[]) @@ -349,7 +349,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Puts byte array into this configuration store. - * + * * @param name property key * @param value byte array */ @@ -373,7 +373,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Retrieves boolean-based property value. - * + * * @param name property key * @return boolean value * @exception EBaseException failed to retrieve @@ -401,7 +401,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Retrieves boolean-based property value. - * + * * @param name property key * @param defval default value * @return boolean value @@ -425,7 +425,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Puts boolean value into the configuration store. - * + * * @param name property key * @param value property value */ @@ -439,7 +439,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Retrieves integer value. - * + * * @param name property key * @return property value * @exception EBaseException failed to retrieve value @@ -465,7 +465,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Retrieves integer value. - * + * * @param name property key * @param defval default value * @return property value @@ -488,7 +488,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Puts an integer value. - * + * * @param name property key * @param val property value * @exception EBaseException failed to retrieve value @@ -499,7 +499,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Retrieves big integer value. - * + * * @param name property key * @return property value * @exception EBaseException failed to retrieve value @@ -529,7 +529,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Retrieves integer value. - * + * * @param name property key * @param defval default value * @return property value @@ -551,7 +551,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Puts a big integer value. - * + * * @param name property key * @param val default value */ @@ -562,7 +562,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Creates a new sub store. * <P> - * + * * @param name substore name * @return substore */ @@ -585,7 +585,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Removes a sub store. * <p> - * + * * @param name substore name */ @SuppressWarnings("unchecked") @@ -610,21 +610,21 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Retrieves a sub store. A substore contains a list * of properties and substores. For example, - * + * * <PRE> * cms.ldap.host=ds.netscape.com * cms.ldap.port=389 * </PRE> - * + * * "ldap" is a substore in above example. If the * substore property itself is set, this method * will treat the value as a reference. For example, - * + * * <PRE> * cms.ldap = kms.ldap * </PRE> * <P> - * + * * @param name substore name * @return substore */ @@ -645,7 +645,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Retrieves a list of property names. - * + * * @return a list of string-based property names */ public Enumeration<String> getPropertyNames() { @@ -674,7 +674,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Returns a list of sub store names. * <P> - * + * * @return list of substore names */ public Enumeration<String> getSubStoreNames() { @@ -704,7 +704,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { * Retrieves the source configuration store where * the properties are stored. * <P> - * + * * @return source configuration store */ public ISourceConfigStore getSourceConfigStore() { @@ -732,7 +732,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Converts the substore parameters. - * + * * @param name property name * @return fill property name */ @@ -745,7 +745,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Cloning of property configuration store. - * + * * @return a new configuration store */ public Object clone() { @@ -783,7 +783,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { /** * Commits properties into the file. - * + * * @param createBackup true if create backup * @exception EBaseException failed to commit properties */ diff --git a/base/common/src/com/netscape/cmscore/base/SimpleProperties.java b/base/common/src/com/netscape/cmscore/base/SimpleProperties.java index 7b1c6bae4..cc1bd6201 100644 --- a/base/common/src/com/netscape/cmscore/base/SimpleProperties.java +++ b/base/common/src/com/netscape/cmscore/base/SimpleProperties.java @@ -38,13 +38,13 @@ import java.util.Hashtable; * <p> * A property list can contain another property list as its "defaults"; this second property list is searched if the * property key is not found in the original property list. - * + * * Because <code>Properties</code> inherits from <code>Hashtable</code>, the <code>put</code> and <code>putAll</code> * methods can be applied to a <code>Properties</code> object. Their use is strongly discouraged as they allow the * caller to insert entries whose keys or values are not <code>Strings</code>. The <code>setProperty</code> method * should be used instead. If the <code>store</code> or <code>save</code> method is called on a "compromised" * <code>Properties</code> object that contains a non- <code>String</code> key or value, the call will fail. - * + * */ public class SimpleProperties extends Hashtable<String, String> { @@ -56,7 +56,7 @@ public class SimpleProperties extends Hashtable<String, String> { /** * A property list that contains default values for any keys not * found in this property list. - * + * * @serial */ protected SimpleProperties defaults; @@ -70,7 +70,7 @@ public class SimpleProperties extends Hashtable<String, String> { /** * Creates an empty property list with the specified defaults. - * + * * @param defaults the defaults. */ public SimpleProperties(SimpleProperties defaults) { @@ -81,7 +81,7 @@ public class SimpleProperties extends Hashtable<String, String> { * Calls the hashtable method <code>put</code>. Provided for * parallelism with the getProperties method. Enforces use of * strings for property keys and values. - * + * * @since JDK1.2 */ public synchronized Object setProperty(String key, String value) { @@ -123,43 +123,43 @@ public class SimpleProperties extends Hashtable<String, String> { * As an example, each of the following four lines specifies the key <code>"Truth"</code> and the associated element * value <code>"Beauty"</code>: * <p> - * + * * <pre> * Truth = Beauty * Truth:Beauty * Truth :Beauty * </pre> - * + * * As another example, the following three lines specify a single property: * <p> - * + * * <pre> * fruits apple, banana, pear, \ * cantaloupe, watermelon, \ * kiwi, mango * </pre> - * + * * The key is <code>"fruits"</code> and the associated element is: * <p> - * + * * <pre> * "apple, banana, pear, cantaloupe, watermelon,kiwi, mango" * </pre> - * + * * Note that a space appears before each <code>\</code> so that a space will appear after each comma in the final * result; the <code>\</code>, line terminator, and leading whitespace on the continuation line are merely discarded * and are <i>not</i> replaced by one or more other characters. * <p> * As a third example, the line: * <p> - * + * * <pre> * cheeses * </pre> - * + * * specifies that the key is <code>"cheeses"</code> and the associated element is the empty string. * <p> - * + * * @param in the input stream. * @exception IOException if an error occurred when reading from the * input stream. @@ -262,12 +262,12 @@ public class SimpleProperties extends Hashtable<String, String> { /** * Calls the <code>store(OutputStream out, String header)</code> method * and suppresses IOExceptions that were thrown. - * + * * @deprecated This method does not throw an IOException if an I/O error * occurs while saving the property list. As of JDK 1.2, the preferred * way to save a properties list is via the <code>store(OutputStream out, * String header)</code> method. - * + * * @param out an output stream. * @param header a description of the property list. * @exception ClassCastException if this <code>Properties</code> object @@ -308,7 +308,7 @@ public class SimpleProperties extends Hashtable<String, String> { * <p> * After the entries have been written, the output stream is flushed. The output stream remains open after this * method returns. - * + * * @param out an output stream. * @param header a description of the property list. * @exception ClassCastException if this <code>Properties</code> object @@ -343,7 +343,7 @@ public class SimpleProperties extends Hashtable<String, String> { * If the key is not found in this property list, the default property list, * and its defaults, recursively, are then checked. The method returns <code>null</code> if the property is not * found. - * + * * @param key the property key. * @return the value in this property list with the specified key value. * @see java.util.Properties#defaults @@ -360,10 +360,10 @@ public class SimpleProperties extends Hashtable<String, String> { * If the key is not found in this property list, the default property list, * and its defaults, recursively, are then checked. The method returns the * default value argument if the property is not found. - * + * * @param key the hashtable key. * @param defaultValue a default value. - * + * * @return the value in this property list with the specified key value. * @see java.util.Properties#defaults */ @@ -376,7 +376,7 @@ public class SimpleProperties extends Hashtable<String, String> { /** * Returns an enumeration of all the keys in this property list, including * the keys in the default property list. - * + * * @return an enumeration of all the keys in this property list, including * the keys in the default property list. * @see java.util.Enumeration @@ -392,7 +392,7 @@ public class SimpleProperties extends Hashtable<String, String> { /** * Prints this property list out to the specified output stream. * This method is useful for debugging. - * + * * @param out an output stream. */ public void list(PrintStream out) { @@ -414,7 +414,7 @@ public class SimpleProperties extends Hashtable<String, String> { /** * Prints this property list out to the specified output stream. * This method is useful for debugging. - * + * * @param out an output stream. * @since JDK1.1 */ @@ -442,7 +442,7 @@ public class SimpleProperties extends Hashtable<String, String> { /** * Enumerates all key/value pairs in the specified hastable. - * + * * @param h the hashtable */ private synchronized void enumerate(Hashtable<String, String> h) { diff --git a/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java b/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java index 3c4ec6992..546b97591 100644 --- a/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java +++ b/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java @@ -23,7 +23,7 @@ import com.netscape.certsrv.base.ISourceConfigStore; * This class is is a wrapper to hide the Properties methods from * the PropConfigStore. Lucky for us, Properties already implements * almost every thing ISourceConfigStore requires. - * + * * @version $Revision$, $Date$ * @see java.util.Properties */ @@ -37,7 +37,7 @@ public class SourceConfigStore extends SimpleProperties implements ISourceConfig /** * Retrieves a property from the config store * <P> - * + * * @param name property name * @return property value */ @@ -48,7 +48,7 @@ public class SourceConfigStore extends SimpleProperties implements ISourceConfig /** * Puts a property into the config store. * <P> - * + * * @param name property name * @param value property value * @return diff --git a/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java b/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java index a9307e858..8cd2990a1 100644 --- a/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java +++ b/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.base.ISubsystem; /** * A class represents a subsystem loader. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java b/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java index 7078c3440..30f806ea2 100644 --- a/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java +++ b/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java @@ -24,7 +24,7 @@ import netscape.security.x509.X509CertImpl; /** * Compares validity dates for use in sorting. - * + * * @author kanda * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java b/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java index 726fa5e14..ecd1a4a60 100644 --- a/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java +++ b/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.base.ICertPrettyPrint; /** * This class will display the certificate content in predefined * format. - * + * * @author Jack Pan-Chen * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/cert/CertificatePair.java b/base/common/src/com/netscape/cmscore/cert/CertificatePair.java index b8f958be5..0a68da2d9 100644 --- a/base/common/src/com/netscape/cmscore/cert/CertificatePair.java +++ b/base/common/src/com/netscape/cmscore/cert/CertificatePair.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.cert.ICrossCertPairSubsystem; /** * This class implements CertificatePair used for Cross Certification - * + * * @author cfu * @version $Revision$, $Date$ */ @@ -48,7 +48,7 @@ public class CertificatePair implements ASN1Value { * construct a CertificatePair. It doesn't matter which is * forward and which is reverse in the parameters. It will figure * it out - * + * * @param cert1 one X509Certificate * @param cert2 one X509Certificate */ @@ -76,7 +76,7 @@ public class CertificatePair implements ASN1Value { * construct a CertificatePair. It doesn't matter which is * forward and which is reverse in the parameters. It will figure * it out - * + * * @param cert1 one certificate byte array * @param cert2 one certificate byte array */ @@ -114,7 +114,7 @@ public class CertificatePair implements ASN1Value { /* It looks the DN's returned are not normalized and fail * comparison - if ((c1.getIssuerDN().equals((Object) caCert.getSubjectDN()))) + if ((c1.getIssuerDN().equals((Object) caCert.getSubjectDN()))) debug("myCA signed c1"); else { debug("c1 issuerDN="+c1.getIssuerDN().toString()); @@ -144,7 +144,7 @@ public class CertificatePair implements ASN1Value { if ((c1.getIssuerDN().equals((Object) caCert.getSubjectDN())) && (caCert.getSubjectDN().equals((Object) c2.getSubjectDN()))) - + { return false; } else if ((c2.getIssuerDN().equals((Object) caCert.getSubjectDN())) diff --git a/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java b/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java index 6d838b70d..532211c42 100644 --- a/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java +++ b/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java @@ -36,7 +36,7 @@ import com.netscape.certsrv.ca.ICertificateAuthority; /** * This class will display the certificate content in predefined * format. - * + * * @author Andrew Wnuk * @version $Revision$, $Date$ */ @@ -70,7 +70,7 @@ public class CrlCachePrettyPrint implements ICRLPrettyPrint { * This method return string representation of the certificate * revocation list in predefined format using specified client * local. I18N Support. - * + * * @param clientLocale Locale to be used for localization * @return string representation of the certificate */ diff --git a/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java b/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java index 1d6048c8d..2dc947641 100644 --- a/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java +++ b/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.base.ICRLPrettyPrint; /** * This class will display the certificate content in predefined * format. - * + * * @author Andrew Wnuk * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java b/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java index 8d8a337c5..9b950e239 100644 --- a/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java +++ b/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java @@ -60,7 +60,7 @@ import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; * If it happens that the above two cases finds its pairing * cert already there, then a CertifiatePair is created and put * in the internal db "crosscertificatepair;binary" attribute - * + * * @author cfu * @version $Revision$, $Date$ */ @@ -141,7 +141,7 @@ public class CrossCertPairSubsystem implements ICrossCertPairSubsystem { * If it happens that it finds its pairing * cert already there, then a CertifiatePair is created and put * in the internal db "crosscertificatepair;binary" attribute - * + * * @param certBytes cert in byte array to be imported */ public void importCert(byte[] certBytes) throws EBaseException { @@ -166,7 +166,7 @@ public class CrossCertPairSubsystem implements ICrossCertPairSubsystem { * If it happens that it finds its pairing * cert already there, then a CertifiatePair is created and put * in the internal db "crosscertificatepair;binary" attribute - * + * * @param certBytes cert in byte array to be imported */ public synchronized void importCert(Object certObj) throws EBaseException { @@ -180,7 +180,7 @@ public class CrossCertPairSubsystem implements ICrossCertPairSubsystem { // cert // 2. does cert2's subject match this CA's subject? // 3. other valididity checks: is this a ca cert? Is this - // cert still valid? If the issuer is not yet trusted, let it + // cert still valid? If the issuer is not yet trusted, let it // be. // get certs from internal db to see if we find a pair @@ -277,7 +277,7 @@ public class CrossCertPairSubsystem implements ICrossCertPairSubsystem { /** * are cert1 and cert2 cross-signed certs? - * + * * @param cert1 the cert for comparison in our internal db * @param cert2 the cert that's being considered */ diff --git a/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java b/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java index 5f5c66a48..10ac3fbb1 100644 --- a/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java +++ b/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.base.IExtPrettyPrint; /** * This class will display the certificate content in predefined * format. - * + * * @author Andrew Wnuk * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java b/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java index dfd7dbab8..c4983d7c8 100644 --- a/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java +++ b/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.base.ISubsystem; import com.netscape.cmscore.util.Debug; /** - * + * * @author stevep * @version $Revision */ @@ -52,7 +52,7 @@ public class OidLoaderSubsystem implements ISubsystem { private static final String PROP_CLASS = "class"; /** - * + * */ private OidLoaderSubsystem() { } @@ -122,7 +122,7 @@ public class OidLoaderSubsystem implements ISubsystem { * Note that individual subsystem should be initialized in a separated thread if it has dependency on the * initialization of other subsystems. * <P> - * + * * @param owner owner of this subsystem * @param config configuration store */ diff --git a/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java b/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java index 669200575..7b7ce64f9 100644 --- a/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java +++ b/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.base.IPrettyPrintFormat; /** * This class will display the certificate content in predefined * format. - * + * * @author Andrew Wnuk * @version $Revision$, $Date$ */ @@ -76,7 +76,7 @@ public class PrettyPrintFormat implements IPrettyPrintFormat { /** * Provide white space indention * stevep - speed improvements. Factor of 10 improvement - * + * * @param numSpace number of white space to be returned * @return white spaces */ @@ -92,7 +92,7 @@ public class PrettyPrintFormat implements IPrettyPrintFormat { /** * Convert Byte Array to Hex String Format * stevep - speedup by factor of 8 - * + * * @param byte array of data to hexify * @param indentSize number of spaces to prepend before each line * @param lineLen number of bytes to output on each line (0 diff --git a/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java b/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java index 361f50b47..0756664d9 100644 --- a/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java +++ b/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java @@ -24,7 +24,7 @@ import netscape.security.x509.KeyUsageExtension; /** * Resource Boundle for the Pretty Print - * + * * @author Jack Pan-Chen * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java b/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java index 9ea581812..5c5b13084 100644 --- a/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java +++ b/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java @@ -22,7 +22,7 @@ import java.security.PublicKey; /** * This class will display the certificate content in predefined * format. - * + * * @author Jack Pan-Chen * @author Andrew Wnuk * @version $Revision$, $Date$ diff --git a/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java b/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java index de5e233c9..0d58973f8 100644 --- a/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java +++ b/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java @@ -41,7 +41,7 @@ import com.netscape.cmscore.util.Debug; * <li>Add X500Name (string to oid) maps for attributes that are not supported by default. * <li>Specify an order for encoding Directory Strings other than the default. * </ul> - * + * * @author lhsiao * @version $Revision$ */ @@ -84,12 +84,12 @@ public class X500NameSubsystem implements ISubsystem { * All paramters are optional. * <ul> * <li>Change encoding order of Directory Strings: - * + * * <pre> * X500Name.directoryStringEncodingOrder=order seperated by commas * For example: Printable,BMPString,UniversalString. * </pre> - * + * * Possible values are: * <ul> * <li>Printable @@ -100,34 +100,34 @@ public class X500NameSubsystem implements ISubsystem { * </ul> * <p> * <li>Add X500Name attributes: - * + * * <pre> * X500Name.attr.attribute-name.oid=n.n.n.n * X500Name.attr.attribute-name.class=value converter class * </pre> - * + * * The value converter class converts a string to a ASN.1 value. It must implement * netscape.security.x509.AVAValueConverter interface. Converter classes provided in CMS are: - * + * * <pre> - * netscape.security.x509.PrintableConverter - - * Converts to a Printable String value. String must have only - * printable characters. - * netscape.security.x509.IA5StringConverter - + * netscape.security.x509.PrintableConverter - + * Converts to a Printable String value. String must have only + * printable characters. + * netscape.security.x509.IA5StringConverter - * Converts to a IA5String value. String must have only IA5String - * characters. - * netscape.security.x509.DirStrConverter - - * Converts to a Directory (v3) String. String is expected to + * characters. + * netscape.security.x509.DirStrConverter - + * Converts to a Directory (v3) String. String is expected to * be in Directory String format according to rfc2253. - * netscape.security.x509.GenericValueConverter - + * netscape.security.x509.GenericValueConverter - * Converts string character by character in the following order * from smaller character sets to broadest character set. * Printable, IA5String, BMPString, Universal String. * </pre> - * + * * </ul> * <P> - * + * * @param owner owner of this subsystem * @param config configuration store */ @@ -142,7 +142,7 @@ public class X500NameSubsystem implements ISubsystem { // get order for encoding directory strings if any. setDirStrEncodingOrder(); - // load x500 name maps + // load x500 name maps loadX500NameAttrMaps(); } diff --git a/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java b/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java index 01bb0f879..2d8c98ee4 100644 --- a/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java +++ b/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java @@ -37,7 +37,7 @@ public class HttpConnFactory { private ILogger mLogger = CMS.getLogger(); private int mNumConns = 0; // number of available conns in array - private int mTotal = 0; // total num conns + private int mTotal = 0; // total num conns private IHttpConnection mMasterConn = null; // master connection object. private IHttpConnection mConns[]; private IAuthority mSource = null; @@ -59,7 +59,7 @@ public class HttpConnFactory { /** * Constructor for HttpConnFactory - * + * * @param minConns minimum number of connections to have available * @param maxConns max number of connections to have available. This is * @param serverInfo server connection info - host, port, etc. @@ -79,7 +79,7 @@ public class HttpConnFactory { /** * initialize parameters obtained from either constructor or * config store - * + * * @param minConns minimum number of connection handls to have available. * @param maxConns maximum total number of connections to ever have. * @param connInfo ldap connection info. @@ -177,7 +177,7 @@ public class HttpConnFactory { * returnConn() method. * The best thing to do is to put returnConn in a finally clause so it * always gets called. For example, - * + * * <pre> * IHttpConnection c = null; * try { @@ -204,7 +204,7 @@ public class HttpConnFactory { * Returns null if maximum number of connections reached. * The best thing to do is to put returnConn in a finally clause so it * always gets called. For example, - * + * * <pre> * IHttpConnnection c = null; * try { @@ -260,7 +260,7 @@ public class HttpConnFactory { * This is mandatory after a getConn(). * The best thing to do is to put returnConn in a finally clause so it * always gets called. For example, - * + * * <pre> * IHttpConnection c = null; * try { diff --git a/base/common/src/com/netscape/cmscore/connector/HttpConnection.java b/base/common/src/com/netscape/cmscore/connector/HttpConnection.java index 95cdbc779..7a65c1760 100644 --- a/base/common/src/com/netscape/cmscore/connector/HttpConnection.java +++ b/base/common/src/com/netscape/cmscore/connector/HttpConnection.java @@ -73,7 +73,7 @@ public class HttpConnection implements IHttpConnection { CMS.debug("HttpConnection: connecting to " + dest.getHost() + ":" + dest.getPort()); String host = dest.getHost(); // we could have a list of host names in the host parameters - // the format is, for example, + // the format is, for example, // "directory.knowledge.com:1050 people.catalog.com 199.254.1.2" if (host != null && host.indexOf(' ') != -1) { // try to do client-side failover @@ -116,7 +116,7 @@ public class HttpConnection implements IHttpConnection { // Insert end /** * sends a request to remote RA/CA, returning the result. - * + * * @throws EBaseException if request could not be encoded */ public IPKIMessage send(IPKIMessage tomsg) @@ -222,8 +222,8 @@ public class HttpConnection implements IHttpConnection { } } - // decode reply. - // if reply is bad, error is thrown and request will be resent + // decode reply. + // if reply is bad, error is thrown and request will be resent String pcontent = p.getContent(); if (Debug.ON) { diff --git a/base/common/src/com/netscape/cmscore/connector/HttpConnector.java b/base/common/src/com/netscape/cmscore/connector/HttpConnector.java index cdb315795..90979f870 100644 --- a/base/common/src/com/netscape/cmscore/connector/HttpConnector.java +++ b/base/common/src/com/netscape/cmscore/connector/HttpConnector.java @@ -70,7 +70,7 @@ public class HttpConnector implements IConnector { } // mConn = CMS.getHttpConnection(dest, mFactory); - // this will start resending past requests in parallel. + // this will start resending past requests in parallel. mResender = CMS.getResender(mSource, nickName, dest, resendInterval); mResendThread = new Thread(mResender, "HttpConnector"); } @@ -95,7 +95,7 @@ public class HttpConnector implements IConnector { CMS.debug("can't create new HttpConnFactory"); } - // this will start resending past requests in parallel. + // this will start resending past requests in parallel. mResender = CMS.getResender(mSource, nickName, dest, resendInterval); mResendThread = new Thread(mResender, "HttpConnector"); } @@ -140,7 +140,7 @@ public class HttpConnector implements IConnector { CMS.debug("reply status " + replyStatus); // non terminal states. - // XXX hack: don't resend get revocation info requests since + // XXX hack: don't resend get revocation info requests since // resent results are ignored. if ((!r.getRequestType().equals( IRequest.GETREVOCATIONINFO_REQUEST)) && @@ -169,7 +169,7 @@ public class HttpConnector implements IConnector { r.setExtData(IRequest.RESULT, IRequest.RES_ERROR); r.setExtData(IRequest.ERROR, new EBaseException(CMS.getUserMessage("CMS_BASE_REMOTE_AUTHORITY_ERROR"))); - // XXX overload svcerrors for now. + // XXX overload svcerrors for now. Vector<String> policyErrors = r.getExtDataInStringVector(IRequest.ERRORS); if (policyErrors != null && policyErrors.size() > 0) { @@ -189,7 +189,7 @@ public class HttpConnector implements IConnector { CMS.debug("HttpConn: error sending request to cert " + e.toString()); mSource.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CONNECTOR_SEND_REQUEST", r.getRequestId() .toString(), mDest.getHost(), Integer.toString(mDest.getPort()))); - // mSource.log(ILogger.LL_INFO, + // mSource.log(ILogger.LL_INFO, // "Queing " + r.getRequestId() + " for resend."); return false; } finally { diff --git a/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java b/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java index ea235391d..ddf23378a 100644 --- a/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java +++ b/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java @@ -64,7 +64,7 @@ public class HttpPKIMessage implements IHttpPKIMessage { * copy contents of request to make a simple name/value message. */ public void fromRequest(IRequest r) { - // actually don't need to copy source id since + // actually don't need to copy source id since reqType = r.getRequestType(); reqId = r.getRequestId().toString(); reqStatus = r.getRequestStatus().toString(); @@ -96,7 +96,7 @@ public class HttpPKIMessage implements IHttpPKIMessage { */ @SuppressWarnings("unchecked") public void toRequest(IRequest r) { - // id, type and status + // id, type and status // type had to have been set in instantiation. // id is checked but not reset. // request status cannot be set, but can be looked at. diff --git a/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java b/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java index 76d39b3ed..bb18030dc 100644 --- a/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java +++ b/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java @@ -58,7 +58,7 @@ public class HttpRequestEncoder implements IRequestEncoder { result = is.readObject(); } catch (ClassNotFoundException e) { - // XXX hack: change this + // XXX hack: change this if (Debug.ON) Debug.trace("class not found ex " + e + e.getMessage()); throw new IOException("Class Not Found " + e.getMessage()); diff --git a/base/common/src/com/netscape/cmscore/connector/LocalConnector.java b/base/common/src/com/netscape/cmscore/connector/LocalConnector.java index 42c6636ce..9c4825494 100644 --- a/base/common/src/com/netscape/cmscore/connector/LocalConnector.java +++ b/base/common/src/com/netscape/cmscore/connector/LocalConnector.java @@ -71,11 +71,11 @@ public class LocalConnector implements IConnector { CMS.debug("local connector dest req " + destreq.getRequestId() + " created for source rId " + r.getRequestId()); - // mSource.log(ILogger.LL_DEBUG, + // mSource.log(ILogger.LL_DEBUG, // "setting connector dest " + mDest.getId() + // " source id to " + r.getRequestId()); - // XXX set context to the real identity later. + // XXX set context to the real identity later. destreq.setSourceId( mSource.getX500Name().toString() + ":" + r.getRequestId().toString()); //destreq.copyContents(r); // copy meta attributes in request. @@ -98,7 +98,7 @@ public class LocalConnector implements IConnector { } // Locally cache the source request so that we - // can update it when the dest request is + // can update it when the dest request is // processed (when LocalConnListener is being called). mSourceReqs.put(r.getRequestId().toString(), r); try { @@ -140,9 +140,9 @@ public class LocalConnector implements IConnector { "dest " + mDest.getId() + " done with " + destreq.getRequestId()); IRequestQueue sourceQ = mSource.getRequestQueue(); - // accept requests that only belong to us. + // accept requests that only belong to us. // XXX review death scenarios here. - If system dies anywhere - // here need to check all requests at next server startup. + // here need to check all requests at next server startup. String sourceNameAndId = destreq.getSourceId(); String sourceName = mSource.getX500Name().toString(); @@ -174,7 +174,7 @@ public class LocalConnector implements IConnector { // performance enhancement, approved request will // not be immediately available in the database. So // retrieving the request from the queue within - // the serviceRequest() function will have + // the serviceRequest() function will have // diffculities. // You may wonder what happen if the system crashes // during the request servicing. Yes, the request @@ -182,7 +182,7 @@ public class LocalConnector implements IConnector { // resubmit their requests again. // Note that the pending requests, on the other hand, // are persistent before the servicing. - // Please see stateEngine() function in + // Please see stateEngine() function in // ARequestQueue.java for details. r = mSourceReqs.get(rId); if (r != null) { diff --git a/base/common/src/com/netscape/cmscore/connector/Resender.java b/base/common/src/com/netscape/cmscore/connector/Resender.java index 783caa671..e1b19749a 100644 --- a/base/common/src/com/netscape/cmscore/connector/Resender.java +++ b/base/common/src/com/netscape/cmscore/connector/Resender.java @@ -67,7 +67,7 @@ public class Resender implements IResender { mDest = dest; mNickName = nickName; - //mConn = new HttpConnection(dest, + //mConn = new HttpConnection(dest, // new JssSSLSocketFactory(nickName)); } @@ -80,7 +80,7 @@ public class Resender implements IResender { if (interval > 0) mInterval = interval * SECOND; // interval specified in seconds. - //mConn = new HttpConnection(dest, + //mConn = new HttpConnection(dest, // new JssSSLSocketFactory(nickName)); } @@ -96,7 +96,7 @@ public class Resender implements IResender { CMS.debug( "added request Id " + rid + " in init to resend queue."); - // note these are added as strings + // note these are added as strings mRequestIds.addElement(rid.toString()); } } @@ -149,7 +149,7 @@ public class Resender implements IResender { try { r = mQueue.findRequest(rid); } catch (EBaseException e) { - // XXX bad case. should we remove the rid now ? + // XXX bad case. should we remove the rid now ? mAuthority.log(ILogger.LL_WARN, CMS.getLogMessage("CMSCORE_CONNECTOR_REQUEST_NOT_FOUND", rid.toString())); continue; diff --git a/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java b/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java index b42bc00f9..34b378bf1 100644 --- a/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java +++ b/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java @@ -41,7 +41,7 @@ public class CRMFParser { /** * Retrieves PKIArchiveOptions from CRMF request. - * + * * @param request CRMF request * @return PKIArchiveOptions * @exception failed to extrace option diff --git a/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java b/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java index 3fa613198..9af436295 100644 --- a/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.dbs.IDBObj; * A class represents ann attribute mapper that maps * a Java BigInteger object into LDAP attribute, * and vice versa. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java b/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java index 38362f341..1d1f218b2 100644 --- a/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.dbs.IDBObj; * A class represents ann attribute mapper that maps * a Java byte array object into LDAP attribute, * and vice versa. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java b/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java index 253bd81e0..60f6b69a1 100644 --- a/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java +++ b/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java @@ -21,7 +21,7 @@ package com.netscape.cmscore.dbs; * A class represents a collection of schema information * for CRL. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java b/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java index 0a3a46f14..c6d041b34 100644 --- a/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java +++ b/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java @@ -33,7 +33,7 @@ import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; /** * A class represents a CRL issuing point record. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java b/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java index 7eb470d55..c83494984 100644 --- a/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java +++ b/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java @@ -39,7 +39,7 @@ import com.netscape.certsrv.dbs.crldb.ICRLRepository; * A class represents a CRL repository. It stores all the * CRL issuing points. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java b/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java index 67b662713..916e83a8a 100644 --- a/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java +++ b/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java @@ -21,7 +21,7 @@ package com.netscape.cmscore.dbs; * A class represents a collection of certificate record * specific schema information. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/CertRecord.java b/base/common/src/com/netscape/cmscore/dbs/CertRecord.java index 1981757cb..b70c8cd36 100644 --- a/base/common/src/com/netscape/cmscore/dbs/CertRecord.java +++ b/base/common/src/com/netscape/cmscore/dbs/CertRecord.java @@ -36,7 +36,7 @@ import com.netscape.certsrv.dbs.certdb.IRevocationInfo; /** * A class represents a serializable certificate record. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java b/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java index 29792880d..c4f10a61f 100644 --- a/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java +++ b/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java @@ -29,7 +29,7 @@ import com.netscape.certsrv.dbs.certdb.ICertRecordList; /** * A class represents a list of certificate records. * <P> - * + * * @author thomask mzhao * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java b/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java index f4074c213..61d823b88 100644 --- a/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java @@ -37,7 +37,7 @@ import com.netscape.cmscore.util.Debug; * A class represents a mapper to serialize * certificate record into database. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java b/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java index 20e40a8e3..6a4e23f19 100644 --- a/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java +++ b/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java @@ -41,14 +41,14 @@ import com.netscape.certsrv.logging.ILogger; * A class represents a registry where all the * schema (object classes and attribute) information * is stored. - * + * * Attribute mappers can be registered with this * registry. - * + * * Given the schema information stored, this registry * has knowledge to convert a Java object into a * LDAPAttributeSet or vice versa. - * + * * @author thomask * @version $Revision$, $Date$ */ @@ -181,7 +181,7 @@ public class DBRegistry implements IDBRegistry, ISubsystem { * Creates LDAP-based search filters with help of * registered mappers. * Parses filter from filter string specified in RFC1558. - * + * * <pre> * <filter> ::= '(' <filtercomp> ')' * <filtercomp> ::= <and> | <or> | <not> | <item> diff --git a/base/common/src/com/netscape/cmscore/dbs/DBSSession.java b/base/common/src/com/netscape/cmscore/dbs/DBSSession.java index ddc9f1874..fd59e8d8f 100644 --- a/base/common/src/com/netscape/cmscore/dbs/DBSSession.java +++ b/base/common/src/com/netscape/cmscore/dbs/DBSSession.java @@ -49,10 +49,10 @@ import com.netscape.certsrv.logging.ILogger; /** * A class represents the database session. Operations * can be performed with a session. - * + * * Transaction and Caching support can be integrated * into session. - * + * * @author thomask * @version $Revision$, $Date$ */ @@ -64,7 +64,7 @@ public class DBSSession implements IDBSSession { /** * Constructs a database session. - * + * * @param system the database subsytem * @param c the ldap connection */ @@ -95,12 +95,12 @@ public class DBSSession implements IDBSSession { /** * Adds object to backend database. For example, - * + * * <PRE> * session.add("cn=123459,o=certificate repository,o=airius.com", * certRec); * </PRE> - * + * * @param name the name of the ldap entry * @param obj the DBobj that can be mapped to ldap attrubute set */ @@ -128,7 +128,7 @@ public class DBSSession implements IDBSSession { /** * Reads an object from the database. * all attributes will be returned - * + * * @param name the name of the ldap entry */ public IDBObj read(String name) throws EBaseException { @@ -138,7 +138,7 @@ public class DBSSession implements IDBSSession { /** * Reads an object from the database, and only populates * the selected attributes. - * + * * @param name the name of the ldap entry * @param attrs the attributes to be selected */ @@ -375,7 +375,7 @@ public class DBSSession implements IDBSSession { Integer version = (Integer) (mConn.getOption(LDAPv2.PROTOCOL_VERSION)); - // Only version 3 protocol supports persistent search. + // Only version 3 protocol supports persistent search. if (version.intValue() == 2) { mConn.setOption(LDAPv2.PROTOCOL_VERSION, Integer.valueOf(3)); } diff --git a/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java b/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java index 7c551b141..1460db969 100644 --- a/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java +++ b/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java @@ -21,7 +21,7 @@ package com.netscape.cmscore.dbs; * A class represents ann attribute mapper that maps * a Java BigInteger object into LDAP attribute, * and vice versa. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java b/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java index 0621701b0..a97998916 100644 --- a/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java +++ b/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java @@ -31,7 +31,7 @@ import com.netscape.certsrv.logging.ILogger; * A class represents the search results. A search * results object contain a enumeration of * Java objects that are just read from the database. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java b/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java index 4bc5b6471..82e688c03 100644 --- a/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java +++ b/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java @@ -55,11 +55,11 @@ import com.netscape.cmscore.ldapconn.LdapConnInfo; /** * A class represents the database subsystem that manages * the backend data storage. - * + * * This subsystem maintains multiple sessions that allows * operations to be performed, and provide a registry * where all the schema information is stored. - * + * * @author thomask * @version $Revision$, $Date$ */ @@ -170,7 +170,7 @@ public class DBSubsystem implements IDBSubsystem { /** * This method is used for unit tests. It allows the underlying instance * to be stubbed out. - * + * * @param dbSubsystem The stubbed out subsystem to override with. */ public static void setInstance(IDBSubsystem dbSubsystem) { @@ -242,7 +242,7 @@ public class DBSubsystem implements IDBSubsystem { /** * Gets minimum serial number limit in config file - * + * * @param repo repo identifier * @return min serial number */ @@ -252,7 +252,7 @@ public class DBSubsystem implements IDBSubsystem { /** * Gets maximum serial number limit in config file - * + * * @param repo repo identifier * @return max serial number */ @@ -262,7 +262,7 @@ public class DBSubsystem implements IDBSubsystem { /** * Gets minimum serial number limit in next range in config file - * + * * @param repo repo identifier * @return min serial number in next range */ @@ -277,7 +277,7 @@ public class DBSubsystem implements IDBSubsystem { /** * Gets maximum serial number limit in next range in config file - * + * * @param repo repo identifier * @return max serial number in next range */ @@ -292,7 +292,7 @@ public class DBSubsystem implements IDBSubsystem { /** * Gets low water mark limit in config file - * + * * @param repo repo identifier * @return low water mark */ @@ -302,7 +302,7 @@ public class DBSubsystem implements IDBSubsystem { /** * Gets range increment for next range in config file - * + * * @param repo repo identifier * @return range increment */ @@ -312,7 +312,7 @@ public class DBSubsystem implements IDBSubsystem { /** * Sets maximum serial number limit in config file - * + * * @param repo repo identifier * @param serial max serial number * @exception EBaseException failed to set @@ -333,7 +333,7 @@ public class DBSubsystem implements IDBSubsystem { /** * Sets minimum serial number limit in config file - * + * * @param repo repo identifier * @param serial min serial number * @exception EBaseException failed to set @@ -354,7 +354,7 @@ public class DBSubsystem implements IDBSubsystem { /** * Sets maximum serial number limit for next range in config file - * + * * @param repo repo identifier * @param serial max serial number for next range * @exception EBaseException failed to set @@ -381,7 +381,7 @@ public class DBSubsystem implements IDBSubsystem { /** * Sets minimum serial number limit for next range in config file - * + * * @param repo repo identifier * @param serial min serial number for next range * @exception EBaseException failed to set @@ -410,7 +410,7 @@ public class DBSubsystem implements IDBSubsystem { * Gets start of next range from database. * Increments the nextRange attribute and allocates * this range to the current instance by creating a pkiRange object. - * + * * @param repo repo identifier * @return start of next range */ @@ -429,8 +429,8 @@ public class DBSubsystem implements IDBSubsystem { BigInteger nextRangeNo = new BigInteger(nextRange); BigInteger incrementNo = new BigInteger((String) h.get(PROP_INCREMENT)); - // To make sure attrNextRange always increments, first delete the current value and then - // increment. Two operations in the same transaction + // To make sure attrNextRange always increments, first delete the current value and then + // increment. Two operations in the same transaction LDAPAttribute attrNextRange = new LDAPAttribute(PROP_NEXT_RANGE, nextRangeNo.add(incrementNo).toString()); LDAPModification[] mods = { new LDAPModification(LDAPModification.DELETE, attr), @@ -472,7 +472,7 @@ public class DBSubsystem implements IDBSubsystem { * If so, delete the conflict entry and remove the next range. * When the next number is requested, if the number of certs is still * below the low water mark, then a new range will be requested. - * + * * @param repo repo identifier * @return true if range conflict, false otherwise */ diff --git a/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java b/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java index 20562404b..2b60be4f6 100644 --- a/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.dbs.IDBObj; * A class represents ann attribute mapper that maps * a Java Date array object into LDAP attribute, * and vice versa. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/DateMapper.java b/base/common/src/com/netscape/cmscore/dbs/DateMapper.java index a767758f6..ab2b2e225 100644 --- a/base/common/src/com/netscape/cmscore/dbs/DateMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/DateMapper.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.dbs.IDBObj; * A class represents ann attribute mapper that maps * a Java Date object into LDAP attribute, * and vice versa. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java b/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java index 8dc07e4d9..574030c42 100644 --- a/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java @@ -31,7 +31,7 @@ import com.netscape.certsrv.dbs.IDBObj; * A class represents ann attribute mapper that maps * a Java Integer object into LDAP attribute, * and vice versa. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java b/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java index 50b3badc3..743176318 100644 --- a/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java +++ b/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java @@ -21,7 +21,7 @@ package com.netscape.cmscore.dbs; * A class represents a collection of key record * specific schema information. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java b/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java index e8122b6b8..7ae546184 100644 --- a/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java +++ b/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.dbs.keydb.KeyState; * archived key. Namely, whether a key is inactive because * of compromise. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ @@ -88,7 +88,7 @@ public class KeyRecord implements IDBObj, IKeyRecord { /* * Constructs key record. - * + * * @param key key to be archived */ public KeyRecord(BigInteger serialNo, byte publicData[], @@ -213,7 +213,7 @@ public class KeyRecord implements IDBObj, IKeyRecord { * Retrieves serial number of the key record. Each key record * is uniquely identified by serial number. * <P> - * + * * @return serial number of this key record */ public BigInteger getSerialNumber() throws EBaseException { @@ -231,7 +231,7 @@ public class KeyRecord implements IDBObj, IKeyRecord { * Retrieves the key state. This gives key life cycle * information. * <P> - * + * * @return key state */ public KeyState getState() throws EBaseException { @@ -256,7 +256,7 @@ public class KeyRecord implements IDBObj, IKeyRecord { /** * Retrieves key. * <P> - * + * * @return archived key */ public byte[] getPrivateKeyData() throws EBaseException { @@ -273,7 +273,7 @@ public class KeyRecord implements IDBObj, IKeyRecord { /** * Retrieves the key size. * <P> - * + * * @return key size */ public Integer getKeySize() throws EBaseException { diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java b/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java index 941b0552d..732957c25 100644 --- a/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java +++ b/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.dbs.keydb.IKeyRecordList; /** * A class represents a list of key records. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java b/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java index 1a6103492..15e6935e2 100644 --- a/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.logging.ILogger; * A class represents a mapper to serialize * key record into database. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java b/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java index 2622cdbc6..afb88bf66 100644 --- a/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java @@ -31,7 +31,7 @@ import com.netscape.certsrv.dbs.keydb.KeyState; /** * A class represents a key state mapper. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java b/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java index ff867bf52..4bd31bcad 100644 --- a/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java +++ b/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.dbs.IFilterConverter; * A class represents a filter converter * that understands how to convert a attribute * type from one defintion to another. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/LongMapper.java b/base/common/src/com/netscape/cmscore/dbs/LongMapper.java index b4d6c75d6..0afa95c72 100644 --- a/base/common/src/com/netscape/cmscore/dbs/LongMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/LongMapper.java @@ -31,7 +31,7 @@ import com.netscape.certsrv.dbs.IDBObj; * A class represents ann attribute mapper that maps * a Java Long object into LDAP attribute, * and vice versa. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java b/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java index 9b224508c..f30d13bf6 100644 --- a/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java @@ -32,14 +32,14 @@ import com.netscape.certsrv.dbs.IDBObj; /** * A class represent mapper for metainfo attribute. Metainfo * is in format of the following: - * + * * <PRE> * metaInfoType:metaInfoValue * metaInfoType:metaInfoValue * metaInfoType:metaInfoValue * metaInfoType:metaInfoValue * </PRE> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java b/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java index f77a36ed4..b6f39818a 100644 --- a/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java @@ -39,7 +39,7 @@ import com.netscape.certsrv.logging.ILogger; * A class represents ann attribute mapper that maps * a Java object into LDAP attribute, * and vice versa. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java b/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java index 8b66d02ca..ba5880282 100644 --- a/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java @@ -37,7 +37,7 @@ import com.netscape.cmscore.cert.CertUtils; * a public key data into LDAP attribute and * vice versa. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java b/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java index 46ab07385..5a6a61d20 100644 --- a/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java +++ b/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java @@ -29,7 +29,7 @@ import com.netscape.certsrv.dbs.replicadb.IReplicaIDRepository; * A class represents a replica repository. It * creates unique managed replica IDs. * <P> - * + * * @author alee * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/Repository.java b/base/common/src/com/netscape/cmscore/dbs/Repository.java index aadfb888a..2cfe320f6 100644 --- a/base/common/src/com/netscape/cmscore/dbs/Repository.java +++ b/base/common/src/com/netscape/cmscore/dbs/Repository.java @@ -39,11 +39,11 @@ import com.netscape.certsrv.dbs.repository.IRepositoryRecord; * <P> * To build domain specific repository, subclass should be created. * <P> - * + * * @author galperin * @author thomask * @version $Revision: 1.4 - * + * * $, $Date$ */ @@ -126,7 +126,7 @@ public abstract class Repository implements IRepository { /** * Retrieves the next serial number attr in db. * <P> - * + * * @return next serial number */ protected BigInteger getSerialNumber() throws EBaseException { @@ -152,7 +152,7 @@ public abstract class Repository implements IRepository { BigInteger serial = rec.getSerialNumber(); if (!mInit) { - // cms may crash after issue a cert but before update + // cms may crash after issue a cert but before update // the serial number record try { IDBObj obj = s.read("cn=" + @@ -173,7 +173,7 @@ public abstract class Repository implements IRepository { /** * Updates the serial number to the specified in db. * <P> - * + * * @param num serial number */ protected void setSerialNumber(BigInteger num) throws EBaseException { @@ -186,7 +186,7 @@ public abstract class Repository implements IRepository { /** * Get the maximum serial number. - * + * * @return maximum serial number */ public String getMaxSerial() { @@ -195,7 +195,7 @@ public abstract class Repository implements IRepository { /** * Set the maximum serial number. - * + * * @param serial maximum number * @exception EBaseException failed to set maximum serial number */ @@ -212,7 +212,7 @@ public abstract class Repository implements IRepository { /** * Get the maximum serial number in next range. - * + * * @return maximum serial number in next range */ public String getNextMaxSerial() { @@ -221,7 +221,7 @@ public abstract class Repository implements IRepository { /** * Set the maximum serial number in next range - * + * * @param serial maximum number in next range * @exception EBaseException failed to set maximum serial number in next range */ @@ -240,7 +240,7 @@ public abstract class Repository implements IRepository { /** * Get the minimum serial number. - * + * * @return minimum serial number */ public String getMinSerial() { @@ -337,7 +337,7 @@ public abstract class Repository implements IRepository { /** * Updates the serial number to the specified in db and cache. * <P> - * + * * @param num serial number */ public void setTheSerialNumber(BigInteger num) throws EBaseException { @@ -364,7 +364,7 @@ public abstract class Repository implements IRepository { * Retrieves the next serial number, and also increase the * serial number by one. * <P> - * + * * @return serial number */ public synchronized BigInteger getNextSerialNumber() throws @@ -422,7 +422,7 @@ public abstract class Repository implements IRepository { /** * Checks to see if a new range is needed, or if we have reached the end of the * current range, or if a range conflict has occurred. - * + * * @exception EBaseException failed to check next range for conflicts */ public void checkRanges() throws EBaseException { @@ -483,7 +483,7 @@ public abstract class Repository implements IRepository { /** * Sets whether serial number management is enabled for certs * and requests. - * + * * @param value true/false * @exception EBaseException failed to set */ diff --git a/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java b/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java index 8f90723cd..36d5ce914 100644 --- a/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java +++ b/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.dbs.repository.IRepositoryRecord; /** * A class represents a repository record. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java b/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java index 4a0cf4155..4ec8da629 100644 --- a/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java +++ b/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java @@ -21,7 +21,7 @@ package com.netscape.cmscore.dbs; * A class represents a collection of repository-specific * schema information. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java b/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java index 00ca0034b..36f470511 100644 --- a/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java +++ b/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java @@ -30,7 +30,7 @@ import com.netscape.certsrv.dbs.certdb.IRevocationInfo; * object is written as an attribute of certificate record * which essentially signifies a revocation act. * <P> - * + * * @author galperin * @version $Revision$, $Date$ */ @@ -52,7 +52,7 @@ public class RevocationInfo implements IRevocationInfo, Serializable { /** * Constructs revocation info used by revocation * request implementation. - * + * * @param reason if not null contains CRL entry extension * that specifies revocation reason * @see CRLReasonExtension diff --git a/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java b/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java index 7cf39dcef..396067c79 100644 --- a/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java @@ -40,7 +40,7 @@ import com.netscape.cmscore.util.Debug; * A class represents a mapper to serialize * revocation information into database. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/StringMapper.java b/base/common/src/com/netscape/cmscore/dbs/StringMapper.java index 710a17875..d3b1ea710 100644 --- a/base/common/src/com/netscape/cmscore/dbs/StringMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/StringMapper.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.dbs.IDBObj; * A class represents ann attribute mapper that maps * a Java String object into LDAP attribute, * and vice versa. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java b/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java index 7a465231b..60dec48b7 100644 --- a/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java @@ -31,7 +31,7 @@ import com.netscape.certsrv.dbs.IDBObj; * A class represents ann attribute mapper that maps * a Java String object into LDAP attribute, * and vice versa. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java b/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java index 0bf3bf7da..684f27c22 100644 --- a/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java @@ -36,7 +36,7 @@ import com.netscape.certsrv.logging.ILogger; * A class represents ann attribute mapper that maps * a Java X500Name object into LDAP attribute, * and vice versa. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java b/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java index 18f0c8e3d..6fbb2cfca 100644 --- a/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.dbs.certdb.ICertRecord; /** * A class represents a mapper to serialize * x509 certificate into database. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java b/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java index 213772882..ba02eff23 100644 --- a/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java +++ b/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java @@ -54,7 +54,7 @@ public class CMSExtensionsMap implements ISubsystem { /** * Create extensions from configuration store. - * + * * @param config the configuration store. */ public void init(ISubsystem owner, IConfigStore config) @@ -140,7 +140,7 @@ public class CMSExtensionsMap implements ISubsystem { /** * Get the extension class by name. - * + * * @param name name of the extension * @return the extension class. */ @@ -150,7 +150,7 @@ public class CMSExtensionsMap implements ISubsystem { /** * Get the extension class by its OID. - * + * * @param oid - the OID of the extension. * @return the extension class. */ diff --git a/base/common/src/com/netscape/cmscore/jobs/CronItem.java b/base/common/src/com/netscape/cmscore/jobs/CronItem.java index 91574c6cc..f15e0402a 100644 --- a/base/common/src/com/netscape/cmscore/jobs/CronItem.java +++ b/base/common/src/com/netscape/cmscore/jobs/CronItem.java @@ -31,7 +31,7 @@ import com.netscape.certsrv.logging.ILogger; * an "item"...which includes both numbers and '-' separated ranges. * <p> * for each of the 5 cron fields, it's represented as a CronItem - * + * * @author cfu * @version $Revision$, $Date$ */ @@ -55,7 +55,7 @@ public class CronItem { /** * parses and sets a string cron item - * + * * @param sItem the string representing an item of a cron string. * item can be potentially comma separated with ranges specified * with '-'s @@ -149,7 +149,7 @@ public class CronItem { /** * get the vector stuffed with elements where each element is * represented as CronRange - * + * * @return a vector of CronRanges */ public Vector<CronRange> getElements() { diff --git a/base/common/src/com/netscape/cmscore/jobs/CronRange.java b/base/common/src/com/netscape/cmscore/jobs/CronRange.java index af5ae2a51..c49a5b1b4 100644 --- a/base/common/src/com/netscape/cmscore/jobs/CronRange.java +++ b/base/common/src/com/netscape/cmscore/jobs/CronRange.java @@ -25,7 +25,7 @@ package com.netscape.cmscore.jobs; * <p> * an Element can contain either an integer number or a range specified as CronRange. In case of integer numbers, begin * and end are of the same value - * + * * @author cfu * @version $Revision$, $Date$ */ @@ -67,7 +67,7 @@ public class CronRange { /** * checks to see if the lower and higher boundary values are * within the min/max. - * + * * @param min the minimum value one can specify in this field * @param max the maximum value one can specify in this field * @return a boolean (true/false) on whether the begin/end values diff --git a/base/common/src/com/netscape/cmscore/jobs/JobCron.java b/base/common/src/com/netscape/cmscore/jobs/JobCron.java index 164c1250e..7befa611c 100644 --- a/base/common/src/com/netscape/cmscore/jobs/JobCron.java +++ b/base/common/src/com/netscape/cmscore/jobs/JobCron.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.logging.ILogger; * e.g. jobsScheduler.job.rnJob1.cron=30 11,23 * * 1-5 In this example, the job "rnJob1" will be executed from Monday * through Friday, at 11:30am and 11:30pm. * <p> - * + * * @author cfu * @version $Revision$, $Date$ */ @@ -173,7 +173,7 @@ public class JobCron implements IJobCron { /** * retrieves the cron item - * + * * @param item name of the item. must be one of the <b>CRON_*</b> * strings defined in this class * @return an instance of the CronItem class which represents the @@ -199,7 +199,7 @@ public class JobCron implements IJobCron { /** * Does the element fit any element in the item - * + * * @param element the element of "now" in cron format * @param item the item consists of a vector of elements * @return boolean (true/false) on whether the element is one of @@ -229,7 +229,7 @@ public class JobCron implements IJobCron { /** * convert the day of the week representation from Calendar to * cron - * + * * @param time the Calendar value represents a moment of time * @return an integer value that represents a cron Day-Of-Week * element @@ -277,7 +277,7 @@ public class JobCron implements IJobCron { /** * convert the month of year representation from Calendar to cron - * + * * @param time the Calendar value represents a moment of time * @return an integer value that represents a cron Month-Of-Year * element diff --git a/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java b/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java index b35f8c340..feabb1f46 100644 --- a/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java +++ b/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java @@ -47,7 +47,7 @@ import com.netscape.cmscore.util.Debug; * on each Tuesday (e.g. * 7 * * 2) will result in the execution of the job thread only once every 5 minutes during that * hour. <b>The inteval value is recommended at 1 minute, setting it otherwise has the potential of forever missing the * beat</b>. Use with caution. - * + * * @author cfu * @see JobCron * @version $Revision$, $Date$ @@ -93,7 +93,7 @@ public class JobsScheduler implements Runnable, IJobsScheduler { * the config params have the following formats: jobScheduler.impl.[implementation name].class=[package name] * jobScheduler.job.[job name].pluginName=[implementation name] jobScheduler.job.[job name].cron=[crontab format] * jobScheduler.job.[job name].[any job specific params]=[values] - * + * * @param config jobsScheduler configStore */ public void init(ISubsystem owner, IConfigStore config) @@ -373,7 +373,7 @@ public class JobsScheduler implements Runnable, IJobsScheduler { /** * Retrieves id (name) of this subsystem. - * + * * @return name of the Jobs Scheduler subsystem */ public String getId() { @@ -384,7 +384,7 @@ public class JobsScheduler implements Runnable, IJobsScheduler { * Sets id string to this subsystem. * <p> * Use with caution. Should not do it when sharing with others - * + * * @param id name to be applied to an Jobs Scheduler subsystem */ public void setId(String id) throws EBaseException { @@ -423,7 +423,7 @@ public class JobsScheduler implements Runnable, IJobsScheduler { /** * Returns the root configuration storage of this system. * <P> - * + * * @return configuration store of this subsystem */ public IConfigStore getConfigStore() { @@ -433,7 +433,7 @@ public class JobsScheduler implements Runnable, IJobsScheduler { /** * Gets configuration parameters for the given * job plugin. - * + * * @param implName Name of the job plugin. * @return Hashtable of required parameters. */ @@ -454,7 +454,7 @@ public class JobsScheduler implements Runnable, IJobsScheduler { implName)); } - // XXX can find an instance of this plugin in existing + // XXX can find an instance of this plugin in existing // auth manager instantces to avoid instantiation just for this. // a temporary instance diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java b/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java index 3d7e7f31d..7c1fa979e 100644 --- a/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java +++ b/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java @@ -25,9 +25,9 @@ import com.netscape.certsrv.request.IRequest; /** * This class represents an expression of the form * <var1 op val1 AND var2 op va2>. - * + * * Expressions are used as predicates for publishing rule selection. - * + * * @author mzhao * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java b/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java index 7dd282140..859e442fa 100644 --- a/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java +++ b/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java @@ -108,7 +108,7 @@ public class LdapConnModule implements ILdapConnModule { * Use ILdapConnFactory.getConn() to get a Ldap connection to the ldap * publishing directory. * Use ILdapConnFactory.returnConn() to return the connection. - * + * * @see com.netscape.certsrv.ldap.ILdapBoundConnFactory * @see com.netscape.certsrv.ldap.ILdapConnFactory */ diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java b/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java index 011e3e690..92a9b902e 100644 --- a/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java +++ b/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java @@ -25,9 +25,9 @@ import com.netscape.certsrv.request.IRequest; /** * This class represents an Or expression of the form * (var1 op val1 OR var2 op val2). - * + * * Expressions are used as predicates for publishing rule selection. - * + * * @author mzhao * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java index 469ba62a0..14263a951 100644 --- a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java +++ b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java @@ -26,16 +26,16 @@ import com.netscape.cmscore.util.Debug; /** * Default implementation of predicate parser. - * + * * Limitations: - * + * * 1. Currently parentheses are not suported. * 2. Only ==, != <, >, <= and >= operators are supported. * 3. The only boolean operators supported are AND and OR. AND takes precedence * over OR. Example: a AND b OR e OR c AND d * is treated as (a AND b) OR e OR (c AND d) * 4. If this is n't adequate, roll your own. - * + * * @author mzhao * @version $Revision$, $Date$ */ @@ -51,7 +51,7 @@ public class LdapPredicateParser { /** * Parse the predicate expression and return a vector of expressions. - * + * * @param predicateExp The predicate expression as read from the config file. * @return expVector The vector of expressions. */ @@ -197,7 +197,7 @@ public class LdapPredicateParser { * req.set("request", "issuance"); * req.set("id", new Integer(10)); * req.set("dualcerts", new Boolean(true)); - * + * * Vector v = new Vector(); * v.addElement("one"); * v.addElement("two"); @@ -227,8 +227,8 @@ public class LdapPredicateParser { * } * catch (Exception e) {e.printStackTrace(); } * } - * - * + * + * * try * { * BufferedReader rdr = new BufferedReader( @@ -248,7 +248,7 @@ public class LdapPredicateParser { * boolean result = exp.evaluate(req); * System.out.println("Result: " + result); * } - * + * * }catch (Exception e){e.printStackTrace();} * } * } diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java b/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java index bbe86e8a5..263187bf3 100644 --- a/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java +++ b/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java @@ -153,7 +153,7 @@ public class LdapPublishModule implements ILdapPublishModule { * Use ILdapConnFactory.getConn() to get a Ldap connection to the ldap * publishing directory. * Use ILdapConnFactory.returnConn() to return the connection. - * + * * @see com.netscape.certsrv.ldap.ILdapBoundConnFactory * @see com.netscape.certsrv.ldap.ILdapConnFactory */ @@ -607,7 +607,7 @@ class HandleRenewal implements IRequestListener { } public void accept(IRequest r) { - // Note we do not remove old certs from directory during renewal + // Note we do not remove old certs from directory during renewal X509CertImpl[] certs = r.getExtDataInCertArray(IRequest.ISSUED_CERTS); if (certs == null || certs.length == 0) { diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java b/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java index cbeeed2df..dd567efe7 100644 --- a/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java +++ b/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java @@ -105,7 +105,7 @@ public class LdapRequestListener implements IRequestListener { obj.setCerts(certs); return obj; } else if (type.equals(IRequest.RENEWAL_REQUEST)) { - // Note we do not remove old certs from directory during renewal + // Note we do not remove old certs from directory during renewal X509CertImpl[] certs = r.getExtDataInCertArray(IRequest.ISSUED_CERTS); if (certs == null || certs.length == 0) { @@ -262,7 +262,7 @@ class LdapRenewalListener implements IRequestListener { } public void accept(IRequest r) { - // Note we do not remove old certs from directory during renewal + // Note we do not remove old certs from directory during renewal Certificate[] certs = r.getExtDataInCertArray(IRequest.ISSUED_CERTS); if (certs == null || certs.length == 0) { diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapRule.java b/base/common/src/com/netscape/cmscore/ldap/LdapRule.java index 0f0c3a3b9..df8153366 100644 --- a/base/common/src/com/netscape/cmscore/ldap/LdapRule.java +++ b/base/common/src/com/netscape/cmscore/ldap/LdapRule.java @@ -222,7 +222,7 @@ public class LdapRule implements ILdapRule, IExtendedPluginInfo { /** * Sets a predicate expression for rule matching. * <P> - * + * * @param exp The predicate expression for the rule. */ public void setPredicate(ILdapExpression exp) { @@ -232,7 +232,7 @@ public class LdapRule implements ILdapRule, IExtendedPluginInfo { /** * Returns the predicate expression for the rule. * <P> - * + * * @return The predicate expression for the rule. */ public ILdapExpression getPredicate() { diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java b/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java index 0a1dde49f..2c5caf2bd 100644 --- a/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java +++ b/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java @@ -30,9 +30,9 @@ import com.netscape.cmscore.util.AssertionException; /** * This class represents an expression of the form var = val, * var != val, var < val, var > val, var <= val, var >= val. - * + * * Expressions are used as predicates for publishing rule selection. - * + * * @author mzhao * @version $Revision$, $Date$ */ @@ -45,7 +45,7 @@ public class LdapSimpleExpression implements ILdapExpression { private boolean hasWildCard; public static final char WILDCARD_CHAR = '*'; - // This is just for indicating a null expression. + // This is just for indicating a null expression. public static LdapSimpleExpression NULL_EXPRESSION = new LdapSimpleExpression("null", OP_EQUAL, "null"); public static ILdapExpression parse(String input) diff --git a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java index 453703443..74ac574da 100644 --- a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java +++ b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java @@ -360,7 +360,7 @@ public class PublisherProcessor implements /** * Retrieves LDAP connection module. * <P> - * + * * @return LDAP connection instance */ public ILdapConnModule getLdapConnModule() { @@ -444,7 +444,7 @@ public class PublisherProcessor implements mAuthority.removeRequestListener(mLdapRequestListener); } } catch (Exception e) { - // ignore + // ignore } } @@ -830,7 +830,7 @@ public class PublisherProcessor implements + " published as " + published + " in the ldap directory. Cert Record not found. Error: " + e - + " Don't be alarmed if it's a subordinate ca or clone's ca siging cert. " + + " Don't be alarmed if it's a subordinate ca or clone's ca siging cert. " + "Otherwise your internal db may be corrupted."); } } diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java index dc4c86547..1edee3812 100644 --- a/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java +++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java @@ -48,7 +48,7 @@ public class LdapAnonConnFactory implements ILdapConnFactory { public static final String PROP_ERROR_IF_DOWN = "errorIfDown"; private int mNumConns = 0; // number of available conns in array - private int mTotal = 0; // total num conns + private int mTotal = 0; // total num conns private AnonConnection mConns[] = null; private boolean mInited = false; @@ -69,7 +69,7 @@ public class LdapAnonConnFactory implements ILdapConnFactory { /** * Constructor for LdapAnonConnFactory - * + * * @param minConns minimum number of connections to have available * @param maxConns max number of connections to have available. This is * the maximum number of clones of this connection one wants to allow. @@ -135,7 +135,7 @@ public class LdapAnonConnFactory implements ILdapConnFactory { protected void init(int minConns, int maxConns, LdapConnInfo connInfo) throws ELdapException { if (mInited) - return; // XXX should throw exception here ? + return; // XXX should throw exception here ? if (minConns <= 0 || maxConns <= 0 || minConns > maxConns) throw new ELdapException( @@ -181,10 +181,10 @@ public class LdapAnonConnFactory implements ILdapConnFactory { } } catch (LDAPException e) { // XXX errorCodeToString() used here so users won't see message. - // though why are messages from exceptions being displayed to + // though why are messages from exceptions being displayed to // users ? if (e.getLDAPResultCode() == LDAPException.UNAVAILABLE) { - // need to intercept this because message from LDAP is + // need to intercept this because message from LDAP is // "DSA is unavailable" which confuses with DSA PKI. log(ILogger.LL_FAILURE, "Cannot connect to Ldap server. Error: " + @@ -215,7 +215,7 @@ public class LdapAnonConnFactory implements ILdapConnFactory { * If not the max number of connections may be reached prematurely. * The best thing to put returnConn in a finally clause so it * always gets called. For example, - * + * * <pre> * LDAPConnection c = null; * try { @@ -242,7 +242,7 @@ public class LdapAnonConnFactory implements ILdapConnFactory { * Returns null if maximum number of connections reached. * <p> * The best thing to put returnConn in a finally clause so it always gets called. For example, - * + * * <pre> * LDAPConnection c = null; * try { @@ -292,7 +292,7 @@ public class LdapAnonConnFactory implements ILdapConnFactory { "to " + mConnInfo.getHost() + ":" + mConnInfo.getPort()); } CMS.debug("LdapAnonConnFactory.getConn(): num avail conns now " + mNumConns); - //Beginning of fix for Bugzilla #630176 + //Beginning of fix for Bugzilla #630176 boolean isConnected = false; if (conn != null) { isConnected = conn.isConnected(); @@ -321,7 +321,7 @@ public class LdapAnonConnFactory implements ILdapConnFactory { * If not the max number of connections may be reached prematurely. * <p> * The best thing to put returnConn in a finally clause so it always gets called. For example, - * + * * <pre> * LDAPConnection c = null; * try { @@ -342,7 +342,7 @@ public class LdapAnonConnFactory implements ILdapConnFactory { AnonConnection anon = (AnonConnection) conn; if (anon.getFacId() != mConns) { - // returning a connection not from this factory. + // returning a connection not from this factory. log(ILogger.LL_WARN, "returnConn: unknown connection."); } // check if conn has already been returned. diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java index 1dc9723a8..a0d9b2466 100644 --- a/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java +++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java @@ -42,7 +42,7 @@ public class LdapAnonConnection extends LDAPConnection { throws LDAPException { super(connInfo.getSecure() ? new LdapJssSSLSocketFactory() : null); - // Set option to automatically follow referrals. + // Set option to automatically follow referrals. // rebind info is also anonymous. boolean followReferrals = connInfo.getFollowReferrals(); diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java index b1af367b9..c1822113d 100644 --- a/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java +++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java @@ -108,7 +108,7 @@ public class LdapAuthInfo implements ILdapAuthInfo { /** * initialize this class from the config store, and verify the password. - * + * * @param host The host that the directory server is running on. * This will be used to verify the password by attempting to connect. * If it is <code>null</code>, the password will not be verified. @@ -258,7 +258,7 @@ public class LdapAuthInfo implements ILdapAuthInfo { /** * get authentication type. - * + * * @return one of: <br> * LdapAuthInfo.LDAP_AUTHTYPE_BASICAUTH or * LdapAuthInfo.LDAP_AUTHTYPE_SSLCLIENTAUTH @@ -269,7 +269,7 @@ public class LdapAuthInfo implements ILdapAuthInfo { /** * get params for authentication - * + * * @return array of parameters for this authentication. */ public String[] getParms() { diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java index b4839f7d5..1da965a3a 100644 --- a/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java +++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java @@ -51,7 +51,7 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory { public static final String PROP_ERROR_IF_DOWN = "errorIfDown"; private int mNumConns = 0; // number of available conns in array - private int mTotal = 0; // total num conns + private int mTotal = 0; // total num conns private boolean doCloning = true; private LdapBoundConnection mMasterConn = null; // master connection object. @@ -92,7 +92,7 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory { /** * Constructor for LdapBoundConnFactory - * + * * @param minConns minimum number of connections to have available * @param maxConns max number of connections to have available. This is * the maximum number of clones of this connection or separate connections one wants to allow. @@ -128,7 +128,7 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory { /** * initialize parameters obtained from either constructor or * config store - * + * * @param minConns minimum number of connection handls to have available. * @param maxConns maximum total number of connections to ever have. * @param connInfo ldap connection info. @@ -169,7 +169,7 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory { /** * makes the initial master connection used to clone others.. - * + * * @exception ELdapException if any error occurs. */ protected void makeConnection(boolean errorIfDown) throws ELdapException { @@ -201,7 +201,7 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory { /** * makes subsequent connections if cloning is not used . - * + * * @exception ELdapException if any error occurs. */ private LdapBoundConnection makeNewConnection(boolean errorIfDown) throws ELdapException { @@ -268,7 +268,7 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory { * returnConn() method. * The best thing to do is to put returnConn in a finally clause so it * always gets called. For example, - * + * * <pre> * LDAPConnection c = null; * try { @@ -295,7 +295,7 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory { * Returns null if maximum number of connections reached. * The best thing to do is to put returnConn in a finally clause so it * always gets called. For example, - * + * * <pre> * LDAPConnection c = null; * try { @@ -396,7 +396,7 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory { * This is mandatory after a getConn(). * The best thing to do is to put returnConn in a finally clause so it * always gets called. For example, - * + * * <pre> * LDAPConnection c = null; * try { diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java index 4ef7d804c..f05fc237e 100644 --- a/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java +++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java @@ -56,8 +56,8 @@ public class LdapConnInfo implements ILdapConnInfo { String version = (String) config.get(PROP_PROTOCOL); if (version != null && version.equals("")) { - // provide a default when this field is blank from the - // configuration. + // provide a default when this field is blank from the + // configuration. mVersion = LDAP_VERSION_3; } else { mVersion = config.getInteger(PROP_PROTOCOL, LDAP_VERSION_3); @@ -82,7 +82,7 @@ public class LdapConnInfo implements ILdapConnInfo { mPort = port; mSecure = secure; if (mHost == null || mPort <= 0) { - // XXX log something here + // XXX log something here throw new IllegalArgumentException("LDAP host or port is null"); } } @@ -91,7 +91,7 @@ public class LdapConnInfo implements ILdapConnInfo { mHost = host; mPort = port; if (mHost == null || mPort <= 0) { - // XXX log something here + // XXX log something here throw new IllegalArgumentException("LDAP host or port is null"); } } diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java index 4df2fe357..bad9e3b23 100644 --- a/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java +++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java @@ -33,7 +33,7 @@ import com.netscape.certsrv.logging.ILogger; /** * Uses HCL ssl socket. - * + * * @author Lily Hsiao lhsiao@netscape.com */ public class LdapJssSSLSocketFactory implements LDAPSSLSocketFactoryExt { diff --git a/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java b/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java index baedb98de..fbdeca579 100644 --- a/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java +++ b/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java @@ -20,7 +20,7 @@ package com.netscape.cmscore.listeners; /** * This class represents a registered listener plugin. * <P> - * + * * @author stevep * @version $Revision$, $Date$ */ @@ -31,7 +31,7 @@ public class ListenerPlugin { /** * Constructs a Listener plugin. - * + * * @param id listener implementation name * @param classPath class path */ diff --git a/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java b/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java index 438b3abb9..fea638eb6 100644 --- a/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java +++ b/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.logging.ILogger; /** * A log event object for handling audit messages * <P> - * + * * @author mikep * @author mzhao * @version $Revision$, $Date$ @@ -48,7 +48,7 @@ public class AuditEventFactory implements ILogEventFactory { /** * Creates an log event. - * + * * @param evtClass the event type * @param prop the resource bundle * @param source the subsystem ID who creates the log event @@ -72,7 +72,7 @@ public class AuditEventFactory implements ILogEventFactory { /** * Set the resource bundle of the log event. - * + * * @param prop the properties * @param event the log event */ @@ -90,7 +90,7 @@ public class AuditEventFactory implements ILogEventFactory { /** * Releases an log event. - * + * * @param e the log event */ public void release(ILogEvent e) { diff --git a/base/common/src/com/netscape/cmscore/logging/AuditFormat.java b/base/common/src/com/netscape/cmscore/logging/AuditFormat.java index a5ce83251..9ba62babb 100644 --- a/base/common/src/com/netscape/cmscore/logging/AuditFormat.java +++ b/base/common/src/com/netscape/cmscore/logging/AuditFormat.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.request.IRequest; /** * Define audit log message format - * + * * @author mzhao * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/logging/LogQueue.java b/base/common/src/com/netscape/cmscore/logging/LogQueue.java index 90ca05d81..f5b31b082 100644 --- a/base/common/src/com/netscape/cmscore/logging/LogQueue.java +++ b/base/common/src/com/netscape/cmscore/logging/LogQueue.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.logging.ILogQueue; /** * A class represents a log queue. * <P> - * + * * @author mzhao * @version $Revision$, $Date$ */ @@ -49,7 +49,7 @@ public class LogQueue implements ILogQueue { /** * Initializes the log queue. * <P> - * + * */ public void init() { mListeners = new Vector<ILogEventListener>(); @@ -71,7 +71,7 @@ public class LogQueue implements ILogQueue { /** * Adds an event listener. - * + * * @param listener the log event listener */ public void addLogEventListener(ILogEventListener listener) { @@ -82,7 +82,7 @@ public class LogQueue implements ILogQueue { /** * Removes an event listener. - * + * * @param listener the log event listener */ public void removeLogEventListener(ILogEventListener listener) { @@ -91,7 +91,7 @@ public class LogQueue implements ILogQueue { /** * Logs an event, and notifies logger to reuse the event. - * + * * @param event the log event */ public void log(ILogEvent event) { @@ -106,7 +106,7 @@ public class LogQueue implements ILogQueue { // ConsoleError.send(new SystemEvent(CMS.getUserMessage("CMS_LOG_EVENT_FAILED", // event.getEventType(), e.toString()))); - // Don't do this again. + // Don't do this again. removeLogEventListener((ILogEventListener) mListeners.elementAt(i)); } } diff --git a/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java b/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java index 1cfce4e65..86e7f529c 100644 --- a/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java +++ b/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java @@ -35,7 +35,7 @@ import com.netscape.cmscore.util.Debug; /** * A class represents a log subsystem. * <P> - * + * * @author thomask * @author mzhao * @version $Revision$, $Date$ @@ -75,7 +75,7 @@ public class LogSubsystem implements ILogSubsystem { /** * Initializes the log subsystem. * <P> - * + * * @param owner owner of this subsystem * @param config configuration store */ @@ -178,7 +178,7 @@ public class LogSubsystem implements ILogSubsystem { /** * Returns the root configuration storage of this system. * <P> - * + * * @return configuration store of this subsystem */ public IConfigStore getConfigStore() { diff --git a/base/common/src/com/netscape/cmscore/logging/Logger.java b/base/common/src/com/netscape/cmscore/logging/Logger.java index 79895e263..b27147f20 100644 --- a/base/common/src/com/netscape/cmscore/logging/Logger.java +++ b/base/common/src/com/netscape/cmscore/logging/Logger.java @@ -29,7 +29,7 @@ import com.netscape.certsrv.logging.ILogger; * A class represents certificate server logger * implementation. * <P> - * + * * @author thomask * @author mzhao * @version $Revision$, $Date$ @@ -69,7 +69,7 @@ public class Logger implements ILogger { /** * Registers log factory. - * + * * @param evtClass the event class name: ILogger.EV_SYSTEM or ILogger.EV_AUDIT * @param f the event factory name */ @@ -80,7 +80,7 @@ public class Logger implements ILogger { //************** default level **************** /** * Logs an event using default log level: ILogger.LL_INFO - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM. * @param source the source of the log event * @param msg the one line detail message to be logged @@ -91,7 +91,7 @@ public class Logger implements ILogger { /** * Logs an event using default log level: ILogger.LL_INFO - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM. * @param props the resource bundle used for the detailed message * @param source the source of the log event @@ -105,7 +105,7 @@ public class Logger implements ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM. * @param source the source of the log event * @param level the level of the log event @@ -117,7 +117,7 @@ public class Logger implements ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM. * @param props the resource bundle used for the detailed message * @param source the source of the log event @@ -132,7 +132,7 @@ public class Logger implements ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM. * @param props the resource bundle used for the detailed message * @param source the source of the log event @@ -145,7 +145,7 @@ public class Logger implements ILogger { /** * Logs an event using default log level: ILogger.LL_INFO - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM. * @param props the resource bundle used for the detailed message * @param source the source of the log event @@ -158,7 +158,7 @@ public class Logger implements ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM. * @param props the resource bundle used for the detailed message * @param source the source of the log event @@ -178,7 +178,7 @@ public class Logger implements ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM. * @param source the source of the log event * @param level the level of the log event @@ -193,7 +193,7 @@ public class Logger implements ILogger { //*************** the real implementation ***************** /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM. * @param props the resource bundle used for the detailed message * @param source the source of the log event @@ -210,7 +210,7 @@ public class Logger implements ILogger { //************** default level **************** /** * Logs an event using default log level: ILogger.LL_INFO - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM. * @param source the source of the log event * @param msg the one line detail message to be logged @@ -222,7 +222,7 @@ public class Logger implements ILogger { /** * Logs an event using default log level: ILogger.LL_INFO - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM. * @param props the resource bundle used for the detailed message * @param source the source of the log event @@ -237,7 +237,7 @@ public class Logger implements ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM. * @param source the source of the log event * @param level the level of the log event @@ -250,7 +250,7 @@ public class Logger implements ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM. * @param props the resource bundle used for the detailed message * @param source the source of the log event @@ -266,7 +266,7 @@ public class Logger implements ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM. * @param props the resource bundle used for the detailed message * @param source the source of the log event @@ -280,7 +280,7 @@ public class Logger implements ILogger { /** * Logs an event using default log level: ILogger.LL_INFO - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM. * @param props the resource bundle used for the detailed message * @param source the source of the log event @@ -294,7 +294,7 @@ public class Logger implements ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM. * @param props the resource bundle used for the detailed message * @param source the source of the log event @@ -315,7 +315,7 @@ public class Logger implements ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM. * @param source the source of the log event * @param level the level of the log event @@ -331,7 +331,7 @@ public class Logger implements ILogger { //*************** the real implementation ***************** /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM. * @param props the resource bundle used for the detailed message * @param source the source of the log event @@ -364,7 +364,7 @@ public class Logger implements ILogger { /** * Notifies logger to reuse the event. This framework * opens up possibility to reuse event. - * + * * @param event a log event */ public void release(ILogEvent event) { diff --git a/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java b/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java index 48570cada..6ba492dc3 100644 --- a/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java +++ b/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java @@ -29,7 +29,7 @@ import com.netscape.cmscore.util.Debug; /** * A log event object for handling system messages * <P> - * + * * @author mikep * @author mzhao * @author cfu @@ -50,7 +50,7 @@ public class SignedAuditEventFactory implements ILogEventFactory { /** * Creates an log event. - * + * * @param evtClass the event type * @param prop the resource bundle * @param source the subsystem ID who creates the log event @@ -98,7 +98,7 @@ public class SignedAuditEventFactory implements ILogEventFactory { /** * Set the resource bundle of the log event. - * + * * @param prop the properties * @param event the log event */ @@ -116,7 +116,7 @@ public class SignedAuditEventFactory implements ILogEventFactory { /** * Releases an log event. - * + * * @param e the log event */ public void release(ILogEvent e) { diff --git a/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java b/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java index acc2b866f..4b6fd55a2 100644 --- a/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java +++ b/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java @@ -21,7 +21,7 @@ package com.netscape.cmscore.logging; * A class represents certificate server logger * implementation. * <P> - * + * * @author thomask * @author mzhao * @version $Revision$, $Date$ diff --git a/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java b/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java index dfe25f03f..6821fac6f 100644 --- a/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java +++ b/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.logging.SystemEvent; /** * A log event object for handling system messages * <P> - * + * * @author mikep * @author mzhao * @version $Revision$, $Date$ @@ -48,7 +48,7 @@ public class SystemEventFactory implements ILogEventFactory { /** * Creates an log event. - * + * * @param evtClass the event type * @param prop the resource bundle * @param source the subsystem ID who creates the log event @@ -72,7 +72,7 @@ public class SystemEventFactory implements ILogEventFactory { /** * Set the resource bundle of the log event. - * + * * @param prop the properties * @param event the log event */ @@ -90,7 +90,7 @@ public class SystemEventFactory implements ILogEventFactory { /** * Releases an log event. - * + * * @param e the log event */ public void release(ILogEvent e) { diff --git a/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java b/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java index a057484cf..4848238b7 100644 --- a/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java +++ b/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java @@ -31,7 +31,7 @@ import com.netscape.certsrv.notification.IEmailFormProcessor; * '$' is used preceeding a token name. A token name should not be a * substring of any other token name * <p> - * + * * @author cfu * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java b/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java index cd63841eb..7012801c5 100644 --- a/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java +++ b/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.notification.IEmailResolverKeys; /** * Email resolver keys as input to email resolvers * <P> - * + * * @author cfu * @version $Revision$, $Date$ */ @@ -43,7 +43,7 @@ public class EmailResolverKeys implements IEmailResolverKeys { /** * sets a key with key name and the key - * + * * @param name key name * @param key key * @exception com.netscape.certsrv.base.EBaseException NullPointerException @@ -60,7 +60,7 @@ public class EmailResolverKeys implements IEmailResolverKeys { /** * returns the key to which the specified name is mapped in this * key set - * + * * @param name key name * @return the named email resolver key */ @@ -72,7 +72,7 @@ public class EmailResolverKeys implements IEmailResolverKeys { * removes the name and its corresponding key from this * key set. This method does nothing if the named * key is not in the key set. - * + * * @param name key name */ public void delete(String name) { @@ -83,7 +83,7 @@ public class EmailResolverKeys implements IEmailResolverKeys { * returns an enumeration of the key names in this key * set. Use the Enumeration methods on the returned object to * fetch the elements sequentially. - * + * * @return an enumeration of the values in this key set * @see java.util.Enumeration */ diff --git a/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java b/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java index bdc16a24e..bd56ec608 100644 --- a/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java +++ b/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java @@ -30,8 +30,8 @@ import com.netscape.certsrv.notification.IEmailTemplate; /** * Files to be processed and returned to the requested parties. It * is a template with $tokens to be used by the form/template processor. - * - * + * + * * @author cfu * @version $Revision$, $Date$ */ @@ -55,7 +55,7 @@ public class EmailTemplate implements IEmailTemplate { /** * Default Constructor - * + * * @param templateFile File name of the template including the full path and * file extension */ diff --git a/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java b/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java index 330621e7a..de34f7be0 100644 --- a/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java +++ b/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.request.IRequest; * An email resolver that first checks the request email, if none, * then follows by checking the subjectDN of the certificate * <p> - * + * * @author cfu * @version $Revision$, $Date$ */ @@ -53,7 +53,7 @@ public class ReqCertEmailResolver implements IEmailResolver { /** * returns an email address by using the resolver keys. The * return value can possibly be null - * + * * @param keys list of keys used for resolving the email address */ public String getEmail(IEmailResolverKeys keys) @@ -137,7 +137,7 @@ public class ReqCertEmailResolver implements IEmailResolver { /** * Returns array of required keys for this email resolver - * + * * @return Array of required keys. */ diff --git a/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java b/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java index 68556dfc0..f3d5e8252 100644 --- a/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java +++ b/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java @@ -47,7 +47,7 @@ import com.netscape.certsrv.request.IRequest; * then follows by checking the subjectDN of the certificate, if none, * then follows by checking the subjectalternatename extension * <p> - * + * * @author cfu * @version $Revision$, $Date$ */ @@ -66,7 +66,7 @@ public class ReqCertSANameEmailResolver implements IEmailResolver { /** * returns an email address by using the resolver keys. The * return value can possibly be null - * + * * @param keys list of keys used for resolving the email address */ public String getEmail(IEmailResolverKeys keys) @@ -258,7 +258,7 @@ public class ReqCertSANameEmailResolver implements IEmailResolver { /** * Returns array of required keys for this email resolver - * + * * @return Array of required keys. */ diff --git a/base/common/src/com/netscape/cmscore/policy/AndExpression.java b/base/common/src/com/netscape/cmscore/policy/AndExpression.java index 459660f1e..9a2274b11 100644 --- a/base/common/src/com/netscape/cmscore/policy/AndExpression.java +++ b/base/common/src/com/netscape/cmscore/policy/AndExpression.java @@ -24,9 +24,9 @@ import com.netscape.certsrv.request.IRequest; /** * This class represents an expression of the form * <var1 op val1 AND var2 op va2>. - * + * * Expressions are used as predicates for policy selection. - * + * * @deprecated * @author kanda * @version $Revision$, $Date$ diff --git a/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java b/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java index 7c7162d0c..a3f64915d 100644 --- a/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java +++ b/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java @@ -89,7 +89,7 @@ public class GeneralNameUtil implements IGeneralNameUtil { * Form a General Name from a General Name choice and value. * The General Name choice must be one of the General Name Choice Strings * defined in this class. - * + * * @param generalNameChoice General Name choice. Must be one of the General * Name choices defined in this class. * @param value String value of the general name to form. @@ -192,7 +192,7 @@ public class GeneralNameUtil implements IGeneralNameUtil { /** * Checks if given string is a valid General Name choice and returns * the actual string that can be passed into form_GeneralName(). - * + * * @param generalNameChoice a General Name choice string. * @return one of General Name choices defined in this class that can be * passed into form_GeneralName(). @@ -209,7 +209,7 @@ public class GeneralNameUtil implements IGeneralNameUtil { theGeneralNameChoice = GENNAME_CHOICE_DNSNAME; /* X400Address not supported. - else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_X400ADDRESS)) + else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_X400ADDRESS)) theGeneralNameChoice = GENNAME_CHOICE_X400ADDRESS; */ else if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_DIRECTORYNAME)) diff --git a/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java b/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java index 05f8e111a..823c416dc 100644 --- a/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java +++ b/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java @@ -55,11 +55,11 @@ import com.netscape.cmscore.util.Debug; * Renewal, Revocation and KeyRecovery and KeyArchival. * 2. To apply the configured policies on the given request. * 3. To enable policy listing/configuration via MCC console. - * + * * Since the policy processor also implements the IPolicy interface * the processor itself presents itself as one big policy to the * request processor. - * + * * @deprecated * @author kanda * @version $Revision$, $Date$ @@ -126,7 +126,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { /** * Returns the configuration store. * <P> - * + * * @return configuration store */ public IConfigStore getConfigStore() { @@ -136,7 +136,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { /** * Initializes the PolicyProcessor * <P> - * + * * @param owner owner of this subsystem * @param config configuration of this subsystem * @exception EBaseException failed to initialize this Subsystem. @@ -323,7 +323,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { } catch (Throwable e) { mAuthority.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_POLICY_INIT_FAILED", instanceName, e.toString())); - // disable rule initialized if there is + // disable rule initialized if there is // configuration error enabled = false; c.putString(PROP_ENABLE, "false"); @@ -372,7 +372,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { /** * Apply policies on the given request. - * + * * @param IRequest The given request * @return The policy result object. */ @@ -384,9 +384,9 @@ public class GenericPolicyProcessor implements IPolicyProcessor { if (op == null) { CMS.debug("GenericPolicyProcessor: apply op null"); // throw new AssertionException("Missing operation type in request. Can't happen!"); - // Return ACCEPTED for now. Looks like even get CA chain - // is being passed in here with request type set elsewhere - // on the request. + // Return ACCEPTED for now. Looks like even get CA chain + // is being passed in here with request type set elsewhere + // on the request. return PolicyResult.ACCEPTED; } if (isProfileRequest(req)) { @@ -920,7 +920,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { // Predicate for the persistent rule can't be changed. ht.put(IPolicyRule.PROP_ENABLE, String.valueOf(active)); - // put old config store parameters first. + // put old config store parameters first. for (Enumeration<String> oldkeys = oldStore.keys(); oldkeys.hasMoreElements();) { String k = (String) oldkeys.nextElement(); String v = (String) oldStore.getString(k); @@ -957,7 +957,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { // Try to initialize this rule. newRule.init(this, newStore); - // If we are successfully initialized, replace the rule + // If we are successfully initialized, replace the rule // instance policyInstance.setRule(newRule); policyInstance.setActive(active); @@ -1161,26 +1161,26 @@ public class GenericPolicyProcessor implements IPolicyProcessor { /** * Initializes the default system policies. Currently there is only * one policy - ManualAuthentication. More may be added later on. - * + * * The default policies may be disabled - for example to over-ride * agent approval for testing the system by setting the following * property in the config file: - * + * * <subsystemId>.Policy.systemPolicies.enable=false - * + * * By default the value for this property is true. - * + * * Users can over-ride the default system policies by listing their * 'custom' system policies under the following property: - * + * * <subsystemId>.Policy.systemPolicies=<system policy1 class path>, * <system policy2 class path> - * + * * There can only be one instance of the system policy in the system * and will apply to all requests, and hence predicates are not used * for a system policy. Due to the same reason, these properties are * not configurable using the Console. - * + * * A System policy may read config properties from a subtree under * <subsystemId>.Policy.systemPolicies.<ClassName>. An example is * ra.Policy.systemPolicies.ManualAuthentication.param1=value @@ -1221,7 +1221,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { mSystemDefaults = DEF_POLICIES; } - // Now Initialize the rules. These defaults have only one + // Now Initialize the rules. These defaults have only one // instance and the rule name is the name of the class itself. // Any configuration parameters required could be read from // <subsystemId>.Policy.default.RuleName. @@ -1268,84 +1268,84 @@ public class GenericPolicyProcessor implements IPolicyProcessor { /** * Read list of undeletable policies if any configured in the * system. - * + * * These are required to protect the system from being misconfigured * to the point that the requests wouldn't serialize or certain * fields in the certificate(s) being checked will go unchecked * ..etc. - * + * * For now the following policies are undeletable: - * + * * DirAuthRule: This is a default DirectoryAuthentication policy * for user certificates that interprets directory * credentials. The presence of this policy is needed * if the OOTB DirectoryAuthentication-based automatic * certificate issuance is supported. - * + * * DefaultUserNameRule: This policy verifies/sets subjectDn for user * certificates. - * + * * DefaultServerNameRule: This policy verifies/sets subjectDn for * server certificates. - * + * * DefaultValidityRule: Verifies/sets validty for all certificates. - * + * * DefaultRenewalValidityRule: Verifies/sets validity for certs being * renewed. - * + * * The 'undeletables' cannot be deleted from the config file, nor * can the be disabled. If any predicates are associated with them * the predicates can't be changed either. But, other config parameters * such as maxValidity, renewalInterval ..etc can be changed to suit * local policy requirements. - * + * * During start up the policy processor will verify if the undeletables * are present, and that they are enabled and that their predicates are * not changed. - * + * * The rules mentioned above are currently hard coded. If these need to * read from the config file, the 'undeletables' can be configured as * as follows: - * + * * <subsystemId>.Policy.undeletablePolicies=<comma separated rule names> * Example: * ra.Policy.undeletablePolicies=DirAuthRule, DefaultUserNameRule, DefaultServerNameRule, DefaultValidityRule, * DefaultRenewalValidityRule - * + * * The predicates if any associated with them may be configured as * follows: * <subsystemId>.Policy.undeletablePolicies.DirAuthRule.predicate= certType == client. - * + * * where subsystemId is ra or ca. - * + * * If the undeletables are configured in the file,the configured entries * take precedence over the hardcoded ones in this file. If you are * configuring them in the file, please remember to configure the * predicates if applicable. - * + * * During policy configuration from MCC, the policy processor will not * let you delete an 'undeletable', nor will it let you disable it. * You will not be able to change the predicate either. Other parameters * can be configured as needed. - * + * * If a particular rule needs to be removed from the 'undeletables', * either remove it from the hard coded list above, or configure the * rules required rules only via the config file. The former needs * recompilation of the source. The later is flexible to be able to * make any rule an 'undeletable' or nor an 'undeletable'. - * + * * Example: We want to use only manual forms for enrollment. * We do n't need to burn in DirAuthRule. We need to configure all * other rules except the DirAuthRule as follows: - * + * * ra.Policy.undeletablePolicies = DefaultUserNameRule, DefaultServerNameRule, DefaultValidityRule, * DefaultRenewalValidityRule - * + * * The following predicates are necessary: - * + * * ra.Policy.undeletablePolicies.DefaultUserNameRule.predicate = certType == client * ra.Policy.undeletablePolicies.DefaultServerNameRule.predicate = certType == server - * + * * The other two rules do not have any predicates. */ private void initUndeletablePolicies(IConfigStore mConfig) @@ -1375,7 +1375,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { return; } - // For each rule read from the config file, see if any + // For each rule read from the config file, see if any // predicate is set. mUndeletablePolicies = new Hashtable<String, IExpression>(); for (Enumeration<String> e = rules.elements(); e.hasMoreElements();) { diff --git a/base/common/src/com/netscape/cmscore/policy/OrExpression.java b/base/common/src/com/netscape/cmscore/policy/OrExpression.java index 3b220c100..512bba256 100644 --- a/base/common/src/com/netscape/cmscore/policy/OrExpression.java +++ b/base/common/src/com/netscape/cmscore/policy/OrExpression.java @@ -24,9 +24,9 @@ import com.netscape.certsrv.request.IRequest; /** * This class represents an Or expression of the form * (var1 op val1 OR var2 op val2). - * + * * Expressions are used as predicates for policy selection. - * + * * @deprecated * @author kanda * @version $Revision$, $Date$ diff --git a/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java b/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java index 568a38e6d..b40a50699 100644 --- a/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java +++ b/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java @@ -26,16 +26,16 @@ import com.netscape.cmscore.util.Debug; /** * Default implementation of predicate parser. - * + * * Limitations: - * + * * 1. Currently parentheses are not suported. * 2. Only ==, != <, >, <= and >= operators are supported. * 3. The only boolean operators supported are AND and OR. AND takes precedence * over OR. Example: a AND b OR e OR c AND d * is treated as (a AND b) OR e OR (c AND d) * 4. If this is n't adequate, roll your own. - * + * * @deprecated * @author kanda * @version $Revision$, $Date$ @@ -52,7 +52,7 @@ public class PolicyPredicateParser { /** * Parse the predicate expression and return a vector of expressions. - * + * * @param predicateExp The predicate expression as read from the config file. * @return expVector The vector of expressions. */ @@ -198,7 +198,7 @@ public class PolicyPredicateParser { * req.set("request", "issuance"); * req.set("id", new Integer(10)); * req.set("dualcerts", new Boolean(true)); - * + * * Vector v = new Vector(); * v.addElement("one"); * v.addElement("two"); @@ -228,8 +228,8 @@ public class PolicyPredicateParser { * } * catch (Exception e) {e.printStackTrace(); } * } - * - * + * + * * try * { * BufferedReader rdr = new BufferedReader( @@ -249,7 +249,7 @@ public class PolicyPredicateParser { * boolean result = exp.evaluate(req); * System.out.println("Result: " + result); * } - * + * * }catch (Exception e){e.printStackTrace();} * } * } diff --git a/base/common/src/com/netscape/cmscore/policy/PolicySet.java b/base/common/src/com/netscape/cmscore/policy/PolicySet.java index 9e7ecdc64..d824d2629 100644 --- a/base/common/src/com/netscape/cmscore/policy/PolicySet.java +++ b/base/common/src/com/netscape/cmscore/policy/PolicySet.java @@ -32,7 +32,7 @@ import com.netscape.cmscore.util.Debug; /** * Implements a policy set per IPolicySet interface. This class * uses a vector of ordered policies to enforce priority. - * + * * @deprecated * @author kanda * @version $Revision$, $Date$ @@ -50,7 +50,7 @@ public class PolicySet implements IPolicySet { /** * Returns the name of the rule set. * <P> - * + * * @return The name of the rule set. */ public String getName() { @@ -60,7 +60,7 @@ public class PolicySet implements IPolicySet { /** * Returns the no of rules in a set. * <P> - * + * * @return the no of rules. */ public int count() { @@ -70,7 +70,7 @@ public class PolicySet implements IPolicySet { /** * Add a policy rule. * <P> - * + * * @param ruleName The name of the rule to be added. * @param rule The rule to be added. */ @@ -88,7 +88,7 @@ public class PolicySet implements IPolicySet { /** * Remplaces a policy rule identified by the given name. - * + * * @param name The name of the rule to be replaced. * @param rule The rule to be replaced. */ @@ -106,7 +106,7 @@ public class PolicySet implements IPolicySet { /** * Removes a policy rule identified by the given name. - * + * * @param name The name of the rule to be removed. */ public void removeRule(String ruleName) { @@ -122,7 +122,7 @@ public class PolicySet implements IPolicySet { /** * Returns the rule identified by a given name. * <P> - * + * * @param name The name of the rule to be return. * @return The rule identified by the given name or null if none exists. */ @@ -137,7 +137,7 @@ public class PolicySet implements IPolicySet { /** * Returns an enumeration of rules. * <P> - * + * * @return An enumeration of rules. */ public Enumeration<IPolicyRule> getRules() { @@ -147,7 +147,7 @@ public class PolicySet implements IPolicySet { /** * Apply policies on a given request from a rule set. * The rules may modify the request. - * + * * @param req The request to apply policies on. * @return the PolicyResult. */ @@ -161,7 +161,7 @@ public class PolicySet implements IPolicySet { // if atleast one of the policies returns a REJECTED, we need to // return that status. If none of the policies REJECTED // the request, but atleast one of them DEFERRED the request, we - // need to return DEFERRED. + // need to return DEFERRED. boolean rejected = false; boolean deferred = false; int size = mRules.size(); @@ -235,7 +235,7 @@ public class PolicySet implements IPolicySet { ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_POLICY_ERROR_RESULT", req.getRequestId().toString(), name, ex.toString())); - // treat as rejected to prevent request from going into + // treat as rejected to prevent request from going into // a weird state. request queue doesn't handle this case. rejected = true; ((IPolicyRule) rule).setError( diff --git a/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java b/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java index 892fd6451..cf6e44bb0 100644 --- a/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java +++ b/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java @@ -30,9 +30,9 @@ import com.netscape.cmscore.util.Debug; /** * This class represents an expression of the form var = val, * var != val, var < val, var > val, var <= val, var >= val. - * + * * Expressions are used as predicates for policy selection. - * + * * @deprecated * @author kanda * @version $Revision$, $Date$ @@ -46,7 +46,7 @@ public class SimpleExpression implements IExpression { private boolean hasWildCard; public static final char WILDCARD_CHAR = '*'; - // This is just for indicating a null expression. + // This is just for indicating a null expression. public static SimpleExpression NULL_EXPRESSION = new SimpleExpression("null", OP_EQUAL, "null"); public static IExpression parse(String input) diff --git a/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java b/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java index 585af5600..54f54e009 100644 --- a/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java +++ b/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java @@ -65,7 +65,7 @@ public class ProfileSubsystem implements IProfileSubsystem { * Initializes this subsystem with the given configuration * store. * <P> - * + * * @param owner owner of this subsystem * @param config configuration store * @exception EBaseException failed to initialize @@ -220,7 +220,7 @@ public class ProfileSubsystem implements IProfileSubsystem { /** * Returns the root configuration storage of this system. * <P> - * + * * @return configuration store of this subsystem */ public IConfigStore getConfigStore() { @@ -312,7 +312,7 @@ public class ProfileSubsystem implements IProfileSubsystem { /** * Checks if owner id should be enforced during profile approval. - * + * * @return true if approval should be checked */ public boolean checkOwner() { diff --git a/base/common/src/com/netscape/cmscore/realm/ACL.java b/base/common/src/com/netscape/cmscore/realm/ACL.java index 4d7303f9d..5c7defd1d 100644 --- a/base/common/src/com/netscape/cmscore/realm/ACL.java +++ b/base/common/src/com/netscape/cmscore/realm/ACL.java @@ -29,7 +29,7 @@ import java.util.Vector; * An <code>ACL</code> may contain one or more <code>ACLEntry</code>. However, in case of multiple <code>ACLEntry</code> * , a subject must pass ALL of the <code>ACLEntry</code> evaluation for permission to be granted * <P> - * + * * @version $Revision$, $Date$ */ public class ACL { @@ -54,7 +54,7 @@ public class ACL { * Class constructor. * Constructs an access control list associated * with a resource name - * + * * @param name resource name * @param rights applicable rights defined for this resource * @param resourceACLs the entire ACL specification. For example: @@ -78,7 +78,7 @@ public class ACL { /** * Sets the name of the resource governed by this * access control. - * + * * @param name name of the resource */ public void setName(String name) { @@ -88,7 +88,7 @@ public class ACL { /** * Retrieves the name of the resource governed by * this access control. - * + * * @return name of the resource */ public String getName() { @@ -97,7 +97,7 @@ public class ACL { /** * Retrieves the exact string of the resourceACLs - * + * * @return resource's acl */ public String getResourceACLs() { @@ -107,7 +107,7 @@ public class ACL { /** * Sets the description of the resource governed by this * access control. - * + * * @param description Description of the protected resource */ public void setDescription(String description) { @@ -117,7 +117,7 @@ public class ACL { /** * Retrieves the description of the resource governed by * this access control. - * + * * @return Description of the protected resource */ public String getDescription() { @@ -126,7 +126,7 @@ public class ACL { /** * Adds an ACL entry to this list. - * + * * @param entry the <code>ACLEntry</code> to be added to this resource */ public void addEntry(ACLEntry entry) { @@ -135,7 +135,7 @@ public class ACL { /** * Returns ACL entries. - * + * * @return enumeration for the <code>ACLEntry</code> vector */ public Enumeration<ACLEntry> entries() { @@ -144,7 +144,7 @@ public class ACL { /** * Returns the string reprsentation. - * + * * @return the string representation of the ACL entries in the * following format: * <resource name>[<ACLEntry1>,<ACLEntry 2>,...<ACLEntry N>] @@ -165,7 +165,7 @@ public class ACL { /** * Adds an rights entry to this list. - * + * * @param right The right to be added for this ACL */ public void addRight(String right) { @@ -174,7 +174,7 @@ public class ACL { /** * Tells if the permission is one of the defined "rights" - * + * * @param permission permission to be checked * @return true if it's one of the "rights"; false otherwise */ @@ -184,7 +184,7 @@ public class ACL { /** * Returns rights entries. - * + * * @return enumeration of rights defined for this ACL */ public Enumeration<String> rights() { diff --git a/base/common/src/com/netscape/cmscore/realm/ACLEntry.java b/base/common/src/com/netscape/cmscore/realm/ACLEntry.java index 8e502b02c..e05abf0b9 100644 --- a/base/common/src/com/netscape/cmscore/realm/ACLEntry.java +++ b/base/common/src/com/netscape/cmscore/realm/ACLEntry.java @@ -24,7 +24,7 @@ import java.util.StringTokenizer; /** * A class represents an ACI entry of an access control list. * <P> - * + * * @version $Revision$, $Date$ */ public class ACLEntry { @@ -44,7 +44,7 @@ public class ACLEntry { /** * Checks if this ACL entry is set to negative. - * + * * @return true if this ACL entry expression is for "deny"; * false if this ACL entry expression is for "allow" */ @@ -61,9 +61,9 @@ public class ACLEntry { /** * Sets the ACL entry string - * + * * @param s string in the following format: - * + * * <PRE> * allow|deny (right[,right...]) attribute_expression * </PRE> @@ -74,9 +74,9 @@ public class ACLEntry { /** * Gets the ACL Entry String - * + * * @return ACL Entry string in the following format: - * + * * <PRE> * allow|deny (right[,right...]) attribute_expression * </PRE> @@ -88,7 +88,7 @@ public class ACLEntry { /** * Adds permission to this entry. Permission must be one of the * "rights" defined for each protected resource in its ACL - * + * * @param acl the acl instance that this aclEntry is associated with * @param permission one of the "rights" defined for each * protected resource in its ACL @@ -104,7 +104,7 @@ public class ACLEntry { /** * Returns a list of permissions associated with * this entry. - * + * * @return a list of permissions for this ACL entry */ public Enumeration<String> permissions() { @@ -113,7 +113,7 @@ public class ACLEntry { /** * Sets the expression associated with this entry. - * + * * @param expressions the evaluator expressions. For example, * group="Administrators" */ @@ -123,7 +123,7 @@ public class ACLEntry { /** * Retrieves the expression associated with this entry. - * + * * @return the evaluator expressions. For example, * group="Administrators" */ @@ -134,7 +134,7 @@ public class ACLEntry { /** * Checks to see if this <code>ACLEntry</code> contains a * particular permission - * + * * @param permission one of the "rights" defined for each * protected resource in its ACL * @return true if permission contained in the permission list @@ -146,7 +146,7 @@ public class ACLEntry { /** * Checks if this entry has the given permission. - * + * * @param permission one of the "rights" defined for each * protected resource in its ACL * @return true if the permission is allowed; false if the @@ -167,13 +167,13 @@ public class ACLEntry { /** * Parse string in the following format: - * + * * <PRE> * allow|deny (right[,right...]) attribute_expression * </PRE> - * + * * into an instance of the <code>ACLEntry</code> class - * + * * @param acl the acl instance associated with this aclentry * @param aclEntryString aclEntryString in the specified format * @return an instance of the <code>ACLEntry</code> class @@ -217,7 +217,7 @@ public class ACLEntry { /** * Returns the string representation of this ACLEntry - * + * * @return string representation of this ACLEntry */ public String toString() { diff --git a/base/common/src/com/netscape/cmscore/realm/PKIJNDIRealm.java b/base/common/src/com/netscape/cmscore/realm/PKIJNDIRealm.java index 720d9f52e..b847332c6 100644 --- a/base/common/src/com/netscape/cmscore/realm/PKIJNDIRealm.java +++ b/base/common/src/com/netscape/cmscore/realm/PKIJNDIRealm.java @@ -32,19 +32,19 @@ import javax.servlet.http.HttpServletResponse; /* * Self contained PKI JNDI Real that overrides the standard JNDI Realm - * + * * The purpose is to move authentication and authorization code out of the core server. * This realm can be used standalone with only the dependency of having tomcatjss and jss installed * and having tomcatjss connectors configured in the tomcat instance. - * + * * This realm allows for configurable SSL client authentication checking as well * as checking against the standard PKI ACLs we have configured in our ldap database. * Those not using a CS instance could either not configure the ACL checking or * override this class to read in and evaluate their own ACL's. - * + * * This code makes use and simplifies some existing ACL and authorization code * from the main server for now. - * + * */ public class PKIJNDIRealm extends JNDIRealm { @@ -123,11 +123,11 @@ public class PKIJNDIRealm extends JNDIRealm { //Call the getPrincipal method of the base JNDIRealm class //based on the just calculated uid. During the next call - // one of our methods to extract and store the user's ldap stored + // one of our methods to extract and store the user's ldap stored //client cert will be invoked Principal user = getPrincipal(uid); - + //ToDo: Possibly perform some more cert verficiation // such as OCSP, even though the tomcat jss connector // can already be configured for OCSP @@ -154,12 +154,12 @@ public class PKIJNDIRealm extends JNDIRealm { * otherwise return <code>null</code>. * Override here to extract the client auth certificate from the * ldap db. - * + * * @param context The directory context * @param username Username to be looked up - * + * * @exception NamingException if a directory server error occurs - * + * * @see #getUser(DirContext, String, String, int) */ @Override @@ -175,7 +175,7 @@ public class PKIJNDIRealm extends JNDIRealm { // Support for SSL client auth does not appear to support // the userPattern attribute. Certainly another method here // could be overridden to get this working. - + User certUser = super.getUser(context, username); if (certUser != null) { @@ -190,12 +190,12 @@ public class PKIJNDIRealm extends JNDIRealm { * Return <code>true</code> if this constraint is satisfied and processing * should continue, or <code>false</code> otherwise. * override to check for custom PKI ACL's authz permissions. - * + * * @param request Request we are processing * @param response Response we are creating * @param constraints Security constraint we are enforcing * @param context The Context to which client of this class is attached. - * + * * @exception IOException if an input/output error occurs */ @Override @@ -254,7 +254,7 @@ public class PKIJNDIRealm extends JNDIRealm { return allowed; } - + /** * Return a List of roles associated with the given User. Any * roles present in the user's directory entry are supplemented by @@ -280,10 +280,10 @@ public class PKIJNDIRealm extends JNDIRealm { return super.getRoles(context, user); } - + /* Custom variables, see <Realm> element */ - /* Attribute to find encoded Cert in ldap + /* Attribute to find encoded Cert in ldap * "userCertificate" is most common value. */ private String certAttrName; @@ -296,7 +296,7 @@ public class PKIJNDIRealm extends JNDIRealm { this.certAttrName = certAttrName; } - /* Attribute to find encoded acl resources in ldap + /* Attribute to find encoded acl resources in ldap * "aclResources" is most common value. */ private String aclAttrName; @@ -309,7 +309,7 @@ public class PKIJNDIRealm extends JNDIRealm { this.aclAttrName = aclAttrName; } - /* Attribute for base dn of acl resources in ldap + /* Attribute for base dn of acl resources in ldap */ private String aclBase; @@ -338,7 +338,7 @@ public class PKIJNDIRealm extends JNDIRealm { /* Saved user certificate object obtained during authentication * from the user's LDAP record. - * Will be accessed later to compare with incoming client auth certificate. + * Will be accessed later to compare with incoming client auth certificate. */ private X509Certificate storedUserCert; @@ -547,7 +547,7 @@ public class PKIJNDIRealm extends JNDIRealm { } - /* Attempt to get the stored user certificate object and save it for + /* Attempt to get the stored user certificate object and save it for * future reference. This all takes place within one command invocation from * the getPrincipal method defined here. */ @@ -630,7 +630,7 @@ public class PKIJNDIRealm extends JNDIRealm { // as one of the parameters to the message. // There may be a way to extract this information at this level. // The parameter name to scan for could be configured with the Realm. - + private String getACLEntryDataForURL(String requestURI) { String aclEntryData; @@ -746,9 +746,9 @@ public class PKIJNDIRealm extends JNDIRealm { /** * Parse ACL resource attributes - * + * * @param res same format as the resource attribute: - * + * * <PRE> * <resource name>:<permission1,permission2,...permissionn>: * <allow|deny> (<subset of the permission set>) <evaluator expression> @@ -894,14 +894,14 @@ public class PKIJNDIRealm extends JNDIRealm { return; } } - + /** * Return a String representing the value of the specified attribute. * Create our own since the super class has it as private - * + * * @param attrId Attribute name * @param attrs Attributes containing the required value - * + * * @exception NamingException if a directory server error occurs */ private Vector<String> getAttributeValues(String attrId, Attributes attrs) @@ -929,7 +929,7 @@ public class PKIJNDIRealm extends JNDIRealm { } return values; } - + /* * ToDo: Figure out how to do real logging */ diff --git a/base/common/src/com/netscape/cmscore/registry/PluginInfo.java b/base/common/src/com/netscape/cmscore/registry/PluginInfo.java index 681861901..f9f734b72 100644 --- a/base/common/src/com/netscape/cmscore/registry/PluginInfo.java +++ b/base/common/src/com/netscape/cmscore/registry/PluginInfo.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.registry.IPluginInfo; /** * The plugin information includes id, name, * classname, and description. - * + * * @author thomask */ public class PluginInfo implements IPluginInfo { diff --git a/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java b/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java index 42bb3e68e..95a723785 100644 --- a/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java +++ b/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java @@ -65,7 +65,7 @@ public class PluginRegistry implements IPluginRegistry { * Initializes this subsystem with the given configuration * store. * <P> - * + * * @param owner owner of this subsystem * @param config configuration store * @exception EBaseException failed to initialize @@ -251,7 +251,7 @@ public class PluginRegistry implements IPluginRegistry { /** * Returns the root configuration storage of this system. * <P> - * + * * @return configuration store of this subsystem */ public IConfigStore getConfigStore() { diff --git a/base/common/src/com/netscape/cmscore/request/ARequestQueue.java b/base/common/src/com/netscape/cmscore/request/ARequestQueue.java index 16db3985c..1d247ab0c 100644 --- a/base/common/src/com/netscape/cmscore/request/ARequestQueue.java +++ b/base/common/src/com/netscape/cmscore/request/ARequestQueue.java @@ -76,7 +76,7 @@ import com.netscape.certsrv.request.RequestStatus; * <p> * This class also implements the locking operations specified by the IRequestQueue interface. * <p> - * + * * @author thayes * @version $Revision$ $Date$ */ @@ -94,7 +94,7 @@ public abstract class ARequestQueue * This method must be implemented by the specialized class to generate a new id from data in the persistant store. * This id is used to create a new request object. * <p> - * + * * @return * a new RequestId object. * @exception EBaseException @@ -112,7 +112,7 @@ public abstract class ARequestQueue * The implementation of this object can use the createRequest member function to create a new instance of an * IRequest, and use the setRequestStatus, setCreationTime and setModificationTime functions to set those values. * <p> - * + * * @param id * the id of the request to read. * @return @@ -132,7 +132,7 @@ public abstract class ARequestQueue * <p> * This function is called when a new request immediately after creating a new request. * <p> - * + * * @param request * the request to add. * @exception EBaseException @@ -147,7 +147,7 @@ public abstract class ARequestQueue * <p> * Currently there are no hints for what has changed, so the entire request should be updated. * <p> - * + * * @param request * @exception EBaseException * TODO: this is not implemented yet @@ -164,7 +164,7 @@ public abstract class ARequestQueue * <p> * TODO: return IRequestList -or- just use listRequests as the basic engine. * <p> - * + * * @return * an Enumeration that generates RequestId objects. */ @@ -173,7 +173,7 @@ public abstract class ARequestQueue /** * protected access for setting the current state of a request. * <p> - * + * * @param request * The request to be modified. * @param status @@ -188,7 +188,7 @@ public abstract class ARequestQueue /** * protected access for setting the modification time of a request. * <p> - * + * * @param request * The request to be modified. * @param date @@ -203,7 +203,7 @@ public abstract class ARequestQueue /** * protected access for setting the creation time of a request. * <p> - * + * * @param request * The request to be modified. * @param date @@ -218,7 +218,7 @@ public abstract class ARequestQueue /** * protected access for creating a new Request object * <p> - * + * * @param id * The identifier for the new request * @return @@ -246,7 +246,7 @@ public abstract class ARequestQueue /** * Implements IRequestQueue.newRequest * <p> - * + * * @see IRequestQueue#newRequest */ public IRequest newRequest(String requestType) @@ -282,18 +282,18 @@ public abstract class ARequestQueue /** * Implements IRequestQueue.cloneRequest * <p> - * + * * @see IRequestQueue#cloneRequest */ public IRequest cloneRequest(IRequest r) throws EBaseException { - // 1. check for valid state. (Are any invalid ?) + // 1. check for valid state. (Are any invalid ?) RequestStatus rs = r.getRequestStatus(); if (rs == RequestStatus.BEGIN) throw new EBaseException("Invalid Status"); - // 2. create new request + // 2. create new request String reqType = r.getRequestType(); IRequest clone = newRequest(reqType); @@ -313,7 +313,7 @@ public abstract class ARequestQueue /** * Implements IRequestQueue.findRequest * <p> - * + * * @see IRequestQueue#findRequest */ public IRequest findRequest(RequestId id) @@ -342,7 +342,7 @@ public abstract class ARequestQueue /** * Implements IRequestQueue.processRequest * <p> - * + * * @see IRequestQueue#processRequest */ public final void processRequest(IRequest r) @@ -373,7 +373,7 @@ public abstract class ARequestQueue /** * Implements IRequestQueue.markRequestPending * <p> - * + * * @see IRequestQueue#markRequestPending */ public final void markRequestPending(IRequest r) @@ -397,7 +397,7 @@ public abstract class ARequestQueue /** * Implements IRequestQueue.cloneAndMarkPending * <p> - * + * * @see IRequestQueue#cloneAndMarkPending */ public IRequest cloneAndMarkPending(IRequest r) @@ -411,7 +411,7 @@ public abstract class ARequestQueue /** * Implements IRequestQueue.approveRequest * <p> - * + * * @see IRequestQueue#approveRequest */ public final void approveRequest(IRequest r) @@ -455,7 +455,7 @@ public abstract class ARequestQueue /** * Implements IRequestQueue.rejectRequest * <p> - * + * * @see IRequestQueue#rejectRequest */ public final void rejectRequest(IRequest r) @@ -477,7 +477,7 @@ public abstract class ARequestQueue /** * Implments IRequestQueue.cancelRequest * <p> - * + * * @see IRequestQueue#cancelRequest */ public final void cancelRequest(IRequest r) @@ -509,7 +509,7 @@ public abstract class ARequestQueue * Should be overridden by the specialized class if a more efficient method is available for implementing this * operation. * <P> - * + * * @see IRequestQueue#listRequests */ public IRequestList listRequests() { @@ -522,7 +522,7 @@ public abstract class ARequestQueue * Should be overridden by the specialized class if a more efficient method is available for implementing this * operation. * <P> - * + * * @see IRequestQueue#listRequestsByStatus */ public IRequestList listRequestsByStatus(RequestStatus s) { @@ -532,7 +532,7 @@ public abstract class ARequestQueue /** * Implements IRequestQueue.releaseRequest * <p> - * + * * @see IRequestQueue#releaseRequest */ public final void releaseRequest(IRequest request) { @@ -733,7 +733,7 @@ public abstract class ARequestQueue } catch (InterruptedException e) { }; } - } + } public synchronized void unlock(RequestId id) { mHashtable.remove(id); @@ -742,7 +742,7 @@ public abstract class ARequestQueue } // instance variables - Hashtable mHashtable = new Hashtable(); + Hashtable mHashtable = new Hashtable(); } */ @@ -859,7 +859,7 @@ class Request * This function used to check that the keys obeyed LDAP attribute name * syntax rules. Keys are being encoded now, so it is changed to just * filter out null and empty string keys. - * + * * @param key The key to check * @return false if invalid */ diff --git a/base/common/src/com/netscape/cmscore/request/ARequestRecord.java b/base/common/src/com/netscape/cmscore/request/ARequestRecord.java index e23d4007c..5f2aa50b2 100644 --- a/base/common/src/com/netscape/cmscore/request/ARequestRecord.java +++ b/base/common/src/com/netscape/cmscore/request/ARequestRecord.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.request.RequestStatus; * The low level (attributes only) version of the database * record object. This exists so that RecordAttr methods can use * this type definition, - * + * * RequestRecord refers both to this class and to RecordAttr objects. */ class ARequestRecord { diff --git a/base/common/src/com/netscape/cmscore/request/CertRequestConstants.java b/base/common/src/com/netscape/cmscore/request/CertRequestConstants.java index eab41fcd5..9b9391d44 100644 --- a/base/common/src/com/netscape/cmscore/request/CertRequestConstants.java +++ b/base/common/src/com/netscape/cmscore/request/CertRequestConstants.java @@ -23,8 +23,8 @@ package com.netscape.cmscore.request; * as needed. */ public class CertRequestConstants { - // request types - these have string values. - // made to match policy constants. + // request types - these have string values. + // made to match policy constants. public final static String GETCRL_REQUEST = "getCRL"; public final static String GETCACHAIN_REQUEST = "getCAChain"; public final static String GETREVOCATIONINFO_REQUEST = "getRevocationInfo"; @@ -50,7 +50,7 @@ public class CertRequestConstants { // this has a CRLExtensions value. public final static String CRLEXTS = "CRLExts"; - // this has a String value - it is either null or set. + // this has a String value - it is either null or set. public final static String DOGETCACHAIN = "doGetCAChain"; // this has a CertificateChain value. @@ -63,7 +63,7 @@ public class CertRequestConstants { public final static String CERTIFICATE = "certificate"; // this is an array of EBaseException for service errors when - // there's an error processing an array of something such as + // there's an error processing an array of something such as // certs to renew, certs to revoke, etc. public final static String SVCERRORS = "serviceErrors"; diff --git a/base/common/src/com/netscape/cmscore/request/RequestAttr.java b/base/common/src/com/netscape/cmscore/request/RequestAttr.java index 25734c91e..a48fca1d2 100644 --- a/base/common/src/com/netscape/cmscore/request/RequestAttr.java +++ b/base/common/src/com/netscape/cmscore/request/RequestAttr.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.request.ldap.IRequestMod; abstract class RequestAttr { /** - * + * */ abstract void set(ARequestRecord r, Object o); diff --git a/base/common/src/com/netscape/cmscore/request/RequestQueue.java b/base/common/src/com/netscape/cmscore/request/RequestQueue.java index ef13d3c29..95335724a 100644 --- a/base/common/src/com/netscape/cmscore/request/RequestQueue.java +++ b/base/common/src/com/netscape/cmscore/request/RequestQueue.java @@ -306,7 +306,7 @@ public class RequestQueue /** * Implements IRequestQueue.findRequestBySourceId * <p> - * + * * @see com.netscape.certsrv.request.IRequestQueue#findRequestBySourceId */ public RequestId findRequestBySourceId(String id) { @@ -321,7 +321,7 @@ public class RequestQueue /** * Implements IRequestQueue.findRequestsBySourceId * <p> - * + * * @see com.netscape.certsrv.request.IRequestQueue#findRequestsBySourceId */ public IRequestList findRequestsBySourceId(String id) { @@ -406,7 +406,7 @@ public class RequestQueue return new SearchEnumeration(this, results); } - /** + /** */ public IRequestList listRequestsByFilter(String f, int maxSize) { IDBSearchResults results = null; @@ -476,7 +476,7 @@ public class RequestQueue dbs = mDB.createSession(); results = dbs.search(mBaseDN, f1); } catch (EBaseException e) { - //System.err.println("Error: "+e); + //System.err.println("Error: "+e); //e.printStackTrace(); } finally { // Close session - ignoring errors (UTIL) @@ -595,7 +595,7 @@ public class RequestQueue } /* - * return request repository + * return request repository */ public IRepository getRequestRepository() { return (IRepository) mRepository; diff --git a/base/common/src/com/netscape/cmscore/request/RequestRecord.java b/base/common/src/com/netscape/cmscore/request/RequestRecord.java index 1d066f0ad..3381727e4 100644 --- a/base/common/src/com/netscape/cmscore/request/RequestRecord.java +++ b/base/common/src/com/netscape/cmscore/request/RequestRecord.java @@ -267,7 +267,7 @@ public class RequestRecord * This table contains attribute handlers for attributes * of the request. These attributes are ones that are stored * apart from the generic name/value pairs supported by the get/set - * interface plus the hashtable for the name/value pairs themselves. + * interface plus the hashtable for the name/value pairs themselves. * * NOTE: Eventually, all attributes should be done here. Currently * only the last ones added are implemented this way. @@ -430,10 +430,10 @@ class RequestIdMapper /** * A mapper between an request attr set and its LDAP attribute representation. - * + * * The attr attribute is no longer used. This class is kept for historical * and migration purposes. - * + * * @author thayes * @version $Revision$ $Date$ * @deprecated @@ -557,7 +557,7 @@ class RequestAttrsMapper /** * Implements IDBAttrMapper.mapLDAPAttributeSetToObject * <p> - * + * * @see IDBAttrMapper#mapLDAPAttributeSetToObject */ public void mapLDAPAttributeSetToObject(LDAPAttributeSet attrs, @@ -567,7 +567,7 @@ class RequestAttrsMapper // // Data is stored in a (single valued) binary attribute - // + // byte[] value; LDAPAttribute attr = null; @@ -609,14 +609,14 @@ class RequestAttrsMapper /** * Maps dynamic data for the extData- prefix to and from the extData Hashtable * in RequestRecord. - * + * * The data in RequestRecord is stored in a Hashtable. It comes in two forms: * 1. String key1 => String value1 * String key2 => String value2 * This is stored in LDAP as: * extData-key1 => value1 * extData-key2 => value2 - * + * * 2. String key => Hashtable value * where value stores: * String key2 => String value2 @@ -624,10 +624,10 @@ class RequestAttrsMapper * This is stored in LDAP as: * extData-key;key2 => value2 * extData-key;key3 => value3 - * + * * These can be mixed, but each top-level key can only be associated with * a String value or a Hashtable value. - * + * */ class ExtAttrDynMapper implements IDBDynAttrMapper { @@ -644,10 +644,10 @@ class ExtAttrDynMapper implements IDBDynAttrMapper { * Decodes extdata encoded keys. * -- followed by a 4 digit hexadecimal string is decoded to the character * representing the hex string. - * + * * The routine is written to be highly efficient. It only allocates * the StringBuffer if needed and copies the pieces in large chunks. - * + * * @param key The key to decode * @return The decoded key. */ @@ -693,7 +693,7 @@ class ExtAttrDynMapper implements IDBDynAttrMapper { /** * Encoded extdata keys for storage in LDAP. - * + * * The rules for encoding are trickier than decoding. We want to allow * '-' by itself to be stored in the database (for the common case of keys * like 'Foo-Bar'. Therefore we are using '--' as the encoding character. @@ -706,11 +706,11 @@ class ExtAttrDynMapper implements IDBDynAttrMapper { * 4) If [-] is preceded or followed by [^a-zA-Z0-9] then * the - as well as all following [^a-zA-Z0-9] characters are encoded * as --XXXX. - * + * * This routine tries to be as efficient as possible with StringBuffer and * large copies. However, the encoding unfortunately requires several * objects to be allocated. - * + * * @param key The key to encode * @return The encoded key */ diff --git a/base/common/src/com/netscape/cmscore/request/RequestRepository.java b/base/common/src/com/netscape/cmscore/request/RequestRepository.java index 0a4a4ebf9..ed18c7048 100644 --- a/base/common/src/com/netscape/cmscore/request/RequestRepository.java +++ b/base/common/src/com/netscape/cmscore/request/RequestRepository.java @@ -36,7 +36,7 @@ import com.netscape.cmscore.dbs.RepositoryRecord; * TODO: what does this class provide beyond the Repository * base class?? * <p> - * + * * @author thayes * @version $Revision$ $Date$ */ @@ -49,7 +49,7 @@ class RequestRepository /** * Create a request repository that uses the LDAP database * <p> - * + * * @param name * the name of the repository. This String is used to * construct the DN for the repository's LDAP entry. @@ -88,7 +88,7 @@ class RequestRepository * value can be used by the request queue to create the * name for the request records themselves. * <p> - * + * * @return * the LDAP base DN. */ diff --git a/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java b/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java index 862ddaa68..69c0d0ce9 100644 --- a/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java +++ b/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java @@ -39,7 +39,7 @@ import com.netscape.cmscore.dbs.DBSubsystem; * TODO: review this It provides: + registration of LDAP/JAVA mapping classes with the DBSubsystem + creation of * RequestQueue storage in the database + retrieval of existing RequestQueue objects from the database * <p> - * + * * @author thayes * @version $Revision$, $Date$ */ @@ -91,7 +91,7 @@ public class RequestSubsystem RequestQueue rq = new RequestQueue(name, increment, p, s, n, pendingNotifier); // can't do this here because the service depends on getting rq - // (to get request) and since this method hasn't returned it's rq is null. + // (to get request) and since this method hasn't returned it's rq is null. //rq.recover(); return rq; @@ -105,7 +105,7 @@ public class RequestSubsystem /** * Implements ISubsystem.getId * <p> - * + * * @see ISubsystem#getId */ public String getId() { @@ -127,7 +127,7 @@ public class RequestSubsystem /** * Implements ISubsystem.startup * <p> - * + * * @see ISubsystem#startup */ public void startup() diff --git a/base/common/src/com/netscape/cmscore/security/CASigningCert.java b/base/common/src/com/netscape/cmscore/security/CASigningCert.java index bba12561f..335bd9f37 100644 --- a/base/common/src/com/netscape/cmscore/security/CASigningCert.java +++ b/base/common/src/com/netscape/cmscore/security/CASigningCert.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.security.KeyCertData; /** * CA signing certificate. - * + * * @author Christine Ho * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/security/CertificateInfo.java b/base/common/src/com/netscape/cmscore/security/CertificateInfo.java index fc7fb9087..914803223 100644 --- a/base/common/src/com/netscape/cmscore/security/CertificateInfo.java +++ b/base/common/src/com/netscape/cmscore/security/CertificateInfo.java @@ -62,7 +62,7 @@ import com.netscape.certsrv.security.KeyCertData; /** * This base class provides methods to import CA signing cert or get certificate * request. - * + * * @author Christine Ho * @version $Revision$, $Date$ */ @@ -103,7 +103,7 @@ public abstract class CertificateInfo { String period = (String)mProperties.get(Constants.PR_VALIDITY_PERIOD); Date notBeforeDate = CMS.getCurrentDate(); Date notAfterDate = new Date(notBeforeDate.getYear(), - notBeforeDate.getMonth(), + notBeforeDate.getMonth(), notBeforeDate.getDate()+Integer.parseInt(period)); return new CertificateValidity(notBeforeDate, notAfterDate); */ diff --git a/base/common/src/com/netscape/cmscore/security/KRATransportCert.java b/base/common/src/com/netscape/cmscore/security/KRATransportCert.java index 79988e7d6..7f6632e09 100644 --- a/base/common/src/com/netscape/cmscore/security/KRATransportCert.java +++ b/base/common/src/com/netscape/cmscore/security/KRATransportCert.java @@ -30,7 +30,7 @@ import com.netscape.certsrv.security.KeyCertData; /** * KRA transport certificate - * + * * @author Christine Ho * @version $Revision$, $Date$ */ @@ -86,7 +86,7 @@ public class KRATransportCert extends CertificateInfo { return sAlg; } String alg = (String)mProperties.get(Constants.PR_KEY_TYPE); - + if (alg.equals("RSA")) return SignatureAlgorithm.RSASignatureWithMD5Digest; else diff --git a/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java b/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java index 762db5e90..16ca08b80 100644 --- a/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java +++ b/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.security.KeyCertData; /** * OCSP signing certificate. - * + * * @author Christine Ho * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/security/PWCBsdr.java b/base/common/src/com/netscape/cmscore/security/PWCBsdr.java index 32a0e90ed..4017a7869 100644 --- a/base/common/src/com/netscape/cmscore/security/PWCBsdr.java +++ b/base/common/src/com/netscape/cmscore/security/PWCBsdr.java @@ -29,7 +29,7 @@ import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.logging.ILogger; import com.netscape.cmscore.base.JDialogPasswordCallback; -/* +/* * A class to retrieve passwords from the SDR password cache * * @author Christina Fu @@ -91,7 +91,7 @@ public class PWCBsdr implements PasswordCallback { // + mprompt ); } - /* We are now assuming that PasswordCallbackInfo.getname() returns + /* We are now assuming that PasswordCallbackInfo.getname() returns * the tag we are hoping to match in the cache. */ @@ -167,7 +167,7 @@ public class PWCBsdr implements PasswordCallback { /* The password cache has failed to return a password (or a usable password. * Now we will try and get the password from the user and hopefully add - * the password to the cache pw cache + * the password to the cache pw cache */ public Password getPasswordAgain(PasswordCallbackInfo info) throws PasswordCallback.GiveUpException { diff --git a/base/common/src/com/netscape/cmscore/security/PWsdrCache.java b/base/common/src/com/netscape/cmscore/security/PWsdrCache.java index 6c834d0e0..ef9b4b823 100644 --- a/base/common/src/com/netscape/cmscore/security/PWsdrCache.java +++ b/base/common/src/com/netscape/cmscore/security/PWsdrCache.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.logging.ILogger; import com.netscape.cmsutil.util.Utils; -/* +/* * A class for managing passwords in the SDR password cache * * @author Christina Fu diff --git a/base/common/src/com/netscape/cmscore/security/RASigningCert.java b/base/common/src/com/netscape/cmscore/security/RASigningCert.java index 581fc8866..ac47055b6 100644 --- a/base/common/src/com/netscape/cmscore/security/RASigningCert.java +++ b/base/common/src/com/netscape/cmscore/security/RASigningCert.java @@ -30,7 +30,7 @@ import com.netscape.certsrv.security.KeyCertData; /** * RA signing certificate - * + * * @author Christine Ho * @version $Revision$, $Date$ */ @@ -92,7 +92,7 @@ public class RASigningCert extends CertificateInfo { return sAlg; } String alg = (String)mProperties.get(Constants.PR_KEY_TYPE); - + if (alg.equals("RSA")) return SignatureAlgorithm.RSASignatureWithMD5Digest; else diff --git a/base/common/src/com/netscape/cmscore/security/SSLCert.java b/base/common/src/com/netscape/cmscore/security/SSLCert.java index b54f24dc7..b4fea7f89 100644 --- a/base/common/src/com/netscape/cmscore/security/SSLCert.java +++ b/base/common/src/com/netscape/cmscore/security/SSLCert.java @@ -30,7 +30,7 @@ import com.netscape.certsrv.security.KeyCertData; /** * SSL server certificate - * + * * @author Christine Ho * @version $Revision$, $Date$ */ @@ -101,7 +101,7 @@ public class SSLCert extends CertificateInfo { return sAlg; } String alg = (String)mProperties.get(Constants.PR_KEY_TYPE); - + if (alg.equals("RSA")) return SignatureAlgorithm.RSASignatureWithMD5Digest; else diff --git a/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java b/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java index 1d70e7a1d..8d8e7dfcc 100644 --- a/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java +++ b/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java @@ -30,7 +30,7 @@ import com.netscape.certsrv.security.KeyCertData; /** * SSL server certificate - * + * * @author Christine Ho * @version $Revision$, $Date$ */ @@ -93,7 +93,7 @@ public class SSLSelfSignedCert extends CertificateInfo { return sAlg; } String alg = (String)mProperties.get(Constants.PR_KEY_TYPE); - + if (alg.equals("RSA")) return SignatureAlgorithm.RSASignatureWithMD5Digest; else diff --git a/base/common/src/com/netscape/cmscore/security/SubsystemCert.java b/base/common/src/com/netscape/cmscore/security/SubsystemCert.java index aede5e4d9..d0ce74490 100644 --- a/base/common/src/com/netscape/cmscore/security/SubsystemCert.java +++ b/base/common/src/com/netscape/cmscore/security/SubsystemCert.java @@ -30,7 +30,7 @@ import com.netscape.certsrv.security.KeyCertData; /** * Subsystem certificate. - * + * * @author Christine Ho * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java b/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java index 2146b290d..62bf09063 100644 --- a/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java +++ b/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java @@ -34,7 +34,7 @@ import java.util.StringTokenizer; * This class implements a single element in * an ordered list of self test instances. * <P> - * + * * @author mharmsen * @author thomask * @version $Revision$, $Date$ @@ -63,7 +63,7 @@ public class SelfTestOrderedInstance { * A "listElement" contains a string of the form "[instanceName]" or * "[instanceName]:critical". * <P> - * + * * @param listElement a string containing the "instanceName" and * information indictating whether or not the instance is "critical" */ @@ -106,7 +106,7 @@ public class SelfTestOrderedInstance { /** * Returns the name associated with this self test; may be null. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -116,7 +116,7 @@ public class SelfTestOrderedInstance { /** * Returns the criticality associated with this self test. * <P> - * + * * @return true if failure of this self test is fatal when * it is executed; otherwise return false */ @@ -127,7 +127,7 @@ public class SelfTestOrderedInstance { /** * Sets/resets the criticality associated with this self test. * <P> - * + * * @param criticalMode the criticality of this self test */ public void setSelfTestCriticalMode(boolean criticalMode) { diff --git a/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java b/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java index 6fac3d9d7..5d56e7a85 100644 --- a/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java +++ b/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java @@ -55,7 +55,7 @@ import com.netscape.certsrv.selftests.ISelfTestSubsystem; /** * This class implements a container for self tests. * <P> - * + * * @author mharmsen * @author thomask * @version $Revision$, $Date$ @@ -108,10 +108,10 @@ public class SelfTestSubsystem /** * Signed Audit Log - * + * * This helper method is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ private void audit(String msg) { @@ -134,7 +134,7 @@ public class SelfTestSubsystem * substore name prepended in front of the plugin/parameter name). This * method may return null. * <P> - * + * * @param instancePrefix full name of configuration store * @param instanceName instance name of self test * @return fullname of this self test plugin @@ -171,7 +171,7 @@ public class SelfTestSubsystem * This helper method checks to see if an instance name/value * pair exists for the corresponding ordered list element. * <P> - * + * * @param element owner of this subsystem * @param instanceName instance name of self test * @exception EMissingSelfTestException subsystem has missing name/value @@ -250,7 +250,7 @@ public class SelfTestSubsystem * List the instance names of all the self tests enabled to run on demand * (in execution order); may return null. * <P> - * + * * @return list of self test instance names run on demand */ public String[] listSelfTestsEnabledOnDemand() { @@ -287,7 +287,7 @@ public class SelfTestSubsystem /** * Enable the specified self test to be executed on demand. * <P> - * + * * @param instanceName instance name of self test * @param isCritical isCritical is either a critical failure (true) or * a non-critical failure (false) @@ -349,7 +349,7 @@ public class SelfTestSubsystem /** * Disable the specified self test from being able to be executed on demand. * <P> - * + * * @param instanceName instance name of self test * @exception EMissingSelfTestException subsystem has missing name */ @@ -397,7 +397,7 @@ public class SelfTestSubsystem /** * Determine if the specified self test is enabled to be executed on demand. * <P> - * + * * @param instanceName instance name of self test * @return true if the specified self test is enabled on demand * @exception EMissingSelfTestException subsystem has missing name @@ -436,7 +436,7 @@ public class SelfTestSubsystem * Determine if failure of the specified self test is fatal when * it is executed on demand. * <P> - * + * * @param instanceName instance name of self test * @return true if failure of the specified self test is fatal when * it is executed on demand @@ -489,7 +489,7 @@ public class SelfTestSubsystem /** * Execute all self tests specified to be run on demand. * <P> - * + * * @exception EMissingSelfTestException subsystem has missing name * @exception ESelfTestException self test exception */ @@ -575,7 +575,7 @@ public class SelfTestSubsystem * List the instance names of all the self tests enabled to run * at server startup (in execution order); may return null. * <P> - * + * * @return list of self test instance names run at server startup */ public String[] listSelfTestsEnabledAtStartup() { @@ -612,7 +612,7 @@ public class SelfTestSubsystem /** * Enable the specified self test at server startup. * <P> - * + * * @param instanceName instance name of self test * @param isCritical isCritical is either a critical failure (true) or * a non-critical failure (false) @@ -674,7 +674,7 @@ public class SelfTestSubsystem /** * Disable the specified self test at server startup. * <P> - * + * * @param instanceName instance name of self test * @exception EMissingSelfTestException subsystem has missing name */ @@ -723,7 +723,7 @@ public class SelfTestSubsystem * Determine if the specified self test is executed automatically * at server startup. * <P> - * + * * @param instanceName instance name of self test * @return true if the specified self test is executed at server startup * @exception EMissingSelfTestException subsystem has missing name @@ -762,7 +762,7 @@ public class SelfTestSubsystem * Determine if failure of the specified self test is fatal to * server startup. * <P> - * + * * @param instanceName instance name of self test * @return true if failure of the specified self test is fatal to * server startup @@ -815,11 +815,11 @@ public class SelfTestSubsystem /** * Execute all self tests specified to be run at server startup. * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION used when self tests are run at server startup * </ul> - * + * * @exception EMissingSelfTestException subsystem has missing name * @exception ESelfTestException self test exception */ @@ -957,7 +957,7 @@ public class SelfTestSubsystem * Retrieve an individual self test from the instances list * given its instance name. This method may return null. * <P> - * + * * @param instanceName instance name of self test * @return individual self test */ @@ -992,7 +992,7 @@ public class SelfTestSubsystem * Returns the ILogEventListener of this subsystem. * This method may return null. * <P> - * + * * @return ILogEventListener of this subsystem */ public ILogEventListener getSelfTestLogger() { @@ -1002,7 +1002,7 @@ public class SelfTestSubsystem /** * This method represents the log interface for the self test subsystem. * <P> - * + * * @param logger log event listener * @param msg self test log message */ @@ -1041,7 +1041,7 @@ public class SelfTestSubsystem * on the "on demand" list (note that the specified self test * will be appended to the end of each list). * <P> - * + * * @param instanceName instance name of self test * @param isCritical isCritical is either a critical failure (true) or * a non-critical failure (false) @@ -1094,7 +1094,7 @@ public class SelfTestSubsystem * on the "on demand" list (note that the specified self test * will be removed from each list). * <P> - * + * * @param instanceName instance name of self test * @exception EMissingSelfTestException subsystem has missing name */ @@ -1141,7 +1141,7 @@ public class SelfTestSubsystem * on the "startup" list (note that the specified self test * will be appended to the end of each list). * <P> - * + * * @param instanceName instance name of self test * @param isCritical isCritical is either a critical failure (true) or * a non-critical failure (false) @@ -1194,7 +1194,7 @@ public class SelfTestSubsystem * on the "startup" list (note that the specified self test * will be removed from each list). * <P> - * + * * @param instanceName instance name of self test * @exception EMissingSelfTestException subsystem has missing name */ @@ -1244,7 +1244,7 @@ public class SelfTestSubsystem * This method retrieves the name of this subsystem. This method * may return null. * <P> - * + * * @return identification of this subsystem */ public String getId() { @@ -1254,7 +1254,7 @@ public class SelfTestSubsystem /** * This method sets information specific to this subsystem. * <P> - * + * * @param id identification of this subsystem * @exception EBaseException base CMS exception */ @@ -1278,7 +1278,7 @@ public class SelfTestSubsystem /** * This method initializes this subsystem. * <P> - * + * * @param owner owner of this subsystem * @param config configuration store * @exception EBaseException base CMS exception @@ -1825,7 +1825,7 @@ public class SelfTestSubsystem /** * Notifies this subsystem if owner is in running mode. * <P> - * + * * @exception EBaseException base CMS exception */ public void startup() @@ -1891,7 +1891,7 @@ public class SelfTestSubsystem * Returns the root configuration storage of this subsystem. * This method may return null. * <P> - * + * * @return configuration store of this subsystem */ public IConfigStore getConfigStore() { diff --git a/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java b/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java index 8f4cd8841..673146695 100644 --- a/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java +++ b/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.usrgrp.IUser; * the incoming certificate(s) with the certificate(s) * in the scope. It matches the "certdn" field which contains * the subject dn of the certificate - * + * * @author cfu * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java b/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java index 871a38435..d9a39afb8 100644 --- a/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java +++ b/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.usrgrp.IUser; * the incoming certificate(s) with the certificate(s) * in the scope. It matches the "description" field which contains a * stringied certificate. - * + * * @author thomask * @author cfu * @version $Revision$, $Date$ diff --git a/base/common/src/com/netscape/cmscore/usrgrp/Group.java b/base/common/src/com/netscape/cmscore/usrgrp/Group.java index eee2afb43..336e7b029 100644 --- a/base/common/src/com/netscape/cmscore/usrgrp/Group.java +++ b/base/common/src/com/netscape/cmscore/usrgrp/Group.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.usrgrp.IUsrGrp; /** * A class represents a group. - * + * * @author cfu * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java index a4c4d6854..cd46bcae3 100644 --- a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java +++ b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java @@ -56,7 +56,7 @@ import com.netscape.cmscore.util.Debug; * This class defines low-level LDAP usr/grp management * usr/grp information is located remotely on another * LDAP server. - * + * * @author thomask * @author cfu * @version $Revision$, $Date$ @@ -417,7 +417,7 @@ public final class UGSubsystem implements IUGSubsystem { /** * builds a User instance. Sets only uid for user entry retrieved * from LDAP server. for listing efficiency only. - * + * * @return the User entity. */ protected IUser lbuildUser(LDAPEntry entry) throws EUsrGrpException { @@ -474,7 +474,7 @@ public final class UGSubsystem implements IUGSubsystem { /** * builds a User instance. Set all attributes retrieved from * LDAP server and set them on User. - * + * * @return the User entity. */ protected IUser buildUser(LDAPEntry entry) throws EUsrGrpException { @@ -1071,7 +1071,7 @@ public final class UGSubsystem implements IUGSubsystem { * attrCertStr.addValue(getCertificateString(certs[i])); * } * attrs.add(attrCertStr); - * + * * if (user.getCertOp() == OpDef.ADD) { * attrs.add(LDAPModification.ADD, attrCertBin); * } else if (user.getCertOp() == OpDef.DELETE) { @@ -1407,7 +1407,7 @@ public final class UGSubsystem implements IUGSubsystem { } Debug.trace("authorization exception: " + errMsg); // too chatty in system log - // log(ILogger.LL_FAILURE, errMsg); + // log(ILogger.LL_FAILURE, errMsg); } catch (ELdapException e) { String errMsg = "isMemberOfLdapGroup: Could not get connection to internaldb. Error " + e; diff --git a/base/common/src/com/netscape/cmscore/usrgrp/User.java b/base/common/src/com/netscape/cmscore/usrgrp/User.java index 89ea3e589..77f9bade4 100644 --- a/base/common/src/com/netscape/cmscore/usrgrp/User.java +++ b/base/common/src/com/netscape/cmscore/usrgrp/User.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.usrgrp.IUsrGrp; /** * A class represents a user. - * + * * @author cfu * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/util/Debug.java b/base/common/src/com/netscape/cmscore/util/Debug.java index 8c41d5bb5..bd10a493c 100644 --- a/base/common/src/com/netscape/cmscore/util/Debug.java +++ b/base/common/src/com/netscape/cmscore/util/Debug.java @@ -62,7 +62,7 @@ public class Debug // if (Debug.ON) { // System.out.println(".."); // } - // I want to make sure that any Debug.trace() is not logged to + // I want to make sure that any Debug.trace() is not logged to // System.out if the server is running under watchdog private static boolean TRACE_ON = false; @@ -89,13 +89,13 @@ public class Debug * if the argument to Debug.trace() is an object whose toString() is * expensive, that this toString() will still be called in any case. * In such a case, it is wise to wrap the Debug.trace like this: - * + * * <pre> * if (Debug.on()) { * Debug.trace("obj is: " + obj); * } * </pre> - * + * * @param level the message level. If this is >= than the currently set * level (set with setLevel() ), the message is printed * @param t the message to print @@ -259,13 +259,13 @@ public class Debug /** * Set the current debugging level. You can use: - * + * * <pre> * OBNOXIOUS = 10 * VERBOSE = 5 * INFORM = 1 * </pre> - * + * * Or another value */ @@ -307,7 +307,7 @@ public class Debug /** * Debug subsystem initialization. This subsystem is usually * given the following parameters: - * + * * <pre> * debug.enabled : (true|false) default false * debug.filename : can be a pathname, or STDOUT @@ -362,7 +362,7 @@ public class Debug setLevel(level); } catch (Exception e) { // Don't do anything. Logging is not set up yet, and - // we can't write to STDOUT. + // we can't write to STDOUT. } } diff --git a/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java b/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java index eb1d1097a..c62d7b8b5 100644 --- a/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java +++ b/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java @@ -28,7 +28,7 @@ import java.io.FilenameFilter; * <P> * Copied verbatium from sun.awt.tiny.TinyFileDialogPeer. Used by RollingLogFile expiration code * <P> - * + * * @author mikep * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java b/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java index 222964261..c4d870e39 100644 --- a/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java +++ b/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java @@ -33,7 +33,7 @@ import com.netscape.certsrv.util.StatsEvent; * can be loaded into cert server kernel to perform * statistics collection. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ @@ -72,7 +72,7 @@ public class StatsSubsystem implements IStatsSubsystem { * Note that individual subsystem should be initialized in a separated thread if it has dependency on the * initialization of other subsystems. * <P> - * + * * @param owner owner of this subsystem * @param config configuration store */ diff --git a/base/common/src/com/netscape/cmscore/util/UtilMessage.java b/base/common/src/com/netscape/cmscore/util/UtilMessage.java index 8002cfe1f..ce2132dc4 100644 --- a/base/common/src/com/netscape/cmscore/util/UtilMessage.java +++ b/base/common/src/com/netscape/cmscore/util/UtilMessage.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.base.MessageFormatter; /** * This object is used to easily create I18N messages for utility * classes and standalone programs. - * + * * @author mikep * @version $Revision$, $Date$ * @see com.netscape.certsrv.base.MessageFormatter @@ -44,7 +44,7 @@ public class UtilMessage { /** * Constructs a message event * <P> - * + * * @param msgFormat the message string */ public UtilMessage(String msgFormat) { @@ -54,12 +54,12 @@ public class UtilMessage { /** * Constructs a message with a parameter. For example, - * + * * <PRE> * new UtilMessage("failed to load {0}", fileName); * </PRE> * <P> - * + * * @param msgFormat details in message string format * @param param message string parameter */ @@ -73,7 +73,7 @@ public class UtilMessage { * Constructs a message from an exception. It can be used to carry * a system exception that may contain information about * the context. For example, - * + * * <PRE> * try { * ... @@ -82,7 +82,7 @@ public class UtilMessage { * } * </PRE> * <P> - * + * * @param msgFormat exception details in message string format * @param exception system exception */ @@ -95,7 +95,7 @@ public class UtilMessage { /** * Constructs a message from a base exception. This will use the msgFormat * from the exception itself. - * + * * <PRE> * try { * ... @@ -104,7 +104,7 @@ public class UtilMessage { * } * </PRE> * <P> - * + * * @param exception CMS exception */ public UtilMessage(Exception e) { @@ -117,7 +117,7 @@ public class UtilMessage { * Constructs a message event with a list of parameters * that will be substituted into the message format. * <P> - * + * * @param msgFormat message string format * @param params list of message format parameters */ @@ -129,7 +129,7 @@ public class UtilMessage { /** * Returns the current message format string. * <P> - * + * * @return details message */ public String getMessage() { @@ -139,7 +139,7 @@ public class UtilMessage { /** * Returns a list of parameters. * <P> - * + * * @return list of message format parameters */ public Object[] getParameters() { @@ -150,7 +150,7 @@ public class UtilMessage { * Returns localized message string. This method should * only be called if a localized string is necessary. * <P> - * + * * @return details message */ public String toString() { @@ -160,7 +160,7 @@ public class UtilMessage { /** * Returns the string based on the given locale. * <P> - * + * * @param locale locale * @return details message */ diff --git a/base/common/src/com/netscape/cmscore/util/UtilResources.java b/base/common/src/com/netscape/cmscore/util/UtilResources.java index 6955dda50..9ea7648f5 100644 --- a/base/common/src/com/netscape/cmscore/util/UtilResources.java +++ b/base/common/src/com/netscape/cmscore/util/UtilResources.java @@ -22,7 +22,7 @@ import java.util.ListResourceBundle; /** * A class represents a resource bundle for miscellanous utilities * <P> - * + * * @author mikep * @version $Revision$, $Date$ * @see java.util.ListResourceBundle |