diff options
Diffstat (limited to 'base')
1521 files changed, 11973 insertions, 11973 deletions
diff --git a/base/ca/src/com/netscape/ca/CAPolicy.java b/base/ca/src/com/netscape/ca/CAPolicy.java index 4df28d344..fa41a961a 100644 --- a/base/ca/src/com/netscape/ca/CAPolicy.java +++ b/base/ca/src/com/netscape/ca/CAPolicy.java @@ -38,7 +38,7 @@ import com.netscape.cmscore.util.Debug; * connectors. * XXX2 moved to just implement IPolicy since GenericPolicyProcessor is * unuseable for CA. - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -90,7 +90,7 @@ public class CAPolicy implements IPolicy { return true; } - /** + /** */ public PolicyResult apply(IRequest r) { if (r == null) { diff --git a/base/ca/src/com/netscape/ca/CAService.java b/base/ca/src/com/netscape/ca/CAService.java index 62bae3b5f..919f01e96 100644 --- a/base/ca/src/com/netscape/ca/CAService.java +++ b/base/ca/src/com/netscape/ca/CAService.java @@ -119,7 +119,7 @@ public class CAService implements ICAService, IService { public CAService(ICertificateAuthority ca) { mCA = ca; - // init services. + // init services. mServants.put( IRequest.ENROLLMENT_REQUEST, new serviceIssue(this)); @@ -170,11 +170,11 @@ public class CAService implements ICAService, IService { try { // MOVED TO com.netscape.certsrv.apps.CMS // java.security.Security.addProvider(new netscape.security.provider.CMS()); - // java.security.Provider pr = java.security.Security.getProvider("CMS"); + // java.security.Provider pr = java.security.Security.getProvider("CMS"); // if (pr != null) { // ; - // } - // else + // } + // else // Debug.trace("Something is wrong in CMS install !"); java.security.cert.CertificateFactory cf = java.security.cert.CertificateFactory.getInstance("X.509"); @@ -282,20 +282,20 @@ public class CAService implements ICAService, IService { RemoteAuthority remauthority = new RemoteAuthority(host, port, uri, timeout); - // Change end + // Change end if (nickname == null) nickname = mCA.getNickname(); // Changed by beomsuk - //connector = + //connector = // new HttpConnector(mCA, nickname, remauthority, resendInterval); if (timeout == 0) connector = new HttpConnector((IAuthority) mCA, nickname, remauthority, resendInterval, config); else connector = new HttpConnector((IAuthority) mCA, nickname, remauthority, resendInterval, config, timeout); - // Change end + // Change end - // log(ILogger.LL_INFO, "remote authority "+ + // log(ILogger.LL_INFO, "remote authority "+ // host+":"+port+" "+uri+" inited"); } return connector; @@ -346,19 +346,19 @@ public class CAService implements ICAService, IService { // This function is called only from ConnectorServlet - // serialize to request queue + // serialize to request queue } /** * method interface for IService * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST used whenever a user private key archive * request is made. This is an option in a cert enrollment request detected by an RA or a CA, so, if selected, it * should be logged immediately following the certificate request. * </ul> - * + * * @param request a certificate enrollment request from an RA or CA * @return true or false */ @@ -635,7 +635,7 @@ public class CAService implements ICAService, IService { certi.get(X509CertInfo.KEY) == null) { mCA.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_MISSING_ATTR")); - // XXX how do you reject a request in the service object ? + // XXX how do you reject a request in the service object ? throw new ECAException( CMS.getUserMessage("CMS_CA_MISSING_REQD_FIELDS_IN_CERTISSUE")); } @@ -647,8 +647,8 @@ public class CAService implements ICAService, IService { } // set default validity if not set. - // validity would normally be set by policies or by - // agent or by authentication module. + // validity would normally be set by policies or by + // agent or by authentication module. CertificateValidity validity = (CertificateValidity) certi.get(X509CertInfo.VALIDITY); Date begin = null, end = null; @@ -673,7 +673,7 @@ public class CAService implements ICAService, IService { /* * For non-CA certs, check if validity exceeds CA time. - * If so, set to CA's not after if default validity + * If so, set to CA's not after if default validity * exceeds ca's not after. */ @@ -787,12 +787,12 @@ public class CAService implements ICAService, IService { CMS.getUserMessage("CMS_CA_MISSING_INFO_IN_RENEWREQ")); } } catch (CertificateException e) { - // not possible + // not possible mCA.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_NO_ORG_SERIAL", e.getMessage())); throw new ECAException( CMS.getUserMessage("CMS_CA_MISSING_INFO_IN_RENEWREQ")); } catch (IOException e) { - // not possible. + // not possible. mCA.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_NO_ORG_SERIAL", e.getMessage())); throw new ECAException( CMS.getUserMessage("CMS_CA_MISSING_INFO_IN_RENEWREQ")); @@ -868,8 +868,8 @@ public class CAService implements ICAService, IService { boolean renewal, BigInteger oldSerialNo, String crmfReqId, String challengePassword, String profileId) throws EBaseException { // now store in repository. - // if renewal, set the old serial number in the new cert, - // set the new serial number in the old cert. + // if renewal, set the old serial number in the new cert, + // set the new serial number in the old cert. CMS.debug("In storeX509Cert"); try { @@ -1131,10 +1131,10 @@ public class CAService implements ICAService, IService { /** * Signed Audit Log - * + * * This method is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ private void audit(String msg) { @@ -1154,11 +1154,11 @@ public class CAService implements ICAService, IService { /** * Signed Audit Log Subject ID - * + * * This method is called to obtain the "SubjectID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message SubjectID */ private String auditSubjectID() { @@ -1190,11 +1190,11 @@ public class CAService implements ICAService, IService { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message RequesterID */ private String auditRequesterID() { @@ -1244,7 +1244,7 @@ class serviceIssue implements IServant { public boolean service(IRequest request) throws EBaseException { - // XXX This is ugly. should associate attributes with + // XXX This is ugly. should associate attributes with // request types, not policy. // XXX how do we know what to look for in request ? @@ -1256,7 +1256,7 @@ class serviceIssue implements IServant { public boolean serviceX509(IRequest request) throws EBaseException { - // XXX This is ugly. should associate attributes with + // XXX This is ugly. should associate attributes with // request types, not policy. // XXX how do we know what to look for in request ? X509CertInfo certinfos[] = @@ -1293,14 +1293,14 @@ class serviceIssue implements IServant { e.printStackTrace(); mCA.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_STORE_ERROR", Integer.toString(i), rid, e.toString())); - ex = e; // save to throw later. + ex = e; // save to throw later. break; } } if (ex != null) { for (int j = 0; j < i; j++) { - // delete the stored cert records from the database. - // we issue all or nothing. + // delete the stored cert records from the database. + // we issue all or nothing. BigInteger serialNo = ((X509Certificate) certs[i]).getSerialNumber(); @@ -1400,7 +1400,7 @@ class serviceRenewal implements IServant { continue; } - // check if cert has been revoked. + // check if cert has been revoked. String certStatus = certRecord.getStatus(); if (certStatus.equals(ICertRecord.STATUS_REVOKED) || @@ -1425,7 +1425,7 @@ class serviceRenewal implements IServant { mCA.getCertificateRepository().getX509Certificate(serial); if (cert == null) { - // something wrong + // something wrong mCA.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_MISSING_RENEWED", serial.toString())); svcerrors[i] = new ECAException( @@ -1571,8 +1571,8 @@ class serviceCheckChallenge implements IServant { public boolean service(IRequest request) throws EBaseException { - // note: some request attributes used below are set in - // authentication/ChallengePhraseAuthentication.java :( + // note: some request attributes used below are set in + // authentication/ChallengePhraseAuthentication.java :( BigInteger serialno = request.getExtDataInBigInteger("serialNumber"); String pwd = request.getExtDataInString( CAService.CHALLENGE_PHRASE); @@ -1681,14 +1681,14 @@ class serviceRevoke implements IServant { throws EBaseException { boolean sendStatus = true; // XXX Need to think passing as array. - // XXX every implemented according to servlet. + // XXX every implemented according to servlet. RevokedCertImpl crlentries[] = request.getExtDataInRevokedCertArray(IRequest.CERT_INFO); if (crlentries == null || crlentries.length == 0 || crlentries[0] == null) { - // XXX should this be an error ? + // XXX should this be an error ? mCA.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_CRL_NOT_FOUND", request.getRequestId().toString())); throw new ECAException(CMS.getUserMessage("CMS_CA_MISSING_INFO_IN_REVREQ")); @@ -1992,7 +1992,7 @@ class serviceCert4Crl implements IServant { public boolean service(IRequest request) throws EBaseException { // XXX Need to think passing as array. - // XXX every implemented according to servlet. + // XXX every implemented according to servlet. BigInteger revokedCertIds[] = request.getExtDataInBigIntegerArray( IRequest.REVOKED_CERT_RECORDS); if (revokedCertIds == null || @@ -2012,7 +2012,7 @@ class serviceCert4Crl implements IServant { if (revokedCertRecs == null || revokedCertRecs.length == 0 || revokedCertRecs[0] == null) { - // XXX should this be an error ? + // XXX should this be an error ? mCA.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_CERT4CRL_NO_ENTRY", request.getRequestId().toString())); throw new ECAException(CMS.getUserMessage("CMS_CA_MISSING_INFO_IN_CLAREQ")); diff --git a/base/ca/src/com/netscape/ca/CMSCRLExtensions.java b/base/ca/src/com/netscape/ca/CMSCRLExtensions.java index 94693d69a..bbb4e5f19 100644 --- a/base/ca/src/com/netscape/ca/CMSCRLExtensions.java +++ b/base/ca/src/com/netscape/ca/CMSCRLExtensions.java @@ -431,7 +431,7 @@ public class CMSCRLExtensions implements ICMSCRLExtensions { } public boolean isCRLExtensionEnabled(String extName) { - return ((mCRLExtensionNames.contains(extName) || mCRLEntryExtensionNames.contains(extName)) && + return ((mCRLExtensionNames.contains(extName) || mCRLEntryExtensionNames.contains(extName)) && mEnabledCRLExtensions.contains(extName)); } @@ -610,7 +610,7 @@ public class CMSCRLExtensions implements ICMSCRLExtensions { mCriticalCRLExtensions.remove(id); } } - //Sync the onlyContainsCACerts with similar property in CRLIssuingPoint + //Sync the onlyContainsCACerts with similar property in CRLIssuingPoint //called caCertsOnly. if (name.equals(CMSIssuingDistributionPointExtension.PROP_CACERTS)) { NameValuePairs crlIssuingPointPairs = null; diff --git a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java index d4b747b32..e55c95cfd 100644 --- a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java +++ b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java @@ -92,7 +92,7 @@ import com.netscape.cmscore.util.Debug; * parameter minUpdateInterval can be used to prevent CRL * from being updated too often * <P> - * + * * @author awnuk * @author lhsiao * @author galperin @@ -415,7 +415,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { /** * Initializes a CRL issuing point config. * <P> - * + * * @param ca reference to CertificateAuthority instance which * owns this issuing point. * @param id string id of this CRL issuing point. @@ -697,10 +697,10 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { mAutoUpdateInterval < mMinUpdateInterval) mAutoUpdateInterval = mMinUpdateInterval; - // get next update grace period + // get next update grace period mNextUpdateGracePeriod = MINUTE * config.getInteger(Constants.PR_GRACE_PERIOD, 0); - // Get V2 or V1 CRL + // Get V2 or V1 CRL mAllowExtensions = config.getBoolean(Constants.PR_EXTENSIONS, false); mIncludeExpiredCerts = config.getBoolean(Constants.PR_INCLUDE_EXPIREDCERTS, false); @@ -718,13 +718,13 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { String algorithm = config.getString(Constants.PR_SIGNING_ALGORITHM, null); if (algorithm != null) { - // make sure this algorithm is acceptable to CA. + // make sure this algorithm is acceptable to CA. mCA.getCRLSigningUnit().checkSigningAlgorithmFromName(algorithm); mSigningAlgorithm = algorithm; } mPublishOnStart = config.getBoolean(PROP_PUBLISH_ON_START, false); - // if publish dn is null then certificate will be published to + // if publish dn is null then certificate will be published to // CA's entry in the directory. mPublishDN = config.getString(PROP_PUBLISH_DN, null); @@ -771,7 +771,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { return; } catch (EBaseException e) { // CRL was never set. - // fall to the following.. + // fall to the following.. } if (crlRecord != null) { @@ -892,7 +892,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { } if (crlRecord == null) { - // no crl was ever created, or crl in db is corrupted. + // no crl was ever created, or crl in db is corrupted. // create new one. try { crlRecord = new CRLIssuingPointRecord(mId, BigInteger.ZERO, Long.valueOf(-1), @@ -1248,7 +1248,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { /** * Returns internal id of this CRL issuing point. * <P> - * + * * @return internal id of this CRL issuing point */ public String getId() { @@ -1258,7 +1258,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { /** * Returns internal description of this CRL issuing point. * <P> - * + * * @return internal description of this CRL issuing point */ public String getDescription() { @@ -1267,7 +1267,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { /** * Sets internal description of this CRL issuing point. - * + * * @param description description for this CRL issuing point. */ public void setDescription(String description) { @@ -1278,7 +1278,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { * Returns DN of the directory entry where CRLs.from this issuing point * are published. * <P> - * + * * @return DN of the directory entry where CRLs are published. */ public String getPublishDN() { @@ -1288,7 +1288,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { /** * Returns signing algorithm. * <P> - * + * * @return SigningAlgorithm. */ public String getSigningAlgorithm() { @@ -1302,7 +1302,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { /** * Returns current CRL generation schema for this CRL issuing point. * <P> - * + * * @return current CRL generation schema for this CRL issuing point */ public int getCRLSchema() { @@ -1312,7 +1312,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { /** * Returns current CRL number of this CRL issuing point. * <P> - * + * * @return current CRL number of this CRL issuing point */ public BigInteger getCRLNumber() { @@ -1322,7 +1322,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { /** * Returns current delta CRL number of this CRL issuing point. * <P> - * + * * @return current delta CRL number of this CRL issuing point */ public BigInteger getDeltaCRLNumber() { @@ -1332,7 +1332,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { /** * Returns next CRL number of this CRL issuing point. * <P> - * + * * @return next CRL number of this CRL issuing point */ public BigInteger getNextCRLNumber() { @@ -1342,7 +1342,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { /** * Returns number of entries in the CRL * <P> - * + * * @return number of entries in the CRL */ public long getCRLSize() { @@ -1352,7 +1352,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { /** * Returns number of entries in delta CRL * <P> - * + * * @return number of entries in delta CRL */ public long getDeltaCRLSize() { @@ -1362,7 +1362,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { /** * Returns last update time * <P> - * + * * @return last CRL update time */ public Date getLastUpdate() { @@ -1372,7 +1372,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { /** * Returns next update time * <P> - * + * * @return next CRL update time */ public Date getNextUpdate() { @@ -1382,7 +1382,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { /** * Returns next update time * <P> - * + * * @return next CRL update time */ public Date getNextDeltaUpdate() { @@ -1392,7 +1392,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { /** * Returns all the revoked certificates from the CRL cache. * <P> - * + * * @return set of all the revoked certificates or null if there are none. */ public Set<RevokedCertificate> getRevokedCertificates(int start, int end) { @@ -1407,7 +1407,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { /** * Returns certificate authority. * <P> - * + * * @return certificate authority */ public ISubsystem getCertificateAuthority() { @@ -1488,7 +1488,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { /** * Finds next update time expressed as delay or time of the next update. - * + * * @param fromLastUpdate if true, function returns delay to the next update time * otherwise returns the next update time. * @param delta if true, function returns the next update time for delta CRL, @@ -1756,7 +1756,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { Debug.printStackTrace(e); } } - // put this here to prevent continuous loop if internal + // put this here to prevent continuous loop if internal // db is down. if (mDoLastAutoUpdate) mDoLastAutoUpdate = false; @@ -1784,8 +1784,8 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { */ private void updateCRL() throws EBaseException { /* - if (mEnableUpdateFreq && mAutoUpdateInterval > 0 && - (System.currentTimeMillis() - mLastUpdate.getTime() < + if (mEnableUpdateFreq && mAutoUpdateInterval > 0 && + (System.currentTimeMillis() - mLastUpdate.getTime() < mMinUpdateInterval)) { // log or alternatively throw an Exception return; @@ -1852,7 +1852,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { * This does not include expired certs. * <i>Override this method to make a CRL other than the * full/complete CRL.</i> - * + * * @return Enumeration of CertRecords to put into CRL. * @exception EBaseException if an error occured in the database. */ @@ -2793,8 +2793,8 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { /* * The Session Context is a Hashtable, but without type information. - * Suppress the warnings generated by adding to the session context - * + * Suppress the warnings generated by adding to the session context + * */ protected void publishCRL(X509CRLImpl x509crl, boolean isDeltaCRL) throws EBaseException { diff --git a/base/ca/src/com/netscape/ca/CRLWithExpiredCerts.java b/base/ca/src/com/netscape/ca/CRLWithExpiredCerts.java index 9ad619ff8..0fa835051 100644 --- a/base/ca/src/com/netscape/ca/CRLWithExpiredCerts.java +++ b/base/ca/src/com/netscape/ca/CRLWithExpiredCerts.java @@ -31,9 +31,9 @@ public class CRLWithExpiredCerts extends CRLIssuingPoint { /** * overrides getRevokedCerts in CRLIssuingPoint to include * all revoked certs, including once that have expired. - * + * * @param thisUpdate parameter is ignored. - * + * * @exception EBaseException if an exception occured getting revoked * certificates from the database. */ diff --git a/base/ca/src/com/netscape/ca/CertificateAuthority.java b/base/ca/src/com/netscape/ca/CertificateAuthority.java index c8783f566..592f1557b 100644 --- a/base/ca/src/com/netscape/ca/CertificateAuthority.java +++ b/base/ca/src/com/netscape/ca/CertificateAuthority.java @@ -119,7 +119,7 @@ import com.netscape.cmsutil.ocsp.UnknownInfo; * A class represents a Certificate Authority that is * responsible for certificate specific operations. * <P> - * + * * @author lhsiao * @version $Revision$, $Date$ */ @@ -132,7 +132,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori protected IConfigStore mConfig = null; protected ILogger mLogger = CMS.getLogger(); protected Hashtable<String, ICRLIssuingPoint> mCRLIssuePoints = new Hashtable<String, ICRLIssuingPoint>(); - protected CRLIssuingPoint mMasterCRLIssuePoint = null; // the complete crl. + protected CRLIssuingPoint mMasterCRLIssuePoint = null; // the complete crl. protected SigningUnit mSigningUnit; protected SigningUnit mOCSPSigningUnit; protected SigningUnit mCRLSigningUnit; @@ -286,7 +286,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori /** * Initializes this CA subsystem. * <P> - * + * * @param owner owner of this subsystem * @param config configuration of this subsystem * @exception EBaseException failed to initialize this CA @@ -299,7 +299,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori mOwner = owner; mConfig = config; - // init cert & crl database. + // init cert & crl database. initCaDatabases(); // init signing unit & CA cert. @@ -374,8 +374,8 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori // rely on this subsystem, so it has to be initialized) initPublish(); - // Initialize CRL issuing points. - // note CRL framework depends on DBS, CRYPTO and PUBLISHING + // Initialize CRL issuing points. + // note CRL framework depends on DBS, CRYPTO and PUBLISHING // being functional. initCRL(); @@ -624,7 +624,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori /** * Retrieves certificate repository. * <P> - * + * * @return certificate repository */ public ICertificateRepository getCertificateRepository() { @@ -634,7 +634,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori /** * Retrieves replica repository. * <P> - * + * * @return replica repository */ public IReplicaIDRepository getReplicaRepository() { @@ -655,7 +655,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori /** * Retrieves the CRL issuing point by id. * <P> - * + * * @param id string id of the CRL issuing point * @return CRL issuing point */ @@ -666,7 +666,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori /** * Enumerates CRL issuing points * <P> - * + * * @return security service */ public Enumeration<ICRLIssuingPoint> getCRLIssuingPoints() { @@ -855,7 +855,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori /** * Returns X500 name of the Certificate Authority * <P> - * + * * @return CA name */ public X500Name getX500Name() { @@ -873,7 +873,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori /** * Returns nickname of CA's signing cert. * <p> - * + * * @return CA signing cert nickname. */ public String getNickname() { @@ -883,7 +883,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori /** * Returns nickname of OCSP's signing cert. * <p> - * + * * @return OCSP signing cert nickname. */ public String getOCSPNickname() { @@ -893,7 +893,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori /** * Returns default signing unit used by this CA * <P> - * + * * @return request identifier */ public ISigningUnit getSigningUnit() { @@ -917,12 +917,12 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori * If no algorithm is specified the CA's default signing algorithm * is used. * <P> - * + * * @param crl the CRL to be signed. * @param algname the algorithm name to use. This is a JCA name such * as MD5withRSA, etc. If set to null the default signing algorithm * is used. - * + * * @return the signed CRL */ public X509CRLImpl sign(X509CRLImpl crl, String algname) @@ -991,7 +991,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori * Signs the given certificate info using specified signing algorithm * If no algorithm is specified the CA's default algorithm is used. * <P> - * + * * @param certInfo the certificate info to be signed. * @param algname the signing algorithm to use. These are names defined * in JCA, such as MD5withRSA, etc. If null the CA's default @@ -1078,7 +1078,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori * Sign a byte array using the specified algorithm. * If algorithm is null the CA's default algorithm is used. * <p> - * + * * @param data the data to be signed in a byte array. * @param algname the algorithm to use. * @return the signature in a byte array. @@ -1090,7 +1090,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori /** * logs a message in the CA area. - * + * * @param level the debug level. * @param msg the message to debug. */ @@ -1101,7 +1101,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori /** * Retrieves certificate chains of this CA. - * + * * @return this CA's cert chain. */ public CertificateChain getCACertChain() { @@ -1161,7 +1161,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori } ////////// - // Initialization routines. + // Initialization routines. // /** @@ -1351,7 +1351,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori try { mDefaultCertVersion = new CertificateVersion(version - 1); } catch (IOException e) { - // should never occur. + // should never occur. } int validity_in_days = mConfig.getInteger(PROP_DEF_VALIDITY, 2 * 365); diff --git a/base/ca/src/com/netscape/ca/SigningUnit.java b/base/ca/src/com/netscape/ca/SigningUnit.java index 85e3621d7..85ee1d482 100644 --- a/base/ca/src/com/netscape/ca/SigningUnit.java +++ b/base/ca/src/com/netscape/ca/SigningUnit.java @@ -51,7 +51,7 @@ import com.netscape.cmsutil.util.Cert; /** * CA signing unit based on JSS. - * + * * $Revision$ $Date$ */ @@ -209,10 +209,10 @@ public final class SigningUnit implements ISigningUnit { /** * Check if the signing algorithm name is supported and valid for this * signing unit's token and key. - * + * * @param algname a signing algorithm name from JCA. * @return the mapped JSS signature algorithm object. - * + * * @exception EBaseException if signing algorithm is not supported. */ public SignatureAlgorithm checkSigningAlgorithmFromName(String algname) @@ -263,7 +263,7 @@ public final class SigningUnit implements ISigningUnit { signAlg = checkSigningAlgorithmFromName(algname); } - // XXX use a pool of signers based on alg ? + // XXX use a pool of signers based on alg ? // XXX Map algor. name to id. hack: use hardcoded define for now. CMS.debug( "Getting algorithm context for " + algname + " " + signAlg); diff --git a/base/common/src/com/netscape/certsrv/acls/ACL.java b/base/common/src/com/netscape/certsrv/acls/ACL.java index 508793ddf..ea962975c 100644 --- a/base/common/src/com/netscape/certsrv/acls/ACL.java +++ b/base/common/src/com/netscape/certsrv/acls/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 implements IACL, java.io.Serializable { @@ -55,7 +55,7 @@ public class ACL implements IACL, java.io.Serializable { * 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: @@ -79,7 +79,7 @@ public class ACL implements IACL, java.io.Serializable { /** * Sets the name of the resource governed by this * access control. - * + * * @param name name of the resource */ public void setName(String name) { @@ -89,7 +89,7 @@ public class ACL implements IACL, java.io.Serializable { /** * Retrieves the name of the resource governed by * this access control. - * + * * @return name of the resource */ public String getName() { @@ -98,7 +98,7 @@ public class ACL implements IACL, java.io.Serializable { /** * Retrieves the exact string of the resourceACLs - * + * * @return resource's acl */ public String getResourceACLs() { @@ -108,7 +108,7 @@ public class ACL implements IACL, java.io.Serializable { /** * Sets the description of the resource governed by this * access control. - * + * * @param description Description of the protected resource */ public void setDescription(String description) { @@ -118,7 +118,7 @@ public class ACL implements IACL, java.io.Serializable { /** * Retrieves the description of the resource governed by * this access control. - * + * * @return Description of the protected resource */ public String getDescription() { @@ -127,7 +127,7 @@ public class ACL implements IACL, java.io.Serializable { /** * Adds an ACL entry to this list. - * + * * @param entry the <code>ACLEntry</code> to be added to this resource */ public void addEntry(ACLEntry entry) { @@ -136,7 +136,7 @@ public class ACL implements IACL, java.io.Serializable { /** * Returns ACL entries. - * + * * @return enumeration for the <code>ACLEntry</code> vector */ public Enumeration<ACLEntry> entries() { @@ -145,7 +145,7 @@ public class ACL implements IACL, java.io.Serializable { /** * Returns the string reprsentation. - * + * * @return the string representation of the ACL entries in the * following format: * <resource name>[<ACLEntry1>,<ACLEntry 2>,...<ACLEntry N>] @@ -166,7 +166,7 @@ public class ACL implements IACL, java.io.Serializable { /** * Adds an rights entry to this list. - * + * * @param right The right to be added for this ACL */ public void addRight(String right) { @@ -175,7 +175,7 @@ public class ACL implements IACL, java.io.Serializable { /** * 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 */ @@ -185,7 +185,7 @@ public class ACL implements IACL, java.io.Serializable { /** * Returns rights entries. - * + * * @return enumeration of rights defined for this ACL */ public Enumeration<String> rights() { diff --git a/base/common/src/com/netscape/certsrv/acls/ACLEntry.java b/base/common/src/com/netscape/certsrv/acls/ACLEntry.java index 2c1b7c3ea..3d18c263c 100644 --- a/base/common/src/com/netscape/certsrv/acls/ACLEntry.java +++ b/base/common/src/com/netscape/certsrv/acls/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 implements IACLEntry, java.io.Serializable { @@ -46,7 +46,7 @@ public class ACLEntry implements IACLEntry, java.io.Serializable { /** * 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" */ @@ -63,9 +63,9 @@ public class ACLEntry implements IACLEntry, java.io.Serializable { /** * Sets the ACL entry string - * + * * @param s string in the following format: - * + * * <PRE> * allow|deny (right[,right...]) attribute_expression * </PRE> @@ -76,9 +76,9 @@ public class ACLEntry implements IACLEntry, java.io.Serializable { /** * Gets the ACL Entry String - * + * * @return ACL Entry string in the following format: - * + * * <PRE> * allow|deny (right[,right...]) attribute_expression * </PRE> @@ -90,7 +90,7 @@ public class ACLEntry implements IACLEntry, java.io.Serializable { /** * 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 @@ -106,7 +106,7 @@ public class ACLEntry implements IACLEntry, java.io.Serializable { /** * Returns a list of permissions associated with * this entry. - * + * * @return a list of permissions for this ACL entry */ public Enumeration<String> permissions() { @@ -115,7 +115,7 @@ public class ACLEntry implements IACLEntry, java.io.Serializable { /** * Sets the expression associated with this entry. - * + * * @param expressions the evaluator expressions. For example, * group="Administrators" */ @@ -125,7 +125,7 @@ public class ACLEntry implements IACLEntry, java.io.Serializable { /** * Retrieves the expression associated with this entry. - * + * * @return the evaluator expressions. For example, * group="Administrators" */ @@ -136,7 +136,7 @@ public class ACLEntry implements IACLEntry, java.io.Serializable { /** * 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 @@ -148,7 +148,7 @@ public class ACLEntry implements IACLEntry, java.io.Serializable { /** * 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 @@ -169,13 +169,13 @@ public class ACLEntry implements IACLEntry, java.io.Serializable { /** * 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 @@ -219,7 +219,7 @@ public class ACLEntry implements IACLEntry, java.io.Serializable { /** * Returns the string representation of this ACLEntry - * + * * @return string representation of this ACLEntry */ public String toString() { diff --git a/base/common/src/com/netscape/certsrv/acls/ACLsResources.java b/base/common/src/com/netscape/certsrv/acls/ACLsResources.java index bf3ea4a28..d886eb383 100644 --- a/base/common/src/com/netscape/certsrv/acls/ACLsResources.java +++ b/base/common/src/com/netscape/certsrv/acls/ACLsResources.java @@ -23,7 +23,7 @@ import java.util.ListResourceBundle; * A class represents a resource bundle for the entire ACL component. * system. * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -31,7 +31,7 @@ public class ACLsResources extends ListResourceBundle { /** * Returns the content of this resource. - * + * * @return the content of this resource. */ public Object[][] getContents() { diff --git a/base/common/src/com/netscape/certsrv/acls/EACLsException.java b/base/common/src/com/netscape/certsrv/acls/EACLsException.java index 8d204091e..b72796ec5 100644 --- a/base/common/src/com/netscape/certsrv/acls/EACLsException.java +++ b/base/common/src/com/netscape/certsrv/acls/EACLsException.java @@ -29,7 +29,7 @@ import com.netscape.certsrv.base.MessageFormatter; * allows AccessManager to be easily integrated into any * existing code. * <P> - * + * * @version $Revision$, $Date$ */ public class EACLsException extends EBaseException { @@ -46,7 +46,7 @@ public class EACLsException extends EBaseException { /** * Constructs an acls exception. * <P> - * + * * @param msgFormat exception details */ public EACLsException(String msgFormat) { @@ -56,12 +56,12 @@ public class EACLsException extends EBaseException { /** * Constructs a base exception with a parameter. For example, - * + * * <PRE> * new EACLsException("failed to load {0}", fileName); * </PRE> * <P> - * + * * @param msgFormat exception details in message string format * @param param message string parameter */ @@ -75,7 +75,7 @@ public class EACLsException extends EBaseException { * Constructs a base exception. It can be used to carry * a system exception that may contain information about * the context. For example, - * + * * <PRE> * try { * ... @@ -84,7 +84,7 @@ public class EACLsException extends EBaseException { * } * </PRE> * <P> - * + * * @param msgFormat exception details in message string format * @param param system exception */ @@ -98,7 +98,7 @@ public class EACLsException extends EBaseException { * Constructs a base exception with a list of parameters * that will be substituted into the message format. * <P> - * + * * @param msgFormat exception details in message string format * @param params list of message format parameters */ @@ -110,7 +110,7 @@ public class EACLsException extends EBaseException { /** * Returns a list of parameters. * <P> - * + * * @return list of message format parameters */ public Object[] getParameters() { @@ -119,7 +119,7 @@ public class EACLsException extends EBaseException { /** * String representation for the corresponding exception. - * + * * @return String representation for the corresponding exception. */ public String toString() { @@ -128,7 +128,7 @@ public class EACLsException extends EBaseException { /** * Returns string representation for the corresponding exception. - * + * * @param locale client specified locale for string representation. * @return String representation for the corresponding exception. */ @@ -139,7 +139,7 @@ public class EACLsException extends EBaseException { /** * Return the class name of the resource bundle. - * + * * @return class name of the resource bundle. */ protected String getBundleName() { diff --git a/base/common/src/com/netscape/certsrv/acls/IACL.java b/base/common/src/com/netscape/certsrv/acls/IACL.java index aad733722..4126c884c 100644 --- a/base/common/src/com/netscape/certsrv/acls/IACL.java +++ b/base/common/src/com/netscape/certsrv/acls/IACL.java @@ -25,42 +25,42 @@ import java.util.Enumeration; * enforcer can verify the ACLs with the current * context to see if the corresponding resource is accessible. * <P> - * + * * @version $Revision$, $Date$ */ public interface IACL { /** * Returns the name of the current ACL. - * + * * @return the name of the current ACL. */ public String getName(); /** * Returns the description of the current ACL. - * + * * @return the description of the current ACL. */ public String getDescription(); /** * Returns a list of access rights of the current ACL. - * + * * @return a list of access rights */ public Enumeration<String> rights(); /** * Returns a list of entries of the current ACL. - * + * * @return a list of entries */ public Enumeration<ACLEntry> entries(); /** * Verifies if permission is granted. - * + * * @param permission one of the applicable rights * @return true if the given permission is one of the applicable rights; false otherwise. */ diff --git a/base/common/src/com/netscape/certsrv/acls/IACLEntry.java b/base/common/src/com/netscape/certsrv/acls/IACLEntry.java index ff806f155..3b5a1c070 100644 --- a/base/common/src/com/netscape/certsrv/acls/IACLEntry.java +++ b/base/common/src/com/netscape/certsrv/acls/IACLEntry.java @@ -20,14 +20,14 @@ package com.netscape.certsrv.acls; /** * A class represents an entry of access control list. * <P> - * + * * @version $Revision$, $Date$ */ public interface IACLEntry { /** * Returns the ACL entry string of the entry. - * + * * @return the ACL entry string of the entry. */ public String getACLEntryString(); diff --git a/base/common/src/com/netscape/certsrv/apps/CMS.java b/base/common/src/com/netscape/certsrv/apps/CMS.java index 3a36c71bc..4d4577777 100644 --- a/base/common/src/com/netscape/certsrv/apps/CMS.java +++ b/base/common/src/com/netscape/certsrv/apps/CMS.java @@ -101,13 +101,13 @@ import com.netscape.cmsutil.password.IPasswordStore; * This represents the CMS server. Plugins can access other * public objects such as subsystems via this inteface. * This object also include a set of utility functions. - * + * * This object does not include the actual implementation. * It acts as a public interface for plugins, and the * actual implementation is in the CMS engine * (com.netscape.cmscore.apps.CMSEngine) that implements * ICMSEngine interface. - * + * * @version $Revision$, $Date$ */ public final class CMS { @@ -139,7 +139,7 @@ public final class CMS { /** * Private constructor. - * + * * @param engine CMS engine implementation */ private CMS(ICMSEngine engine) { @@ -149,7 +149,7 @@ public final class CMS { /** * This method is used for unit tests. It allows the underlying _engine * to be stubbed out. - * + * * @param engine The stub engine to set, for testing. */ public static void setCMSEngine(ICMSEngine engine) { @@ -158,7 +158,7 @@ public final class CMS { /** * Gets this ID . - * + * * @return CMS engine identifier */ public static String getId() { @@ -168,7 +168,7 @@ public final class CMS { /** * Sets the identifier of this subsystem. Should never be called. * Returns error. - * + * * @param id CMS engine identifier */ public static void setId(String id) throws EBaseException { @@ -177,7 +177,7 @@ public final class CMS { /** * 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 @@ -194,7 +194,7 @@ public final class CMS { /** * Starts up all subsystems. subsystems must be initialized. - * + * * @exception EBaseException if any subsystem fails to startup. */ public static void startup() throws EBaseException { @@ -219,7 +219,7 @@ public final class CMS { * Checks to ensure that all new incoming requests have been blocked. * This method is used for reentrancy protection. * <P> - * + * * @return true or false */ public static boolean areRequestsDisabled() { @@ -269,7 +269,7 @@ public final class CMS { * server will be initialization state first. After the * initialization state, the server will be in the running * state. - * + * * @return true if the server is in the running state */ public static boolean isInRunningState() { @@ -280,7 +280,7 @@ public final class CMS { * Returns the logger of the current server. The logger can * be used to log critical informational or critical error * messages. - * + * * @return logger */ public static ILogger getLogger() { @@ -291,7 +291,7 @@ public final class CMS { * Returns the signed audit logger of the current server. This logger can * be used to log critical informational or critical error * messages. - * + * * @return signed audit logger */ public static ILogger getSignedAuditLogger() { @@ -300,7 +300,7 @@ public final class CMS { /** * Creates a repository record in the internal database. - * + * * @return repository record */ public static IRepositoryRecord createRepositoryRecord() { @@ -309,9 +309,9 @@ public final class CMS { /** * 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> @@ -325,7 +325,7 @@ public final class CMS { /** * Creates an issuing poing record. - * + * * @return issuing record */ public static ICRLIssuingPointRecord createCRLIssuingPointRecord(String id, BigInteger crlNumber, Long crlSize, @@ -335,7 +335,7 @@ public final class CMS { /** * Retrieves the default CRL issuing point record name. - * + * * @return CRL issuing point record name */ public static String getCRLIssuingPointRecordName() { @@ -344,7 +344,7 @@ public final class CMS { /** * Retrieves the process id of this server. - * + * * @return process id of the server */ public static int getPID() { @@ -353,7 +353,7 @@ public final class CMS { /** * Retrieves the instance roort path of this server. - * + * * @return instance directory path name */ public static String getInstanceDir() { @@ -363,7 +363,7 @@ public final class CMS { /** * Returns a server wide system time. Plugins should call * this method to retrieve system time. - * + * * @return current time */ public static Date getCurrentDate() { @@ -374,7 +374,7 @@ public final class CMS { /** * Puts data of an byte array into the debug file. - * + * * @param data byte array to be recorded in the debug file */ public static void debug(byte data[]) { @@ -384,7 +384,7 @@ public final class CMS { /** * Puts a message into the debug file. - * + * * @param msg debugging message */ public static void debug(String msg) { @@ -394,7 +394,7 @@ public final class CMS { /** * Puts a message into the debug file. - * + * * @param level 0-10 (0 is less detail, 10 is more detail) * @param msg debugging message */ @@ -405,7 +405,7 @@ public final class CMS { /** * Puts an exception into the debug file. - * + * * @param e exception */ public static void debug(Throwable e) { @@ -415,7 +415,7 @@ public final class CMS { /** * Checks if the debug mode is on or not. - * + * * @return true if debug mode is on */ public static boolean debugOn() { @@ -439,7 +439,7 @@ public final class CMS { * is expecting to find, or what database attributes it is looking for. * @param type indicates what the source of key/val is. For example, * this could be 'CS.cfg', or something else. In the debug - * subsystem, there is a mechanism to filter this so only the types + * subsystem, there is a mechanism to filter this so only the types * you care about are listed * @param key the 'key' of the hashtable which is being accessed. * This could be the name of the config parameter, or the http param @@ -468,7 +468,7 @@ public final class CMS { /** * Returns the names of all the registered subsystems. - * + * * @return a list of string-based subsystem names */ public static Enumeration<String> getSubsystemNames() { @@ -481,7 +481,7 @@ public final class CMS { /** * Returns all the registered subsystems. - * + * * @return a list of ISubsystem-based subsystems */ public static Enumeration<ISubsystem> getSubsystems() { @@ -490,7 +490,7 @@ public final class CMS { /** * Retrieves the registered subsytem with the given name. - * + * * @param name subsystem name * @return subsystem of the given name */ @@ -500,7 +500,7 @@ public final class CMS { /** * Retrieves the localized user message from UserMessages.properties. - * + * * @param msgID message id defined in UserMessages.properties * @return localized user message */ @@ -512,7 +512,7 @@ public final class CMS { /** * Retrieves the localized user message from UserMessages.properties. - * + * * @param locale end-user locale * @param msgID message id defined in UserMessages.properties * @return localized user message @@ -525,7 +525,7 @@ public final class CMS { /** * Retrieves the localized user message from UserMessages.properties. - * + * * @param msgID message id defined in UserMessages.properties * @param p1 1st parameter * @return localized user message @@ -538,7 +538,7 @@ public final class CMS { /** * Retrieves the localized user message from UserMessages.properties. - * + * * @param locale end-user locale * @param msgID message id defined in UserMessages.properties * @param p1 1st parameter @@ -552,7 +552,7 @@ public final class CMS { /** * Retrieves the localized user message from UserMessages.properties. - * + * * @param msgID message id defined in UserMessages.properties * @param p1 1st parameter * @param p2 2nd parameter @@ -566,7 +566,7 @@ public final class CMS { /** * Retrieves the localized user message from UserMessages.properties. - * + * * @param locale end-user locale * @param msgID message id defined in UserMessages.properties * @param p1 1st parameter @@ -581,7 +581,7 @@ public final class CMS { /** * Retrieves the localized user message from UserMessages.properties. - * + * * @param msgID message id defined in UserMessages.properties * @param p1 1st parameter * @param p2 2nd parameter @@ -603,7 +603,7 @@ public final class CMS { /** * Retrieves the localized user message from UserMessages.properties. - * + * * @param locale end-user locale * @param msgID message id defined in UserMessages.properties * @param p1 1st parameter @@ -619,7 +619,7 @@ public final class CMS { /** * Retrieves the localized user message from UserMessages.properties. - * + * * @param msgID message id defined in UserMessages.properties * @param p an array of parameters * @return localized user message @@ -632,7 +632,7 @@ public final class CMS { /** * Retrieves the localized user message from UserMessages.properties. - * + * * @param locale end-user locale * @param msgID message id defined in UserMessages.properties * @param p an array of parameters @@ -646,7 +646,7 @@ public final class CMS { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @return localized log message */ @@ -656,7 +656,7 @@ public final class CMS { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p an array of parameters * @return localized log message @@ -667,7 +667,7 @@ public final class CMS { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p1 1st parameter * @return localized log message @@ -678,7 +678,7 @@ public final class CMS { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p1 1st parameter * @param p2 2nd parameter @@ -690,7 +690,7 @@ public final class CMS { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p1 1st parameter * @param p2 2nd parameter @@ -703,7 +703,7 @@ public final class CMS { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p1 1st parameter * @param p2 2nd parameter @@ -717,7 +717,7 @@ public final class CMS { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p1 1st parameter * @param p2 2nd parameter @@ -732,7 +732,7 @@ public final class CMS { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p1 1st parameter * @param p2 2nd parameter @@ -748,7 +748,7 @@ public final class CMS { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p1 1st parameter * @param p2 2nd parameter @@ -766,7 +766,7 @@ public final class CMS { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p1 1st parameter * @param p2 2nd parameter @@ -785,7 +785,7 @@ public final class CMS { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p1 1st parameter * @param p2 2nd parameter @@ -805,7 +805,7 @@ public final class CMS { /** * Returns the main config store. It is a handle to CMS.cfg. - * + * * @return configuration store */ public static IConfigStore getConfigStore() { @@ -814,7 +814,7 @@ public final class CMS { /** * Retrieves time server started up. - * + * * @return last startup time */ public static long getStartupTime() { @@ -823,7 +823,7 @@ public final class CMS { /** * Retrieves the HTTP Connection for use with connector. - * + * * @param authority remote authority * @param factory socket factory * @return http connection to the remote authority @@ -835,7 +835,7 @@ public final class CMS { /** * Retrieves the HTTP Connection for use with connector. - * + * * @param authority remote authority * @param factory socket factory * @param timeout return error if connection cannot be established within @@ -849,7 +849,7 @@ public final class CMS { /** * Retrieves the request sender for use with connector. - * + * * @param authority local authority * @param nickname nickname of the client certificate * @param remote remote authority @@ -863,7 +863,7 @@ public final class CMS { /** * Retrieves the nickname of the server's server certificate. - * + * * @return nickname of the server certificate */ public static String getServerCertNickname() { @@ -872,7 +872,7 @@ public final class CMS { /** * Sets the nickname of the server's server certificate. - * + * * @param tokenName name of token where the certificate is located * @param nickName name of server certificate */ @@ -882,7 +882,7 @@ public final class CMS { /** * Sets the nickname of the server's server certificate. - * + * * @param newName new nickname of server certificate */ public static void setServerCertNickname(String newName) { @@ -891,7 +891,7 @@ public final class CMS { /** * Retrieves the host name of the server's secure end entity service. - * + * * @return host name of end-entity service */ public static String getEEHost() { @@ -900,7 +900,7 @@ public final class CMS { /** * Retrieves the host name of the server's non-secure end entity service. - * + * * @return host name of end-entity non-secure service */ public static String getEENonSSLHost() { @@ -909,7 +909,7 @@ public final class CMS { /** * Retrieves the IP address of the server's non-secure end entity service. - * + * * @return ip address of end-entity non-secure service */ public static String getEENonSSLIP() { @@ -918,7 +918,7 @@ public final class CMS { /** * Retrieves the port number of the server's non-secure end entity service. - * + * * @return port of end-entity non-secure service */ public static String getEENonSSLPort() { @@ -927,7 +927,7 @@ public final class CMS { /** * Retrieves the host name of the server's secure end entity service. - * + * * @return port of end-entity secure service */ public static String getEESSLHost() { @@ -936,7 +936,7 @@ public final class CMS { /** * Retrieves the host name of the server's secure end entity service. - * + * * @return port of end-entity secure service */ public static String getEEClientAuthSSLPort() { @@ -945,7 +945,7 @@ public final class CMS { /** * Retrieves the IP address of the server's secure end entity service. - * + * * @return ip address of end-entity secure service */ public static String getEESSLIP() { @@ -954,7 +954,7 @@ public final class CMS { /** * Retrieves the port number of the server's secure end entity service. - * + * * @return port of end-entity secure service */ public static String getEESSLPort() { @@ -963,7 +963,7 @@ public final class CMS { /** * Retrieves the host name of the server's agent service. - * + * * @return host name of agent service */ public static String getAgentHost() { @@ -972,7 +972,7 @@ public final class CMS { /** * Retrieves the IP address of the server's agent service. - * + * * @return ip address of agent service */ public static String getAgentIP() { @@ -981,7 +981,7 @@ public final class CMS { /** * Retrieves the port number of the server's agent service. - * + * * @return port of agent service */ public static String getAgentPort() { @@ -990,7 +990,7 @@ public final class CMS { /** * Retrieves the host name of the server's administration service. - * + * * @return host name of administration service */ public static String getAdminHost() { @@ -999,7 +999,7 @@ public final class CMS { /** * Retrieves the IP address of the server's administration service. - * + * * @return ip address of administration service */ public static String getAdminIP() { @@ -1008,7 +1008,7 @@ public final class CMS { /** * Retrieves the port number of the server's administration service. - * + * * @return port of administration service */ public static String getAdminPort() { @@ -1017,7 +1017,7 @@ public final class CMS { /** * Creates a general name constraints. - * + * * @param generalNameChoice type of general name * @param value general name string * @return general name object @@ -1030,7 +1030,7 @@ public final class CMS { /** * Creates a general name. - * + * * @param generalNameChoice type of general name * @param value general name string * @return general name object @@ -1043,7 +1043,7 @@ public final class CMS { /** * Get default parameters for subject alt name configuration. - * + * * @param name configuration name * @param params configuration parameters */ @@ -1054,7 +1054,7 @@ public final class CMS { /** * Get extended plugin info for subject alt name configuration. - * + * * @param name configuration name * @param params configuration parameters */ @@ -1065,7 +1065,7 @@ public final class CMS { /** * Creates subject alt name configuration. - * + * * @param name configuration name * @param config configuration store * @param isValueConfigured true if value is configured @@ -1079,7 +1079,7 @@ public final class CMS { /** * Retrieves default general name configuration. - * + * * @param name configuration name * @param isValueConfigured true if value is configured * @param params configuration parameters @@ -1093,7 +1093,7 @@ public final class CMS { /** * Retrieves default general names configuration. - * + * * @param name configuration name * @param isValueConfigured true if value is configured * @param params configuration parameters @@ -1107,7 +1107,7 @@ public final class CMS { /** * Retrieves extended plugin info for general name configuration. - * + * * @param name configuration name * @param isValueConfigured true if value is configured * @param info configuration parameters @@ -1121,7 +1121,7 @@ public final class CMS { /** * Retrieves extended plugin info for general name configuration. - * + * * @param name configuration name * @param isValueConfigured true if value is configured * @param info configuration parameters @@ -1135,7 +1135,7 @@ public final class CMS { /** * Created general names configuration. - * + * * @param name configuration name * @param config configuration store * @param isValueConfigured true if value is configured @@ -1151,7 +1151,7 @@ public final class CMS { /** * Created general name constraints configuration. - * + * * @param name configuration name * @param config configuration store * @param isValueConfigured true if value is configured @@ -1167,7 +1167,7 @@ public final class CMS { /** * Created general name constraints configuration. - * + * * @param name configuration name * @param config configuration store * @param isValueConfigured true if value is configured @@ -1183,7 +1183,7 @@ public final class CMS { /** * Returns the finger print of the given certificate. - * + * * @param cert certificate * @return finger print of certificate */ @@ -1194,7 +1194,7 @@ public final class CMS { /** * Returns the finger print of the given certificate. - * + * * @param certDer DER byte array of the certificate * @return finger print of certificate */ @@ -1205,7 +1205,7 @@ public final class CMS { /** * Returns the finger print of the given certificate. - * + * * @param cert certificate * @return finger print of certificate */ @@ -1217,7 +1217,7 @@ public final class CMS { /** * Creates a HTTP PKI Message that can be sent to a remote * authority. - * + * * @return a new PKI Message for remote authority */ public static IPKIMessage getHttpPKIMessage() { @@ -1227,7 +1227,7 @@ public final class CMS { /** * Creates a request encoder. A request cannot be sent to * the remote authority in its regular format. - * + * * @return a request encoder */ public static IRequestEncoder getHttpRequestEncoder() { @@ -1236,7 +1236,7 @@ public final class CMS { /** * Converts a BER-encoded byte array into a MIME-64 encoded string. - * + * * @param data data in byte array format * @return base-64 encoding for the data */ @@ -1246,7 +1246,7 @@ public final class CMS { /** * Converts a MIME-64 encoded string into a BER-encoded byte array. - * + * * @param data base-64 encoding for the data * @return data data in byte array format */ @@ -1257,7 +1257,7 @@ public final class CMS { /** * Retrieves the ldap connection information from the configuration * store. - * + * * @param config configuration parameters of ldap connection * @return a LDAP connection info */ @@ -1270,7 +1270,7 @@ public final class CMS { * Creates a LDAP SSL socket with the given nickname. The * certificate associated with the nickname will be used * for client authentication. - * + * * @param certNickname nickname of client certificate * @return LDAP SSL socket factory */ @@ -1281,7 +1281,7 @@ public final class CMS { /** * Creates a LDAP SSL socket. - * + * * @return LDAP SSL socket factory */ public static LDAPSSLSocketFactoryExt getLdapJssSSLSocketFactory() { @@ -1290,7 +1290,7 @@ public final class CMS { /** * Creates a LDAP Auth Info object. - * + * * @return LDAP authentication info */ public static ILdapAuthInfo getLdapAuthInfo() { @@ -1299,7 +1299,7 @@ public final class CMS { /** * Retrieves the LDAP connection factory. - * + * * @return bound LDAP connection pool */ public static ILdapConnFactory getLdapBoundConnFactory() @@ -1309,7 +1309,7 @@ public final class CMS { /** * Retrieves the LDAP connection factory. - * + * * @return anonymous LDAP connection pool */ public static ILdapConnFactory getLdapAnonConnFactory() @@ -1319,7 +1319,7 @@ public final class CMS { /** * Retrieves the default X.509 certificate template. - * + * * @return default certificate template */ public static X509CertInfo getDefaultX509CertInfo() { @@ -1329,7 +1329,7 @@ public final class CMS { /** * Retrieves the certifcate in MIME-64 encoded format * with header and footer. - * + * * @param cert certificate * @return base-64 format certificate */ @@ -1369,7 +1369,7 @@ public final class CMS { /** * Checks if the given certificate is a signing certificate. - * + * * @param cert certificate * @return true if the given certificate is a signing certificate */ @@ -1379,7 +1379,7 @@ public final class CMS { /** * Checks if the given certificate is an encryption certificate. - * + * * @param cert certificate * @return true if the given certificate is an encryption certificate */ @@ -1389,7 +1389,7 @@ public final class CMS { /** * Retrieves the email form processor. - * + * * @return email form processor */ public static IEmailFormProcessor getEmailFormProcessor() { @@ -1398,7 +1398,7 @@ public final class CMS { /** * Retrieves the email form template. - * + * * @return email template */ public static IEmailTemplate getEmailTemplate(String path) { @@ -1407,7 +1407,7 @@ public final class CMS { /** * Retrieves the email notification handler. - * + * * @return email notification */ public static IMailNotification getMailNotification() { @@ -1416,7 +1416,7 @@ public final class CMS { /** * Retrieves the email key resolver. - * + * * @return email key resolver */ public static IEmailResolverKeys getEmailResolverKeys() { @@ -1425,7 +1425,7 @@ public final class CMS { /** * Checks if the given OID is valid. - * + * * @param attrName attribute name * @param value attribute value * @return object identifier of the given attrName @@ -1437,7 +1437,7 @@ public final class CMS { /** * Retrieves the email resolver that checks for subjectAlternateName. - * + * * @return email key resolver */ public static IEmailResolver getReqCertSANameEmailResolver() { @@ -1446,7 +1446,7 @@ public final class CMS { /** * Retrieves the extension pretty print handler. - * + * * @param e extension * @param indent indentation * @return extension pretty print handler @@ -1457,7 +1457,7 @@ public final class CMS { /** * Retrieves the certificate pretty print handler. - * + * * @param delimiter delimiter * @return certificate pretty print handler */ @@ -1467,7 +1467,7 @@ public final class CMS { /** * Retrieves the CRL pretty print handler. - * + * * @param crl CRL * @return CRL pretty print handler */ @@ -1477,7 +1477,7 @@ public final class CMS { /** * Retrieves the CRL cache pretty print handler. - * + * * @param ip CRL issuing point * @return CRL pretty print handler */ @@ -1487,7 +1487,7 @@ public final class CMS { /** * Retrieves the certificate pretty print handler. - * + * * @param cert certificate * @return certificate pretty print handler */ @@ -1505,7 +1505,7 @@ public final class CMS { /** * Retrieves the password check. - * + * * @return default password checker */ public static IPasswordCheck getPasswordChecker() { @@ -1514,7 +1514,7 @@ public final class CMS { /** * Puts a password entry into the single-sign on cache. - * + * * @param tag password tag * @param pw password */ @@ -1524,7 +1524,7 @@ public final class CMS { /** * Retrieves the password callback. - * + * * @return default password callback */ public static PasswordCallback getPasswordCallback() { @@ -1533,7 +1533,7 @@ public final class CMS { /** * Retrieves command queue - * + * * @return command queue */ public static ICommandQueue getCommandQueue() { @@ -1542,7 +1542,7 @@ public final class CMS { /** * Loads the configuration file and starts CMS's core implementation. - * + * * @param path path to configuration file (CMS.cfg) * @exception EBaseException failed to start CMS */ @@ -1582,7 +1582,7 @@ public final class CMS { shutdown(); throw e; - } catch (Exception e) { // catch everything here purposely + } catch (Exception e) { // catch everything here purposely ByteArrayOutputStream bos = new ByteArrayOutputStream(); PrintStream ps = new PrintStream(bos); diff --git a/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java b/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java index ba9731867..41f4c348e 100644 --- a/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java +++ b/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java @@ -86,14 +86,14 @@ import com.netscape.cmsutil.password.IPasswordStore; * <p> * The engine implementation is loaded by CMS at startup. It is responsible for starting up all the related subsystems. * <p> - * + * * @version $Revision$, $Date$ */ public interface ICMSEngine extends ISubsystem { /** * Gets this ID . - * + * * @return CMS engine identifier */ public String getId(); @@ -101,14 +101,14 @@ public interface ICMSEngine extends ISubsystem { /** * Sets the identifier of this subsystem. Should never be called. * Returns error. - * + * * @param id CMS engine identifier */ public void setId(String id) throws EBaseException; /** * Retrieves the process id of this server. - * + * * @return process id of the server */ public int getPID(); @@ -125,7 +125,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the instance roort path of this server. - * + * * @return instance directory path name */ public String getInstanceDir(); @@ -133,14 +133,14 @@ public interface ICMSEngine extends ISubsystem { /** * Returns a server wide system time. Plugins should call * this method to retrieve system time. - * + * * @return current time */ public Date getCurrentDate(); /** * Retrieves time server started up. - * + * * @return last startup time */ public long getStartupTime(); @@ -150,28 +150,28 @@ public interface ICMSEngine extends ISubsystem { * server will be initialization state first. After the * initialization state, the server will be in the running * state. - * + * * @return true if the server is in the running state */ public boolean isInRunningState(); /** * Returns the names of all the registered subsystems. - * + * * @return a list of string-based subsystem names */ public Enumeration<String> getSubsystemNames(); /** * Returns all the registered subsystems. - * + * * @return a list of ISubsystem-based subsystems */ public Enumeration<ISubsystem> getSubsystems(); /** * Retrieves the registered subsytem with the given name. - * + * * @param name subsystem name * @return subsystem of the given name */ @@ -181,7 +181,7 @@ public interface ICMSEngine extends ISubsystem { * Returns the logger of the current server. The logger can * be used to log critical informational or critical error * messages. - * + * * @return logger */ public ILogger getLogger(); @@ -190,28 +190,28 @@ public interface ICMSEngine extends ISubsystem { * Returns the signed audit logger of the current server. This logger can * be used to log critical informational or critical error * messages. - * + * * @return signed audit logger */ public ILogger getSignedAuditLogger(); /** * Puts data of an byte array into the debug file. - * + * * @param data byte array to be recorded in the debug file */ public void debug(byte data[]); /** * Puts a message into the debug file. - * + * * @param msg debugging message */ public void debug(String msg); /** * Puts a message into the debug file. - * + * * @param level 0-10 * @param msg debugging message */ @@ -219,14 +219,14 @@ public interface ICMSEngine extends ISubsystem { /** * Puts an exception into the debug file. - * + * * @param e exception */ public void debug(Throwable e); /** * Checks if the debug mode is on or not. - * + * * @return true if debug mode is on */ public boolean debugOn(); @@ -249,7 +249,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the localized user message from UserMessages.properties. - * + * * @param locale end-user locale * @param msgID message id defined in UserMessages.properties * @return localized user message @@ -258,7 +258,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the localized user message from UserMessages.properties. - * + * * @param locale end-user locale * @param msgID message id defined in UserMessages.properties * @param p an array of parameters @@ -268,7 +268,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the localized user message from UserMessages.properties. - * + * * @param locale end-user locale * @param msgID message id defined in UserMessages.properties * @param p1 1st parameter @@ -278,7 +278,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the localized user message from UserMessages.properties. - * + * * @param locale end-user locale * @param msgID message id defined in UserMessages.properties * @param p1 1st parameter @@ -289,7 +289,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the localized user message from UserMessages.properties. - * + * * @param locale end-user locale * @param msgID message id defined in UserMessages.properties * @param p1 1st parameter @@ -301,7 +301,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @return localized log message */ @@ -309,7 +309,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p an array of parameters * @return localized log message @@ -318,7 +318,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p1 1st parameter * @return localized log message @@ -327,7 +327,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p1 1st parameter * @param p2 2nd parameter @@ -337,7 +337,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p1 1st parameter * @param p2 2nd parameter @@ -348,7 +348,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p1 1st parameter * @param p2 2nd parameter @@ -360,7 +360,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p1 1st parameter * @param p2 2nd parameter @@ -373,7 +373,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p1 1st parameter * @param p2 2nd parameter @@ -387,7 +387,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p1 1st parameter * @param p2 2nd parameter @@ -403,7 +403,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p1 1st parameter * @param p2 2nd parameter @@ -420,7 +420,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the centralized log message from LogMessages.properties. - * + * * @param msgID message id defined in LogMessages.properties * @param p1 1st parameter * @param p2 2nd parameter @@ -438,9 +438,9 @@ public interface ICMSEngine extends ISubsystem { /** * 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> @@ -452,7 +452,7 @@ public interface ICMSEngine extends ISubsystem { /** * Creates an issuing poing record. - * + * * @return issuing record */ public ICRLIssuingPointRecord createCRLIssuingPointRecord(String id, BigInteger crlNumber, Long crlSize, @@ -460,14 +460,14 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the default CRL issuing point record name. - * + * * @return CRL issuing point record name */ public String getCRLIssuingPointRecordName(); /** * Returns the finger print of the given certificate. - * + * * @param cert certificate * @return finger print of certificate */ @@ -476,7 +476,7 @@ public interface ICMSEngine extends ISubsystem { /** * Returns the finger print of the given certificate. - * + * * @param cert certificate * @return finger print of certificate */ @@ -494,7 +494,7 @@ public interface ICMSEngine extends ISubsystem { /** * Creates a repository record in the internal database. - * + * * @return repository record */ public IRepositoryRecord createRepositoryRecord(); @@ -502,7 +502,7 @@ public interface ICMSEngine extends ISubsystem { /** * Creates a HTTP PKI Message that can be sent to a remote * authority. - * + * * @return a new PKI Message for remote authority */ public IPKIMessage getHttpPKIMessage(); @@ -510,14 +510,14 @@ public interface ICMSEngine extends ISubsystem { /** * Creates a request encoder. A request cannot be sent to * the remote authority in its regular format. - * + * * @return a request encoder */ public IRequestEncoder getHttpRequestEncoder(); /** * Converts a BER-encoded byte array into a MIME-64 encoded string. - * + * * @param data data in byte array format * @return base-64 encoding for the data */ @@ -525,7 +525,7 @@ public interface ICMSEngine extends ISubsystem { /** * Converts a MIME-64 encoded string into a BER-encoded byte array. - * + * * @param data base-64 encoding for the data * @return data data in byte array format */ @@ -534,7 +534,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the certifcate in MIME-64 encoded format * with header and footer. - * + * * @param cert certificate * @return base-64 format certificate */ @@ -542,7 +542,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the certificate pretty print handler. - * + * * @param delimiter delimiter * @return certificate pretty print handler */ @@ -550,7 +550,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the extension pretty print handler. - * + * * @param e extension * @param indent indentation * @return extension pretty print handler @@ -559,7 +559,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the certificate pretty print handler. - * + * * @param cert certificate * @return certificate pretty print handler */ @@ -567,7 +567,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the CRL pretty print handler. - * + * * @param crl CRL * @return CRL pretty print handler */ @@ -575,7 +575,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the CRL cache pretty print handler. - * + * * @param ip CRL issuing point * @return CRL pretty print handler */ @@ -584,7 +584,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the ldap connection information from the configuration * store. - * + * * @param config configuration parameters of ldap connection * @return a LDAP connection info */ @@ -595,7 +595,7 @@ public interface ICMSEngine extends ISubsystem { * Creates a LDAP SSL socket with the given nickname. The * certificate associated with the nickname will be used * for client authentication. - * + * * @param certNickname nickname of client certificate * @return LDAP SSL socket factory */ @@ -604,21 +604,21 @@ public interface ICMSEngine extends ISubsystem { /** * Creates a LDAP SSL socket. - * + * * @return LDAP SSL socket factory */ public LDAPSSLSocketFactoryExt getLdapJssSSLSocketFactory(); /** * Creates a LDAP Auth Info object. - * + * * @return LDAP authentication info */ public ILdapAuthInfo getLdapAuthInfo(); /** * Retrieves the LDAP connection factory. - * + * * @return bound LDAP connection pool */ public ILdapConnFactory getLdapBoundConnFactory() throws ELdapException; @@ -629,21 +629,21 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the LDAP connection factory. - * + * * @return anonymous LDAP connection pool */ public ILdapConnFactory getLdapAnonConnFactory() throws ELdapException; /** * Retrieves the password check. - * + * * @return default password checker */ public IPasswordCheck getPasswordChecker(); /** * Puts a password entry into the single-sign on cache. - * + * * @param tag password tag * @param pw password */ @@ -651,21 +651,21 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the password callback. - * + * * @return default password callback */ public PasswordCallback getPasswordCallback(); /** * Retrieves the nickname of the server's server certificate. - * + * * @return nickname of the server certificate */ public String getServerCertNickname(); /** * Sets the nickname of the server's server certificate. - * + * * @param tokenName name of token where the certificate is located * @param nickName name of server certificate */ @@ -673,112 +673,112 @@ public interface ICMSEngine extends ISubsystem { /** * Sets the nickname of the server's server certificate. - * + * * @param newName new nickname of server certificate */ public void setServerCertNickname(String newName); /** * Retrieves the host name of the server's secure end entity service. - * + * * @return host name of end-entity service */ public String getEEHost(); /** * Retrieves the host name of the server's non-secure end entity service. - * + * * @return host name of end-entity non-secure service */ public String getEENonSSLHost(); /** * Retrieves the IP address of the server's non-secure end entity service. - * + * * @return ip address of end-entity non-secure service */ public String getEENonSSLIP(); /** * Retrieves the port number of the server's non-secure end entity service. - * + * * @return port of end-entity non-secure service */ public String getEENonSSLPort(); /** * Retrieves the host name of the server's secure end entity service. - * + * * @return port of end-entity secure service */ public String getEESSLHost(); /** * Retrieves the IP address of the server's secure end entity service. - * + * * @return ip address of end-entity secure service */ public String getEESSLIP(); /** * Retrieves the port number of the server's secure end entity service. - * + * * @return port of end-entity secure service */ public String getEESSLPort(); /** * Retrieves the port number of the server's client auth secure end entity service. - * + * * @return port of end-entity client auth secure service */ public String getEEClientAuthSSLPort(); /** * Retrieves the host name of the server's agent service. - * + * * @return host name of agent service */ public String getAgentHost(); /** * Retrieves the IP address of the server's agent service. - * + * * @return ip address of agent service */ public String getAgentIP(); /** * Retrieves the port number of the server's agent service. - * + * * @return port of agent service */ public String getAgentPort(); /** * Retrieves the host name of the server's administration service. - * + * * @return host name of administration service */ public String getAdminHost(); /** * Retrieves the IP address of the server's administration service. - * + * * @return ip address of administration service */ public String getAdminIP(); /** * Retrieves the port number of the server's administration service. - * + * * @return port of administration service */ public String getAdminPort(); /** * Verifies all system certificates - * + * * @return true if all passed, false otherwise */ public boolean verifySystemCerts(); @@ -786,28 +786,28 @@ public interface ICMSEngine extends ISubsystem { /** * Verifies a system certificate by its tag name * as defined in <subsystemtype>.cert.list - * + * * @return true if passed, false otherwise */ public boolean verifySystemCertByTag(String tag); /** * Verifies a system certificate by its nickname - * + * * @return true if passed, false otherwise */ public boolean verifySystemCertByNickname(String nickname, String certificateUsage); /** * get the CertificateUsage as defined in JSS CryptoManager - * + * * @return CertificateUsage as defined in JSS CryptoManager */ public CertificateUsage getCertificateUsage(String certusage); /** * Checks if the given certificate is a signing certificate. - * + * * @param cert certificate * @return true if the given certificate is a signing certificate */ @@ -815,7 +815,7 @@ public interface ICMSEngine extends ISubsystem { /** * Checks if the given certificate is an encryption certificate. - * + * * @param cert certificate * @return true if the given certificate is an encryption certificate */ @@ -823,49 +823,49 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the default X.509 certificate template. - * + * * @return default certificate template */ public X509CertInfo getDefaultX509CertInfo(); /** * Retrieves the email form processor. - * + * * @return email form processor */ public IEmailFormProcessor getEmailFormProcessor(); /** * Retrieves the email form template. - * + * * @return email template */ public IEmailTemplate getEmailTemplate(String path); /** * Retrieves the email notification handler. - * + * * @return email notification */ public IMailNotification getMailNotification(); /** * Retrieves the email key resolver. - * + * * @return email key resolver */ public IEmailResolverKeys getEmailResolverKeys(); /** * Retrieves the email resolver that checks for subjectAlternateName. - * + * * @return email key resolver */ public IEmailResolver getReqCertSANameEmailResolver(); /** * Checks if the given OID is valid. - * + * * @param attrName attribute name * @param value attribute value * @return object identifier of the given attrName @@ -875,7 +875,7 @@ public interface ICMSEngine extends ISubsystem { /** * Creates a general name constraints. - * + * * @param generalNameChoice type of general name * @param value general name string * @return general name object @@ -885,7 +885,7 @@ public interface ICMSEngine extends ISubsystem { /** * Creates a general name. - * + * * @param generalNameChoice type of general name * @param value general name string * @return general name object @@ -896,7 +896,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves default general name configuration. - * + * * @param name configuration name * @param isValueConfigured true if value is configured * @param params configuration parameters @@ -907,7 +907,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves default general names configuration. - * + * * @param name configuration name * @param isValueConfigured true if value is configured * @param params configuration parameters @@ -918,7 +918,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves extended plugin info for general name configuration. - * + * * @param name configuration name * @param isValueConfigured true if value is configured * @param info configuration parameters @@ -929,7 +929,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves extended plugin info for general name configuration. - * + * * @param name configuration name * @param isValueConfigured true if value is configured * @param info configuration parameters @@ -940,7 +940,7 @@ public interface ICMSEngine extends ISubsystem { /** * Created general names configuration. - * + * * @param name configuration name * @param config configuration store * @param isValueConfigured true if value is configured @@ -953,7 +953,7 @@ public interface ICMSEngine extends ISubsystem { /** * Created general name constraints configuration. - * + * * @param name configuration name * @param config configuration store * @param isValueConfigured true if value is configured @@ -966,7 +966,7 @@ public interface ICMSEngine extends ISubsystem { /** * Created general name constraints configuration. - * + * * @param name configuration name * @param config configuration store * @param isValueConfigured true if value is configured @@ -979,7 +979,7 @@ public interface ICMSEngine extends ISubsystem { /** * Get default parameters for subject alt name configuration. - * + * * @param name configuration name * @param params configuration parameters */ @@ -987,7 +987,7 @@ public interface ICMSEngine extends ISubsystem { /** * Get extended plugin info for subject alt name configuration. - * + * * @param name configuration name * @param params configuration parameters */ @@ -995,7 +995,7 @@ public interface ICMSEngine extends ISubsystem { /** * Creates subject alt name configuration. - * + * * @param name configuration name * @param config configuration store * @param isValueConfigured true if value is configured @@ -1006,7 +1006,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the HTTP Connection for use with connector. - * + * * @param authority remote authority * @param factory socket factory * @return http connection to the remote authority @@ -1016,7 +1016,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the HTTP Connection for use with connector. - * + * * @param authority remote authority * @param factory socket factory * @param timeout return error if connection cannot be established within @@ -1028,7 +1028,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves the request sender for use with connector. - * + * * @param authority local authority * @param nickname nickname of the client certificate * @param remote remote authority @@ -1040,7 +1040,7 @@ public interface ICMSEngine extends ISubsystem { /** * Retrieves command queue - * + * * @return command queue */ public ICommandQueue getCommandQueue(); @@ -1059,14 +1059,14 @@ public interface ICMSEngine extends ISubsystem { * Checks to ensure that all new incoming requests have been blocked. * This method is used for reentrancy protection. * <P> - * + * * @return true or false */ public boolean areRequestsDisabled(); /** * Create configuration file. - * + * * @param path configuration path * @return configuration store * @exception EBaseException failed to create file @@ -1091,7 +1091,7 @@ public interface ICMSEngine extends ISubsystem { /** * Checks against the local certificate repository to see * if the certificates are revoked. - * + * * @param certificates certificates * @return true if certificate is revoked in the local * certificate repository @@ -1100,7 +1100,7 @@ public interface ICMSEngine extends ISubsystem { /** * Sets list of verified certificates - * + * * @param size size of verified certificates list * @param interval interval in which certificate is not recheck * against local certificate repository diff --git a/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java b/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java index a165ab461..77b0a4e2b 100644 --- a/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java +++ b/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java @@ -24,14 +24,14 @@ import com.netscape.cms.servlet.common.CMSRequest; /** * This interface represents a command queue for registeration * and unregisteration proccess for clean shutdown - * + * * @version $Revision$, $Date$ */ public interface ICommandQueue { /** * Registers a thread into the command queue. - * + * * @param currentRequest request object * @param currentServlet servlet that serves the request object */ @@ -39,7 +39,7 @@ public interface ICommandQueue { /** * UnRegisters a thread from the command queue. - * + * * @param currentRequest request object * @param currentServlet servlet that serves the request object */ diff --git a/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java b/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java index 5a0cdd3b8..ac17e2d3d 100644 --- a/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java +++ b/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.base.IArgBlock; * Authentication Credentials as input to the authMgr. It contains all the * information required for authentication in the authMgr. * <P> - * + * * @version $Revision$, $Date$ */ public class AuthCredentials implements IAuthCredentials { @@ -44,7 +44,7 @@ public class AuthCredentials implements IAuthCredentials { /** * Sets an authentication credential with credential name and the credential object - * + * * @param name credential name * @param cred credential object */ @@ -56,7 +56,7 @@ public class AuthCredentials implements IAuthCredentials { /** * Returns the credential to which the specified name is mapped in this * credential set - * + * * @param name credential name * @return the authentication credential for the given name */ @@ -68,7 +68,7 @@ public class AuthCredentials implements IAuthCredentials { * Removes the name and its corresponding credential from this * credential set. This method does nothing if the named * credential is not in the credential set. - * + * * @param name credential name */ public void delete(String name) { @@ -79,7 +79,7 @@ public class AuthCredentials implements IAuthCredentials { * Returns an enumeration of the credential names in this credential * set. Use the Enumeration methods on the returned object to * fetch the elements sequentially. - * + * * @return an enumeration of the names in this credential set */ public Enumeration<String> getElements() { @@ -96,7 +96,7 @@ public class AuthCredentials implements IAuthCredentials { /** * Returns the argblock. - * + * * @return the argblock. */ public IArgBlock getArgBlock() { diff --git a/base/common/src/com/netscape/certsrv/authentication/AuthManagerProxy.java b/base/common/src/com/netscape/certsrv/authentication/AuthManagerProxy.java index 76161e803..84ed047df 100644 --- a/base/common/src/com/netscape/certsrv/authentication/AuthManagerProxy.java +++ b/base/common/src/com/netscape/certsrv/authentication/AuthManagerProxy.java @@ -20,7 +20,7 @@ package com.netscape.certsrv.authentication; /** * A class represents an authentication manager. It contains an * authentication manager instance and its state (enable or not). - * + * * @version $Revision$, $Date$ */ public class AuthManagerProxy { @@ -29,7 +29,7 @@ public class AuthManagerProxy { /** * Constructor - * + * * @param enable true if the authMgr is enabled; false otherwise * @param mgr authentication manager instance */ @@ -40,7 +40,7 @@ public class AuthManagerProxy { /** * Returns the state of the authentication manager instance - * + * * @return true if the state of the authentication manager instance is * enabled; false otherwise. */ @@ -50,7 +50,7 @@ public class AuthManagerProxy { /** * Returns an authentication manager instance. - * + * * @return an authentication manager instance */ public IAuthManager getAuthManager() { diff --git a/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java b/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java index 4226fd83c..8d06aa1e9 100644 --- a/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java +++ b/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java @@ -20,7 +20,7 @@ package com.netscape.certsrv.authentication; /** * This class represents a registered authentication manager plugin. * <P> - * + * * @version $Revision$, $Date$ */ public class AuthMgrPlugin { @@ -30,7 +30,7 @@ public class AuthMgrPlugin { /** * Constructs a AuthManager plugin. - * + * * @param id auth manager implementation name * @param classPath class path */ @@ -46,7 +46,7 @@ public class AuthMgrPlugin { /** * Returns an auth manager implementation name - * + * * @return an auth manager implementation name */ public String getId() { @@ -55,7 +55,7 @@ public class AuthMgrPlugin { /** * Returns a classpath of a AuthManager plugin - * + * * @return a classpath of a AuthManager plugin */ public String getClassPath() { @@ -64,7 +64,7 @@ public class AuthMgrPlugin { /** * Returns a visibility of the plugin - * + * * @return a visibility of the plugin */ public boolean isVisible() { @@ -73,7 +73,7 @@ public class AuthMgrPlugin { /** * Sets visibility of the plugin - * + * * @param visibility visibility of the plugin */ public void setVisible(boolean visibility) { diff --git a/base/common/src/com/netscape/certsrv/authentication/AuthResources.java b/base/common/src/com/netscape/certsrv/authentication/AuthResources.java index 35e810112..30a7a5d67 100644 --- a/base/common/src/com/netscape/certsrv/authentication/AuthResources.java +++ b/base/common/src/com/netscape/certsrv/authentication/AuthResources.java @@ -22,7 +22,7 @@ import java.util.ListResourceBundle; /** * A class represents a resource bundle for the authentication component. * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -30,7 +30,7 @@ public class AuthResources extends ListResourceBundle { /** * Returns the content of this resource. - * + * * @return the contents of this resource */ public Object[][] getContents() { diff --git a/base/common/src/com/netscape/certsrv/authentication/AuthToken.java b/base/common/src/com/netscape/certsrv/authentication/AuthToken.java index 0a2b1f0a2..d934f62e8 100644 --- a/base/common/src/com/netscape/certsrv/authentication/AuthToken.java +++ b/base/common/src/com/netscape/certsrv/authentication/AuthToken.java @@ -45,7 +45,7 @@ import com.netscape.certsrv.usrgrp.Certificates; * its own list of such information. See individual authenticaiton * manager for more details. * <p> - * + * * @version $Revision$, $Date$ */ public class AuthToken implements IAuthToken { @@ -94,13 +94,13 @@ public class AuthToken implements IAuthToken { /** * Constructs an instance of a authentication token. * The token by default contains the following attributes: <br> - * + * * <pre> * "authMgrInstName" - The authentication manager instance name. * "authMgrImplName" - The authentication manager plugin name. * "authTime" - The - The time of authentication. * </pre> - * + * * @param authMgr The authentication manager that created this Token. */ public AuthToken(IAuthManager authMgr) { @@ -126,7 +126,7 @@ public class AuthToken implements IAuthToken { /** * Removes an attribute in the AuthToken - * + * * @param attrName The name of the attribute to remove. */ public void delete(String attrName) { @@ -135,7 +135,7 @@ public class AuthToken implements IAuthToken { /** * Enumerate all attribute names in the AuthToken. - * + * * @return Enumeration of all attribute names in this AuthToken. */ public Enumeration<String> getElements() { @@ -411,7 +411,7 @@ public class AuthToken implements IAuthToken { /** * Enumerate all attribute values in the AuthToken. - * + * * @return Enumeration of all attribute names in this AuthToken. */ public Enumeration<Object> getVals() { @@ -421,7 +421,7 @@ public class AuthToken implements IAuthToken { /** * Gets the name of the authentication manager instance that created * this token. - * + * * @return The name of the authentication manager instance that created * this token. */ @@ -432,7 +432,7 @@ public class AuthToken implements IAuthToken { /** * Gets the plugin name of the authentication manager that created this * token. - * + * * @return The plugin name of the authentication manager that created this * token. */ @@ -442,7 +442,7 @@ public class AuthToken implements IAuthToken { /** * Gets the time of authentication. - * + * * @return The time of authentication */ public Date getAuthTime() { diff --git a/base/common/src/com/netscape/certsrv/authentication/EAuthException.java b/base/common/src/com/netscape/certsrv/authentication/EAuthException.java index c79c3e9a7..07a87ab96 100644 --- a/base/common/src/com/netscape/certsrv/authentication/EAuthException.java +++ b/base/common/src/com/netscape/certsrv/authentication/EAuthException.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.base.EBaseException; /** * This class represents authentication exceptions. * <P> - * + * * @version $Revision$, $Date$ */ public class EAuthException extends EBaseException { @@ -39,7 +39,7 @@ public class EAuthException extends EBaseException { /** * Constructs an authentication exception * <P> - * + * * @param msgFormat exception details */ public EAuthException(String msgFormat) { @@ -49,7 +49,7 @@ public class EAuthException extends EBaseException { /** * Constructs an authentication exception with a parameter. * <p> - * + * * @param msgFormat exception details in message string format * @param param message string parameter */ @@ -60,7 +60,7 @@ public class EAuthException extends EBaseException { /** * Constructs a auth exception with a exception parameter. * <P> - * + * * @param msgFormat exception details in message string format * @param exception system exception */ @@ -71,7 +71,7 @@ public class EAuthException extends EBaseException { /** * Constructs a auth exception with a list of parameters. * <P> - * + * * @param msgFormat the message format. * @param params list of message format parameters */ @@ -81,7 +81,7 @@ public class EAuthException extends EBaseException { /** * Returns the resource bundle name - * + * * @return resource bundle name. */ protected String getBundleName() { diff --git a/base/common/src/com/netscape/certsrv/authentication/EAuthInternalError.java b/base/common/src/com/netscape/certsrv/authentication/EAuthInternalError.java index 52688f922..ed76e7516 100644 --- a/base/common/src/com/netscape/certsrv/authentication/EAuthInternalError.java +++ b/base/common/src/com/netscape/certsrv/authentication/EAuthInternalError.java @@ -30,7 +30,7 @@ public class EAuthInternalError extends EAuthException { /** * Constructs an authentication internal error exception * with a detailed message. - * + * * @param errorString Detailed error message. */ public EAuthInternalError(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/authentication/EAuthMgrNotFound.java b/base/common/src/com/netscape/certsrv/authentication/EAuthMgrNotFound.java index 925aaabf0..7a20c4beb 100644 --- a/base/common/src/com/netscape/certsrv/authentication/EAuthMgrNotFound.java +++ b/base/common/src/com/netscape/certsrv/authentication/EAuthMgrNotFound.java @@ -29,7 +29,7 @@ public class EAuthMgrNotFound extends EAuthException { /** * Constructs a exception for a missing authentication manager - * + * * @param errorString error string for missing authentication manager */ public EAuthMgrNotFound(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/authentication/EAuthMgrPluginNotFound.java b/base/common/src/com/netscape/certsrv/authentication/EAuthMgrPluginNotFound.java index 2ca90e3c8..c15bf723a 100644 --- a/base/common/src/com/netscape/certsrv/authentication/EAuthMgrPluginNotFound.java +++ b/base/common/src/com/netscape/certsrv/authentication/EAuthMgrPluginNotFound.java @@ -29,7 +29,7 @@ public class EAuthMgrPluginNotFound extends EAuthException { /** * Constructs a exception for a missing authentication manager plugin - * + * * @param errorString error for a missing authentication manager plugin */ public EAuthMgrPluginNotFound(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/authentication/EAuthUserError.java b/base/common/src/com/netscape/certsrv/authentication/EAuthUserError.java index f816c35e8..c2028aa45 100644 --- a/base/common/src/com/netscape/certsrv/authentication/EAuthUserError.java +++ b/base/common/src/com/netscape/certsrv/authentication/EAuthUserError.java @@ -29,7 +29,7 @@ public class EAuthUserError extends EAuthException { /** * Constructs a exception for a Invalid attribute value - * + * * @param errorString Detailed error message. */ public EAuthUserError(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/authentication/ECompSyntaxErr.java b/base/common/src/com/netscape/certsrv/authentication/ECompSyntaxErr.java index 84725bb96..25844c1ff 100644 --- a/base/common/src/com/netscape/certsrv/authentication/ECompSyntaxErr.java +++ b/base/common/src/com/netscape/certsrv/authentication/ECompSyntaxErr.java @@ -29,7 +29,7 @@ public class ECompSyntaxErr extends EAuthException { /** * Constructs an component syntax error - * + * * @param errorString Detailed error message. */ public ECompSyntaxErr(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/authentication/EFormSubjectDN.java b/base/common/src/com/netscape/certsrv/authentication/EFormSubjectDN.java index 952824481..99f1371f9 100644 --- a/base/common/src/com/netscape/certsrv/authentication/EFormSubjectDN.java +++ b/base/common/src/com/netscape/certsrv/authentication/EFormSubjectDN.java @@ -29,7 +29,7 @@ public class EFormSubjectDN extends EAuthException { /** * Constructs an Error on formulating the subject dn. - * + * * @param errorString Detailed error message. */ public EFormSubjectDN(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/authentication/EInvalidCredentials.java b/base/common/src/com/netscape/certsrv/authentication/EInvalidCredentials.java index 3e4daaf0d..a562d69e5 100644 --- a/base/common/src/com/netscape/certsrv/authentication/EInvalidCredentials.java +++ b/base/common/src/com/netscape/certsrv/authentication/EInvalidCredentials.java @@ -29,7 +29,7 @@ public class EInvalidCredentials extends EAuthException { /** * Constructs an Invalid Credentials exception. - * + * * @param errorString Detailed error message. */ public EInvalidCredentials(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/authentication/EMissingCredential.java b/base/common/src/com/netscape/certsrv/authentication/EMissingCredential.java index 5de73aa0d..6a2866630 100644 --- a/base/common/src/com/netscape/certsrv/authentication/EMissingCredential.java +++ b/base/common/src/com/netscape/certsrv/authentication/EMissingCredential.java @@ -29,7 +29,7 @@ public class EMissingCredential extends EAuthException { /** * Constructs a exception for a missing required authentication credential - * + * * @param errorString Detailed error message. */ public EMissingCredential(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java b/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java index cd8434433..7a7effb4d 100644 --- a/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java +++ b/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java @@ -24,21 +24,21 @@ import com.netscape.certsrv.base.IAttrSet; * An interface represents authentication credentials: * e.g. uid/pwd, uid/pin, certificate, etc. * <P> - * + * * @version $Revision$, $Date$ */ public interface IAuthCredentials extends IAttrSet { /** * Set argblock. - * + * * @param blk argblock */ public void setArgBlock(IArgBlock blk); /** * Returns argblock. - * + * * @return Argblock. */ public IArgBlock getArgBlock(); diff --git a/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java b/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java index 1ff46af7d..f9eddbc66 100644 --- a/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java +++ b/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java @@ -23,7 +23,7 @@ import com.netscape.certsrv.base.IConfigStore; /** * Authentication Manager interface. * <P> - * + * * @version $Revision$, $Date$ */ public interface IAuthManager { @@ -41,7 +41,7 @@ public interface IAuthManager { /** * Get the name of this authentication manager instance. * <p> - * + * * @return the name of this authentication manager. */ public String getName(); @@ -49,14 +49,14 @@ public interface IAuthManager { /** * Get name of authentication manager plugin. * <p> - * + * * @return the name of the authentication manager plugin. */ public String getImplName(); /** * Authenticate the given credentials. - * + * * @param authCred The authentication credentials * @return authentication token * @exception EMissingCredential If a required credential for this @@ -69,7 +69,7 @@ public interface IAuthManager { /** * Initialize this authentication manager. - * + * * @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. @@ -86,7 +86,7 @@ public interface IAuthManager { /** * Gets a list of the required credentials for this authentication manager. - * + * * @return The required credential attributes. */ public String[] getRequiredCreds(); @@ -96,7 +96,7 @@ public interface IAuthManager { * The configuration parameters returned is passed to the * configuration console so configuration for instances of this * implementation can be made through the console. - * + * * @return a list of configuration parameters. * @exception EBaseException If an internal error occurred */ @@ -105,7 +105,7 @@ public interface IAuthManager { /** * Get the configuration store for this authentication manager. - * + * * @return The configuration store of this authentication manager. */ public IConfigStore getConfigStore(); diff --git a/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java b/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java index 329b6802e..e1ccc2d34 100644 --- a/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java +++ b/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.base.ISubsystem; /** * An interface that represents an authentication component * <P> - * + * * @version $Revision$, $Date$ */ public interface IAuthSubsystem extends ISubsystem { @@ -120,7 +120,7 @@ public interface IAuthSubsystem extends ISubsystem { /** * Authenticate the given credentials using the given manager name. - * + * * @param authCred The authentication credentials * @param authMgrName The authentication manager name * @return a authentication token. @@ -134,7 +134,7 @@ public interface IAuthSubsystem extends ISubsystem { /** * Gets the required credential attributes for the given authentication * manager. - * + * * @param authMgrName The authentication manager name * @return a Vector of required credential attribute names. * @exception EBaseException If the required credential is missing @@ -143,7 +143,7 @@ public interface IAuthSubsystem extends ISubsystem { /** * Adds (registers) the given authentication manager. - * + * * @param name The authentication manager name * @param authMgr The authentication manager instance. */ @@ -151,14 +151,14 @@ public interface IAuthSubsystem extends ISubsystem { /** * Deletes (deregisters) the given authentication manager. - * + * * @param name The authentication manager name to delete. */ public void delete(String name); /** * Gets the Authentication manager instance of the specified name. - * + * * @param name The authentication manager's name. * @exception EBaseException when internal error occurs. */ @@ -167,21 +167,21 @@ public interface IAuthSubsystem extends ISubsystem { /** * Gets an enumeration of authentication managers registered to the * authentication subsystem. - * + * * @return a list of authentication managers */ public Enumeration<IAuthManager> getAuthManagers(); /** * Gets an enumeration of authentication manager plugins. - * + * * @return a list of authentication plugins */ public Enumeration<AuthMgrPlugin> getAuthManagerPlugins(); /** * Gets a single authentication manager plugin implementation - * + * * @param name given authentication plugin name * @return the given authentication plugin */ @@ -189,7 +189,7 @@ public interface IAuthSubsystem extends ISubsystem { /** * Get configuration parameters for a authentication mgr plugin. - * + * * @param implName The plugin name. * @return configuration parameters for the given authentication manager plugin * @exception EAuthMgrPluginNotFound If the authentication manager @@ -201,7 +201,7 @@ public interface IAuthSubsystem extends ISubsystem { /** * Log error message. - * + * * @param level log level * @param msg error message */ @@ -209,21 +209,21 @@ public interface IAuthSubsystem extends ISubsystem { /** * Get a hashtable containing all authentication plugins. - * + * * @return all authentication plugins. */ public Hashtable<String, AuthMgrPlugin> getPlugins(); /** * Get a hashtable containing all authentication instances. - * + * * @return all authentication instances. */ public Hashtable<?, ?> getInstances(); /** * Get an authentication manager interface for the given name. - * + * * @param name given authentication manager name. * @return an authentication manager for the given manager name. */ @@ -231,7 +231,7 @@ public interface IAuthSubsystem extends ISubsystem { /** * Get an authentication manager plugin impl for the given name. - * + * * @param name given authentication manager name. * @return an authentication manager plugin */ diff --git a/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java b/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java index f46ee3ca1..25a73b8f1 100644 --- a/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java +++ b/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java @@ -39,7 +39,7 @@ public interface IAuthToken { /** * Sets an attribute value within this AttrSet. - * + * * @param name the name of the attribute * @param value the attribute object. * @return false on an error @@ -48,7 +48,7 @@ public interface IAuthToken { /** * Gets an attribute value. - * + * * @param name the name of the attribute to return. * @exception EBaseException on attribute handling errors. * @return the attribute value @@ -58,7 +58,7 @@ public interface IAuthToken { /** * Returns an enumeration of the names of the attributes existing within * this AttrSet. - * + * * @return an enumeration of the attribute names. */ public Enumeration<String> getElements(); @@ -72,7 +72,7 @@ public interface IAuthToken { /** * Retrieves the byte array value for name. The value should have been * previously stored as a byte array (it will be CMS.AtoB decoded). - * + * * @param name The attribute name. * @return The byte array or null on error. */ @@ -80,7 +80,7 @@ public interface IAuthToken { /** * Stores the byte array with the associated key. - * + * * @param name The attribute name. * @param value The value to store * @return false on an error @@ -89,7 +89,7 @@ public interface IAuthToken { /** * Retrieves the Integer value for name. - * + * * @param name The attribute name. * @return The Integer or null on error. */ @@ -97,7 +97,7 @@ public interface IAuthToken { /** * Stores the Integer with the associated key. - * + * * @param name The attribute name. * @param value The value to store * @return false on an error @@ -106,7 +106,7 @@ public interface IAuthToken { /** * Retrieves the BigInteger array value for name. - * + * * @param name The attribute name. * @return The value or null on error. */ @@ -114,7 +114,7 @@ public interface IAuthToken { /** * Stores the BigInteger array with the associated key. - * + * * @param name The attribute name. * @param value The value to store * @return false on an error @@ -123,7 +123,7 @@ public interface IAuthToken { /** * Retrieves the Date value for name. - * + * * @param name The attribute name. * @return The value or null on error. */ @@ -131,7 +131,7 @@ public interface IAuthToken { /** * Stores the Date with the associated key. - * + * * @param name The attribute name. * @param value The value to store * @return false on an error @@ -140,7 +140,7 @@ public interface IAuthToken { /** * Retrieves the String array value for name. - * + * * @param name The attribute name. * @return The value or null on error. */ @@ -148,7 +148,7 @@ public interface IAuthToken { /** * Stores the String array with the associated key. - * + * * @param name The attribute name. * @param value The value to store * @return False on error. @@ -157,7 +157,7 @@ public interface IAuthToken { /** * Retrieves the X509CertImpl value for name. - * + * * @param name The attribute name. * @return The value or null on error. */ @@ -165,7 +165,7 @@ public interface IAuthToken { /** * Stores the X509CertImpl with the associated key. - * + * * @param name The attribute name. * @param value The value to store * @return false on error @@ -174,7 +174,7 @@ public interface IAuthToken { /** * Retrieves the CertificateExtensions value for name. - * + * * @param name The attribute name. * @return The value or null on error. */ @@ -182,7 +182,7 @@ public interface IAuthToken { /** * Stores the CertificateExtensions with the associated key. - * + * * @param name The attribute name. * @param value The value to store * @return false on error @@ -191,7 +191,7 @@ public interface IAuthToken { /** * Retrieves the Certificates value for name. - * + * * @param name The attribute name. * @return The value or null on error. */ @@ -199,7 +199,7 @@ public interface IAuthToken { /** * Stores the Certificates with the associated key. - * + * * @param name The attribute name. * @param value The value to store * @return false on error @@ -208,7 +208,7 @@ public interface IAuthToken { /** * Retrieves the byte[][] value for name. - * + * * @param name The attribute name. * @return The value or null on error. */ @@ -216,7 +216,7 @@ public interface IAuthToken { /** * Stores the byte[][] with the associated key. - * + * * @param name The attribute name. * @param value The value to store * @return false on error diff --git a/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java b/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java index 6932decc0..ce8f40bd0 100644 --- a/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java +++ b/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java @@ -24,17 +24,17 @@ import java.security.cert.X509Certificate; * SSL client certificate in a SSL session. Normally, this * object is a servlet. * <p> - * + * * This interface is used to avoid the internal imeplemtnation to have servlet (protocol handler) dependency. * <p> - * + * * @version $Revision$, $Date$ */ public interface ISSLClientCertProvider { /** * Retrieves the SSL client certificate chain. - * + * * @return certificate chain */ public X509Certificate[] getClientCertificateChain(); diff --git a/base/common/src/com/netscape/certsrv/authority/IAuthority.java b/base/common/src/com/netscape/certsrv/authority/IAuthority.java index 2875e4dd1..a232fc452 100644 --- a/base/common/src/com/netscape/certsrv/authority/IAuthority.java +++ b/base/common/src/com/netscape/certsrv/authority/IAuthority.java @@ -23,7 +23,7 @@ import com.netscape.certsrv.request.IRequestQueue; /** * Authority interface. - * + * * @version $Revision$ $Date$ */ public interface IAuthority extends ISubsystem { @@ -31,7 +31,7 @@ public interface IAuthority extends ISubsystem { /** * Retrieves the request queue for the Authority. * <P> - * + * * @return the request queue. */ public IRequestQueue getRequestQueue(); diff --git a/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java b/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java index c2f2c91ec..885ca202f 100644 --- a/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java +++ b/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java @@ -30,7 +30,7 @@ import com.netscape.certsrv.request.IRequestListener; * Authority that handles certificates needed by the cert registration * servlets. * <P> - * + * * @version $Revision$ $Date$ */ public interface ICertAuthority extends IAuthority { @@ -38,7 +38,7 @@ public interface ICertAuthority extends IAuthority { /** * Retrieves the certificate repository for this authority. * <P> - * + * * @return the certificate repository. */ public ICertificateRepository getCertificateRepository(); @@ -46,7 +46,7 @@ public interface ICertAuthority extends IAuthority { /** * Returns CA's certificate chain. * <P> - * + * * @return the Certificate Chain for the CA. */ public CertificateChain getCACertChain(); @@ -54,7 +54,7 @@ public interface ICertAuthority extends IAuthority { /** * Returns CA's certificate implementaion. * <P> - * + * * @return CA's certificate. */ public X509CertImpl getCACert(); @@ -94,7 +94,7 @@ public interface ICertAuthority extends IAuthority { * Returns the logging interface for this authority. * Using this interface both System and Audit events can be * logged. - * + * */ public ILogger getLogger(); diff --git a/base/common/src/com/netscape/certsrv/authorization/AuthzManagerProxy.java b/base/common/src/com/netscape/certsrv/authorization/AuthzManagerProxy.java index 58a5264ba..acd3b201c 100644 --- a/base/common/src/com/netscape/certsrv/authorization/AuthzManagerProxy.java +++ b/base/common/src/com/netscape/certsrv/authorization/AuthzManagerProxy.java @@ -20,7 +20,7 @@ package com.netscape.certsrv.authorization; /** * A class represents an authorization manager. It contains an * authorization manager instance and its state (enable or not). - * + * * @version $Revision$, $Date$ */ public class AuthzManagerProxy { @@ -29,7 +29,7 @@ public class AuthzManagerProxy { /** * Constructor - * + * * @param enable true if the authzMgr is enabled; false otherwise * @param mgr authorization manager instance */ @@ -40,7 +40,7 @@ public class AuthzManagerProxy { /** * Returns the state of the authorization manager instance - * + * * @return true if the state of the authorization manager instance is * enabled; false otherwise. */ @@ -50,7 +50,7 @@ public class AuthzManagerProxy { /** * Returns an authorization manager instance. - * + * * @return an authorization manager instance */ public IAuthzManager getAuthzManager() { diff --git a/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java b/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java index e47e58171..011ee294e 100644 --- a/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java +++ b/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java @@ -20,7 +20,7 @@ package com.netscape.certsrv.authorization; /** * This class represents a registered authorization manager plugin. * <P> - * + * * @version $Revision$, $Date$ */ public class AuthzMgrPlugin { @@ -30,7 +30,7 @@ public class AuthzMgrPlugin { /** * Constructs a AuthzManager plugin. - * + * * @param id authz manager implementation name * @param classPath class path */ @@ -41,7 +41,7 @@ public class AuthzMgrPlugin { /** * Returns an authorization manager implementation name - * + * * @return an authorization manager implementation name */ public String getId() { @@ -50,7 +50,7 @@ public class AuthzMgrPlugin { /** * Returns a classpath of a AuthzManager plugin - * + * * @return a classpath of a AuthzManager plugin */ public String getClassPath() { @@ -59,7 +59,7 @@ public class AuthzMgrPlugin { /** * Returns a visibility of the plugin - * + * * @return a visibility of the plugin */ public boolean isVisible() { @@ -68,7 +68,7 @@ public class AuthzMgrPlugin { /** * Sets visibility of the plugin - * + * * @param visibility visibility of the plugin */ public void setVisible(boolean visibility) { diff --git a/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java b/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java index 13d33c212..5f736aa02 100644 --- a/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java +++ b/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java @@ -22,7 +22,7 @@ import java.util.ListResourceBundle; /** * A class represents a resource bundle for the authorization subsystem * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -30,7 +30,7 @@ public class AuthzResources extends ListResourceBundle { /** * Returns the content of this resource. - * + * * @return the content of this resource */ public Object[][] getContents() { diff --git a/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java b/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java index 262902e62..1272a3dd3 100644 --- a/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java +++ b/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java @@ -30,7 +30,7 @@ import com.netscape.certsrv.base.IAttrSet; * authorization happened, name of the resource, type of operation performed * on the resource. * <p> - * + * * @version $Revision$, $Date$ */ public class AuthzToken implements IAttrSet { @@ -77,13 +77,13 @@ public class AuthzToken implements IAttrSet { /** * Constructs an instance of a authorization token. * The token by default contains the following attributes: <br> - * + * * <pre> * "authzMgrInstName" - The authorization manager instance name. * "authzMgrImplName" - The authorization manager plugin name. * "authzTime" - The - The time of authorization. * </pre> - * + * * @param authzMgr The authorization manager that created this Token. */ public AuthzToken(IAuthzManager authzMgr) { @@ -95,7 +95,7 @@ public class AuthzToken implements IAttrSet { /** * Get the value of an attribute in the AuthzToken - * + * * @param attrName The attribute name * @return The value of attrName if any. */ @@ -106,7 +106,7 @@ public class AuthzToken implements IAttrSet { /** * Used by an Authorization manager to set an attribute and value * in the AuthzToken. - * + * * @param attrName The name of the attribute * @param value The value of the attribute to set. */ @@ -116,7 +116,7 @@ public class AuthzToken implements IAttrSet { /** * Removes an attribute in the AuthzToken - * + * * @param attrName The name of the attribute to remove. */ public void delete(String attrName) { @@ -125,7 +125,7 @@ public class AuthzToken implements IAttrSet { /** * Enumerate all attribute names in the AuthzToken. - * + * * @return Enumeration of all attribute names in this AuthzToken. */ public Enumeration<String> getElements() { @@ -134,7 +134,7 @@ public class AuthzToken implements IAttrSet { /** * Enumerate all attribute values in the AuthzToken. - * + * * @return Enumeration of all attribute names in this AuthzToken. */ public Enumeration<Object> getVals() { @@ -144,7 +144,7 @@ public class AuthzToken implements IAttrSet { /** * Gets the name of the authorization manager instance that created * this token. - * + * * @return The name of the authorization manager instance that created * this token. */ @@ -155,7 +155,7 @@ public class AuthzToken implements IAttrSet { /** * Gets the plugin name of the authorization manager that created this * token. - * + * * @return The plugin name of the authorization manager that created this * token. */ @@ -165,7 +165,7 @@ public class AuthzToken implements IAttrSet { /** * Gets the time of authorization. - * + * * @return The time of authorization */ public Date getAuthzTime() { diff --git a/base/common/src/com/netscape/certsrv/authorization/EAuthzAccessDenied.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzAccessDenied.java index 9fc7777c7..9b50176c8 100644 --- a/base/common/src/com/netscape/certsrv/authorization/EAuthzAccessDenied.java +++ b/base/common/src/com/netscape/certsrv/authorization/EAuthzAccessDenied.java @@ -29,7 +29,7 @@ public class EAuthzAccessDenied extends EAuthzException { /** * Constructs a exception for access denied by Authz manager - * + * * @param errorString Detailed error message. */ public EAuthzAccessDenied(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/authorization/EAuthzException.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzException.java index 65d95a571..873ada1af 100644 --- a/base/common/src/com/netscape/certsrv/authorization/EAuthzException.java +++ b/base/common/src/com/netscape/certsrv/authorization/EAuthzException.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.base.EBaseException; /** * This class represents authorization exceptions. * <P> - * + * * @version $Revision$, $Date$ */ public class EAuthzException extends EBaseException { @@ -39,7 +39,7 @@ public class EAuthzException extends EBaseException { /** * Constructs a authz exception * <P> - * + * * @param msgFormat exception details */ public EAuthzException(String msgFormat) { @@ -49,7 +49,7 @@ public class EAuthzException extends EBaseException { /** * Constructs a authz exception with a parameter. * <p> - * + * * @param msgFormat exception details in message string format * @param param message string parameter */ @@ -60,7 +60,7 @@ public class EAuthzException extends EBaseException { /** * Constructs a authz exception with a exception parameter. * <P> - * + * * @param msgFormat exception details in message string format * @param param system exception */ @@ -71,7 +71,7 @@ public class EAuthzException extends EBaseException { /** * Constructs a authz exception with a list of parameters. * <P> - * + * * @param msgFormat the message format. * @param params list of message format parameters */ @@ -81,7 +81,7 @@ public class EAuthzException extends EBaseException { /** * Returns the resource bundle name - * + * * @return resource bundle name */ protected String getBundleName() { diff --git a/base/common/src/com/netscape/certsrv/authorization/EAuthzInternalError.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzInternalError.java index 2afe2c747..82588b622 100644 --- a/base/common/src/com/netscape/certsrv/authorization/EAuthzInternalError.java +++ b/base/common/src/com/netscape/certsrv/authorization/EAuthzInternalError.java @@ -29,7 +29,7 @@ public class EAuthzInternalError extends EAuthzException { /** * Constructs an authorization internal error exception - * + * * @param errorString error with a detailed message. */ public EAuthzInternalError(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrNotFound.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrNotFound.java index a920d37ac..f3efc656c 100644 --- a/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrNotFound.java +++ b/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrNotFound.java @@ -29,7 +29,7 @@ public class EAuthzMgrNotFound extends EAuthzException { /** * Constructs a exception for a missing required authorization manager - * + * * @param errorString Detailed error message. */ public EAuthzMgrNotFound(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrPluginNotFound.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrPluginNotFound.java index 43ae6edcd..5b183aa50 100644 --- a/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrPluginNotFound.java +++ b/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrPluginNotFound.java @@ -29,7 +29,7 @@ public class EAuthzMgrPluginNotFound extends EAuthzException { /** * Constructs a exception for a missing authorization plugin - * + * * @param errorString Detailed error message. */ public EAuthzMgrPluginNotFound(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownOperation.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownOperation.java index ce061ddd2..b2bcb9c9d 100644 --- a/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownOperation.java +++ b/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownOperation.java @@ -29,7 +29,7 @@ public class EAuthzUnknownOperation extends EAuthzException { /** * Constructs a exception for an operation unknown to the authorization manager - * + * * @param errorString Detailed error message. */ public EAuthzUnknownOperation(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownProtectedRes.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownProtectedRes.java index 5cb2d7276..5848c620c 100644 --- a/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownProtectedRes.java +++ b/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownProtectedRes.java @@ -29,7 +29,7 @@ public class EAuthzUnknownProtectedRes extends EAuthzException { /** * Constructs a exception for a protected resource unknown to the authorization manager - * + * * @param errorString Detailed error message. */ public EAuthzUnknownProtectedRes(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java b/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java index 8b52b3928..871f05230 100644 --- a/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java +++ b/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.evaluators.IAccessEvaluator; * Authorization Manager interface needs to be implemented by all * authorization managers. * <P> - * + * * @version $Revision$, $Date$ */ public interface IAuthzManager { @@ -40,7 +40,7 @@ public interface IAuthzManager { /** * Get the name of this authorization manager instance. * <p> - * + * * @return String the name of this authorization manager. */ public String getName(); @@ -49,12 +49,12 @@ public interface IAuthzManager { * Get implementation name of authorization manager plugin. * <p> * An example of an implementation name will be: - * + * * <PRE> * com.netscape.cms.BasicAclAuthz * </PRE> * <p> - * + * * @return The name of the authorization manager plugin. */ public String getImplName(); @@ -66,13 +66,13 @@ public interface IAuthzManager { * <p> * The accessInfo format is determined by each individual authzmgr. For example, for BasicAclAuthz, The accessInfo * is the resACLs, whose format should conform to the following: - * + * * <pre> * <resource ID>:right-1[,right-n]:[allow,deny](right(s))<evaluatorType>=<value>:<comment for this resource acl * </pre> * <P> * Example: resTurnKnob:left,right:allow(left) group="lefties":door knobs for lefties - * + * * @param accessInfo the access info string in the format specified in the authorization manager * @exception EBaseException error parsing the accessInfo */ @@ -81,7 +81,7 @@ public interface IAuthzManager { /** * Check if the user is authorized to perform the given operation on the * given resource. - * + * * @param authToken the authToken associated with a user. * @param resource - the protected resource name * @param operation - the protected resource operation name @@ -97,7 +97,7 @@ public interface IAuthzManager { /** * Initialize this authorization manager. - * + * * @param name The name of this authorization manager instance. * @param implName The name of the authorization manager plugin. * @param config The configuration store for this authorization manager. @@ -117,7 +117,7 @@ public interface IAuthzManager { * The configuration parameters returned is passed to the * console so configuration for instances of this * implementation can be made through the console. - * + * * @return a list of names for configuration parameters. * @exception EBaseException If an internal error occurred */ @@ -126,21 +126,21 @@ public interface IAuthzManager { /** * Get the configuration store for this authorization manager. - * + * * @return The configuration store of this authorization manager. */ public IConfigStore getConfigStore(); /** * Get ACL entries - * + * * @return enumeration of ACL entries. */ public Enumeration<ACL> getACLs(); /** * Get individual ACL entry for the given name of entry. - * + * * @param target The name of the ACL entry * @return The ACL entry. */ @@ -148,7 +148,7 @@ public interface IAuthzManager { /** * Update ACLs in the database - * + * * @param id The name of the ACL entry (ie, resource id) * @param rights The allowable rights for this resource * @param strACLs The value of the ACL entry @@ -160,14 +160,14 @@ public interface IAuthzManager { /** * Get all registered evaluators. - * + * * @return All registered evaluators. */ public Enumeration<IAccessEvaluator> aclEvaluatorElements(); /** * Register new evaluator - * + * * @param type Type of evaluator * @param evaluator Value of evaluator */ @@ -175,7 +175,7 @@ public interface IAuthzManager { /** * Return a table of evaluators - * + * * @return A table of evaluators */ public Hashtable<String, IAccessEvaluator> getAccessEvaluators(); diff --git a/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java b/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java index d8ccc8a83..b96499a77 100644 --- a/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java +++ b/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.base.ISubsystem; /** * An interface that represents an authorization component * <P> - * + * * @version $Revision$, $Date$ */ public interface IAuthzSubsystem extends ISubsystem { @@ -60,7 +60,7 @@ public interface IAuthzSubsystem extends ISubsystem { /** * authorize the user associated with the given authToken for a given * operation with the given authorization manager name - * + * * @param authzMgrName The authorization manager name * @param authToken the authenticaton token associated with a user * @param resource the resource protected by the authorization system @@ -77,7 +77,7 @@ public interface IAuthzSubsystem extends ISubsystem { /** * Adds (registers) the given authorization manager. - * + * * @param name The authorization manager name * @param authzMgr The authorization manager instance. */ @@ -85,14 +85,14 @@ public interface IAuthzSubsystem extends ISubsystem { /** * Deletes (deregisters) the given authorization manager. - * + * * @param name The authorization manager name to delete. */ public void delete(String name); /** * Gets the Authorization manager instance of the specified name. - * + * * @param name The authorization manager's name. * @return an authorization manager interface */ @@ -101,14 +101,14 @@ public interface IAuthzSubsystem extends ISubsystem { /** * Gets an enumeration of authorization managers registered to the * authorization component. - * + * * @return a list of authorization managers */ public Enumeration<IAuthzManager> getAuthzManagers(); /** * Initialize authz info - usually used for BasicAclAuthz - * + * * @param authzMgrName name of the authorization manager * @param accessInfo string representation of the ACL * @exception EBaseException if authorization manager is not found @@ -117,14 +117,14 @@ public interface IAuthzSubsystem extends ISubsystem { /** * Gets an enumeration of authorization manager plugins. - * + * * @return list of authorization manager plugins */ public Enumeration<AuthzMgrPlugin> getAuthzManagerPlugins(); /** * Gets a single authorization manager plugin implementation - * + * * @param name given authorization plugin name * @return authorization manager plugin */ @@ -132,7 +132,7 @@ public interface IAuthzSubsystem extends ISubsystem { /** * Log error message. - * + * * @param level log level * @param msg error message */ @@ -140,21 +140,21 @@ public interface IAuthzSubsystem extends ISubsystem { /** * Get a hashtable containing all authentication plugins. - * + * * @return all authentication plugins. */ public Hashtable<String, AuthzMgrPlugin> getPlugins(); /** * Get a hashtable containing all authentication instances. - * + * * @return all authentication instances. */ public Hashtable<String, AuthzManagerProxy> getInstances(); /** * Get an authorization manager interface for the given name. - * + * * @param name given authorization manager name. * @return an authorization manager interface */ diff --git a/base/common/src/com/netscape/certsrv/base/ASubsystem.java b/base/common/src/com/netscape/certsrv/base/ASubsystem.java index 2b4c6d15a..275108926 100644 --- a/base/common/src/com/netscape/certsrv/base/ASubsystem.java +++ b/base/common/src/com/netscape/certsrv/base/ASubsystem.java @@ -21,7 +21,7 @@ package com.netscape.certsrv.base; * This class represents a basic subsystem. Each basic * subsystem is named with an identifier and has a * configuration store. - * + * * @version $Revision$, $Date$ */ public abstract class ASubsystem implements ISubsystem { @@ -32,7 +32,7 @@ public abstract class ASubsystem implements ISubsystem { /** * Initializes this subsystem. - * + * * @param parent parent subsystem * @param cfg configuration store */ @@ -43,7 +43,7 @@ public abstract class ASubsystem implements ISubsystem { /** * Retrieves the configuration store. - * + * * @return configuration store */ public IConfigStore getConfigStore() { @@ -52,7 +52,7 @@ public abstract class ASubsystem implements ISubsystem { /** * Sets the identifier of this subsystem. - * + * * @param id subsystem identifier */ public void setId(String id) { @@ -61,7 +61,7 @@ public abstract class ASubsystem implements ISubsystem { /** * Retrieves the subsystem identifier. - * + * * @return subsystem identifier */ public String getId() { diff --git a/base/common/src/com/netscape/certsrv/base/AttributeNameHelper.java b/base/common/src/com/netscape/certsrv/base/AttributeNameHelper.java index 5b6db131e..5f00c7670 100644 --- a/base/common/src/com/netscape/certsrv/base/AttributeNameHelper.java +++ b/base/common/src/com/netscape/certsrv/base/AttributeNameHelper.java @@ -20,7 +20,7 @@ package com.netscape.certsrv.base; /** * AttributeNameHelper. This Helper class used to decompose * dot-separated attribute name into prefix and suffix. - * + * * @version $Revision$, $Date$ */ public class AttributeNameHelper { @@ -34,7 +34,7 @@ public class AttributeNameHelper { /** * Default constructor for the class. Name is of the form * "proofOfPosession.type". - * + * * @param name the attribute name. */ public AttributeNameHelper(String name) { @@ -50,7 +50,7 @@ public class AttributeNameHelper { /** * Return the prefix of the name. - * + * * @return attribute prefix */ public String getPrefix() { @@ -59,7 +59,7 @@ public class AttributeNameHelper { /** * Return the suffix of the name. - * + * * @return attribute suffix */ public String getSuffix() { diff --git a/base/common/src/com/netscape/certsrv/base/BaseResources.java b/base/common/src/com/netscape/certsrv/base/BaseResources.java index 41159481f..87c7e60a1 100644 --- a/base/common/src/com/netscape/certsrv/base/BaseResources.java +++ b/base/common/src/com/netscape/certsrv/base/BaseResources.java @@ -23,7 +23,7 @@ import java.util.ListResourceBundle; * A class represents a resource bundle for the entire * system. * <P> - * + * * @version $Revision$, $Date$ * @see java.util.ListResourceBundle */ diff --git a/base/common/src/com/netscape/certsrv/base/EBaseException.java b/base/common/src/com/netscape/certsrv/base/EBaseException.java index 26def60f5..0ce8fdc3d 100644 --- a/base/common/src/com/netscape/certsrv/base/EBaseException.java +++ b/base/common/src/com/netscape/certsrv/base/EBaseException.java @@ -23,7 +23,7 @@ import java.util.Locale; * An exception with localizable error messages. It is the * base class for all exceptions in certificate server. * <P> - * + * * @version $Revision$, $Date$ * @see java.text.MessageFormat * @see com.netscape.certsrv.base.BaseResources @@ -50,7 +50,7 @@ public class EBaseException extends Exception { * Constructs an instance of this exception with the given resource key. * If resource key is not found in the resource bundle, the resource key * specified is used as the error message. - * + * * <pre> * new EBaseException(BaseResources.PERMISSION_DENIED); * new EBaseException("An plain error message"); @@ -65,12 +65,12 @@ public class EBaseException extends Exception { /** * Constructs an instance of this exception with the given resource key * and a parameter as a string. - * + * * <PRE> * new EBaseException(BaseResource.NO_CONFIG_FILE, fileName); * </PRE> * <P> - * + * * @param msgFormat exception details in message string format * @param param message string parameter */ @@ -83,7 +83,7 @@ public class EBaseException extends Exception { /** * Constructs an instance of the exception given the resource key and * a exception parameter. - * + * * <PRE> * try { * ... @@ -92,7 +92,7 @@ public class EBaseException extends Exception { * } * </PRE> * <P> - * + * * @param msgFormat The resource key * @param param The parameter as an exception */ @@ -106,7 +106,7 @@ public class EBaseException extends Exception { * Constructs an instance of this exception given the resource key and * an array of parameters. * <P> - * + * * @param msgFormat The resource key * @param params Array of params */ @@ -118,7 +118,7 @@ public class EBaseException extends Exception { /** * Returns the list of parameters. * <P> - * + * * @return List of parameters. */ public Object[] getParameters() { @@ -128,7 +128,7 @@ public class EBaseException extends Exception { /** * Returns the exception string in the default locale. * <P> - * + * * @return The exception string in the default locale. */ public String toString() { @@ -138,7 +138,7 @@ public class EBaseException extends Exception { /** * Returns the exception string in the given locale. * <P> - * + * * @param locale The locale * @return The exception string in the given locale. */ @@ -149,7 +149,7 @@ public class EBaseException extends Exception { /** * Returns the given resource bundle name. - * + * * @return the name of the resource bundle for this class. */ protected String getBundleName() { diff --git a/base/common/src/com/netscape/certsrv/base/EPropertyNotDefined.java b/base/common/src/com/netscape/certsrv/base/EPropertyNotDefined.java index 466306582..e689b2224 100644 --- a/base/common/src/com/netscape/certsrv/base/EPropertyNotDefined.java +++ b/base/common/src/com/netscape/certsrv/base/EPropertyNotDefined.java @@ -22,7 +22,7 @@ package com.netscape.certsrv.base; * property is not defined (empty string) the configuration store. * It extends EBaseException and uses the same resource bundle. * <p> - * + * * @version $Revision$, $Date$ * @see com.netscape.certsrv.base.EBaseException */ @@ -37,7 +37,7 @@ public class EPropertyNotDefined extends EBaseException { * Constructs an instance of this exception given the name of the * property that's not found. * <p> - * + * * @param errorString Detailed error message. */ public EPropertyNotDefined(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/base/EPropertyNotFound.java b/base/common/src/com/netscape/certsrv/base/EPropertyNotFound.java index 5a8a9550f..bcfca18f7 100644 --- a/base/common/src/com/netscape/certsrv/base/EPropertyNotFound.java +++ b/base/common/src/com/netscape/certsrv/base/EPropertyNotFound.java @@ -22,7 +22,7 @@ package com.netscape.certsrv.base; * property is not found in the configuration store. * It extends EBaseException and uses the same resource bundle. * <p> - * + * * @version $Revision$, $Date$ * @see com.netscape.certsrv.base.EBaseException */ @@ -37,7 +37,7 @@ public class EPropertyNotFound extends EBaseException { * Constructs an instance of this exception given the name of the * property that's not found. * <p> - * + * * @param errorString Detailed error message. */ public EPropertyNotFound(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java b/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java index 86f5999d9..e26025d08 100644 --- a/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java +++ b/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java @@ -22,7 +22,7 @@ import java.util.Locale; /** * Plugin which can return extended information to console * <p> - * + * * @version $Revision$, $Date$ */ public class ExtendedPluginInfo implements IExtendedPluginInfo { @@ -31,7 +31,7 @@ public class ExtendedPluginInfo implements IExtendedPluginInfo { /** * Constructs an extended plugin info object. - * + * * @param epi plugin info list */ public ExtendedPluginInfo(String epi[]) { @@ -42,19 +42,19 @@ public class ExtendedPluginInfo implements IExtendedPluginInfo { * This method returns an array of strings. Each element of the * array represents a configurable parameter, or some other * meta-info (such as help-token) - * + * * there is an entry indexed on that parameter name * <param-name>;<type_info>[,required];<description>;... - * + * * Where: - * + * * type_info is either 'string', 'number', 'boolean', 'password' or * 'choice(ch1,ch2,ch3,...)' - * + * * If the marker 'required' is included after the type_info, * the parameter will has some visually distinctive marking in * the UI. - * + * * 'description' is a short sentence describing the parameter * 'choice' is rendered as a drop-down list. The first parameter in the * list will be activated by default @@ -67,20 +67,20 @@ public class ExtendedPluginInfo implements IExtendedPluginInfo { * the plugin. It is instead inserted directly into the password cache * keyed on the instance name. The value of the parameter * 'bindPWPrompt' (see example below) is set to the key. - * + * * In addition to the configurable parameters, the following magic parameters * may be defined: - * + * * HELP_TOKEN;helptoken - a pointer to the online manual section for this plugin * HELP_TEXT;helptext - a general help string describing the plugin - * + * * For example: * "username;string;The username you wish to login as" * "bindPWPrompt;password;Enter password to bind as above user with" * "algorithm;choice(RSA,DSA);Which algorithm do you want to use" * "enable;boolean;Do you want to run this plugin" * "port;number;Which port number do you want to use" - * + * */ public String[] getExtendedPluginInfo(Locale locale) { return _epi; diff --git a/base/common/src/com/netscape/certsrv/base/IArgBlock.java b/base/common/src/com/netscape/certsrv/base/IArgBlock.java index adddccba6..92c418c7d 100644 --- a/base/common/src/com/netscape/certsrv/base/IArgBlock.java +++ b/base/common/src/com/netscape/certsrv/base/IArgBlock.java @@ -33,14 +33,14 @@ import netscape.security.pkcs.PKCS10; * E.g., ((AttrSet)container.get("x")).get("y") is equivalent to * container.get("x.y"); * <p> - * + * * @version $Revision$, $Date$ **/ public interface IArgBlock extends Serializable { /** * Checks if this argument block contains the given key. - * + * * @param n key * @return true if key is present */ @@ -48,7 +48,7 @@ public interface IArgBlock extends Serializable { /** * Adds string-based value into this argument block. - * + * * @param n key * @param v value * @return value @@ -57,7 +57,7 @@ public interface IArgBlock extends Serializable { /** * Retrieves argument value as string. - * + * * @param n key * @return argument value as string * @exception EBaseException failed to retrieve value @@ -66,7 +66,7 @@ public interface IArgBlock extends Serializable { /** * 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 @@ -75,7 +75,7 @@ public interface IArgBlock extends Serializable { /** * Retrieves argument value as integer. - * + * * @param n key * @return argument value as int * @exception EBaseException failed to retrieve value @@ -84,7 +84,7 @@ public interface IArgBlock extends Serializable { /** * 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 @@ -93,7 +93,7 @@ public interface IArgBlock extends Serializable { /** * Retrieves argument value as big integer. - * + * * @param n key * @return argument value as big integer * @exception EBaseException failed to retrieve value @@ -102,7 +102,7 @@ public interface IArgBlock extends Serializable { /** * 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 @@ -111,7 +111,7 @@ public interface IArgBlock extends Serializable { /** * Retrieves argument value as object - * + * * @param n key * @return argument value as object * @exception EBaseException failed to retrieve value @@ -120,7 +120,7 @@ public interface IArgBlock extends Serializable { /** * 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 @@ -129,7 +129,7 @@ public interface IArgBlock extends Serializable { /** * 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 @@ -138,7 +138,7 @@ public interface IArgBlock extends Serializable { /** * Gets boolean value. They should be "true" or "false". - * + * * @param name name of the input type * @param def Default value to return. * @return boolean type: <code>true</code> or <code>false</code> @@ -147,7 +147,7 @@ public interface IArgBlock extends Serializable { /** * Gets KeyGenInfo - * + * * @param name name of the input type * @param def default value to return * @exception EBaseException On error. @@ -158,7 +158,7 @@ public interface IArgBlock extends Serializable { /** * 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 @@ -168,7 +168,7 @@ public interface IArgBlock extends Serializable { /** * 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 @@ -178,7 +178,7 @@ public interface IArgBlock extends Serializable { /** * Retrieves PKCS10 - * + * * @param name name of the input type * @param checkheader true if header must be present * @return PKCS10 object @@ -188,7 +188,7 @@ public interface IArgBlock extends Serializable { /** * Retrieves PKCS10 - * + * * @param name name of the input type * @param checkheader true if header must be present * @param def default PKCS10 @@ -199,7 +199,7 @@ public interface IArgBlock extends Serializable { /** * Retrieves PKCS10 - * + * * @param name name of the input type * @param def default PKCS10 * @return PKCS10 object @@ -209,14 +209,14 @@ public interface IArgBlock extends Serializable { /** * Retrieves a list of argument keys. - * + * * @return a list of string-based keys */ public Enumeration<String> elements(); /** * Adds long-type arguments to this block. - * + * * @param n key * @param v value * @return value @@ -225,7 +225,7 @@ public interface IArgBlock extends Serializable { /** * Adds integer-type arguments to this block. - * + * * @param n key * @param v value * @return value @@ -234,7 +234,7 @@ public interface IArgBlock extends Serializable { /** * Adds boolean-type arguments to this block. - * + * * @param n key * @param v value * @return value @@ -243,7 +243,7 @@ public interface IArgBlock extends Serializable { /** * Adds integer-type arguments to this block. - * + * * @param n key * @param v value * @param radix radix @@ -253,7 +253,7 @@ public interface IArgBlock extends Serializable { /** * Sets argument into this block. - * + * * @param name key * @param obj value */ @@ -261,7 +261,7 @@ public interface IArgBlock extends Serializable { /** * Retrieves argument. - * + * * @param name key * @return object value */ @@ -269,14 +269,14 @@ public interface IArgBlock extends Serializable { /** * Deletes argument by the given key. - * + * * @param name key */ public void delete(String name); /** * Retrieves a list of argument keys. - * + * * @return a list of string-based keys */ public Enumeration<String> getElements(); diff --git a/base/common/src/com/netscape/certsrv/base/IAttrSet.java b/base/common/src/com/netscape/certsrv/base/IAttrSet.java index e396b072a..eb2ae2746 100644 --- a/base/common/src/com/netscape/certsrv/base/IAttrSet.java +++ b/base/common/src/com/netscape/certsrv/base/IAttrSet.java @@ -30,14 +30,14 @@ import java.util.Enumeration; * E.g., ((AttrSet)container.get("x")).get("y") is equivalent to * container.get("x.y"); * <p> - * + * * @version $Revision$, $Date$ **/ public interface IAttrSet extends Serializable { /** * Sets an attribute value within this AttrSet. - * + * * @param name the name of the attribute * @param obj the attribute object. * @exception EBaseException on attribute handling errors. @@ -46,7 +46,7 @@ public interface IAttrSet extends Serializable { /** * Gets an attribute value. - * + * * @param name the name of the attribute to return. * @exception EBaseException on attribute handling errors. */ @@ -54,7 +54,7 @@ public interface IAttrSet extends Serializable { /** * Deletes an attribute value from this AttrSet. - * + * * @param name the name of the attribute to delete. * @exception EBaseException on attribute handling errors. */ @@ -63,7 +63,7 @@ public interface IAttrSet extends Serializable { /** * Returns an enumeration of the names of the attributes existing within * this AttrSet. - * + * * @return an enumeration of the attribute names. */ public Enumeration<String> getElements(); diff --git a/base/common/src/com/netscape/certsrv/base/IAuthInfo.java b/base/common/src/com/netscape/certsrv/base/IAuthInfo.java index 4806a94c0..b2cb2c934 100644 --- a/base/common/src/com/netscape/certsrv/base/IAuthInfo.java +++ b/base/common/src/com/netscape/certsrv/base/IAuthInfo.java @@ -24,7 +24,7 @@ package com.netscape.certsrv.base; * user needs to authenticate to CMS using SSL. The * client certificate is expressed in authenticated context. * <P> - * + * * @version $Revision$, $Date$ */ public interface IAuthInfo { diff --git a/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java b/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java index d111063a7..5bda77384 100644 --- a/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java +++ b/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java @@ -22,14 +22,14 @@ import java.util.Locale; /** * This interface represents a CRL pretty print handler. * It converts a CRL object into a printable CRL string. - * + * * @version $Revision$, $Date$ */ public interface ICRLPrettyPrint { /** * Retrieves the printable CRL string. - * + * * @param clientLocale end user clocale * @param crlSize CRL size * @param pageStart starting page number @@ -40,7 +40,7 @@ public interface ICRLPrettyPrint { /** * Retrieves the printable CRL string. - * + * * @param clientLocale end user clocale * @return printable CRL string */ diff --git a/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java b/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java index e991d5a11..8f9df30b8 100644 --- a/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java +++ b/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java @@ -23,14 +23,14 @@ import java.util.Locale; * This interface represents a certificate pretty print * handler. This handler converts certificate object into * a printable certificate string. - * + * * @version $Revision$, $Date$ */ public interface ICertPrettyPrint { /** * Returns printable certificate string. - * + * * @param clientLocale end user locale * @return printable certificate string */ diff --git a/base/common/src/com/netscape/certsrv/base/IConfigStore.java b/base/common/src/com/netscape/certsrv/base/IConfigStore.java index d12265e83..d96fddb05 100644 --- a/base/common/src/com/netscape/certsrv/base/IConfigStore.java +++ b/base/common/src/com/netscape/certsrv/base/IConfigStore.java @@ -26,7 +26,7 @@ import java.util.Enumeration; * to keep arbitrary data indexed by string names. * <p> * In the following example: - * + * * <pre> * param1=value1 * configStore1.param11=value11 @@ -35,27 +35,27 @@ import java.util.Enumeration; * configStore1.subStore1.param112=value112 * configStore2.param21=value21 * </pre> - * + * * The top config store has parameters <i>param1</i> and sub-stores <i>configStore1</i> and <i>configStore2</i>. <br> * The following illustrates how a config store is used. - * + * * <pre> - * // the top config store is passed to the following method. + * // the top config store is passed to the following method. * public void init(IConfigStore config) throws EBaseException { * IConfigStore store = config; * String valx = config.getString("param1"); * // valx is "value1" <p> - * + * * IConfigStore substore1 = config.getSubstore("configStore1"); * String valy = substore1.getString("param11"); * // valy is "value11" <p> - * + * * IConfigStore substore2 = config.getSubstore("configStore2"); * String valz = substore2.getString("param21"); * // valz is "value21" <p> * } * </pre> - * + * * @version $Revision$, $Date$ */ public interface IConfigStore extends ISourceConfigStore { @@ -63,7 +63,7 @@ public interface IConfigStore extends ISourceConfigStore { /** * Gets the name of this Configuration Store. * <P> - * + * * @return The name of this Configuration store */ public String getName(); @@ -71,7 +71,7 @@ public interface IConfigStore extends ISourceConfigStore { /** * Retrieves the value of the given property as a string. * <p> - * + * * @param name The name of the property to get * @return The value of the property as a String * @exception EPropertyNotFound If the property is not present @@ -84,7 +84,7 @@ public interface IConfigStore extends ISourceConfigStore { * Retrieves the value of a given property as a string or the * given default value if the property is not present. * <P> - * + * * @param name The property to retrive * @param defval The default value to return if the property is not present * @return The roperty value as a string @@ -96,7 +96,7 @@ public interface IConfigStore extends ISourceConfigStore { /** * Stores a property and its value as a string. * <p> - * + * * @param name The name of the property * @param value The value as a string */ @@ -105,7 +105,7 @@ public interface IConfigStore extends ISourceConfigStore { /** * Retrieves the value of a property as a byte array. * <P> - * + * * @param name The property name * @return The property value as a byte array * @exception EPropertyNotFound If the property is not present @@ -118,7 +118,7 @@ public interface IConfigStore extends ISourceConfigStore { * Retrieves the value of a property as a byte array, using the * given default value if property is not present. * <P> - * + * * @param name The name of the property * @param defval The default value if the property is not present. * @return The property value as a byte array. @@ -130,7 +130,7 @@ public interface IConfigStore extends ISourceConfigStore { /** * Stores the given property and value as a byte array. * <p> - * + * * @param name The property name * @param value The value as a byte array to store */ @@ -139,7 +139,7 @@ public interface IConfigStore extends ISourceConfigStore { /** * Retrieves the given property as a boolean. * <P> - * + * * @param name The name of the property as a string. * @return The value of the property as a boolean. * @exception EPropertyNotFound If the property is not present @@ -151,7 +151,7 @@ public interface IConfigStore extends ISourceConfigStore { /** * Retrieves the given property as a boolean. * <P> - * + * * @param name The name of the property * @param defval The default value to turn as a boolean if * property is not present @@ -164,7 +164,7 @@ public interface IConfigStore extends ISourceConfigStore { /** * Stores the given property and its value as a boolean. * <P> - * + * * @param name The property name * @param value The value as a boolean */ @@ -173,7 +173,7 @@ public interface IConfigStore extends ISourceConfigStore { /** * Retrieves the given property as an integer. * <P> - * + * * @param name The property name * @return The property value as an integer * @exception EPropertyNotFound If property is not found @@ -185,7 +185,7 @@ public interface IConfigStore extends ISourceConfigStore { /** * Retrieves the given property as an integer. * <P> - * + * * @param name The property name * @return int The default value to return as an integer * @exception EBaseException If the value cannot be converted to a @@ -197,7 +197,7 @@ public interface IConfigStore extends ISourceConfigStore { /** * Sets a property and its value as an integer. * <P> - * + * * @param name parameter name * @param value integer value */ @@ -206,7 +206,7 @@ public interface IConfigStore extends ISourceConfigStore { /** * Retrieves the given property as a big integer. * <P> - * + * * @param name The property name * @return The property value as a big integer * @exception EPropertyNotFound If property is not found @@ -218,7 +218,7 @@ public interface IConfigStore extends ISourceConfigStore { /** * Retrieves the given property as a big integer. * <P> - * + * * @param name The property name * @return int The default value to return as a big integer * @exception EBaseException If the value cannot be converted to a @@ -230,7 +230,7 @@ public interface IConfigStore extends ISourceConfigStore { /** * Sets a property and its value as an integer. * <P> - * + * * @param name parameter name * @param value big integer value */ @@ -239,7 +239,7 @@ public interface IConfigStore extends ISourceConfigStore { /** * Creates a nested sub-store with the specified name. * <P> - * + * * @param name The name of the sub-store * @return The sub-store created */ @@ -248,7 +248,7 @@ public interface IConfigStore extends ISourceConfigStore { /** * Retrieves the given sub-store. * <P> - * + * * @param name The name of the sub-store * @return The sub-store */ @@ -258,7 +258,7 @@ public interface IConfigStore extends ISourceConfigStore { * Removes sub-store with the given name. * (Removes all properties and sub-stores under this sub-store.) * <P> - * + * * @param name The name of the sub-store to remove */ public void removeSubStore(String name); @@ -267,7 +267,7 @@ public interface IConfigStore extends ISourceConfigStore { /** * Retrives and enumeration of all properties in this config-store. - * + * * @return An enumeration of all properties in this config-store */ public Enumeration<String> getPropertyNames(); @@ -276,7 +276,7 @@ public interface IConfigStore extends ISourceConfigStore { * Returns an enumeration of the names of the substores of * this config-store. * <P> - * + * * @return An enumeration of the names of the sub-stores of this * config-store */ @@ -284,7 +284,7 @@ public interface IConfigStore extends ISourceConfigStore { /** * Commits all the data into file immediately. - * + * * @param createBackup true if a backup file should be created * @exception EBaseException failed to commit */ diff --git a/base/common/src/com/netscape/certsrv/base/IConfigStoreEventListener.java b/base/common/src/com/netscape/certsrv/base/IConfigStoreEventListener.java index 06e7d522a..8e5c13adf 100644 --- a/base/common/src/com/netscape/certsrv/base/IConfigStoreEventListener.java +++ b/base/common/src/com/netscape/certsrv/base/IConfigStoreEventListener.java @@ -21,14 +21,14 @@ import java.util.Hashtable; /** * ConfigStore Parameters Event Notification. - * + * * @version $Revision$, $Date$ */ public interface IConfigStoreEventListener { /** * Called to validate the config store parameters that changed - * + * * @param action action * @param params configuration parameters changed * @exception EBaseException failed to validate @@ -38,7 +38,7 @@ public interface IConfigStoreEventListener { /** * Validates the config store parameters that changed - * + * * @param action action * @param params configuration parameters changed * @exception EBaseException failed to validate diff --git a/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java b/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java index 8d95a40ca..108f0d544 100644 --- a/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java +++ b/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java @@ -20,14 +20,14 @@ package com.netscape.certsrv.base; /** * This class will display the certificate content in predefined * format. - * + * * @version $Revision$, $Date$ */ public interface IExtPrettyPrint { /** * Retrieves the printable extension string. - * + * * @return printable extension string */ public String toString(); diff --git a/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java b/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java index aff3daf4d..9a4de1345 100644 --- a/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java +++ b/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java @@ -22,7 +22,7 @@ import java.util.Locale; /** * Plugin which can return extended information to console * <p> - * + * * @version $Revision$, $Date$ */ public interface IExtendedPluginInfo { @@ -34,19 +34,19 @@ public interface IExtendedPluginInfo { * This method returns an array of strings. Each element of the * array represents a configurable parameter, or some other * meta-info (such as help-token) - * + * * there is an entry indexed on that parameter name * <param-name>;<type_info>[,required];<description>;... - * + * * Where: - * + * * type_info is either 'string', 'number', 'boolean', 'password' or * 'choice(ch1,ch2,ch3,...)' - * + * * If the marker 'required' is included after the type_info, * the parameter will has some visually distinctive marking in * the UI. - * + * * 'description' is a short sentence describing the parameter * 'choice' is rendered as a drop-down list. The first parameter in the * list will be activated by default @@ -59,20 +59,20 @@ public interface IExtendedPluginInfo { * the plugin. It is instead inserted directly into the password cache * keyed on the instance name. The value of the parameter * 'bindPWPrompt' (see example below) is set to the key. - * + * * In addition to the configurable parameters, the following magic parameters * may be defined: - * + * * HELP_TOKEN;helptoken - a pointer to the online manual section for this plugin * HELP_TEXT;helptext - a general help string describing the plugin - * + * * For example: * "username;string;The username you wish to login as" * "bindPWPrompt;password;Enter password to bind as above user with" * "algorithm;choice(RSA,DSA);Which algorithm do you want to use" * "enable;boolean;Do you want to run this plugin" * "port;number;Which port number do you want to use" - * + * */ public String[] getExtendedPluginInfo(Locale locale); diff --git a/base/common/src/com/netscape/certsrv/base/IPluginImpl.java b/base/common/src/com/netscape/certsrv/base/IPluginImpl.java index a7a0560b5..293aa2017 100644 --- a/base/common/src/com/netscape/certsrv/base/IPluginImpl.java +++ b/base/common/src/com/netscape/certsrv/base/IPluginImpl.java @@ -21,7 +21,7 @@ import java.util.Vector; /** * This interface represents a plugin instance. - * + * * @version $Revision$, $Date$ */ public interface IPluginImpl { @@ -31,7 +31,7 @@ public interface IPluginImpl { /** * Gets the description for this plugin instance. * <P> - * + * * @return The Description for this plugin instance. */ public String getDescription(); @@ -39,7 +39,7 @@ public interface IPluginImpl { /** * Returns the name of the plugin class. * <P> - * + * * @return The name of the plugin class. */ public String getImplName(); @@ -47,7 +47,7 @@ public interface IPluginImpl { /** * Returns the name of the plugin instance. * <P> - * + * * @return The name of the plugin instance. If none is set * the name of the implementation will be returned.xxxx */ @@ -55,7 +55,7 @@ public interface IPluginImpl { /** * Initializes this plugin instance. - * + * * @param sys parent subsystem * @param instanceName instance name of this plugin * @param className class name of this plugin @@ -73,14 +73,14 @@ public interface IPluginImpl { /** * Retrieves the configuration store. - * + * * @return configuration store */ public IConfigStore getConfigStore(); /** * Return configured parameters for a plugin instance. - * + * * @return nvPairs A Vector of name/value pairs. Each name/value * pair is constructed as a String in name=value format. */ @@ -88,14 +88,14 @@ public interface IPluginImpl { /** * Retrieves a list of configuration parameter names. - * + * * @return a list of parameter names */ public String[] getConfigParams(); /** * Return default parameters for a plugin implementation. - * + * * @return nvPairs A Vector of name/value pairs. Each name/value * pair is constructed as a String in name=value. */ diff --git a/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java b/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java index 67c1b01d1..b7d3d5570 100644 --- a/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java +++ b/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java @@ -20,14 +20,14 @@ package com.netscape.certsrv.base; /** * This class will display the certificate content in predefined * format. - * + * * @version $Revision$, $Date$ */ public interface IPrettyPrintFormat { /** * Retrieves a pretty print string of the given byte array. - * + * * @param in byte array * @param indentSize indentation size * @param lineLen length of line @@ -39,7 +39,7 @@ public interface IPrettyPrintFormat { /** * Retrieves a pretty print string of the given byte array. - * + * * @param in byte array * @param indentSize indentation size * @param lineLen length of line @@ -49,7 +49,7 @@ public interface IPrettyPrintFormat { /** * Retrieves a pretty print string of the given byte array. - * + * * @param in byte array * @param indentSize indentation size * @return pretty print string @@ -58,7 +58,7 @@ public interface IPrettyPrintFormat { /** * Retrieves a pretty print string of the given byte array. - * + * * @param in byte array * @return pretty print string */ diff --git a/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java b/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java index eb848c54e..42637c258 100644 --- a/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java +++ b/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java @@ -27,9 +27,9 @@ import java.util.Enumeration; * An interface that represents the source that creates the configuration * store tree. Note that the tree can be built based on the information * from a text file or ldap entries. - * + * * @see com.netscape.certsrv.base.IConfigStore - * + * * @version $Revision$, $Date$ */ public interface ISourceConfigStore extends Serializable { @@ -37,7 +37,7 @@ public interface ISourceConfigStore extends Serializable { /** * Gets a property. * <P> - * + * * @param name The property name * @return property value */ @@ -46,7 +46,7 @@ public interface ISourceConfigStore extends Serializable { /** * Retrieves a property. * <P> - * + * * @param name The property name * @param value The property value */ @@ -55,7 +55,7 @@ public interface ISourceConfigStore extends Serializable { /** * Returns an enumeration of the config store's keys. * <P> - * + * * @return a list of keys * @see java.util.Hashtable#elements * @see java.util.Enumeration @@ -64,7 +64,7 @@ public interface ISourceConfigStore extends Serializable { /** * Reads a config store from an input stream. - * + * * @param in input stream where the properties are located * @exception IOException If an IO error occurs while loading from input. */ @@ -72,7 +72,7 @@ public interface ISourceConfigStore extends Serializable { /** * Stores this config store to the specified output stream. - * + * * @param out output stream where the properties should be serialized * @param header optional header to be serialized */ diff --git a/base/common/src/com/netscape/certsrv/base/ISubsystem.java b/base/common/src/com/netscape/certsrv/base/ISubsystem.java index 7b2a37d7d..25bee71c3 100644 --- a/base/common/src/com/netscape/certsrv/base/ISubsystem.java +++ b/base/common/src/com/netscape/certsrv/base/ISubsystem.java @@ -22,21 +22,21 @@ package com.netscape.certsrv.base; * subsystems. Each subsystem is responsible for a set of * speciailized functions. * <P> - * + * * @version $Revision$, $Date$ */ public interface ISubsystem { /** * Retrieves the name of this subsystem. - * + * * @return subsystem identifier */ public String getId(); /** * Sets specific to this subsystem. - * + * * @param id subsystem identifier * @exception EBaseException failed to set id */ @@ -46,7 +46,7 @@ public interface ISubsystem { * Initializes this subsystem with the given configuration * store. * <P> - * + * * @param owner owner of this subsystem * @param config configuration store * @exception EBaseException failed to initialize @@ -56,7 +56,7 @@ public interface ISubsystem { /** * Notifies this subsystem if owner is in running mode. - * + * * @exception EBaseException failed to start up */ public void startup() throws EBaseException; @@ -71,7 +71,7 @@ public interface ISubsystem { /** * 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/certsrv/base/ISubsystemSource.java b/base/common/src/com/netscape/certsrv/base/ISubsystemSource.java index f6bb6378b..31d7dddfb 100644 --- a/base/common/src/com/netscape/certsrv/base/ISubsystemSource.java +++ b/base/common/src/com/netscape/certsrv/base/ISubsystemSource.java @@ -21,14 +21,14 @@ package com.netscape.certsrv.base; * An interface represents a subsystem source. A subsystem * source is a container that manages multiple subsystems. * <P> - * + * * @version $Revision$, $Date$ */ public interface ISubsystemSource { /** * Retrieves subsystem from the source. - * + * * @param sid subsystem identifier * @return subsystem */ diff --git a/base/common/src/com/netscape/certsrv/base/ITimeSource.java b/base/common/src/com/netscape/certsrv/base/ITimeSource.java index 1e7dd0fb0..194143c7a 100644 --- a/base/common/src/com/netscape/certsrv/base/ITimeSource.java +++ b/base/common/src/com/netscape/certsrv/base/ITimeSource.java @@ -26,14 +26,14 @@ import java.util.Date; * current time based on the system time. It is * possible to register a time source that returns * the current time from a NTP server. - * + * * @version $Revision$, $Date$ */ public interface ITimeSource { /** * Retrieves current time and date. - * + * * @return current time and date */ public Date getCurrentDate(); diff --git a/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java b/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java index 8c13fca56..1846b8a4a 100644 --- a/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java +++ b/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java @@ -27,26 +27,26 @@ import netscape.security.x509.AlgorithmId; import netscape.security.x509.X509Key; /** - * + * * The <code>KeyGenInfo</code> represents the information generated by * the KeyGen tag of the HTML forms. It provides the parsing and accessing * mechanisms. * <p> - * + * * <pre> * SignedPublicKeyAndChallenge ::= SEQUENCE { * publicKeyAndChallenge PublicKeyAndChallenge, * signatureAlgorithm AlgorithmIdentifier, * signature BIT STRING * } - * + * * PublicKeyAndChallenge ::= SEQUENCE { * spki SubjectPublicKeyInfo, * challenge IA5STRING * } * </pre> - * - * + * + * * @version $Revision$, $Date$ */ @@ -80,7 +80,7 @@ public class KeyGenInfo { /** * Construct KeyGenInfo using the SignedPublicKeyAndChallenge * string representation. - * + * * @param spkac SignedPublicKeyAndChallenge string representation */ public KeyGenInfo(String spkac) @@ -94,7 +94,7 @@ public class KeyGenInfo { /** * Initialize using the SPKAC string - * + * * @param spkac SPKAC string from the end user */ public void decode(String spkac) throws IOException { @@ -105,7 +105,7 @@ public class KeyGenInfo { /** * Der encoded into buffer - * + * * @return Der encoded buffer */ public byte[] encode() { @@ -114,7 +114,7 @@ public class KeyGenInfo { /** * Get SPKI in DerValue form - * + * * @return SPKI in DerValue form */ public DerValue getDerSPKI() { @@ -123,7 +123,7 @@ public class KeyGenInfo { /** * Get SPKI as X509Key - * + * * @return SPKI in X509Key form */ public X509Key getSPKI() { @@ -132,7 +132,7 @@ public class KeyGenInfo { /** * Get Challenge phrase in DerValue form - * + * * @return Challenge in DerValue form. null if none. */ public DerValue getDerChallenge() { @@ -141,7 +141,7 @@ public class KeyGenInfo { /** * Get Challenge phrase in string format - * + * * @return challenge phrase. null if none. */ public String getChallenge() { @@ -150,7 +150,7 @@ public class KeyGenInfo { /** * Get Signature - * + * * @return signature */ public byte[] getSignature() { @@ -159,7 +159,7 @@ public class KeyGenInfo { /** * Get Algorithm ID - * + * * @return the algorithm id */ public AlgorithmId getAlgorithmId() { @@ -168,7 +168,7 @@ public class KeyGenInfo { /** * Validate Signature and Challenge Phrase - * + * * @param challenge phrase; null if none * @return true if validated; otherwise, false */ @@ -183,7 +183,7 @@ public class KeyGenInfo { /** * String representation of KenGenInfo - * + * * @return string representation of KeGenInfo */ public String toString() { diff --git a/base/common/src/com/netscape/certsrv/base/MessageFormatter.java b/base/common/src/com/netscape/certsrv/base/MessageFormatter.java index 903b534e0..40275b516 100644 --- a/base/common/src/com/netscape/certsrv/base/MessageFormatter.java +++ b/base/common/src/com/netscape/certsrv/base/MessageFormatter.java @@ -29,7 +29,7 @@ import java.util.ResourceBundle; * messages taking arguments and using java.util.ResourceBundle * and java.text.MessageFormat mechanism. * <P> - * + * * @version $Revision$, $Date$ * @see java.text.MessageFormat * @see java.util.ResourceBundle @@ -40,7 +40,7 @@ public class MessageFormatter { /** * Retrieves the localized string. - * + * * @param locale end user locale * @param resourceBundleBaseName resource bundle class name * @param formatString format string @@ -55,7 +55,7 @@ public class MessageFormatter { /** * Retrieves the localized string. - * + * * @param locale end user locale * @param resourceBundleBaseName resource bundle class name * @param formatString format string @@ -74,7 +74,7 @@ public class MessageFormatter { /** * Retrieves the localized string. - * + * * @param locale end user locale * @param resourceBundleBaseName resource bundle class name * @param formatString format string diff --git a/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java b/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java index 3a7bac977..a9a1e448f 100644 --- a/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java +++ b/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java @@ -25,7 +25,7 @@ import netscape.security.util.ObjectIdentifier; /** * A class representing a meta attribute defintion. * <P> - * + * * @version $Revision$, $Date$ */ public class MetaAttributeDef { @@ -43,7 +43,7 @@ public class MetaAttributeDef { /** * Constructs a MetaAttribute defintion * <P> - * + * * @param name attribute name * @param valueClass attribute value class * @param oid attribute object identifier @@ -58,7 +58,7 @@ public class MetaAttributeDef { /** * Gets an attribute OID. * <P> - * + * * @return returns attribute OID or null if not defined. */ public ObjectIdentifier getOID() { @@ -68,7 +68,7 @@ public class MetaAttributeDef { /** * Gets an Java class for the attribute values * <P> - * + * * @return returns Java class for the attribute values */ public Class<?> getValueClass() { @@ -78,7 +78,7 @@ public class MetaAttributeDef { /** * Gets attribute name * <P> - * + * * @return returns attribute name */ public String getName() { @@ -90,7 +90,7 @@ public class MetaAttributeDef { * Attribute is defined by name, Java class for attribute values and * optional object identifier * <P> - * + * * @param name attribute name * @param valueClass attribute value class * @param oid attribute object identifier @@ -132,7 +132,7 @@ public class MetaAttributeDef { /** * Compares this attribute definition with another, for equality. * <P> - * + * * @return true iff names, valueClasses and object identifiers * are identical. */ @@ -157,7 +157,7 @@ public class MetaAttributeDef { /** * Retrieves attribute definition by name * <P> - * + * * @param name attribute name * @return attribute definition or null if not found */ @@ -168,7 +168,7 @@ public class MetaAttributeDef { /** * Retrieves attribute definition by object identifier * <P> - * + * * @param oid attribute object identifier * @return attribute definition or null if not found */ @@ -179,7 +179,7 @@ public class MetaAttributeDef { /** * Returns enumeration of the registered attribute names * <P> - * + * * @return returns enumeration of the registered attribute names */ public static Enumeration<String> getAttributeNames() { @@ -189,7 +189,7 @@ public class MetaAttributeDef { /** * Returns enumeration of the registered attribute object identifiers * <P> - * + * * @return returns enumeration of the attribute object identifiers */ public static Enumeration<ObjectIdentifier> getAttributeNameOids() { diff --git a/base/common/src/com/netscape/certsrv/base/MetaInfo.java b/base/common/src/com/netscape/certsrv/base/MetaInfo.java index 8aed6b840..1ad561489 100644 --- a/base/common/src/com/netscape/certsrv/base/MetaInfo.java +++ b/base/common/src/com/netscape/certsrv/base/MetaInfo.java @@ -25,7 +25,7 @@ import java.util.Hashtable; * object is just a generic hashtable that is embedded into * a request object. * <P> - * + * * @version $Revision$, $Date$ */ public class MetaInfo implements IAttrSet { @@ -49,7 +49,7 @@ public class MetaInfo implements IAttrSet { /** * Returns a short string describing this certificate attribute. * <P> - * + * * @return information about this certificate attribute. */ public String toString() { @@ -71,7 +71,7 @@ public class MetaInfo implements IAttrSet { /** * Gets an attribute value. * <P> - * + * * @param name the name of the attribute to return. * @exception EBaseException on attribute handling errors. */ @@ -81,10 +81,10 @@ public class MetaInfo implements IAttrSet { /** * Sets an attribute value. - * + * * @param name the name of the attribute * @param obj the attribute object. - * + * * @exception EBaseException on attribute handling errors. */ public void set(String name, Object obj) throws EBaseException { @@ -94,7 +94,7 @@ public class MetaInfo implements IAttrSet { /** * Deletes an attribute value from this CertAttrSet. * <P> - * + * * @param name the name of the attribute to delete. * @exception EBaseException on attribute handling errors. */ @@ -106,7 +106,7 @@ public class MetaInfo implements IAttrSet { * Returns an enumeration of the names of the attributes existing within * this attribute. * <P> - * + * * @return an enumeration of the attribute names. */ public Enumeration<String> getElements() { diff --git a/base/common/src/com/netscape/certsrv/base/Nonces.java b/base/common/src/com/netscape/certsrv/base/Nonces.java index cc0231ac3..c041ec777 100644 --- a/base/common/src/com/netscape/certsrv/base/Nonces.java +++ b/base/common/src/com/netscape/certsrv/base/Nonces.java @@ -24,7 +24,7 @@ import java.util.Vector; /** * This class manages nonces sometimes used to control request state flow. * <P> - * + * * @version $Revision$, $Date$ */ public class Nonces { diff --git a/base/common/src/com/netscape/certsrv/base/PasswordResources.java b/base/common/src/com/netscape/certsrv/base/PasswordResources.java index c3309c5fa..3e4164ad0 100644 --- a/base/common/src/com/netscape/certsrv/base/PasswordResources.java +++ b/base/common/src/com/netscape/certsrv/base/PasswordResources.java @@ -22,7 +22,7 @@ import java.util.ListResourceBundle; /** * A class represents a resource bundle for the password checker. * <p> - * + * * @version $Revision$, $Date$ * @see java.util.ListResourceBundle */ diff --git a/base/common/src/com/netscape/certsrv/base/Plugin.java b/base/common/src/com/netscape/certsrv/base/Plugin.java index 79fae88ac..c81596505 100644 --- a/base/common/src/com/netscape/certsrv/base/Plugin.java +++ b/base/common/src/com/netscape/certsrv/base/Plugin.java @@ -20,7 +20,7 @@ package com.netscape.certsrv.base; /** * This represents a generici CMS plugin. * <p> - * + * * @version $Revision$, $Date$ */ public class Plugin { @@ -30,7 +30,7 @@ public class Plugin { /** * Constructs a plugin. - * + * * @param id plugin implementation name * @param classPath class path */ @@ -41,7 +41,7 @@ public class Plugin { /** * Returns the plugin identifier. - * + * * @return plugin id */ public String getId() { @@ -50,7 +50,7 @@ public class Plugin { /** * Returns the plugin classpath. - * + * * @return plugin classpath */ public String getClassPath() { diff --git a/base/common/src/com/netscape/certsrv/base/SessionContext.java b/base/common/src/com/netscape/certsrv/base/SessionContext.java index b4ecd1241..c3c568f77 100644 --- a/base/common/src/com/netscape/certsrv/base/SessionContext.java +++ b/base/common/src/com/netscape/certsrv/base/SessionContext.java @@ -27,7 +27,7 @@ import java.util.Hashtable; * throughout the server. It is useful for passing * global and per-thread infomration in methods. * <P> - * + * * @version $Revision$, $Date$ */ public class SessionContext extends Hashtable<Object, Object> { @@ -110,7 +110,7 @@ public class SessionContext extends Hashtable<Object, Object> { * with the current thread. * This methods makes custom session context * possible. - * + * * @param sc session context */ public static void setContext(SessionContext sc) { @@ -121,7 +121,7 @@ public class SessionContext extends Hashtable<Object, Object> { * Retrieves the session context associated with * the current thread. If no context is associated, * a context is created. - * + * * @return sesssion context */ public static SessionContext getContext() { @@ -138,7 +138,7 @@ public class SessionContext extends Hashtable<Object, Object> { * Retrieves the session context associated with * the current thread. If no context is associated, * null is returned. - * + * * @return sesssion context */ public static SessionContext getExistingContext() { diff --git a/base/common/src/com/netscape/certsrv/ca/CAResources.java b/base/common/src/com/netscape/certsrv/ca/CAResources.java index dfb72d57d..90e0e5c61 100644 --- a/base/common/src/com/netscape/certsrv/ca/CAResources.java +++ b/base/common/src/com/netscape/certsrv/ca/CAResources.java @@ -22,7 +22,7 @@ import java.util.ListResourceBundle; /** * A class represents a resource bundle for CA subsystem. * <P> - * + * * @version $Revision$ $Date$ */ public class CAResources extends ListResourceBundle { diff --git a/base/common/src/com/netscape/certsrv/ca/ECAException.java b/base/common/src/com/netscape/certsrv/ca/ECAException.java index a530b08a5..54ddbe806 100644 --- a/base/common/src/com/netscape/certsrv/ca/ECAException.java +++ b/base/common/src/com/netscape/certsrv/ca/ECAException.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.base.EBaseException; /** * A class represents a CA exception. * <P> - * + * * @version $Revision$, $Date$ */ public class ECAException extends EBaseException { @@ -39,7 +39,7 @@ public class ECAException extends EBaseException { /** * Constructs a CA exception. * <P> - * + * * @param msgFormat constant from CAResources. */ public ECAException(String msgFormat) { @@ -49,7 +49,7 @@ public class ECAException extends EBaseException { /** * Constructs a CA exception. * <P> - * + * * @param msgFormat constant from CAResources. * @param param additional parameters to the message. */ @@ -60,7 +60,7 @@ public class ECAException extends EBaseException { /** * Constructs a CA exception. * <P> - * + * * @param msgFormat constant from CAResources. * @param e embedded exception. */ @@ -71,7 +71,7 @@ public class ECAException extends EBaseException { /** * Constructs a CA exception. * <P> - * + * * @param msgFormat constant from CAResources. * @param params additional parameters to the message. */ @@ -82,7 +82,7 @@ public class ECAException extends EBaseException { /** * Returns the bundle file name. * <P> - * + * * @return name of bundle class associated with this exception. */ protected String getBundleName() { diff --git a/base/common/src/com/netscape/certsrv/ca/EErrorPublishCRL.java b/base/common/src/com/netscape/certsrv/ca/EErrorPublishCRL.java index b4c10a0c5..ca40e55ae 100644 --- a/base/common/src/com/netscape/certsrv/ca/EErrorPublishCRL.java +++ b/base/common/src/com/netscape/certsrv/ca/EErrorPublishCRL.java @@ -20,7 +20,7 @@ package com.netscape.certsrv.ca; /** * A class represents a CA exception associated with publishing error. * <P> - * + * * @version $Revision$ $Date$ */ public class EErrorPublishCRL extends ECAException { @@ -33,7 +33,7 @@ public class EErrorPublishCRL extends ECAException { /** * Constructs a CA exception caused by publishing error. * <P> - * + * * @param errorString Detailed error message. */ public EErrorPublishCRL(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/ca/ICAService.java b/base/common/src/com/netscape/certsrv/ca/ICAService.java index 1edebcc8b..1d179e076 100644 --- a/base/common/src/com/netscape/certsrv/ca/ICAService.java +++ b/base/common/src/com/netscape/certsrv/ca/ICAService.java @@ -29,7 +29,7 @@ import com.netscape.certsrv.request.IRequest; /** * An interface representing a CA request services. * <P> - * + * * @version $Revision$, $Date$ */ public interface ICAService { @@ -37,7 +37,7 @@ public interface ICAService { /** * Marks certificate record as revoked by adding revocation information. * Updates CRL cache. - * + * * @param crlentry revocation information obtained from revocation request * @exception EBaseException failed to mark certificate record as revoked */ @@ -47,7 +47,7 @@ public interface ICAService { /** * Marks certificate record as revoked by adding revocation information. * Updates CRL cache. - * + * * @param crlentry revocation information obtained from revocation request * @param requestId revocation request id * @exception EBaseException failed to mark certificate record as revoked @@ -58,7 +58,7 @@ public interface ICAService { /** * Issues certificate base on enrollment information, * creates certificate record, and stores all necessary data. - * + * * @param certi information obtain from revocation request * @exception EBaseException failed to issue certificate or create certificate record */ @@ -70,7 +70,7 @@ public interface ICAService { /** * Services profile request. - * + * * @param request profile enrollment request information * @exception EBaseException failed to service profile enrollment request */ @@ -79,7 +79,7 @@ public interface ICAService { /** * Returns KRA-CA connector. - * + * * @return KRA-CA connector */ public IConnector getKRAConnector(); diff --git a/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java b/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java index b3e94d02e..3e7115771 100644 --- a/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java +++ b/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java @@ -25,14 +25,14 @@ import com.netscape.certsrv.common.NameValuePairs; /** * An interface representing a CRL extension plugin. * <P> - * + * * @version $Revision$, $Date$ */ public interface ICMSCRLExtension { /** * Returns CRL extension OID string. - * + * * @return OID of CRL extension */ public String getCRLExtOID(); @@ -40,7 +40,7 @@ public interface ICMSCRLExtension { /** * Sets extension criticality and returns extension * with new criticality. - * + * * @param ext CRL extension that will change criticality * @param critical new criticality to be assigned to CRL extension * @return extension with new criticality @@ -51,7 +51,7 @@ public interface ICMSCRLExtension { /** * Builds new CRL extension based on configuration data, * issuing point information, and criticality. - * + * * @param config configuration store * @param crlIssuingPoint CRL issuing point * @param critical criticality to be assigned to CRL extension @@ -63,7 +63,7 @@ public interface ICMSCRLExtension { /** * Reads configuration data and converts them to name value pairs. - * + * * @param config configuration store * @param nvp name value pairs obtained from configuration data */ diff --git a/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java b/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java index 6fa520fbf..dad5e691b 100644 --- a/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java +++ b/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java @@ -23,7 +23,7 @@ import com.netscape.certsrv.common.NameValuePairs; /** * An interface representing a list of CRL extensions. * <P> - * + * * @version $Revision$, $Date$ */ public interface ICMSCRLExtensions { @@ -31,7 +31,7 @@ public interface ICMSCRLExtensions { /** * Updates configuration store for extension identified by id * with data delivered in name value pairs. - * + * * @param id extension id * @param nvp name value pairs with new configuration data * @param config configuration store @@ -40,7 +40,7 @@ public interface ICMSCRLExtensions { /** * Reads configuration data and returns them as name value pairs. - * + * * @param id extension id * @return name value pairs with configuration data */ @@ -48,7 +48,7 @@ public interface ICMSCRLExtensions { /** * Returns class name with its path. - * + * * @param name extension id * @return class name with its path */ diff --git a/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java b/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java index f317db9b1..80a579cca 100644 --- a/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java +++ b/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.dbs.IElementProcessor; * can also be triggered by invoking updateCRL method directly. Another * parameter minUpdateInterval can be used to prevent CRL * from being updated too often - * + * * @version $Revision$, $Date$ */ @@ -73,98 +73,98 @@ public interface ICRLIssuingPoint { /** * Returns true if CRL issuing point is enabled. - * + * * @return true if CRL issuing point is enabled */ public boolean isCRLIssuingPointEnabled(); /** * Returns true if CRL generation is enabled. - * + * * @return true if CRL generation is enabled */ public boolean isCRLGenerationEnabled(); /** * Enables or disables CRL issuing point according to parameter. - * + * * @param enable if true enables CRL issuing point */ public void enableCRLIssuingPoint(boolean enable); /** * Returns CRL update status. - * + * * @return CRL update status */ public String getCrlUpdateStatusStr(); /** * Returns CRL update error. - * + * * @return CRL update error */ public String getCrlUpdateErrorStr(); /** * Returns CRL publishing status. - * + * * @return CRL publishing status */ public String getCrlPublishStatusStr(); /** * Returns CRL publishing error. - * + * * @return CRL publishing error */ public String getCrlPublishErrorStr(); /** * Returns CRL issuing point initialization status. - * + * * @return status of CRL issuing point initialization */ public int isCRLIssuingPointInitialized(); /** * Checks if manual update is set. - * + * * @return true if manual update is set */ public boolean isManualUpdateSet(); /** * Checks if expired certificates are included in CRL. - * + * * @return true if expired certificates are included in CRL */ public boolean areExpiredCertsIncluded(); /** * Checks if CRL includes CA certificates only. - * + * * @return true if CRL includes CA certificates only */ public boolean isCACertsOnly(); /** * Checks if CRL includes profile certificates only. - * + * * @return true if CRL includes profile certificates only */ public boolean isProfileCertsOnly(); /** * Checks if CRL issuing point includes this profile. - * + * * @return true if CRL issuing point includes this profile */ public boolean checkCurrentProfile(String id); /** * Initializes CRL issuing point. - * + * * @param ca certificate authority that holds CRL issuing point * @param id CRL issuing point id * @param config configuration sub-store for CRL issuing point @@ -181,21 +181,21 @@ public interface ICRLIssuingPoint { /** * Returns internal id of this CRL issuing point. - * + * * @return internal id of this CRL issuing point */ public String getId(); /** * Returns internal description of this CRL issuing point. - * + * * @return internal description of this CRL issuing point */ public String getDescription(); /** * Sets internal description of this CRL issuing point. - * + * * @param description description for this CRL issuing point. */ public void setDescription(String description); @@ -203,21 +203,21 @@ public interface ICRLIssuingPoint { /** * Returns DN of the directory entry where CRLs from this issuing point * are published. - * + * * @return DN of the directory entry where CRLs are published. */ public String getPublishDN(); /** * Returns signing algorithm. - * + * * @return signing algorithm */ public String getSigningAlgorithm(); /** * Returns signing algorithm used in last signing operation.. - * + * * @return last signing algorithm */ public String getLastSigningAlgorithm(); @@ -225,14 +225,14 @@ public interface ICRLIssuingPoint { /** * Returns current CRL generation schema for this CRL issuing point. * <P> - * + * * @return current CRL generation schema for this CRL issuing point */ public int getCRLSchema(); /** * Returns current CRL number of this CRL issuing point. - * + * * @return current CRL number of this CRL issuing point */ public BigInteger getCRLNumber(); @@ -240,56 +240,56 @@ public interface ICRLIssuingPoint { /** * Returns current delta CRL number of this CRL issuing point. * <P> - * + * * @return current delta CRL number of this CRL issuing point */ public BigInteger getDeltaCRLNumber(); /** * Returns next CRL number of this CRL issuing point. - * + * * @return next CRL number of this CRL issuing point */ public BigInteger getNextCRLNumber(); /** * Returns number of entries in the current CRL. - * + * * @return number of entries in the current CRL */ public long getCRLSize(); /** * Returns number of entries in delta CRL - * + * * @return number of entries in delta CRL */ public long getDeltaCRLSize(); /** * Returns time of the last update. - * + * * @return last CRL update time */ public Date getLastUpdate(); /** * Returns time of the next update. - * + * * @return next CRL update time */ public Date getNextUpdate(); /** * Returns time of the next delta CRL update. - * + * * @return next delta CRL update time */ public Date getNextDeltaUpdate(); /** * Returns all the revoked certificates from the CRL cache. - * + * * @param start first requested CRL entry * @param end next after last requested CRL entry * @return set of all the revoked certificates or null if there are none. @@ -298,7 +298,7 @@ public interface ICRLIssuingPoint { /** * Returns certificate authority. - * + * * @return certificate authority */ public ISubsystem getCertificateAuthority(); @@ -306,14 +306,14 @@ public interface ICRLIssuingPoint { /** * Schedules immediate CRL manual-update * and sets signature algorithm to be used for signing. - * + * * @param signatureAlgorithm signature algorithm to be used for signing */ public void setManualUpdate(String signatureAlgorithm); /** * Returns auto update interval in milliseconds. - * + * * @return auto update interval in milliseconds */ public long getAutoUpdateInterval(); @@ -321,14 +321,14 @@ public interface ICRLIssuingPoint { /** * Returns true if CRL is updated for every change * of revocation status of any certificate. - * + * * @return true if CRL update is always triggered by revocation operation */ public boolean getAlwaysUpdate(); /** * Returns next update grace period in minutes. - * + * * @return next update grace period in minutes */ public long getNextUpdateGracePeriod(); @@ -336,7 +336,7 @@ public interface ICRLIssuingPoint { /** * Returns filter used to build CRL based on information stored * in local directory. - * + * * @return filter used to search local directory */ public String getFilter(); @@ -346,7 +346,7 @@ public interface ICRLIssuingPoint { * Calls certificate record processor to get necessary data * from certificate records. * This also regenerates CRL cache. - * + * * @param cp certificate record processor * @exception EBaseException if an error occurred in the database. */ @@ -356,7 +356,7 @@ public interface ICRLIssuingPoint { /** * Returns date of revoked certificate or null * if certificated is not listed as revoked. - * + * * @param serialNumber serial number of certificate to be checked * @param checkDeltaCache true if delta CRL cache suppose to be * included in checking process @@ -370,7 +370,7 @@ public interface ICRLIssuingPoint { /** * Returns split times from CRL generation. - * + * * @return split times from CRL generation in milliseconds */ public Vector<Long> getSplitTimes(); @@ -378,7 +378,7 @@ public interface ICRLIssuingPoint { /** * Generates CRL now based on cache or local directory if cache * is not available. It also publishes CRL if it is required. - * + * * @param signingAlgorithm signing algorithm to be used for CRL signing * @exception EBaseException if an error occurred during * CRL generation or publishing @@ -398,21 +398,21 @@ public interface ICRLIssuingPoint { /** * Returns number of recently revoked certificates. - * + * * @return number of recently revoked certificates */ public int getNumberOfRecentlyRevokedCerts(); /** * Returns number of recently unrevoked certificates. - * + * * @return number of recently unrevoked certificates */ public int getNumberOfRecentlyUnrevokedCerts(); /** * Returns number of recently expired and revoked certificates. - * + * * @return number of recently expired and revoked certificates */ public int getNumberOfRecentlyExpiredCerts(); @@ -420,7 +420,7 @@ public interface ICRLIssuingPoint { /** * Converts list of extensions supplied by revocation request * to list of extensions required to be placed in CRL. - * + * * @param exts list of extensions supplied by revocation request * @return list of extensions required to be placed in CRL */ @@ -428,7 +428,7 @@ public interface ICRLIssuingPoint { /** * Adds revoked certificate to delta-CRL cache. - * + * * @param serialNumber serial number of revoked certificate * @param revokedCert revocation information supplied by revocation request */ @@ -436,7 +436,7 @@ public interface ICRLIssuingPoint { /** * Adds revoked certificate to delta-CRL cache. - * + * * @param serialNumber serial number of revoked certificate * @param revokedCert revocation information supplied by revocation request * @param requestId revocation request id @@ -446,14 +446,14 @@ public interface ICRLIssuingPoint { /** * Adds unrevoked certificate to delta-CRL cache. - * + * * @param serialNumber serial number of unrevoked certificate */ public void addUnrevokedCert(BigInteger serialNumber); /** * Adds unrevoked certificate to delta-CRL cache. - * + * * @param serialNumber serial number of unrevoked certificate * @param requestId unrevocation request id */ @@ -461,7 +461,7 @@ public interface ICRLIssuingPoint { /** * Adds expired and revoked certificate to delta-CRL cache. - * + * * @param serialNumber serial number of expired and revoked certificate */ public void addExpiredCert(BigInteger serialNumber); @@ -474,7 +474,7 @@ public interface ICRLIssuingPoint { /** * Updates issuing point configuration according to supplied data * in name value pairs. - * + * * @param params name value pairs defining new issuing point configuration * @return true if configuration is updated successfully */ @@ -482,35 +482,35 @@ public interface ICRLIssuingPoint { /** * Returns true if delta-CRL is enabled. - * + * * @return true if delta-CRL is enabled */ public boolean isDeltaCRLEnabled(); /** * Returns true if CRL cache is enabled. - * + * * @return true if CRL cache is enabled */ public boolean isCRLCacheEnabled(); /** * Returns true if CRL cache is empty. - * + * * @return true if CRL cache is empty */ public boolean isCRLCacheEmpty(); /** * Returns true if CRL cache testing is enabled. - * + * * @return true if CRL cache testing is enabled */ public boolean isCRLCacheTestingEnabled(); /** * Returns true if supplied delta-CRL is matching current delta-CRL. - * + * * @param deltaCRL delta-CRL to verify against current delta-CRL * @return true if supplied delta-CRL is matching current delta-CRL */ @@ -518,7 +518,7 @@ public interface ICRLIssuingPoint { /** * Returns status of CRL generation. - * + * * @return one of the following according to CRL generation status: * CRL_UPDATE_DONE, CRL_UPDATE_STARTED, and CRL_PUBLISHING_STARTED */ @@ -528,7 +528,7 @@ public interface ICRLIssuingPoint { * Generates CRL now based on cache or local directory if cache * is not available. It also publishes CRL if it is required. * CRL is signed by default signing algorithm. - * + * * @exception EBaseException if an error occurred during * CRL generation or publishing */ @@ -536,7 +536,7 @@ public interface ICRLIssuingPoint { /** * Returns list of CRL extensions. - * + * * @return list of CRL extensions */ public ICMSCRLExtensions getCRLExtensions(); diff --git a/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java b/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java index 25bc9cabe..ee7d60c38 100644 --- a/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java +++ b/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java @@ -47,7 +47,7 @@ import com.netscape.certsrv.security.ISigningUnit; * An interface represents a Certificate Authority that is * responsible for certificate specific operations. * <P> - * + * * @version $Revision$, $Date$ */ public interface ICertificateAuthority extends ISubsystem { @@ -111,14 +111,14 @@ public interface ICertificateAuthority extends ISubsystem { /** * Retrieves the certificate repository where all the locally * issued certificates are kept. - * + * * @return CA's certificate repository */ public ICertificateRepository getCertificateRepository(); /** * Retrieves the request queue of this certificate authority. - * + * * @return CA's request queue */ public IRequestQueue getRequestQueue(); @@ -136,21 +136,21 @@ public interface ICertificateAuthority extends ISubsystem { /** * Retrieves the publishing processor of this certificate authority. - * + * * @return CA's publishing processor */ public IPublisherProcessor getPublisherProcessor(); /** * Retrieves the next available serial number. - * + * * @return next available serial number */ public String getStartSerial(); /** * Sets the next available serial number. - * + * * @param serial next available serial number * @exception EBaseException failed to set next available serial number */ @@ -159,7 +159,7 @@ public interface ICertificateAuthority extends ISubsystem { /** * Retrieves the last serial number that can be used for * certificate issuance in this certificate authority. - * + * * @return the last serial number */ public String getMaxSerial(); @@ -167,7 +167,7 @@ public interface ICertificateAuthority extends ISubsystem { /** * Sets the last serial number that can be used for * certificate issuance in this certificate authority. - * + * * @param serial the last serial number * @exception EBaseException failed to set the last serial number */ @@ -175,21 +175,21 @@ public interface ICertificateAuthority extends ISubsystem { /** * Retrieves the default signature algorithm of this certificate authority. - * + * * @return the default signature algorithm of this CA */ public SignatureAlgorithm getDefaultSignatureAlgorithm(); /** * Retrieves the default signing algorithm of this certificate authority. - * + * * @return the default signing algorithm of this CA */ public String getDefaultAlgorithm(); /** * Sets the default signing algorithm of this certificate authority. - * + * * @param algorithm new default signing algorithm * @exception EBaseException failed to set the default signing algorithm */ @@ -197,7 +197,7 @@ public interface ICertificateAuthority extends ISubsystem { /** * Retrieves the supported signing algorithms of this certificate authority. - * + * * @return the supported signing algorithms of this CA */ public String[] getCASigningAlgorithms(); @@ -205,7 +205,7 @@ public interface ICertificateAuthority extends ISubsystem { /** * Allows certificates to have validities that are longer * than this certificate authority's. - * + * * @param enableCAPast if equals "true", it allows certificates * to have validity longer than CA's certificate validity * @exception EBaseException failed to set above option @@ -214,21 +214,21 @@ public interface ICertificateAuthority extends ISubsystem { /** * Retrieves the default validity period. - * + * * @return the default validity length in days */ public long getDefaultValidity(); /** * Retrieves all the CRL issuing points. - * + * * @return enumeration of all the CRL issuing points */ public Enumeration<ICRLIssuingPoint> getCRLIssuingPoints(); /** * Retrieves CRL issuing point with the given identifier. - * + * * @param id CRL issuing point id * @return CRL issuing point with given id */ @@ -236,7 +236,7 @@ public interface ICertificateAuthority extends ISubsystem { /** * Adds CRL issuing point with the given identifier and description. - * + * * @param crlSubStore sub-store with all CRL issuing points * @param id CRL issuing point id * @param description CRL issuing point description @@ -247,7 +247,7 @@ public interface ICertificateAuthority extends ISubsystem { /** * Deletes CRL issuing point with the given identifier. - * + * * @param crlSubStore sub-store with all CRL issuing points * @param id CRL issuing point id */ @@ -255,77 +255,77 @@ public interface ICertificateAuthority extends ISubsystem { /** * Retrieves the CRL repository. - * + * * @return CA's CRL repository */ public ICRLRepository getCRLRepository(); /** * Retrieves the Replica ID repository. - * + * * @return CA's Replica ID repository */ public IReplicaIDRepository getReplicaRepository(); /** * Retrieves the request in queue listener. - * + * * @return the request in queue listener */ public IRequestListener getRequestInQListener(); /** * Retrieves all request listeners. - * + * * @return name enumeration of all request listeners */ public Enumeration<String> getRequestListenerNames(); /** * Retrieves the request listener for issued certificates. - * + * * @return the request listener for issued certificates */ public IRequestListener getCertIssuedListener(); /** * Retrieves the request listener for revoked certificates. - * + * * @return the request listener for revoked certificates */ public IRequestListener getCertRevokedListener(); /** * Retrieves the CA certificate chain. - * + * * @return the CA certificate chain */ public CertificateChain getCACertChain(); /** * Retrieves the CA certificate. - * + * * @return the CA certificate */ public org.mozilla.jss.crypto.X509Certificate getCaX509Cert(); /** * Retrieves the CA certificate. - * + * * @return the CA certificate */ public X509CertImpl getCACert(); /** * Updates the CRL immediately for MasterCRL issuing point if it exists. - * + * * @exception EBaseException failed to create or publish CRL */ public void updateCRLNow() throws EBaseException; /** * Publishes the CRL immediately for MasterCRL issuing point if it exists. - * + * * @exception EBaseException failed to publish CRL */ public void publishCRLNow() throws EBaseException; @@ -333,7 +333,7 @@ public interface ICertificateAuthority extends ISubsystem { /** * Retrieves the signing unit that manages the CA signing key for * signing certificates. - * + * * @return the CA signing unit for certificates */ public ISigningUnit getSigningUnit(); @@ -341,7 +341,7 @@ public interface ICertificateAuthority extends ISubsystem { /** * Retrieves the signing unit that manages the CA signing key for * signing CRL. - * + * * @return the CA signing unit for CRLs */ public ISigningUnit getCRLSigningUnit(); @@ -349,28 +349,28 @@ public interface ICertificateAuthority extends ISubsystem { /** * Retrieves the signing unit that manages the CA signing key for * signing OCSP response. - * + * * @return the CA signing unit for OCSP responses */ public ISigningUnit getOCSPSigningUnit(); /** * Sets the maximium path length in the basic constraint extension. - * + * * @param num the maximium path length */ public void setBasicConstraintMaxLen(int num); /** * Is this a clone CA? - * + * * @return true if this is a clone CA */ public boolean isClone(); /** * Retrieves the request listener by name. - * + * * @param name request listener name * @return the request listener */ @@ -383,14 +383,14 @@ public interface ICertificateAuthority extends ISubsystem { /** * Registers a request listener. - * + * * @param listener request listener to be registered */ public void registerRequestListener(IRequestListener listener); /** * Registers a request listener. - * + * * @param name under request listener is going to be registered * @param listener request listener to be registered */ @@ -398,21 +398,21 @@ public interface ICertificateAuthority extends ISubsystem { /** * Retrieves the issuer name of this certificate authority. - * + * * @return the issuer name of this certificate authority */ public X500Name getX500Name(); /** * Retrieves the issuer name of this certificate authority issuing point. - * + * * @return the issuer name of this certificate authority issuing point */ public X500Name getCRLX500Name(); /** * Signs the given CRL with the specific algorithm. - * + * * @param crl CRL to be signed * @param algname algorithm used for signing * @return signed CRL @@ -423,7 +423,7 @@ public interface ICertificateAuthority extends ISubsystem { /** * Logs a message to this certificate authority. - * + * * @param level logging level * @param msg logged message */ @@ -431,14 +431,14 @@ public interface ICertificateAuthority extends ISubsystem { /** * Returns the nickname for the CA signing certificate. - * + * * @return the nickname for the CA signing certificate */ public String getNickname(); /** * Signs a X.509 certificate template. - * + * * @param certInfo X.509 certificate template * @param algname algorithm used for signing * @return signed certificate @@ -449,7 +449,7 @@ public interface ICertificateAuthority extends ISubsystem { /** * Retrieves the default certificate version. - * + * * @return the default version certificate */ public CertificateVersion getDefaultCertVersion(); @@ -457,7 +457,7 @@ public interface ICertificateAuthority extends ISubsystem { /** * Is this CA allowed to issue certificate that has longer * validty than the CA's. - * + * * @return true if allows certificates to have validity longer than CA's */ public boolean isEnablePastCATime(); @@ -465,14 +465,14 @@ public interface ICertificateAuthority extends ISubsystem { /** * Retrieves the CA service object that is responsible for * processing requests. - * + * * @return CA service object */ public IService getCAService(); /** * Returns the in-memory count of the processed OCSP requests. - * + * * @return number of processed OCSP requests in memory */ public long getNumOCSPRequest(); @@ -480,7 +480,7 @@ public interface ICertificateAuthority extends ISubsystem { /** * Returns the in-memory time (in mini-second) of * the processed time for OCSP requests. - * + * * @return processed times for OCSP requests */ public long getOCSPRequestTotalTime(); @@ -488,7 +488,7 @@ public interface ICertificateAuthority extends ISubsystem { /** * Returns the in-memory time (in mini-second) of * the signing time for OCSP requests. - * + * * @return processed times for OCSP requests */ public long getOCSPTotalSignTime(); @@ -496,7 +496,7 @@ public interface ICertificateAuthority extends ISubsystem { /** * Returns the total data signed * for OCSP requests. - * + * * @return processed times for OCSP requests */ public long getOCSPTotalData(); diff --git a/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java b/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java index c79479dc7..84abeb775 100644 --- a/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java +++ b/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java @@ -25,7 +25,7 @@ import com.netscape.certsrv.base.ISubsystem; /** * Interface for handling cross certs - * + * * @version $Revision$, $Date$ */ public interface ICrossCertPairSubsystem extends ISubsystem { @@ -37,7 +37,7 @@ public interface ICrossCertPairSubsystem extends ISubsystem { * if matches up a pair, then publish to publishing directory * otherwise, leave in internal ldap db and wait for it's matching * pair - * + * * @param certBytes binary byte array of the cert * @exception EBaseException when certBytes conversion to X509 * certificate fails @@ -46,14 +46,14 @@ public interface ICrossCertPairSubsystem extends ISubsystem { /** * publish all cert pairs, if publisher is on - * + * * @exception EBaseException when publishing fails */ public void publishCertPairs() throws EBaseException; /** * convert byte array to X509Certificate - * + * * @return X509Certificate the X509Certificate class * representation of the certificate byte array * @exception CertificateException when conversion fails diff --git a/base/common/src/com/netscape/certsrv/client/IDataProcessor.java b/base/common/src/com/netscape/certsrv/client/IDataProcessor.java index b6784b6d2..b08fa6fde 100644 --- a/base/common/src/com/netscape/certsrv/client/IDataProcessor.java +++ b/base/common/src/com/netscape/certsrv/client/IDataProcessor.java @@ -20,7 +20,7 @@ package com.netscape.certsrv.client; /** * this class represents the callback interface between * the client package and the data storage object (data model) - * + * * @version $Revision$, $Date$ */ public interface IDataProcessor { @@ -28,7 +28,7 @@ public interface IDataProcessor { /** * This method will be callby the client package each time * data object arrived from the server side. - * + * * @param data data object expected by the interface implementor */ public void processData(Object data); diff --git a/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java b/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java index 0a96ee698..a2c00acba 100644 --- a/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java +++ b/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.client.connection; /** * An interface represents authentiator. - * + * * @version $Revision$, $Date$ */ public interface IAuthenticator { diff --git a/base/common/src/com/netscape/certsrv/client/connection/IConnection.java b/base/common/src/com/netscape/certsrv/client/connection/IConnection.java index 4a8166b02..db6ad5a85 100644 --- a/base/common/src/com/netscape/certsrv/client/connection/IConnection.java +++ b/base/common/src/com/netscape/certsrv/client/connection/IConnection.java @@ -22,7 +22,7 @@ import java.net.SocketException; /** * Interface for all connection objects. - * + * * @version $Revision$, $Date$ */ public interface IConnection { diff --git a/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java b/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java index 4506abbfa..6396f09d4 100644 --- a/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java +++ b/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java @@ -23,14 +23,14 @@ import java.net.UnknownHostException; /** * Interface for all connection factory. Primarily act as * the abstraction layer for different kind of connection factory. - * + * * @version $Revision$, $Date$ */ public interface IConnectionFactory { /** * Creates connection using the host and port - * + * * @param host The host to connect to * @param port The port to connect to * @return The created connection diff --git a/base/common/src/com/netscape/certsrv/common/ConfigConstants.java b/base/common/src/com/netscape/certsrv/common/ConfigConstants.java index 2ea7b7469..0e135dd2b 100644 --- a/base/common/src/com/netscape/certsrv/common/ConfigConstants.java +++ b/base/common/src/com/netscape/certsrv/common/ConfigConstants.java @@ -21,7 +21,7 @@ package com.netscape.certsrv.common; * This interface contains constants that are used * in the protocol between the configuration daemon * and UI configuration wizard. - * + * * @version $Revision$, $Date$ */ public interface ConfigConstants { diff --git a/base/common/src/com/netscape/certsrv/common/Constants.java b/base/common/src/com/netscape/certsrv/common/Constants.java index be9d33b4c..23a9075ae 100644 --- a/base/common/src/com/netscape/certsrv/common/Constants.java +++ b/base/common/src/com/netscape/certsrv/common/Constants.java @@ -20,7 +20,7 @@ package com.netscape.certsrv.common; /** * This interface contains constants that are shared * by certificate server and its client SDK. - * + * * @version $Revision$, $Date$ */ public interface Constants { @@ -467,7 +467,7 @@ public interface Constants { * Security *========================================================*/ - //functionality + //functionality public final static String PR_CERT_SERVER = "SERVER"; public final static String PR_CERT_ADMIN = "ADMIN"; public final static String PR_CERT_AGENT = "AGENT"; @@ -544,7 +544,7 @@ public interface Constants { public final static String PR_TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA = "tls_rsa_des_sha"; /*======================================================== - * Watchdog and Server State Messages + * Watchdog and Server State Messages *========================================================*/ public final static String SERVER_STARTUP_WARNING_MESSAGE = "CMS Warning: "; diff --git a/base/common/src/com/netscape/certsrv/common/DestDef.java b/base/common/src/com/netscape/certsrv/common/DestDef.java index 273e6af05..de7739d0a 100644 --- a/base/common/src/com/netscape/certsrv/common/DestDef.java +++ b/base/common/src/com/netscape/certsrv/common/DestDef.java @@ -21,7 +21,7 @@ package com.netscape.certsrv.common; * This interface defines all the operation destination * used in the administration protocol between the * console and the server. - * + * * @version $Revision$, $Date$ */ public interface DestDef { diff --git a/base/common/src/com/netscape/certsrv/common/NameValuePairs.java b/base/common/src/com/netscape/certsrv/common/NameValuePairs.java index 0999db7bc..0f95ad2e3 100644 --- a/base/common/src/com/netscape/certsrv/common/NameValuePairs.java +++ b/base/common/src/com/netscape/certsrv/common/NameValuePairs.java @@ -23,7 +23,7 @@ import java.util.StringTokenizer; /** * A class represents an ordered list of name * value pairs. - * + * * @version $Revision$, $Date$ */ public class NameValuePairs extends LinkedHashMap<String, String> { @@ -39,7 +39,7 @@ public class NameValuePairs extends LinkedHashMap<String, String> { /** * Show the content of this name value container as * string representation. - * + * * @return string representation */ public String toString() { @@ -57,7 +57,7 @@ public class NameValuePairs extends LinkedHashMap<String, String> { /** * Parses a string into name value pairs. - * + * * @param s string * @param nvp name value pairs * @return true if successful diff --git a/base/common/src/com/netscape/certsrv/common/OpDef.java b/base/common/src/com/netscape/certsrv/common/OpDef.java index 22a974e12..862b44760 100644 --- a/base/common/src/com/netscape/certsrv/common/OpDef.java +++ b/base/common/src/com/netscape/certsrv/common/OpDef.java @@ -21,7 +21,7 @@ package com.netscape.certsrv.common; * This interface defines all the administration operations * used in the administration protocol between the console * and the server. - * + * * @version $Revision$, $Date$ */ public interface OpDef { diff --git a/base/common/src/com/netscape/certsrv/common/PrefixDef.java b/base/common/src/com/netscape/certsrv/common/PrefixDef.java index 833847d05..ac85694ac 100644 --- a/base/common/src/com/netscape/certsrv/common/PrefixDef.java +++ b/base/common/src/com/netscape/certsrv/common/PrefixDef.java @@ -21,7 +21,7 @@ package com.netscape.certsrv.common; * This interface defines all the prefix tags * used in the administration protocol between * the console and the server. - * + * * @version $Revision$, $Date$ */ public interface PrefixDef { diff --git a/base/common/src/com/netscape/certsrv/common/ScopeDef.java b/base/common/src/com/netscape/certsrv/common/ScopeDef.java index f29067f51..e8919de5e 100644 --- a/base/common/src/com/netscape/certsrv/common/ScopeDef.java +++ b/base/common/src/com/netscape/certsrv/common/ScopeDef.java @@ -21,7 +21,7 @@ package com.netscape.certsrv.common; * This interface defines all the operation scope * used in the administration protocol between the * console and the server. - * + * * @version $Revision$, $Date$ */ public interface ScopeDef { diff --git a/base/common/src/com/netscape/certsrv/common/TaskId.java b/base/common/src/com/netscape/certsrv/common/TaskId.java index 01a97b2a1..407ec9187 100644 --- a/base/common/src/com/netscape/certsrv/common/TaskId.java +++ b/base/common/src/com/netscape/certsrv/common/TaskId.java @@ -22,7 +22,7 @@ package com.netscape.certsrv.common; * the configuration protocol between the * configuration wizard and the configuration * daemon. - * + * * @version $Revision$, $Date$ */ public interface TaskId { @@ -108,7 +108,7 @@ public interface TaskId { // check certificate extension public final static String TASK_CHECK_EXTENSION = "checkExtension"; - // check validity period: make sure the notAfterDate of the certificate + // check validity period: make sure the notAfterDate of the certificate // will not go beyond the notAfterDate of the CA cert which signs the certificate. public final static String TASK_VALIDITY_PERIOD = "checkValidityPeriod"; diff --git a/base/common/src/com/netscape/certsrv/connector/IConnector.java b/base/common/src/com/netscape/certsrv/connector/IConnector.java index 202fb0794..61001be5b 100644 --- a/base/common/src/com/netscape/certsrv/connector/IConnector.java +++ b/base/common/src/com/netscape/certsrv/connector/IConnector.java @@ -23,12 +23,12 @@ import com.netscape.certsrv.request.IRequest; /** * This interface represents a connector that forwards * CMS requests to a remote authority. - * + * * To register a connector, one can add the following * to the CMS.cfg: - * + * * <pre> - * + * * Example for KRA type connector. * ca.connector.KRA.enable=true * ca.connector.KRA.host=thehost.netscape.com #Remote host. @@ -36,17 +36,17 @@ import com.netscape.certsrv.request.IRequest; * ca.connector.KRA.nickName="cert-kra" #Nickname of connector for identity purposes. * ca.connector.KRA.uri="/kra/connector" #Uri of the KRA server. * ca.connector.KRA.id="kra" - * ca.connector.KRA.minHttpConns=1 #Min connection pool connections. + * ca.connector.KRA.minHttpConns=1 #Min connection pool connections. * ca.connector.KRA.maxHttpConns=10 #Max connection pool connections. * </pre> - * + * * @version $Revision$, $Date$ */ public interface IConnector { /** * Sends the request to a remote authority. - * + * * @param req Request to be forwarded to remote authority. * @return true for success, otherwise false. * @exception EBaseException Failure to send request to remote authority. diff --git a/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java b/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java index 27a94a57f..55c537cff 100644 --- a/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java +++ b/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java @@ -25,14 +25,14 @@ import com.netscape.certsrv.base.EBaseException; * Multiple threads use this interface to utilize and release * the Ldap connection resources. This factory will maintain a * list of Http type connections to the remote host. - * + * * @version $Revision$, $Date$ */ public interface IHttpConnFactory { /** * Request access to a Ldap connection from the pool. - * + * * @exception EBaseException if any error occurs, such as a * @return Ldap connection object. * connection is not available @@ -42,7 +42,7 @@ public interface IHttpConnFactory { /** * Return connection to the factory. mandatory after a getConn(). - * + * * @param conn Ldap connection object to be returned to the free list of the pool. * @exception EBaseException On any failure to return the connection. */ diff --git a/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java b/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java index d1652dc90..8adc7da72 100644 --- a/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java +++ b/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java @@ -25,14 +25,14 @@ import com.netscape.certsrv.base.EBaseException; * PKI messages to a remote authority. The remote authority * will reply with a PKI message as well. An example would * be the communication between a CA and a KRA. - * + * * @version $Revision$, $Date$ */ public interface IHttpConnection { /** * Sends the PKI message to the remote authority. - * + * * @param tomsg Message to forward to authority. * @exception EBaseException Failed to send message. */ diff --git a/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java b/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java index efa49126e..14b4b8648 100644 --- a/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java +++ b/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java @@ -23,35 +23,35 @@ import com.netscape.certsrv.request.IRequest; * This represents a Http PKI message. It contains * simple name/value pair values. Also maintains information * about the status and type of the message. - * + * * @version $Revision$, $Date$ */ public interface IHttpPKIMessage extends IPKIMessage { /** * Retrieves the request type. - * + * * @return String with the type of request. */ public String getReqType(); /** * Retrieves the request identifier. - * + * * @return String of name of request. */ public String getReqId(); /** * Copies contents of request to make a simple name/value message. - * + * * @param r Instance of IRequest to be copied from. */ public void fromRequest(IRequest r); /** * Copies contents to request. - * + * * @param r Instance of IRequest to be copied to. */ public void toRequest(IRequest r); diff --git a/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java b/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java index 787dd8385..ca352aa82 100644 --- a/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java +++ b/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java @@ -25,29 +25,29 @@ import com.netscape.certsrv.request.IRequest; * Messages that are serialized and go over the wire. * It must be serializable, and * later will be inherited by CRMF message. - * + * * @version $Revision$, $Date$ */ public interface IPKIMessage extends Serializable { /** - * + * * Returns status of request. - * + * * @return String of request status. */ public String getReqStatus(); /** * Retrieves the request type. - * + * * @return String of type of request. */ public String getReqType(); /** * Retrieves the request identifer. - * + * * @return String of name of request. */ public String getReqId(); @@ -55,7 +55,7 @@ public interface IPKIMessage extends Serializable { /** * Makes a PKIMessage from a request * PKIMessage will be sent to wire. - * + * * @param r Request to copy from. */ public void fromRequest(IRequest r); @@ -63,7 +63,7 @@ public interface IPKIMessage extends Serializable { /** * Copies contents of PKIMessage to the request * PKIMessage is from the wire. - * + * * @param r Request to copy to. */ public void toRequest(IRequest r); diff --git a/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java b/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java index 50a3aea5f..f02154021 100644 --- a/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java +++ b/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java @@ -21,35 +21,35 @@ package com.netscape.certsrv.connector; * This represents a remote authority that can be * a certificate manager, or key recovery manager or * some other manager. - * + * * @version $Revision$, $Date$ */ public interface IRemoteAuthority { /** * Retrieves the host name of the remote Authority. - * + * * @return String with the name of host of remote Authority. */ public String getHost(); /** * Retrieves the port number of the remote Authority. - * + * * @return Int with port number of remote Authority. */ public int getPort(); /** * Retrieves the URI of the remote Authority. - * + * * @return String with URI of remote Authority. */ public String getURI(); /** * Retrieves the timeout value for the connection to the remote Authority. - * + * * @return In with remote Authority timeout value. */ public int getTimeout(); diff --git a/base/common/src/com/netscape/certsrv/connector/IRequestEncoder.java b/base/common/src/com/netscape/certsrv/connector/IRequestEncoder.java index 478af4174..c390f7ac3 100644 --- a/base/common/src/com/netscape/certsrv/connector/IRequestEncoder.java +++ b/base/common/src/com/netscape/certsrv/connector/IRequestEncoder.java @@ -23,14 +23,14 @@ import java.io.IOException; * This represents a rquest encoder that serializes and * deserializes a request to a Remote Authority so that it can be sent through * the connector. - * + * * @version $Revision$, $Date$ */ public interface IRequestEncoder { /** * Encodes a request object. - * + * * @param r Object to serve as the source of the message. * @return String containing encoded message. * @exception IOException Failure of the encoding operation due to IO error. @@ -40,7 +40,7 @@ public interface IRequestEncoder { /** * Dncodes a String into an object. - * + * * @return Object which is the result of the decoded message. * @exception IOException Failure of the decoding operation due to IO error. */ diff --git a/base/common/src/com/netscape/certsrv/connector/IResender.java b/base/common/src/com/netscape/certsrv/connector/IResender.java index 85d3e364c..b1cd6149e 100644 --- a/base/common/src/com/netscape/certsrv/connector/IResender.java +++ b/base/common/src/com/netscape/certsrv/connector/IResender.java @@ -24,14 +24,14 @@ import com.netscape.certsrv.request.IRequest; * Default interval is 5 minutes. The need to resend a message could arise * due to an error or the fact that the message could not be serviced * immediately. - * + * * @version $Revision$, $Date$ */ public interface IResender extends Runnable { /** * Adds the request to the resend queue. - * + * * @param r Request to be placed on the resend queue. */ public void addRequest(IRequest r); diff --git a/base/common/src/com/netscape/certsrv/dbs/DBResources.java b/base/common/src/com/netscape/certsrv/dbs/DBResources.java index a2201b8e6..b06959bbc 100644 --- a/base/common/src/com/netscape/certsrv/dbs/DBResources.java +++ b/base/common/src/com/netscape/certsrv/dbs/DBResources.java @@ -22,7 +22,7 @@ import java.util.ListResourceBundle; /** * A class represents a resource bundle for DBS subsystem. * <P> - * + * * @version $Revision$, $Date$ */ public class DBResources extends ListResourceBundle { diff --git a/base/common/src/com/netscape/certsrv/dbs/EDBException.java b/base/common/src/com/netscape/certsrv/dbs/EDBException.java index 77508dca4..1908bdf7e 100644 --- a/base/common/src/com/netscape/certsrv/dbs/EDBException.java +++ b/base/common/src/com/netscape/certsrv/dbs/EDBException.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.base.EBaseException; /** * A class represents a database exception. * <P> - * + * * @version $Revision$, $Date$ */ public class EDBException extends EBaseException { @@ -39,7 +39,7 @@ public class EDBException extends EBaseException { /** * Constructs a database exception. * <P> - * + * * @param msgFormat message format */ public EDBException(String msgFormat) { @@ -49,7 +49,7 @@ public class EDBException extends EBaseException { /** * Constructs a database exception. * <P> - * + * * @param msgFormat message format * @param param parameter */ @@ -60,7 +60,7 @@ public class EDBException extends EBaseException { /** * Constructs a database exception. * <P> - * + * * @param msgFormat message format * @param e exception as parameter */ @@ -71,7 +71,7 @@ public class EDBException extends EBaseException { /** * Constructs a database exception. * <P> - * + * * @param msgFormat message format * @param params list of parameters */ diff --git a/base/common/src/com/netscape/certsrv/dbs/EDBNotAvailException.java b/base/common/src/com/netscape/certsrv/dbs/EDBNotAvailException.java index 6afb2dcc3..a7df8bac7 100644 --- a/base/common/src/com/netscape/certsrv/dbs/EDBNotAvailException.java +++ b/base/common/src/com/netscape/certsrv/dbs/EDBNotAvailException.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.dbs; /** * Indicates internal db is down. - * + * * @version $Revision$, $Date$ */ public class EDBNotAvailException extends EDBException { @@ -31,7 +31,7 @@ public class EDBNotAvailException extends EDBException { /** * Constructs a ldap server down exception with host & port info. - * + * * @param errorString Detailed error message. */ public EDBNotAvailException(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/dbs/EDBRecordNotFoundException.java b/base/common/src/com/netscape/certsrv/dbs/EDBRecordNotFoundException.java index dd3880c12..05b1085f0 100644 --- a/base/common/src/com/netscape/certsrv/dbs/EDBRecordNotFoundException.java +++ b/base/common/src/com/netscape/certsrv/dbs/EDBRecordNotFoundException.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.dbs; /** * Indicates internal db is down. - * + * * @version $Revision$, $Date$ */ public class EDBRecordNotFoundException extends EDBException { @@ -31,7 +31,7 @@ public class EDBRecordNotFoundException extends EDBException { /** * Constructs a ldap server down exception with host & port info. - * + * * @param errorString Detailed error message. */ public EDBRecordNotFoundException(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java b/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java index 27e15bd7d..a5a603ec3 100644 --- a/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java +++ b/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.base.EBaseException; * has knowledge on how to convert a db attribute into * zero or more LDAP attribute, and vice versa. * <P> - * + * * @version $Revision$, $Date$ */ public interface IDBAttrMapper { @@ -37,14 +37,14 @@ public interface IDBAttrMapper { * Retrieves a list of LDAP attributes that are used * in the mapper. By having this, the framework can * provide search on selective attributes. - * + * * @return a list of supported attribute names */ public Enumeration<String> getSupportedLDAPAttributeNames(); /** * Maps object attribute into LDAP attributes. - * + * * @param parent parent object where the object comes from * @param name name of db attribute * @param obj object itself @@ -58,7 +58,7 @@ public interface IDBAttrMapper { /** * Maps LDAP attributes into object, and puts the object * into 'parent'. - * + * * @param attrs LDAP attribute set * @param name name of db attribute to be processed * @param parent parent object where the object should be added @@ -69,7 +69,7 @@ public interface IDBAttrMapper { /** * Maps search filters into LDAP search filter. - * + * * @param name name of db attribute * @param op filte operation (i.e. "=", ">=") * @param value attribute value diff --git a/base/common/src/com/netscape/certsrv/dbs/IDBDynAttrMapper.java b/base/common/src/com/netscape/certsrv/dbs/IDBDynAttrMapper.java index 5684dd4d7..c1c8c3b39 100644 --- a/base/common/src/com/netscape/certsrv/dbs/IDBDynAttrMapper.java +++ b/base/common/src/com/netscape/certsrv/dbs/IDBDynAttrMapper.java @@ -6,7 +6,7 @@ package com.netscape.certsrv.dbs; * assigned db attribute into zero or more dynamically assigned LDAP * attributes, and vice versa. * <P> - * + * * @version $Revision$, $Date$ */ public interface IDBDynAttrMapper extends IDBAttrMapper { @@ -14,7 +14,7 @@ public interface IDBDynAttrMapper extends IDBAttrMapper { /** * Returns true if the LDAP attribute can be mapped by this * dynamic mapper. - * + * * @param attrName LDAP attribute name to check * @return a list of supported attribute names */ diff --git a/base/common/src/com/netscape/certsrv/dbs/IDBObj.java b/base/common/src/com/netscape/certsrv/dbs/IDBObj.java index 5c634beeb..f59fe2195 100644 --- a/base/common/src/com/netscape/certsrv/dbs/IDBObj.java +++ b/base/common/src/com/netscape/certsrv/dbs/IDBObj.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.base.IAttrSet; /** * An interface represents a database object * that is serializable. - * + * * @version $Revision$, $Date$ */ public interface IDBObj extends IAttrSet { @@ -34,7 +34,7 @@ public interface IDBObj extends IAttrSet { * names. This method should return the * attribute name even if there is no attribute * value for the attribute. - * + * * @return a list of serializable attribute names */ public Enumeration<String> getSerializableAttrNames(); diff --git a/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java b/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java index 241f3af9f..badf4d054 100644 --- a/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java +++ b/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java @@ -26,21 +26,21 @@ import com.netscape.certsrv.base.ISubsystem; * 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. - * + * * @version $Revision$, $Date$ */ public interface IDBRegistry extends ISubsystem { /** * Registers object class. - * + * * @param className java class to create for the object classes * @param ldapNames a list of LDAP object classes * @exception EDBException failed to register @@ -50,7 +50,7 @@ public interface IDBRegistry extends ISubsystem { /** * See if an object class is registered. - * + * * @param className java class to create * @return true if object class is registered already */ @@ -58,7 +58,7 @@ public interface IDBRegistry extends ISubsystem { /** * Registers attribute mapper. - * + * * @param ufName LDAP attribute name * @param mapper mapper to invoke for the attribute * @exception EDBException failed to register @@ -68,7 +68,7 @@ public interface IDBRegistry extends ISubsystem { /** * See if an attribute is registered. - * + * * @param ufName attribute name * @return true if attribute is registered already */ @@ -76,7 +76,7 @@ public interface IDBRegistry extends ISubsystem { /** * Registers a dynamic attribute mapper. - * + * * @param mapper The dynamic mapper to register */ public void registerDynamicMapper(IDBDynAttrMapper mapper); @@ -85,7 +85,7 @@ public interface IDBRegistry extends 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> @@ -107,7 +107,7 @@ public interface IDBRegistry extends ISubsystem { * <starval> ::= NULL | <value> '*' <starval> * <final> ::= NULL | <value> * </pre> - * + * * @param filter CMS-based filter * @return LDAP-based filter string * @exception EBaseException failed to convert filter @@ -117,7 +117,7 @@ public interface IDBRegistry extends ISubsystem { /** * Creates LDAP-based search filters with help of * registered mappers. - * + * * @param filter CMS-based filter * @param c filter converter * @return LDAP-based filter string @@ -128,7 +128,7 @@ public interface IDBRegistry extends ISubsystem { /** * Maps object into LDAP attribute set. - * + * * @param parent object's parent * @param name name of the object * @param obj object to be mapped @@ -141,7 +141,7 @@ public interface IDBRegistry extends ISubsystem { /** * Retrieves a list of LDAP attributes that are associated * with the given attributes. - * + * * @param attrs attributes * @return LDAP-based attributes * @exception EBaseException failed to map attributes @@ -151,7 +151,7 @@ public interface IDBRegistry extends ISubsystem { /** * Creates attribute set from object. - * + * * @param obj database object * @return LDAP attribute set * @exception EBaseException failed to create set @@ -161,7 +161,7 @@ public interface IDBRegistry extends ISubsystem { /** * Creates object from attribute set. - * + * * @param attrs LDAP attribute set * @return database object * @exception EBaseException failed to create object diff --git a/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java b/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java index c186d1145..a4c05f40a 100644 --- a/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java +++ b/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java @@ -25,36 +25,36 @@ import com.netscape.certsrv.base.ISubsystem; /** * An interface represents the database session. Operations * can be performed with a session. - * + * * Transaction and Caching support can be integrated * into session. - * + * * @version $Revision$, $Date$ */ public interface IDBSSession { /** * Returns database subsystem. - * + * * @return subsystem */ public ISubsystem getDBSubsystem(); /** * Closes this session. - * + * * @exception EDBException failed to close session */ public void close() throws EDBException; /** * Adds object to backend database. For example, - * + * * <PRE> * session.add("cn=123459,o=certificate repository,o=airius.com", * certRec); * </PRE> - * + * * @param name name of the object * @param obj object to be added * @exception EDBException failed to add object @@ -63,7 +63,7 @@ public interface IDBSSession { /** * Reads an object from the database. - * + * * @param name name of the object that is to be read * @return database object * @exception EBaseException failed to read object @@ -73,7 +73,7 @@ public interface IDBSSession { /** * Reads an object from the database, and only populates * the selected attributes. - * + * * @param name name of the object that is to be read * @param attrs selected attributes * @return database object @@ -84,7 +84,7 @@ public interface IDBSSession { /** * Deletes object from database. - * + * * @param name name of the object that is to be deleted * @exception EBaseException failed to delete object */ @@ -92,7 +92,7 @@ public interface IDBSSession { /** * Modify an object in the database. - * + * * @param name name of the object that is to be modified * @param mods modifications * @exception EBaseException failed to modify @@ -103,7 +103,7 @@ public interface IDBSSession { /** * Searchs for a list of objects that match the * filter. - * + * * @param base starting point of the search * @param filter search filter * @return search results @@ -115,7 +115,7 @@ public interface IDBSSession { /** * Searchs for a list of objects that match the * filter. - * + * * @param base starting point of the search * @param filter search filter * @param maxSize max number of entries @@ -128,7 +128,7 @@ public interface IDBSSession { /** * Searchs for a list of objects that match the * filter. - * + * * @param base starting point of the search * @param filter search filter * @param maxSize max number of entries @@ -142,7 +142,7 @@ public interface IDBSSession { /** * Retrieves a list of object that satifies the given * filter. - * + * * @param base starting point of the search * @param filter search filter * @param attrs selected attributes @@ -154,7 +154,7 @@ public interface IDBSSession { /** * Retrieves a list of objects. - * + * * @param base starting point of the search * @param filter search filter * @param attrs selected attributes @@ -167,7 +167,7 @@ public interface IDBSSession { /** * Sets persistent search to retrieve modified * certificate records. - * + * * @param base starting point of the search * @param filter search filter * @param attrs selected attributes @@ -181,7 +181,7 @@ public interface IDBSSession { /** * Retrieves a list of objects. - * + * * @param base starting point of the search * @param filter search filter * @param attrs selected attributes @@ -196,7 +196,7 @@ public interface IDBSSession { /** * Retrieves a list of objects. - * + * * @param base starting point of the search * @param filter search filter * @param attrs selected attributes diff --git a/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java b/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java index 04736cf32..dd5a41186 100644 --- a/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java +++ b/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java @@ -23,21 +23,21 @@ import java.util.Enumeration; * A class represents the search results. A search * results object contain a enumeration of * Java objects that are just read from the database. - * + * * @version $Revision$, $Date$ */ public interface IDBSearchResults extends Enumeration<Object> { /** * Checks if any element is available. - * + * * @return true if there is more elements */ public boolean hasMoreElements(); /** * Retrieves next element. - * + * * @return next element */ public Object nextElement(); diff --git a/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java b/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java index fec6e6afa..dfa5312e5 100644 --- a/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java +++ b/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java @@ -30,7 +30,7 @@ import com.netscape.certsrv.base.ISubsystem; * <P> * This interface separate the database subsystem functionalities from internal implementation. * <P> - * + * * @version $Revision$, $Date$ */ public interface IDBSubsystem extends ISubsystem { @@ -45,21 +45,21 @@ public interface IDBSubsystem extends ISubsystem { /** * Retrieves the base DN. - * + * * @return base DN of the subsystem */ public String getBaseDN(); /** * Retrieves the registry. - * + * * @return registry */ public IDBRegistry getRegistry(); /** * Creates a database session. - * + * * @return database session * @exception EDBException failed to create session */ @@ -67,14 +67,14 @@ public interface IDBSubsystem extends ISubsystem { /** * Avoids losing serial number. - * + * * @return true if serial number recovery option is enabled */ public boolean enableSerialNumberRecovery(); /** * Records next serial number in config file - * + * * @param serial next serial number * @exception EBaseException failed to set */ @@ -82,14 +82,14 @@ public interface IDBSubsystem extends ISubsystem { /** * Gets the next serial number in config file - * + * * @return next serial number */ public BigInteger getNextSerialConfig(); /** * Records maximum serial number limit in config file - * + * * @param serial max serial number * @param repo repo identifier * @exception EBaseException failed to set @@ -98,7 +98,7 @@ public interface IDBSubsystem extends ISubsystem { /** * Records minimum serial number limit in config file - * + * * @param serial min serial number * @param repo repo identifier * @exception EBaseException failed to set @@ -107,7 +107,7 @@ public interface IDBSubsystem extends ISubsystem { /** * Records maximum serial number limit for the next range in config file - * + * * @param serial max serial number * @param repo repo identifier * @exception EBaseException failed to set @@ -116,7 +116,7 @@ public interface IDBSubsystem extends ISubsystem { /** * Records minimum serial number limit for the next range in config file - * + * * @param serial min serial number * @param repo repo identifier * @exception EBaseException failed to set @@ -125,7 +125,7 @@ public interface IDBSubsystem extends ISubsystem { /** * Gets minimum serial number limit in config file - * + * * @param repo repo identifier * @return min serial number */ @@ -133,7 +133,7 @@ public interface IDBSubsystem extends ISubsystem { /** * Gets the maximum serial number limit in config file - * + * * @param repo repo identifier * @return max serial number */ @@ -141,7 +141,7 @@ public interface IDBSubsystem extends ISubsystem { /** * Gets the maximum serial number limit for next range in config file - * + * * @param repo repo identifier * @return max serial number */ @@ -149,7 +149,7 @@ public interface IDBSubsystem extends ISubsystem { /** * Gets minimum serial number limit for next range in config file - * + * * @param repo repo identifier * @return min serial number */ @@ -157,7 +157,7 @@ public interface IDBSubsystem extends ISubsystem { /** * Gets low water mark limit in config file - * + * * @param repo repo identifier * @return low water mark */ @@ -165,7 +165,7 @@ public interface IDBSubsystem extends ISubsystem { /** * Gets range increment limit for next range in config file - * + * * @param repo repo identifier * @return range increment */ @@ -173,7 +173,7 @@ public interface IDBSubsystem extends ISubsystem { /** * Gets number corresponding to start of next range from database - * + * * @param repo repo identifier * @return start of next range */ @@ -181,7 +181,7 @@ public interface IDBSubsystem extends ISubsystem { /** * Determines if a range conflict has been observed in database - * + * * @param repo repo identifier * @return true if range conflict, false otherwise */ @@ -189,7 +189,7 @@ public interface IDBSubsystem extends ISubsystem { /** * Determines if serial number management has been enabled - * + * * @return true if enabled, false otherwise */ public boolean getEnableSerialMgmt(); @@ -197,7 +197,7 @@ public interface IDBSubsystem extends ISubsystem { /** * Sets whether serial number management is enabled for certs * and requests. - * + * * @param value true/false * @exception EBaseException failed to set */ @@ -205,7 +205,7 @@ public interface IDBSubsystem extends ISubsystem { /** * Returns LDAP connection to connection pool. - * + * * @param conn connection to be returned */ public void returnConn(LDAPConnection conn); diff --git a/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java b/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java index 919a82efb..23b73fe60 100644 --- a/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java +++ b/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.base.EBaseException; /** * A interface represents a virtual list of search results. * Note that this class must be used with DS4.0. - * + * * @version $Revision$, $Date$ */ public interface IDBVirtualList<E> { @@ -33,14 +33,14 @@ public interface IDBVirtualList<E> { * that is three times as large as the number of visible entries. * That way, you can scroll up/down several items(up to a page-full) * without refetching entries from the directory. - * + * * @param size the page size */ public void setPageSize(int size); /** * Sets the sort key - * + * * @param sortKey the attribute to sort by * @exception EBaseException failed to set */ @@ -48,7 +48,7 @@ public interface IDBVirtualList<E> { /** * Sets the sort key - * + * * @param sortKeys the attributes to sort by * @exception EBaseException failed to set */ @@ -58,14 +58,14 @@ public interface IDBVirtualList<E> { * Retrieves the size of this virtual list. * Recommend to call getSize() before getElementAt() or getElements() * since you'd better check if the index is out of bound first. - * + * * @return current size in list */ public int getSize(); /** * Returns current index. - * + * * @return current index */ @@ -80,7 +80,7 @@ public interface IDBVirtualList<E> { * some preceding entries) * Recommend to call getSize() before getElementAt() or getElements() * since you'd better check if the index is out of bound first. - * + * * @param first the index of the first entry of the page you want to fetch */ public boolean getPage(int first); @@ -92,7 +92,7 @@ public interface IDBVirtualList<E> { * of an entry. * If no entries match, the one just before(or after, if none before) * will be returned as mSelectedIndex - * + * * @param text the prefix of the first entry of the page you want to fetch */ public boolean getPage(String text); @@ -103,14 +103,14 @@ public interface IDBVirtualList<E> { * since you'd better check if the index is out of bound first. * If the index is out of range of the virtual list, an exception * will be thrown and return null - * + * * @param index the index of the element to fetch */ public E getElementAt(int index); /** * Retrieves and jumps to element in the given position. - * + * * @param i position * @return object */ @@ -119,7 +119,7 @@ public interface IDBVirtualList<E> { /** * Processes elements as soon as it arrives. It is * more memory-efficient. - * + * * @param startidx starting index * @param endidx ending index * @param ep object to call @@ -130,14 +130,14 @@ public interface IDBVirtualList<E> { /** * Gets the virutal selected index - * + * * @return selected index */ public int getSelectedIndex(); /** * Gets the top of the buffer - * + * * @return first index */ public int getFirstIndex(); diff --git a/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java b/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java index 648a13aef..25388b15f 100644 --- a/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java +++ b/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java @@ -21,14 +21,14 @@ import com.netscape.certsrv.base.EBaseException; /** * Processor handles object read from the session. - * + * * @version $Revision$, $Date$ */ public interface IElementProcessor { /** * Handles object - * + * * @param o object to be processed * @exception EBaseException failed to process object */ diff --git a/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java b/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java index 2c0ccb89f..c78cbebef 100644 --- a/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java +++ b/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java @@ -22,7 +22,7 @@ package com.netscape.certsrv.dbs; * that understands how to convert a attribute * type from one defintion to another. * For example, - * + * * <PRE> * (1) database layer need to convert * registered attribute type to ldap attribute @@ -31,14 +31,14 @@ package com.netscape.certsrv.dbs; * locale specific attribute type to registered * attribute type. * </PRE> - * + * * @version $Revision$, $Date$ */ public interface IFilterConverter { /** * Converts attribute into LDAP attribute. - * + * * @param attr attribute name * @param op attribute operation * @param value attribute value diff --git a/base/common/src/com/netscape/certsrv/dbs/Modification.java b/base/common/src/com/netscape/certsrv/dbs/Modification.java index 6c61bdb1f..685917cff 100644 --- a/base/common/src/com/netscape/certsrv/dbs/Modification.java +++ b/base/common/src/com/netscape/certsrv/dbs/Modification.java @@ -21,7 +21,7 @@ package com.netscape.certsrv.dbs; * A class represents a modification. This is used by the * database (dbs) framework for modification operations. * It specifices the modification type and values. - * + * * @version $Revision$, $Date$ */ public class Modification { @@ -47,7 +47,7 @@ public class Modification { /** * Constructs a role modification. - * + * * @param name attribute name * @param op attribute operation (i.e. MOD_ADD, MOD_DELETE, or MOD_REPLACE) * @param value attribute value @@ -60,7 +60,7 @@ public class Modification { /** * Retrieves attribute name. - * + * * @return attribute name */ public String getName() { @@ -69,7 +69,7 @@ public class Modification { /** * Retrieves modification operation type. - * + * * @return modification type */ public int getOp() { @@ -78,7 +78,7 @@ public class Modification { /** * Retrieves attribute value. - * + * * @return attribute value */ public Object getValue() { diff --git a/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java b/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java index 70e9b377d..1f4a5133b 100644 --- a/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java +++ b/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java @@ -23,7 +23,7 @@ import java.util.Vector; /** * A class represents a modification set. A modification * set contains zero or more modifications. - * + * * @version $Revision$, $Date$ */ public class ModificationSet { @@ -41,7 +41,7 @@ public class ModificationSet { /** * Adds modification to this set. - * + * * @param name attribute name * @param op modification operation * @param value attribute value @@ -52,7 +52,7 @@ public class ModificationSet { /** * Retrieves a list of modifications. - * + * * @return a list of Modifications */ public Enumeration<Modification> getModifications() { diff --git a/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java b/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java index d05c9ed5f..76101d9b7 100644 --- a/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java +++ b/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.dbs.IDBObj; /** * An interface contains constants for certificate record. - * + * * @version $Revision$, $Date$ */ public interface ICertRecord extends IDBObj { @@ -99,77 +99,77 @@ public interface ICertRecord extends IDBObj { /** * Retrieves serial number from stored certificate. - * + * * @return certificate serial number */ public BigInteger getCertificateSerialNumber(); /** * Retrieves serial number from certificate record. - * + * * @return certificate serial number */ public BigInteger getSerialNumber(); /** * Retrieves certificate from certificate record. - * + * * @return certificate */ public X509CertImpl getCertificate(); /** * Retrieves name of who issued this certificate. - * + * * @return name of who issued this certificate */ public String getIssuedBy(); /** * Retrieves name of who revoked this certificate. - * + * * @return name of who revoked this certificate */ public String getRevokedBy(); /** * Retrieves date when this certificate was revoked. - * + * * @return date when this certificate was revoked */ public Date getRevokedOn(); /** * Retrieves meta info. - * + * * @return meta info */ public MetaInfo getMetaInfo(); /** * Retrieves certificate status. - * + * * @return certificate status */ public String getStatus(); /** * Retrieves time of creation of this certificate record. - * + * * @return time of creation of this certificate record */ public Date getCreateTime(); /** * Retrieves time of modification of this certificate record. - * + * * @return time of modification of this certificate record */ public Date getModifyTime(); /** * Retrieves revocation info. - * + * * @return revocation info */ public IRevocationInfo getRevocationInfo(); diff --git a/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java b/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java index 59a826ee2..152ec98ad 100644 --- a/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java +++ b/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java @@ -25,42 +25,42 @@ import com.netscape.certsrv.dbs.IElementProcessor; /** * A class represents a list of certificate records. * <P> - * + * * @version $Revision$, $Date$ */ public interface ICertRecordList { /** * Gets the current index. - * + * * @return current index */ public int getCurrentIndex(); /** * Retrieves the size of request list. - * + * * @return size */ public int getSize(); /** * Gets size before jump to index. - * + * * @return size */ public int getSizeBeforeJumpTo(); /** * Gets size after jump to index. - * + * * @return size */ public int getSizeAfterJumpTo(); /** * Process certificate record as soon as it is returned. - * + * * @param startidx starting index * @param endidx ending index * @param ep element processor @@ -73,7 +73,7 @@ public interface ICertRecordList { * Retrieves requests. * It's no good to call this if you didnt check * if the startidx, endidx are valid. - * + * * @param startidx starting index * @param endidx ending index * @exception EBaseException failed to retrieve @@ -84,7 +84,7 @@ public interface ICertRecordList { /** * Gets one single record at a time similar to * processCertRecords but no extra class needed. - * + * * @param index position of the record to be retrieved * @return object * @exception EBaseException failed to retrieve diff --git a/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java b/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java index a8505c2a2..d44280237 100644 --- a/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java +++ b/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java @@ -37,7 +37,7 @@ import com.netscape.cmscore.dbs.CertificateRepository.RenewableCertificateCollec * An interface represents a CMS certificate repository. * It stores all the issued certificate. * <P> - * + * * @version $Revision$, $Date$ */ public interface ICertificateRepository extends IRepository { @@ -47,7 +47,7 @@ public interface ICertificateRepository extends IRepository { * record contains four parts: certificate, meta-attributes, * issue information and reovcation information. * <P> - * + * * @param record X.509 certificate * @exception EBaseException failed to add new certificate to * the repository @@ -57,7 +57,7 @@ public interface ICertificateRepository extends IRepository { /** * Reads the certificate identified by the given serial no. - * + * * @param serialNo serial number of certificate * @return certificate * @exception EBaseException failed to retrieve certificate @@ -67,7 +67,7 @@ public interface ICertificateRepository extends IRepository { /** * Reads certificate from repository. - * + * * @param serialNo serial number of certificate * @return certificate record * @exception EBaseException failed to retrieve certificate @@ -77,7 +77,7 @@ public interface ICertificateRepository extends IRepository { /** * Sets certificate status update internal - * + * * @param requestRepo request repository * @param interval update interval * @param listenToCloneModifications enable listening to clone modifications @@ -88,14 +88,14 @@ public interface ICertificateRepository extends IRepository { /** * Updates certificate status now. This is a blocking method. - * + * * @exception EBaseException failed to update */ public void updateCertStatus() throws EBaseException; /** * Modifies certificate record. - * + * * @param serialNo serial number of record * @param mods modifications * @exception EBaseException failed to modify @@ -105,7 +105,7 @@ public interface ICertificateRepository extends IRepository { /** * Checks if the certificate exists in this repository. - * + * * @param serialNo serial number of certificate * @return true if it exists * @exception EBaseException failed to check @@ -115,7 +115,7 @@ public interface ICertificateRepository extends IRepository { /** * Deletes certificate from this repository. - * + * * @param serialNo serial number of certificate * @exception EBaseException failed to delete */ @@ -124,7 +124,7 @@ public interface ICertificateRepository extends IRepository { /** * Marks certificate as revoked. - * + * * @param id serial number * @param info revocation information * @exception EBaseException failed to mark @@ -134,7 +134,7 @@ public interface ICertificateRepository extends IRepository { /** * Updates certificate status. - * + * * @param id serial number * @param status certificate status * @exception EBaseException failed to update status @@ -144,7 +144,7 @@ public interface ICertificateRepository extends IRepository { /** * Marks certificate as renewable. - * + * * @param record certificate record to modify * @exception EBaseException failed to update */ @@ -153,7 +153,7 @@ public interface ICertificateRepository extends IRepository { /** * Marks certificate as not renewable. - * + * * @param record certificate record to modify * @exception EBaseException failed to update */ @@ -162,7 +162,7 @@ public interface ICertificateRepository extends IRepository { /** * Marks certificate as renewed. - * + * * @param serialNo certificate record to modify * @exception EBaseException failed to update */ @@ -171,7 +171,7 @@ public interface ICertificateRepository extends IRepository { /** * Marks certificate as renewed and notified. - * + * * @param serialNo certificate record to modify * @exception EBaseException failed to update */ @@ -183,7 +183,7 @@ public interface ICertificateRepository extends IRepository { * the filter. * Here is a list of filter * attribute can be used: - * + * * <pre> * certRecordId * certMetaInfo @@ -194,14 +194,14 @@ public interface ICertificateRepository extends IRepository { * x509Cert.notAfter * x509Cert.subject * </pre> - * + * * The filter should follow RFC1558 LDAP filter syntax. * For example, - * + * * <pre> * (&(certRecordId=5)(x509Cert.notBefore=934398398)) * </pre> - * + * * @param filter search filter * @param maxSize max size to return * @return a list of certificates @@ -213,7 +213,7 @@ public interface ICertificateRepository extends IRepository { /** * Finds a list of certificate records that satisifies * the filter. - * + * * @param filter search filter * @param maxSize max size to return * @param timeLimit timeout value @@ -226,7 +226,7 @@ public interface ICertificateRepository extends IRepository { /** * Finds a list of certificate records that satisifies * the filter. - * + * * @param filter search filter * @param attrs selected attribute * @param pageSize page size @@ -239,7 +239,7 @@ public interface ICertificateRepository extends IRepository { /** * Finds a list of certificate records that satisifies * the filter. - * + * * @param filter search filter * @param attrs selected attribute * @param sortKey key to use for sorting the returned elements @@ -254,7 +254,7 @@ public interface ICertificateRepository extends IRepository { /** * Finds a list of certificate records that satisifies * the filter. - * + * * @param filter search filter * @param attrs selected attribute * @param jumpTo jump to index @@ -274,7 +274,7 @@ public interface ICertificateRepository extends IRepository { /** * Finds a list of certificate records that satisifies * the filter. - * + * * @param filter search filter * @param attrs selected attribute * @param jumpTo jump to index @@ -294,7 +294,7 @@ public interface ICertificateRepository extends IRepository { /** * Gets all valid and unexpired certificates pertaining * to a subject DN. - * + * * @param subjectDN The distinguished name of the subject. * @param validityType The type of certificatese to retrieve. * @return An array of certificates. @@ -305,7 +305,7 @@ public interface ICertificateRepository extends IRepository { /** * Retrieves all the revoked certificates that have not expired. - * + * * @param asOfDate as of date * @return a list of revoked certificates * @exception EBaseException failed to retrieve @@ -316,7 +316,7 @@ public interface ICertificateRepository extends IRepository { /** * Retrieves all revoked certificates including ones that have expired * or that are not yet valid. - * + * * @return a list of revoked certificates * @exception EBaseException failed to search */ @@ -325,7 +325,7 @@ public interface ICertificateRepository extends IRepository { /** * Retrieves all revoked but not expired certificates. - * + * * @return a list of revoked certificates * @exception EBaseException failed to search */ @@ -334,7 +334,7 @@ public interface ICertificateRepository extends IRepository { /** * Finds all certificates given a filter. - * + * * @param filter search filter * @return a list of certificates * @exception EBaseException failed to search @@ -344,7 +344,7 @@ public interface ICertificateRepository extends IRepository { /** * Finds all certificate records given a filter. - * + * * @param filter search filter * @return a list of certificates * @exception EBaseException failed to search @@ -355,7 +355,7 @@ public interface ICertificateRepository extends IRepository { /** * Gets Revoked certs orderes by noAfter date, jumps to records * where notAfter date is greater than current. - * + * * @param date reference date * @param pageSize page size * @return a list of certificate records @@ -367,7 +367,7 @@ public interface ICertificateRepository extends IRepository { /** * Gets Invalid certs orderes by noAfter date, jumps to records * where notAfter date is greater than current. - * + * * @param date reference date * @param pageSize page size * @return a list of certificate records @@ -379,7 +379,7 @@ public interface ICertificateRepository extends IRepository { /** * Gets valid certs orderes by noAfter date, jumps to records * where notAfter date is greater than current. - * + * * @param date reference date * @param pageSize page size * @return a list of certificate records @@ -390,7 +390,7 @@ public interface ICertificateRepository extends IRepository { /** * Creates certificate record. - * + * * @param id serial number * @param cert certificate * @param meta meta information @@ -401,7 +401,7 @@ public interface ICertificateRepository extends IRepository { /** * Finds certificate records. - * + * * @param filter search filter * @return a list of certificate records * @exception EBaseException failed to retrieve cert records @@ -411,7 +411,7 @@ public interface ICertificateRepository extends IRepository { /** * Retrieves renewable certificates. - * + * * @param renewalTime renewal time * @return certificates * @exception EBaseException failed to retrieve @@ -421,7 +421,7 @@ public interface ICertificateRepository extends IRepository { /** * Unmark a revoked certificates. - * + * * @param id serial number * @param info revocation information * @param revokedOn revocation date @@ -434,7 +434,7 @@ public interface ICertificateRepository extends IRepository { /** * Retrieves valid and not published certificates. - * + * * @param from starting serial number * @param to ending serial number * @return a list of certificates @@ -445,7 +445,7 @@ public interface ICertificateRepository extends IRepository { /** * Retrieves expired and published certificates. - * + * * @param from starting serial number * @param to ending serial number * @return a list of certificates @@ -456,7 +456,7 @@ public interface ICertificateRepository extends IRepository { /** * Retrieves revoked and published certificates. - * + * * @param from starting serial number * @param to ending serial number * @return a list of certificates @@ -467,7 +467,7 @@ public interface ICertificateRepository extends IRepository { /** * Retrieves valid certificates. - * + * * @param from starting serial number * @param to ending serial number * @return a list of certificates @@ -478,7 +478,7 @@ public interface ICertificateRepository extends IRepository { /** * Retrieves expired certificates. - * + * * @param from starting serial number * @param to ending serial number * @return a list of certificates @@ -489,7 +489,7 @@ public interface ICertificateRepository extends IRepository { /** * Retrieves revoked certificates. - * + * * @param from starting serial number * @param to ending serial number * @return a list of certificates @@ -500,14 +500,14 @@ public interface ICertificateRepository extends IRepository { /** * Retrieves modified certificate records. - * + * * @param entry LDAPEntry with modified data */ public void getModifications(LDAPEntry entry); /** * Removes certificate records with this repository. - * + * * @param beginS BigInteger with radix 16 * @param endS BigInteger with radix 16 */ diff --git a/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java b/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java index fb773576c..b24e6ca17 100644 --- a/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java +++ b/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java @@ -26,21 +26,21 @@ import netscape.security.x509.CRLExtensions; * object is written as an attribute of certificate record * which essentially signifies a revocation act. * <P> - * + * * @version $Revision$, $Date$ */ public interface IRevocationInfo { /** * Retrieves revocation date. - * + * * @return revocation date */ public Date getRevocationDate(); /** * Retrieves CRL entry extensions. - * + * * @return CRL entry extensions */ public CRLExtensions getCRLEntryExtensions(); diff --git a/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java b/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java index b990bbf57..26fd076fa 100644 --- a/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java +++ b/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.dbs.IDBObj; /** * An interface that defines abilities of * a CRL issuing point record. - * + * * @version $Revision$, $Date$ */ public interface ICRLIssuingPointRecord extends IDBObj { @@ -54,84 +54,84 @@ public interface ICRLIssuingPointRecord extends IDBObj { /** * Retrieve unique CRL identifier. - * + * * @return unique CRL identifier */ public String getId(); /** * Retrieves current CRL number out of CRL issuing point record. - * + * * @return current CRL number */ public BigInteger getCRLNumber(); /** * Retrieves CRL size measured by the number of entries. - * + * * @return CRL size */ public Long getCRLSize(); /** * Retrieves this update time. - * + * * @return time of this update */ public Date getThisUpdate(); /** * Retrieves next update time. - * + * * @return time of next update */ public Date getNextUpdate(); /** * Retrieves current delta CRL number out of CRL issuing point record. - * + * * @return current delta CRL number */ public BigInteger getDeltaCRLNumber(); /** * Retrieves delta CRL size measured by the number of entries. - * + * * @return delta CRL size */ public Long getDeltaCRLSize(); /** * Retrieve Retrieve reference to the first unsaved data. - * + * * @return reference to the first unsaved data */ public String getFirstUnsaved(); /** * Retrieves encoded CRL. - * + * * @return encoded CRL */ public byte[] getCRL(); /** * Retrieves encoded delta CRL. - * + * * @return encoded delta CRL */ public byte[] getDeltaCRL(); /** * Retrieves encoded CA certificate. - * + * * @return encoded CA certificate */ public byte[] getCACert(); /** * Retrieves cache information about CRL. - * + * * @return list of recently revoked certificates */ public Hashtable<BigInteger, RevokedCertificate> getCRLCacheNoClone(); @@ -140,21 +140,21 @@ public interface ICRLIssuingPointRecord extends IDBObj { /** * Retrieves cache information about revoked certificates. - * + * * @return list of recently revoked certificates */ public Hashtable<BigInteger, RevokedCertificate> getRevokedCerts(); /** * Retrieves cache information about certificates released from hold. - * + * * @return list of certificates recently released from hold */ public Hashtable<BigInteger, RevokedCertificate> getUnrevokedCerts(); /** * Retrieves cache information about expired certificates. - * + * * @return list of recently expired certificates */ public Hashtable<BigInteger, RevokedCertificate> getExpiredCerts(); diff --git a/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java b/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java index 806a2cb19..56cbe74d0 100644 --- a/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java +++ b/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java @@ -30,14 +30,14 @@ import com.netscape.certsrv.dbs.ModificationSet; /** * An interface represents a CMS CRL repository. It stores * all the CRL issuing points. - * + * * @version $Revision$, $Date$ */ public interface ICRLRepository { /** * Adds CRL issuing point record. - * + * * @param rec issuing point record * @exception EBaseException failed to add new issuing point record */ @@ -46,7 +46,7 @@ public interface ICRLRepository { /** * Retrieves all the issuing points' names. - * + * * @return A list of issuing points' names. * @exception EBaseException failed to retrieve all the issuing points' names. */ @@ -54,7 +54,7 @@ public interface ICRLRepository { /** * Reads issuing point record. - * + * * @return issuing point record * @exception EBaseException failed to read issuing point record */ @@ -63,7 +63,7 @@ public interface ICRLRepository { /** * Deletes issuing point record. - * + * * @param id issuing point record id * @exception EBaseException failed to delete issuing point record */ @@ -72,7 +72,7 @@ public interface ICRLRepository { /** * Modifies issuing point record. - * + * * @param id issuing point record id * @param mods set of modifications * @exception EBaseException failed to modify issuing point record @@ -82,7 +82,7 @@ public interface ICRLRepository { /** * Updates CRL issuing point record. - * + * * @param id issuing point record id * @param newCRL encoded binary CRL * @param thisUpdate time of this update @@ -97,7 +97,7 @@ public interface ICRLRepository { /** * Updates CRL issuing point record. - * + * * @param id issuing point record id * @param newCRL encoded binary CRL * @param thisUpdate time of this update @@ -118,7 +118,7 @@ public interface ICRLRepository { /** * Updates CRL issuing point record. - * + * * @param id issuing point record id * @param revokedCerts list of revoked certificates * @param unrevokedCerts list of released from hold certificates @@ -129,7 +129,7 @@ public interface ICRLRepository { /** * Updates CRL issuing point record. - * + * * @param id issuing point record id * @param expiredCerts list of expired certificates * @exception EBaseException failed to update issuing point record @@ -139,7 +139,7 @@ public interface ICRLRepository { /** * Updates CRL issuing point record. - * + * * @param id issuing point record id * @param crlSize CRL size * @param revokedCerts list of revoked certificates @@ -155,7 +155,7 @@ public interface ICRLRepository { /** * Updates CRL issuing point record with delta-CRL. - * + * * @param id issuing point record id * @param deltaCRLNumber delta CRL number * @param deltaCRLSize delta CRL size @@ -171,7 +171,7 @@ public interface ICRLRepository { /** * Updates CRL issuing point record with reference to the first * unsaved data. - * + * * @param id issuing point record id * @param firstUnsaved reference to the first unsaved data * @exception EBaseException failed to update issuing point record diff --git a/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java b/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java index 6a02c612d..d1eb05f3d 100644 --- a/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java +++ b/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java @@ -25,7 +25,7 @@ import com.netscape.certsrv.base.EBaseException; /** * An interface contains constants for key record. - * + * * @version $Revision$, $Date$ */ public interface IKeyRecord { @@ -53,7 +53,7 @@ public interface IKeyRecord { /** * Retrieves the state of the key. - * + * * @return key state * @exception EBaseException failed to retrieve state of the key */ @@ -61,7 +61,7 @@ public interface IKeyRecord { /** * Retrieves key identifier. - * + * * @return key id * @exception EBaseException failed to retrieve key id */ @@ -69,7 +69,7 @@ public interface IKeyRecord { /** * Retrieves key owner name. - * + * * @return key owner name * @exception EBaseException failed to retrieve key owner name */ @@ -77,14 +77,14 @@ public interface IKeyRecord { /** * Retrieves key algorithm. - * + * * @return key algorithm */ public String getAlgorithm(); /** * Retrieves key length. - * + * * @return key length * @exception EBaseException failed to retrieve key length */ @@ -123,7 +123,7 @@ public interface IKeyRecord { /** * Retrieves archiver identifier. - * + * * @return archiver uid */ @@ -131,21 +131,21 @@ public interface IKeyRecord { /** * Retrieves creation time. - * + * * @return creation time */ public Date getCreateTime(); /** * Retrieves last modification time. - * + * * @return modification time */ public Date getModifyTime(); /** * Retrieves dates of recovery. - * + * * @return recovery history * @exception EBaseException failed to retrieve recovery history */ @@ -153,7 +153,7 @@ public interface IKeyRecord { /** * Retrieves public key data. - * + * * @return public key data * @exception EBaseException failed to retrieve public key data */ diff --git a/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java b/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java index 75f833892..d55fa2a98 100644 --- a/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java +++ b/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java @@ -24,21 +24,21 @@ import com.netscape.certsrv.base.EBaseException; /** * A class represents a list of key records. * <P> - * + * * @version $Revision$, $Date$ */ public interface IKeyRecordList { /** * Retrieves the size of key list. - * + * * @return size of key list */ public int getSize(); /** * Retrieves key records. - * + * * @param startidx start index * @param endidx end index * @return key records diff --git a/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java b/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java index 627844286..523642aa3 100644 --- a/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java +++ b/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java @@ -31,7 +31,7 @@ import com.netscape.certsrv.dbs.repository.IRepository; * An interface represents a Key repository. This is the * container of archived keys. * <P> - * + * * @version $Revision$, $Date$ */ public interface IKeyRepository extends IRepository { @@ -39,7 +39,7 @@ public interface IKeyRepository extends IRepository { /** * Archives a key to the repository. * <P> - * + * * @param record key record * @exception EBaseException failed to archive key */ @@ -48,7 +48,7 @@ public interface IKeyRepository extends IRepository { /** * Reads an archived key by serial number. * <P> - * + * * @param serialNo serial number * @return key record * @exception EBaseException failed to recover key @@ -59,7 +59,7 @@ public interface IKeyRepository extends IRepository { /** * Reads an archived key by b64 encoded cert. * <P> - * + * * @param cert b64 encoded cert * @return key record * @exception EBaseException failed to recover key @@ -70,7 +70,7 @@ public interface IKeyRepository extends IRepository { /** * Reads an archived key by owner name. * <P> - * + * * @param ownerName owner name * @return key record * @exception EBaseException failed to recover key @@ -80,7 +80,7 @@ public interface IKeyRepository extends IRepository { /** * Reads archived key using public key. - * + * * @param publicKey public key that is corresponding * to the private key * @return key record @@ -91,7 +91,7 @@ public interface IKeyRepository extends IRepository { /** * Searches for private keys. - * + * * @param filter LDAP filter for the search * @param maxSize maximium number of entries to be returned * @return a list of private key records @@ -102,7 +102,7 @@ public interface IKeyRepository extends IRepository { /** * Searches for private keys. - * + * * @param filter LDAP filter for the search * @param maxSize maximium number of entries to be returned * @param timeLimt timeout value @@ -114,7 +114,7 @@ public interface IKeyRepository extends IRepository { /** * Deletes a key record. - * + * * @param serialno key identifier * @exception EBaseException failed to delete key record */ @@ -123,7 +123,7 @@ public interface IKeyRepository extends IRepository { /** * Modifies key record in this repository. - * + * * @param serialNo key identifier * @param mods modification of key records * @exception EBaseException failed to modify key record @@ -134,7 +134,7 @@ public interface IKeyRepository extends IRepository { /** * Searchs for a list of key records. * Here is a list of supported filter attributes: - * + * * <pre> * keySerialNumber * keyState @@ -148,7 +148,7 @@ public interface IKeyRepository extends IRepository { * keyModifyTime * keyMetaInfo * </pre> - * + * * @param filter search filter * @param attrs list of attributes to be returned * @param pageSize virtual list page size @@ -160,7 +160,7 @@ public interface IKeyRepository extends IRepository { /** * Searchs for a list of key records. - * + * * @param filter search filter * @param attrs list of attributes to be returned * @param sortKey name of attribute that the list should be sorted by diff --git a/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java b/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java index fa8a0d768..0a81698eb 100644 --- a/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java +++ b/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java @@ -23,7 +23,7 @@ import java.io.Serializable; * A class represents key state. This object is to * encapsulate the life cycle of a key. * <P> - * + * * @version $Revision$, $Date$ */ public final class KeyState implements Serializable { @@ -50,7 +50,7 @@ public final class KeyState implements Serializable { /** * Checks if the given object equals to this object. - * + * * @param other object to be compared * @return true if both objects are the same */ @@ -65,7 +65,7 @@ public final class KeyState implements Serializable { /** * Returns the hash code. - * + * * @return hash code */ public int hashCode() { @@ -74,7 +74,7 @@ public final class KeyState implements Serializable { /** * Return the string-representation of this object. - * + * * @return string value */ public String toString() { @@ -90,7 +90,7 @@ public final class KeyState implements Serializable { /** * Converts a string into a key state object. - * + * * @param state state in string-representation * @return key state object */ diff --git a/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java b/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java index 574adfae9..80ca18b08 100644 --- a/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java +++ b/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java @@ -23,7 +23,7 @@ import com.netscape.certsrv.dbs.repository.IRepository; * An interface represents a ReplicaID Repository. * It provides unique managed replica IDs. * <P> - * + * * @version $Revision$, $Date$ */ public interface IReplicaIDRepository extends IRepository { diff --git a/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java b/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java index 943d4a686..39744ac9b 100644 --- a/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java +++ b/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java @@ -25,7 +25,7 @@ import com.netscape.certsrv.base.EBaseException; * An interface represents a generic repository. It maintains unique * serial number within repository. * <P> - * + * * @version $Revision$, $Date$ */ public interface IRepository { @@ -33,7 +33,7 @@ public interface IRepository { /** * Retrieves the next serial number, and also increase the * serial number by one. - * + * * @return serial number * @exception EBaseException failed to retrieve next serial number */ @@ -46,7 +46,7 @@ public interface IRepository { /** * Retrieves the next serial number without increasing the serial number. - * + * * @return serial number * @exception EBaseException failed to retrieve next serial number */ @@ -54,7 +54,7 @@ public interface IRepository { /** * Set the maximum serial number. - * + * * @param serial maximum number * @exception EBaseException failed to set maximum serial number */ @@ -62,7 +62,7 @@ public interface IRepository { /** * Set the maximum serial number in next range. - * + * * @param serial maximum number * @exception EBaseException failed to set maximum serial number in next range */ @@ -71,7 +71,7 @@ public interface 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; @@ -79,7 +79,7 @@ public interface 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/certsrv/dbs/repository/IRepositoryRecord.java b/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java index c46e8419c..12dc71c46 100644 --- a/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java +++ b/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java @@ -25,7 +25,7 @@ import com.netscape.certsrv.dbs.IDBObj; * An interface represents a generic repository record. * It maintains unique serial number within repository. * <P> - * + * * @version $Revision$, $Date$ */ public interface IRepositoryRecord extends IDBObj { @@ -35,7 +35,7 @@ public interface IRepositoryRecord extends IDBObj { /** * Retrieves serial number. - * + * * @return serial number */ public BigInteger getSerialNumber(); diff --git a/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java b/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java index 31f8b8c2f..1becee85e 100644 --- a/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java +++ b/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.authentication.IAuthToken; * generally used for access control expression evaluation, however, it * can be used for other evaluation-related operations. * <P> - * + * * @version $Revision$, $Date$ */ public interface IAccessEvaluator { @@ -39,14 +39,14 @@ public interface IAccessEvaluator { /** * Gets the type of the evaluator. Type is defined by each * evaluator plugin. Each evaluator plugin should have a unique type. - * + * * @return type of the evaluator */ public String getType(); /** * Gets the description of the evaluator - * + * * @return a text description for this evaluator */ public String getDescription(); @@ -54,7 +54,7 @@ public interface IAccessEvaluator { /** * Evaluates if the given value satisfies the access * control in current context. - * + * * @param type Type of the evaluator, eg, user, group etc * @param op Operator of the evaluator, eg, =, != * @param value Part of the expression that can be used to @@ -68,7 +68,7 @@ public interface IAccessEvaluator { /** * Evaluates if the given value satisfies the access * control in authToken obtained from Authentication. - * + * * @param authToken Authentication token * @param type Type of the evaluator, eg, user, group etc * @param op Operator of the evaluator, eg, =, != @@ -82,7 +82,7 @@ public interface IAccessEvaluator { /** * Get the supported operators for this evaluator - * + * * @return Supported operators in string array */ public String[] getSupportedOperators(); diff --git a/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java b/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java index 40fe80f99..5374a466a 100644 --- a/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java +++ b/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java @@ -21,7 +21,7 @@ import com.netscape.certsrv.base.EBaseException; /** * This represents the extensions exception. - * + * * @version $Revision$, $Date$ */ public class EExtensionsException extends EBaseException { diff --git a/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java b/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java index ca1e4545a..411509caf 100644 --- a/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java +++ b/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java @@ -21,7 +21,7 @@ import java.util.ListResourceBundle; /** * This represents the resources for extensions. - * + * * @version $Revision$, $Date$ */ public class ExtensionsResources extends ListResourceBundle { diff --git a/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java b/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java index 04086adcf..ef2b1acbf 100644 --- a/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java +++ b/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.base.ISubsystem; /** * CMS extension interface, for creating extensions from http input and * displaying extensions to html forms. - * + * * @version $Revision$, $Date$ */ public interface ICMSExtension { @@ -44,7 +44,7 @@ public interface ICMSExtension { /** * Get name of this extension. - * + * * @return the name of this CMS extension, for */ public String getName(); @@ -56,7 +56,7 @@ public interface ICMSExtension { /** * Get an instance of the extension given http input. - * + * * @return an instance of the extension. */ public Extension getExtension(IArgBlock argblock) @@ -65,7 +65,7 @@ public interface ICMSExtension { /** * Get Javascript name value pairs to put into the request processing * template. - * + * * @return name value pairs */ public IArgBlock getFormParams(Extension extension) diff --git a/base/common/src/com/netscape/certsrv/jobs/EJobsException.java b/base/common/src/com/netscape/certsrv/jobs/EJobsException.java index cc0923ae7..38b9db6b9 100644 --- a/base/common/src/com/netscape/certsrv/jobs/EJobsException.java +++ b/base/common/src/com/netscape/certsrv/jobs/EJobsException.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.base.EBaseException; /** * A class represents a jobs exception. * <P> - * + * * @version $Revision$, $Date$ */ public class EJobsException extends EBaseException { diff --git a/base/common/src/com/netscape/certsrv/jobs/IJob.java b/base/common/src/com/netscape/certsrv/jobs/IJob.java index 5584d68ff..097e2fa64 100644 --- a/base/common/src/com/netscape/certsrv/jobs/IJob.java +++ b/base/common/src/com/netscape/certsrv/jobs/IJob.java @@ -24,14 +24,14 @@ import com.netscape.certsrv.base.ISubsystem; /** * An interface to be implemented from for a job to be scheduled by * the Jobs Scheduler. - * + * * @version $Revision$, $Date$ */ public interface IJob { /** * Initialize from the configuration file. - * + * * @param id String name of this instance * @param implName string name of this implementation * @param config configuration store for this instance @@ -42,7 +42,7 @@ public interface IJob { /** * tells if the job is enabled - * + * * @return a boolean value indicating whether the job is enabled * or not */ @@ -50,21 +50,21 @@ public interface IJob { /** * set instance id. - * + * * @param id String id of the instance */ public void setId(String id); /** * get instance id. - * + * * @return a String identifier */ public String getId(); /** * get cron string associated with this job - * + * * @return a JobCron object that represents the schedule of this job */ public IJobCron getJobCron(); @@ -73,21 +73,21 @@ public interface IJob { * 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(); /** * gets the plugin name of this job. - * + * * @return a String that is the name of this implementation */ public String getImplName(); /** * Gets the configuration substore used by this job - * + * * @return configuration store */ public IConfigStore getConfigStore(); diff --git a/base/common/src/com/netscape/certsrv/jobs/IJobCron.java b/base/common/src/com/netscape/certsrv/jobs/IJobCron.java index f161b5e8d..9a126505a 100644 --- a/base/common/src/com/netscape/certsrv/jobs/IJobCron.java +++ b/base/common/src/com/netscape/certsrv/jobs/IJobCron.java @@ -28,7 +28,7 @@ package com.netscape.certsrv.jobs; * 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> - * + * * @version $Revision$, $Date$ */ public interface IJobCron { diff --git a/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java b/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java index f4184853d..a14aa93e0 100644 --- a/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java +++ b/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java @@ -36,7 +36,7 @@ import com.netscape.certsrv.base.ISubsystem; * 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. - * + * * @version $Revision$, $Date$ */ public interface IJobsScheduler extends ISubsystem { @@ -91,14 +91,14 @@ public interface IJobsScheduler extends ISubsystem { /** * Retrieves all the job implementations. - * + * * @return a Hashtable of available job plugin implementations */ public Hashtable<String, JobPlugin> getPlugins(); /** * Retrieves all the job instances. - * + * * @return a Hashtable of job instances */ public Hashtable<String, IJob> getInstances(); @@ -107,7 +107,7 @@ public interface IJobsScheduler extends ISubsystem { * Retrieves the configuration parameters of the given * implementation. It is used to return to the Console for * configuration - * + * * @param implName the pulubin implementation name * @return a String array of required configuration parameters of * the given implementation. @@ -120,7 +120,7 @@ public interface IJobsScheduler extends ISubsystem { /** * Writes a message to the system log. - * + * * @param level an integer representing the log message level. * Depending on the configuration set by the administrator, this * value is a determining factor for whether this message will be @@ -134,7 +134,7 @@ public interface IJobsScheduler extends ISubsystem { /** * Sets daemon's wakeup interval. - * + * * @param minutes time in minutes that is to be the frequency of * JobsScheduler wakeup call. */ @@ -151,7 +151,7 @@ public interface IJobsScheduler extends ISubsystem { * specifies the rule of frequency that this job should be * executed (e.g. every Sunday at midnight). This method is * called by each job at initialization time. - * + * * @param cs the string that represents the cron. See IJobCron * for detail of the format. * @return IJobCron an IJobCron diff --git a/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java b/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java index 46a1b6d7e..bb64f1565 100644 --- a/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java +++ b/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java @@ -22,7 +22,7 @@ package com.netscape.certsrv.jobs; * JobScheduler. A Job plugin can be instantiated into a Job instance * and scheduled by the JobScheduler to run at a scheduled interval * <P> - * + * * @version $Revision$, $Date$ */ public class JobPlugin { @@ -43,7 +43,7 @@ public class JobPlugin { /** * Constructor for a Job plugin. - * + * * @param id job plugin name * @param classPath the Java class name of this job plugin */ @@ -54,7 +54,7 @@ public class JobPlugin { /** * get the job plugin name - * + * * @return the name of this job plugin */ public String getId() { @@ -63,7 +63,7 @@ public class JobPlugin { /** * get the Java class name - * + * * @return the Java class name of this plugin */ public String getClassPath() { diff --git a/base/common/src/com/netscape/certsrv/jobs/JobsResources.java b/base/common/src/com/netscape/certsrv/jobs/JobsResources.java index ec33137cf..959621d3b 100644 --- a/base/common/src/com/netscape/certsrv/jobs/JobsResources.java +++ b/base/common/src/com/netscape/certsrv/jobs/JobsResources.java @@ -22,7 +22,7 @@ import java.util.ListResourceBundle; /** * A class represents a resource bundle for the * Jobs package - * + * * @version $Revision$, $Date$ */ public class JobsResources extends ListResourceBundle { diff --git a/base/common/src/com/netscape/certsrv/kra/EKRAException.java b/base/common/src/com/netscape/certsrv/kra/EKRAException.java index 3f23bfe78..a42e8f409 100644 --- a/base/common/src/com/netscape/certsrv/kra/EKRAException.java +++ b/base/common/src/com/netscape/certsrv/kra/EKRAException.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.base.EBaseException; * exception for all the KRA specific exceptions. It is * associated with <CODE>KRAResources</CODE>. * <P> - * + * * @version $Revision$, $Date$ */ public class EKRAException extends EBaseException { @@ -42,7 +42,7 @@ public class EKRAException extends EBaseException { /** * Constructs a KRA exception. * <P> - * + * * @param msgFormat constant from KRAResources. */ public EKRAException(String msgFormat) { @@ -52,7 +52,7 @@ public class EKRAException extends EBaseException { /** * Constructs a KRA exception. * <P> - * + * * @param msgFormat constant from KRAResources. * @param param additional parameters to the message. */ @@ -63,7 +63,7 @@ public class EKRAException extends EBaseException { /** * Constructs a KRA exception. * <P> - * + * * @param msgFormat constant from KRAResources. * @param e embedded exception. */ @@ -74,7 +74,7 @@ public class EKRAException extends EBaseException { /** * Constructs a KRA exception. * <P> - * + * * @param msgFormat constant from KRAResources. * @param params additional parameters to the message. */ @@ -85,7 +85,7 @@ public class EKRAException extends EBaseException { /** * Returns the bundle file name. * <P> - * + * * @return name of bundle class associated with this exception. */ protected String getBundleName() { diff --git a/base/common/src/com/netscape/certsrv/kra/IJoinShares.java b/base/common/src/com/netscape/certsrv/kra/IJoinShares.java index e9a5ecae5..fca8b1c52 100644 --- a/base/common/src/com/netscape/certsrv/kra/IJoinShares.java +++ b/base/common/src/com/netscape/certsrv/kra/IJoinShares.java @@ -20,7 +20,7 @@ package com.netscape.certsrv.kra; /** * Use Java's reflection API to leverage CMS's * old Share and JoinShares implementations. - * + * * @deprecated * @version $Revision$ $Date$ */ diff --git a/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java b/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java index a7cc40507..acc3214bb 100644 --- a/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java +++ b/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java @@ -42,7 +42,7 @@ import com.netscape.certsrv.security.ITransportKeyUnit; * key recovery authority is responsibile for archiving * and recovering user encryption private keys. * <P> - * + * * @version $Revision$, $Date$ */ public interface IKeyRecoveryAuthority extends ISubsystem { @@ -69,7 +69,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem { /** * Returns the name of this subsystem. * <P> - * + * * @return KRA name */ public X500Name getX500Name(); @@ -77,7 +77,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem { /** * Retrieves KRA request repository. * <P> - * + * * @return request repository */ public IRequestQueue getRequestQueue(); @@ -91,7 +91,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem { /** * Retrieves the Replica ID repository. - * + * * @return KRA's Replica ID repository */ public IReplicaIDRepository getReplicaRepository(); @@ -102,7 +102,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem { * providing credentials. This feature is for enabling * user-based recovery operation. * <p> - * + * * @param cs list of agent credentials * @param on true if auto recovery state is on * @return current auto recovery state @@ -111,7 +111,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem { /** * Returns the current auto recovery state. - * + * * @return true if auto recvoery state is on */ public boolean getAutoRecoveryState(); @@ -121,7 +121,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem { * In distributed recovery mode, recovery agent login to the * agent interface and submit its credential for a particular * recovery operation. - * + * * @param id authorization identifier * @param creds list of credentials */ @@ -129,7 +129,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem { /** * Removes a particular auto recovery operation. - * + * * @param id authorization identifier */ public void removeAutoRecovery(String id); @@ -138,28 +138,28 @@ public interface IKeyRecoveryAuthority extends ISubsystem { * Returns the number of required agents. In M-out-of-N * recovery schema, only M agents are required even there * are N agents. This method returns M. - * + * * @return number of required agents */ public int getNoOfRequiredAgents() throws EBaseException; /** * Sets the number of required recovery agents - * + * * @param number number of agents */ public void setNoOfRequiredAgents(int number) throws EBaseException; /** * Returns the current recovery identifier. - * + * * @return recovery identifier */ public String getRecoveryID(); /** * Returns a list of recovery identifiers. - * + * * @return list of auto recovery identifiers */ public Enumeration<String> getAutoRecoveryIDs(); @@ -167,7 +167,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem { /** * Returns the storage key unit that manages the * stoarge key. - * + * * @return storage key unit */ public IStorageKeyUnit getStorageKeyUnit(); @@ -175,14 +175,14 @@ public interface IKeyRecoveryAuthority extends ISubsystem { /** * Returns the transport key unit that manages the * transport key. - * + * * @return transport key unit */ public ITransportKeyUnit getTransportKeyUnit(); /** * Returns the token that generates user key pairs for supporting server-side keygen - * + * * @return keygen token */ public CryptoToken getKeygenToken(); @@ -190,7 +190,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem { /** * Adds entropy to the token used for supporting server-side keygen * Parameters are set in the config file - * + * * @param logflag create log messages at info level to report entropy shortage */ public void addEntropy(boolean logflag); @@ -198,7 +198,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem { /** * Returns the request listener that listens on * the request completion event. - * + * * @return request listener */ public IRequestListener getRequestInQListener(); @@ -213,35 +213,35 @@ public interface IKeyRecoveryAuthority extends ISubsystem { /** * Returns the nickname of the transport certificate. - * + * * @return transport certificate nickname. */ public String getNickname(); /** * Sets the nickname of the transport certificate. - * + * * @param str nickname */ public void setNickname(String str); /** * Returns the new nickname of the transport certifiate. - * + * * @return new nickname */ public String getNewNickName() throws EBaseException; /** * Sets the new nickname of the transport certifiate. - * + * * @param name new nickname */ public void setNewNickName(String name); /** * Logs event into key recovery authority logging. - * + * * @param level log level * @param msg log message */ @@ -253,7 +253,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem { * framework will try to serialize all the attribute into * persistent storage. Things like passwords are not * desirable to be stored. - * + * * @param id request id * @return volatile requests */ @@ -261,7 +261,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem { /** * Retrieves the request object. - * + * * @param id request id * @return volatile requests */ @@ -269,7 +269,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem { /** * Destroys the request object. - * + * * @param id request id */ public void destroyVolatileRequest(RequestId id); @@ -279,7 +279,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem { /** * Creates error for a specific recovery operation. - * + * * @param recoveryID recovery id * @param error error * @exception EBaseException failed to create error @@ -289,7 +289,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem { /** * Retrieves error by recovery identifier. - * + * * @param recoveryID recovery id * @return error message */ @@ -298,7 +298,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem { /** * Retrieves PKCS12 package by recovery identifier. - * + * * @param recoveryID recovery id * @return pkcs12 package in bytes */ @@ -307,7 +307,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem { /** * Creates PKCS12 package in memory. - * + * * @param recoveryID recovery id * @param pk12 package in bytes */ diff --git a/base/common/src/com/netscape/certsrv/kra/IKeyService.java b/base/common/src/com/netscape/certsrv/kra/IKeyService.java index 13748f2d1..9118bc935 100644 --- a/base/common/src/com/netscape/certsrv/kra/IKeyService.java +++ b/base/common/src/com/netscape/certsrv/kra/IKeyService.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.security.Credential; /** * An interface representing a recovery service. * <P> - * + * * @version $Revision$, $Date$ */ public interface IKeyService { @@ -36,7 +36,7 @@ public interface IKeyService { /** * Retrieves number of agent required to perform * key recovery operation. - * + * * @return number of required recovery agents * @exception EBaseException failed to retrieve value */ @@ -45,7 +45,7 @@ public interface IKeyService { /** * is async recovery request status APPROVED - * i.e. all required # of recovery agents approved - * + * * @param reqID request id * @return true if # of recovery required agents approved; false otherwise */ @@ -54,7 +54,7 @@ public interface IKeyService { /** * get async recovery request initiating agent - * + * * @param reqID request id * @return agentUID */ @@ -63,7 +63,7 @@ public interface IKeyService { /** * Initiate asynchronous key recovery - * + * * @param kid key identifier * @param cert certificate embedded in PKCS12 * @return requestId @@ -74,7 +74,7 @@ public interface IKeyService { /** * add approving agent in asynchronous key recovery - * + * * @param reqID request id * @param agentID agent id * @exception EBaseException failed to initiate async recovery @@ -84,7 +84,7 @@ public interface IKeyService { /** * Performs administrator-initiated key recovery. - * + * * @param kid key identifier * @param creds list of credentials (id and password) * @param pwd password to protect PKCS12 @@ -101,14 +101,14 @@ public interface IKeyService { * Async Recovers key for administrators. This method is * invoked by the agent operation of the key recovery servlet. * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_KEY_RECOVERY_REQUEST used whenever a user private key recovery request is * made (this is when the DRM receives the request) * <li>signed.audit LOGGING_SIGNED_AUDIT_KEY_RECOVERY_REQUEST_PROCESSED used whenever a user private key recovery * request is processed (this is when the DRM processes the request) * </ul> - * + * * @param reqID request id * @param password password of the PKCS12 package * subsystem @@ -122,14 +122,14 @@ public interface IKeyService { /** * Retrieves recovery identifier. - * + * * @return recovery id */ public String getRecoveryID(); /** * Creates recovery parameters for the given recovery operation. - * + * * @param recoveryID recovery id * @return recovery parameters * @exception EBaseException failed to create @@ -139,7 +139,7 @@ public interface IKeyService { /** * Destroys recovery parameters for the given recovery operation. - * + * * @param recoveryID recovery id * @exception EBaseException failed to destroy */ @@ -148,7 +148,7 @@ public interface IKeyService { /** * Retrieves recovery parameters for the given recovery operation. - * + * * @param recoveryID recovery id * @return recovery parameters * @exception EBaseException failed to retrieve @@ -158,7 +158,7 @@ public interface IKeyService { /** * Adds password in the distributed recovery operation. - * + * * @param recoveryID recovery id * @param uid agent uid * @param pwd agent password @@ -169,7 +169,7 @@ public interface IKeyService { /** * Retrieves credentials in the distributed recovery operation. - * + * * @param recoveryID recovery id * @return agent's credentials * @exception EBaseException failed to retrieve diff --git a/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java b/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java index 20ac336e5..119e199bd 100644 --- a/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java +++ b/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java @@ -24,7 +24,7 @@ import java.util.Date; * An interface represents a proof of archival. * <P> * Here is the ASN1 definition of a proof of escrow: - * + * * <PRE> * ProofOfArchival ::= SIGNED { * SEQUENCE { @@ -38,42 +38,42 @@ import java.util.Date; * } * </PRE> * <P> - * + * * @version $Revision$, $Date$ */ public interface IProofOfArchival { /** * Retrieves version of this proof. - * + * * @return version */ public BigInteger getVersion(); /** * Retrieves the serial number. - * + * * @return serial number */ public BigInteger getSerialNumber(); /** * Retrieves the subject name. - * + * * @return subject name */ public String getSubjectName(); /** * Retrieves the issuer name. - * + * * @return issuer name */ public String getIssuerName(); /** * Returns the beginning of the escrowed perioid. - * + * * @return date of archival */ public Date getDateOfArchival(); diff --git a/base/common/src/com/netscape/certsrv/kra/IShare.java b/base/common/src/com/netscape/certsrv/kra/IShare.java index 19e7d7ce2..14d9952b8 100644 --- a/base/common/src/com/netscape/certsrv/kra/IShare.java +++ b/base/common/src/com/netscape/certsrv/kra/IShare.java @@ -20,7 +20,7 @@ package com.netscape.certsrv.kra; /** * Use Java's reflection API to leverage CMS's * old Share and JoinShares implementations. - * + * * @deprecated * @version $Revision$ $Date$ */ diff --git a/base/common/src/com/netscape/certsrv/kra/KRAResources.java b/base/common/src/com/netscape/certsrv/kra/KRAResources.java index 14b686e63..7eecf9ead 100644 --- a/base/common/src/com/netscape/certsrv/kra/KRAResources.java +++ b/base/common/src/com/netscape/certsrv/kra/KRAResources.java @@ -22,7 +22,7 @@ import java.util.ListResourceBundle; /** * A class represents a resource bundle for KRA subsystem. * <P> - * + * * @version $Revision$, $Date$ */ public class KRAResources extends ListResourceBundle { diff --git a/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java b/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java index df05c882f..7774ca400 100644 --- a/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java +++ b/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java @@ -51,7 +51,7 @@ import com.netscape.certsrv.dbs.IDBObj; * presented. * <P> * Here is the ASN1 definition of a proof of escrow: - * + * * <PRE> * ProofOfEscrow ::= SIGNED { * SEQUENCE { @@ -65,7 +65,7 @@ import com.netscape.certsrv.dbs.IDBObj; * } * </PRE> * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ @@ -105,7 +105,7 @@ public class ProofOfArchival implements IDBObj, IProofOfArchival, Serializable { /** * Constructs a proof of escrow. * <P> - * + * * @param serialNo serial number of proof * @param subject subject name * @param issuer issuer name @@ -123,7 +123,7 @@ public class ProofOfArchival implements IDBObj, IProofOfArchival, Serializable { /** * Constructs proof of escrow from input stream. * <P> - * + * * @param in encoding source * @exception EBaseException failed to decode */ @@ -134,7 +134,7 @@ public class ProofOfArchival implements IDBObj, IProofOfArchival, Serializable { /** * Sets an attribute value. * <P> - * + * * @param name attribute name * @param obj attribute value * @exception EBaseException failed to set attribute @@ -159,7 +159,7 @@ public class ProofOfArchival implements IDBObj, IProofOfArchival, Serializable { /** * Retrieves the value of an named attribute. * <P> - * + * * @param name attribute name * @return attribute value * @exception EBaseException failed to get attribute @@ -184,7 +184,7 @@ public class ProofOfArchival implements IDBObj, IProofOfArchival, Serializable { /** * Deletes an attribute. * <P> - * + * * @param name attribute name * @exception EBaseException failed to get attribute */ @@ -196,7 +196,7 @@ public class ProofOfArchival implements IDBObj, IProofOfArchival, Serializable { /** * Retrieves a list of possible attribute names. * <P> - * + * * @return a list of names */ public Enumeration<String> getElements() { @@ -205,7 +205,7 @@ public class ProofOfArchival implements IDBObj, IProofOfArchival, Serializable { /** * Retrieves serializable attribute names. - * + * * @return a list of serializable attribute names */ public Enumeration<String> getSerializableAttrNames() { @@ -215,7 +215,7 @@ public class ProofOfArchival implements IDBObj, IProofOfArchival, Serializable { /** * Retrieves version of this proof. * <P> - * + * * @return version */ public BigInteger getVersion() { @@ -225,7 +225,7 @@ public class ProofOfArchival implements IDBObj, IProofOfArchival, Serializable { /** * Retrieves the serial number. * <P> - * + * * @return serial number */ public BigInteger getSerialNumber() { @@ -235,7 +235,7 @@ public class ProofOfArchival implements IDBObj, IProofOfArchival, Serializable { /** * Retrieves the subject name. * <P> - * + * * @return subject name */ public String getSubjectName() { @@ -245,7 +245,7 @@ public class ProofOfArchival implements IDBObj, IProofOfArchival, Serializable { /** * Retrieves the issuer name. * <P> - * + * * @return issuer name */ public String getIssuerName() { @@ -255,7 +255,7 @@ public class ProofOfArchival implements IDBObj, IProofOfArchival, Serializable { /** * Returns the beginning of the escrowed perioid. * <P> - * + * * @return date of archival */ public Date getDateOfArchival() { diff --git a/base/common/src/com/netscape/certsrv/ldap/ELdapException.java b/base/common/src/com/netscape/certsrv/ldap/ELdapException.java index 8c1d2d4a5..57d7ca958 100644 --- a/base/common/src/com/netscape/certsrv/ldap/ELdapException.java +++ b/base/common/src/com/netscape/certsrv/ldap/ELdapException.java @@ -23,7 +23,7 @@ import com.netscape.certsrv.base.EBaseException; * A class that represents a Ldap exception. Various * errors can occur when interacting with a Ldap directory server. * <P> - * + * * @version $Revision$, $Date$ */ public class ELdapException extends EBaseException { @@ -39,7 +39,7 @@ public class ELdapException extends EBaseException { /** * Constructs a Ldap exception. - * + * * @param msgFormat Resource Key, if key not present, serves as the message. * <P> */ @@ -49,7 +49,7 @@ public class ELdapException extends EBaseException { /** * Constructs a Ldap exception. - * + * * @param msgFormat Resource Key, if key not present, serves as the message. * Include a message string parameter for variable content. * @param param Message string parameter. @@ -61,7 +61,7 @@ public class ELdapException extends EBaseException { /** * Constructs a Ldap exception. - * + * * @param msgFormat Resource Key, if key not present, serves as the message. * @param e Common exception. * <P> @@ -72,7 +72,7 @@ public class ELdapException extends EBaseException { /** * Constructs a Ldap exception. - * + * * @param msgFormat Resource Key, if key not present, serves as the message. * @param params Array of Message string parameters. * <P> @@ -83,7 +83,7 @@ public class ELdapException extends EBaseException { /** * Gets the resource bundle name - * + * * @return Name of the Ldap Exception resource bundle name. * <p> */ diff --git a/base/common/src/com/netscape/certsrv/ldap/ELdapServerDownException.java b/base/common/src/com/netscape/certsrv/ldap/ELdapServerDownException.java index f347b1714..30ce8d28a 100644 --- a/base/common/src/com/netscape/certsrv/ldap/ELdapServerDownException.java +++ b/base/common/src/com/netscape/certsrv/ldap/ELdapServerDownException.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.ldap; /** * This represents exception which indicates Ldap server is down. - * + * * @version $Revision$, $Date$ */ public class ELdapServerDownException extends ELdapException { @@ -31,7 +31,7 @@ public class ELdapServerDownException extends ELdapException { /** * Constructs a ldap server down exception with host & port info. - * + * * @param errorString Detailed error message. */ public ELdapServerDownException(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java b/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java index 4325f077c..c163c7f0f 100644 --- a/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java +++ b/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java @@ -23,7 +23,7 @@ import com.netscape.certsrv.base.IConfigStore; /** * Class for obtaining ldap authentication info from the configuration store. * Two types of authentication is basic and SSL client authentication. - * + * * @version $Revision$, $Date$ */ public interface ILdapAuthInfo { @@ -43,10 +43,10 @@ public interface ILdapAuthInfo { /** * Initialize this class from the config store. - * + * * @param config The config store from which to initialize. * @exception EBaseException Due to failure of the initialization process. - * + * */ public void init(IConfigStore config) throws EBaseException; @@ -54,10 +54,10 @@ public interface ILdapAuthInfo { * Initialize this class from the config store. * Based on host, port, and secure boolean info. * which allows an actual attempt on the server to verify credentials. - * + * * @param config The config store from which to initialize. * @exception EBaseException Due to failure of the initialization process. - * + * */ public void init(IConfigStore config, String host, int port, boolean secure) throws EBaseException; @@ -69,7 +69,7 @@ public interface ILdapAuthInfo { /** * Get authentication type. - * + * * @return one of: <br> * LdapAuthInfo.LDAP_AUTHTYPE_BASICAUTH or * LdapAuthInfo.LDAP_AUTHTYPE_SSLCLIENTAUTH @@ -78,14 +78,14 @@ public interface ILdapAuthInfo { /** * Get params for authentication. - * + * * @return array of parameters for this authentication as an array of Strings. */ public String[] getParms(); /** * Add password to private password data structure. - * + * * @param prompt Password prompt. * @param pw Password itself. */ @@ -93,7 +93,7 @@ public interface ILdapAuthInfo { /** * Remove password from private password data structure. - * + * * @param prompt Identify password to remove with prompt. */ public void removePassword(String prompt); diff --git a/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java b/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java index 846f51749..36cb6204c 100644 --- a/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java +++ b/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java @@ -25,7 +25,7 @@ package com.netscape.certsrv.ldap; * max size of this connection pool should be configurable. Once * the maximum limit of connections is exceeded, the factory * should provide proper synchronization to resolve contention issues. - * + * * @version $Revision$, $Date$ */ public interface ILdapBoundConnFactory extends ILdapConnFactory { diff --git a/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java b/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java index 738f5832d..74e0394ca 100644 --- a/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java +++ b/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java @@ -26,14 +26,14 @@ import com.netscape.certsrv.base.IConfigStore; * Maintains a pool of connections to the LDAP server. * Multiple threads use this interface to utilize and release * the Ldap connection resources. - * + * * @version $Revision$, $Date$ */ public interface ILdapConnFactory { /** * Initialize the poll from the config store. - * + * * @param config The configuration substore. * @exception EBaseException On configuration error. * @exception ELdapException On all other errors. @@ -42,11 +42,11 @@ public interface ILdapConnFactory { throws EBaseException, ELdapException; /** - * + * * Used for disconnecting all connections. * Used just before a subsystem * shutdown or process exit. - * + * * @exception EldapException on Ldap failure when closing connections. */ public void reset() @@ -54,7 +54,7 @@ public interface ILdapConnFactory { /** * Returns the number of free connections available from this pool. - * + * * @return Integer number of free connections. */ @@ -63,21 +63,21 @@ public interface ILdapConnFactory { /** * Returns the number of total connections available from this pool. * Includes sum of free and in use connections. - * + * * @return Integer number of total connections. */ public int totalConn(); /** * Returns the maximum number of connections available from this pool. - * + * * @return Integer maximum number of connections. */ public int maxConn(); /** * Request access to a Ldap connection from the pool. - * + * * @exception ELdapException if any error occurs, such as a * @return Ldap connection object. * connection is not available @@ -87,7 +87,7 @@ public interface ILdapConnFactory { /** * Return connection to the factory. mandatory after a getConn(). - * + * * @param conn Ldap connection object to be returned to the free list of the pool. * @exception ELdapException On any failure to return the connection. */ diff --git a/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java b/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java index aa5b388a3..e74cc489b 100644 --- a/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java +++ b/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java @@ -23,7 +23,7 @@ import com.netscape.certsrv.base.IConfigStore; /** * Class for reading ldap connection information from the config store. * Ldap connection info: host name, port number,whether of not it is a secure connection. - * + * * @version $Revision$, $Date$ */ public interface ILdapConnInfo { @@ -40,7 +40,7 @@ public interface ILdapConnInfo { /** * Initializes an instance from a config store. - * + * * @param config Configuration store. * @exception ELdapException Ldap related error found. * @exception EBaseException Other errors and errors with params included in the config store. @@ -49,14 +49,14 @@ public interface ILdapConnInfo { /** * Return the name of the Host. - * + * */ public String getHost(); /** * Return the port number of the host. - * + * */ public int getPort(); diff --git a/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java b/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java index efa1c271e..5ee09028b 100644 --- a/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java +++ b/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java @@ -25,7 +25,7 @@ import com.netscape.certsrv.base.ISubsystem; * Class on behalf of the Publishing system that controls an instance of an ILdapConnFactory. * Allows a factory to be intialized and grants access * to the factory to other interested parties. - * + * * @version $Revision$, $Date$ */ @@ -33,7 +33,7 @@ public interface ILdapConnModule { /** * Initialize ldap publishing module with config store. - * + * * @param owner Entity that is interested in this instance of Publishing. * @param config Config store containing the info needed to set up Publishing. * @exception ELdapException Due to Ldap error. @@ -51,7 +51,7 @@ public interface ILdapConnModule { * Use ILdapConnFactory.getConn() to get a Ldap connection to the ldap * publishing directory. * Use ILdapConnFactory.returnConn() to return the connection. - * + * * @return Instance of ILdapConnFactory. */ diff --git a/base/common/src/com/netscape/certsrv/ldap/LdapResources.java b/base/common/src/com/netscape/certsrv/ldap/LdapResources.java index 332fcaddf..c7139e931 100644 --- a/base/common/src/com/netscape/certsrv/ldap/LdapResources.java +++ b/base/common/src/com/netscape/certsrv/ldap/LdapResources.java @@ -21,7 +21,7 @@ import java.util.ListResourceBundle; /** * A resource bundle for ldap subsystem. - * + * * @version $Revision$, $Date$ */ public class LdapResources extends ListResourceBundle { diff --git a/base/common/src/com/netscape/certsrv/listeners/EListenersException.java b/base/common/src/com/netscape/certsrv/listeners/EListenersException.java index 6aee21ff4..1169de0b1 100644 --- a/base/common/src/com/netscape/certsrv/listeners/EListenersException.java +++ b/base/common/src/com/netscape/certsrv/listeners/EListenersException.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.base.EBaseException; /** * A class represents a listener exception. * <P> - * + * * @version $Revision$, $Date$ */ public class EListenersException extends EBaseException { @@ -39,7 +39,7 @@ public class EListenersException extends EBaseException { /** * Constructs a listeners exception. * <P> - * + * * @param msgFormat The error message resource key. */ public EListenersException(String msgFormat) { @@ -49,7 +49,7 @@ public class EListenersException extends EBaseException { /** * Constructs a listeners exception. * <P> - * + * * @param msgFormat exception details in message string format. * @param param message string parameter. */ @@ -60,7 +60,7 @@ public class EListenersException extends EBaseException { /** * Constructs a Listeners exception. * <P> - * + * * @param msgFormat The resource key. * @param e The parameter as an exception. */ @@ -71,7 +71,7 @@ public class EListenersException extends EBaseException { /** * Constructs a Listeners exception. * <P> - * + * * @param msgFormat The resource key. * @param params Array of params. */ @@ -82,7 +82,7 @@ public class EListenersException extends EBaseException { /** * get the listener resource class name. * <P> - * + * * @return the class name of the resource. */ protected String getBundleName() { diff --git a/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java b/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java index c615586db..3f7863248 100644 --- a/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java +++ b/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.base.IConfigStore; * This interface represents a plug-in listener. Implement this class to * add the listener to an ARequestNotifier of a subsystem. * <P> - * + * * @version $Revision$, $Date$ */ public interface IRequestListenerPlugin { @@ -32,7 +32,7 @@ public interface IRequestListenerPlugin { /** * get the registered class name set in the init() method. * <P> - * + * * @return the Name. */ public String getName(); @@ -40,7 +40,7 @@ public interface IRequestListenerPlugin { /** * get the plugin implementaion name set in the init() method. * <P> - * + * * @return the plugin implementation name. */ public String getImplName(); @@ -48,7 +48,7 @@ public interface IRequestListenerPlugin { /** * the subsystem call this method to initialize the plug-in. * <P> - * + * * @param name the registered class name of the plug-in. * @param implName the implemetnation name of the plug-in. * @param config the configuration store where the. @@ -66,7 +66,7 @@ public interface IRequestListenerPlugin { /** * get the configuration parameters of the plug-in. * <P> - * + * * @return the configuration parameters. * @exception EBaseException throws base exception in the certificate server. */ @@ -77,7 +77,7 @@ public interface IRequestListenerPlugin { * get the configuration store of the plugin where the * configuration parameters of the plug-in are stored. * <P> - * + * * @return the configuration store. */ diff --git a/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java b/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java index 9eaf41371..0eccf2f19 100644 --- a/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java +++ b/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java @@ -22,7 +22,7 @@ import java.util.ListResourceBundle; /** * A class represents a resource bundle for the * listeners package. - * + * * @version $Revision$, $Date$ */ public class ListenersResources extends ListResourceBundle { @@ -30,7 +30,7 @@ public class ListenersResources extends ListResourceBundle { /** * get the content of the resource. * <P> - * + * * @return the content of this resource is a value pairs array of keys and values. */ public Object[][] getContents() { diff --git a/base/common/src/com/netscape/certsrv/logging/AuditEvent.java b/base/common/src/com/netscape/certsrv/logging/AuditEvent.java index aa0077b06..8ae5cd669 100644 --- a/base/common/src/com/netscape/certsrv/logging/AuditEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/AuditEvent.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.base.MessageFormatter; * that goes into the Transaction log. Note that the name of this * class "AuditEvent" is legacy and has nothing to do with the signed * audit log events, whcih are represented by SignedAuditEvent. - * + * * @version $Revision$, $Date$ * @see java.text.MessageFormat * @see com.netscape.certsrv.logging.LogResources @@ -59,7 +59,7 @@ public class AuditEvent implements IBundleLogEvent { /** * Constructs a message event * <P> - * + * * @param msgFormat the message string */ public AuditEvent(String msgFormat) { @@ -69,12 +69,12 @@ public class AuditEvent implements IBundleLogEvent { /** * Constructs a message with a parameter. For example, - * + * * <PRE> * new AuditEvent("failed to load {0}", fileName); * </PRE> * <P> - * + * * @param msgFormat details in message string format * @param param message string parameter */ @@ -88,7 +88,7 @@ public class AuditEvent implements IBundleLogEvent { * 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 { * ... @@ -97,7 +97,7 @@ public class AuditEvent implements IBundleLogEvent { * } * </PRE> * <P> - * + * * @param msgFormat exception details in message string format * @param exception system exception */ @@ -110,7 +110,7 @@ public class AuditEvent implements IBundleLogEvent { /** * Constructs a message from a base exception. This will use the msgFormat * from the exception itself. - * + * * <PRE> * try { * ... @@ -119,7 +119,7 @@ public class AuditEvent implements IBundleLogEvent { * } * </PRE> * <P> - * + * * @param e CMS exception */ public AuditEvent(Exception e) { @@ -136,7 +136,7 @@ public class AuditEvent implements IBundleLogEvent { * 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 */ @@ -148,7 +148,7 @@ public class AuditEvent implements IBundleLogEvent { /** * Returns the current message format string. * <P> - * + * * @return details message */ public String getMessage() { @@ -158,7 +158,7 @@ public class AuditEvent implements IBundleLogEvent { /** * Returns a list of parameters. * <P> - * + * * @return list of message format parameters */ public Object[] getParameters() { @@ -169,7 +169,7 @@ public class AuditEvent implements IBundleLogEvent { * Returns localized message string. This method should * only be called if a localized string is necessary. * <P> - * + * * @return details message */ public String toContent() { @@ -179,7 +179,7 @@ public class AuditEvent implements IBundleLogEvent { /** * Returns the string based on the given locale. * <P> - * + * * @param locale locale * @return details message */ @@ -192,7 +192,7 @@ public class AuditEvent implements IBundleLogEvent { /** * Gets the resource bundle name for this class instance. This should * be overridden by subclasses who have their own resource bundles. - * + * * @param bundle String that represents the resource bundle name to be set */ public void setBundleName(String bundle) { @@ -201,7 +201,7 @@ public class AuditEvent implements IBundleLogEvent { /** * Retrieves bundle name. - * + * * @return a String that represents the resource bundle name */ protected String getBundleName() { @@ -210,7 +210,7 @@ public class AuditEvent implements IBundleLogEvent { /** * Retrieves log source. - * + * * @return an integer that indicates the component source * where this message event was triggered */ @@ -220,7 +220,7 @@ public class AuditEvent implements IBundleLogEvent { /** * Sets log source. - * + * * @param source an integer that represents the component source * where this message event was triggered */ @@ -232,7 +232,7 @@ public class AuditEvent implements IBundleLogEvent { * Retrieves log level. * The log level of an event represents its relative importance * or severity within CMS. - * + * * @return Integer log level value. */ public int getLevel() { @@ -241,7 +241,7 @@ public class AuditEvent implements IBundleLogEvent { /** * Retrieves NT specific log event type. - * + * * @return Integer NTEventType value. */ public int getNTEventType() { @@ -252,7 +252,7 @@ public class AuditEvent implements IBundleLogEvent { * Sets log level, NT log event type. * For certain log levels the NT log event type gets * set as well. - * + * * @param level Integer log level value. */ public void setLevel(int level) { @@ -283,7 +283,7 @@ public class AuditEvent implements IBundleLogEvent { /** * Retrieves log multiline attribute. - * + * * @return Boolean whether or not this event is multiline. * A multiline message simply consists of more than one line. */ @@ -294,7 +294,7 @@ public class AuditEvent implements IBundleLogEvent { /** * Sets log multiline attribute. A multiline message consists of * more than one line. - * + * * @param multiline Boolean multiline value. */ public void setMultiline(boolean multiline) { @@ -303,7 +303,7 @@ public class AuditEvent implements IBundleLogEvent { /** * Retrieves event time stamp. - * + * * @return Long integer of the time the event was created. */ public long getTimeStamp() { @@ -313,7 +313,7 @@ public class AuditEvent implements IBundleLogEvent { /** * Retrieves log event type. Each type of event * has an associated String type value. - * + * * @return String containing the type of event. */ public String getEventType() { @@ -323,7 +323,7 @@ public class AuditEvent implements IBundleLogEvent { /** * Sets log event type. Each type of event * has an associated String type value. - * + * * @param eventType String containing the type of event. */ public void setEventType(String eventType) { @@ -332,7 +332,7 @@ public class AuditEvent implements IBundleLogEvent { /** * Return string representation of log message. - * + * * @return String containing log message. */ public String toString() { diff --git a/base/common/src/com/netscape/certsrv/logging/AuditFormat.java b/base/common/src/com/netscape/certsrv/logging/AuditFormat.java index e5f8726f7..72980aa5a 100644 --- a/base/common/src/com/netscape/certsrv/logging/AuditFormat.java +++ b/base/common/src/com/netscape/certsrv/logging/AuditFormat.java @@ -21,7 +21,7 @@ package com.netscape.certsrv.logging; * Define audit log message format. Note that the name of this * class "AuditFormat" is legacy and has nothing to do with the signed * audit log events format - * + * * @version $Revision$, $Date$ */ public class AuditFormat { diff --git a/base/common/src/com/netscape/certsrv/logging/ConsoleError.java b/base/common/src/com/netscape/certsrv/logging/ConsoleError.java index 13e0f3d45..c12887628 100644 --- a/base/common/src/com/netscape/certsrv/logging/ConsoleError.java +++ b/base/common/src/com/netscape/certsrv/logging/ConsoleError.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.logging; /** * A static class to log error messages to the Console - * + * * @version $Revision$, $Date$ */ public class ConsoleError { @@ -27,7 +27,7 @@ public class ConsoleError { /** * Send the given event to the Console. - * + * * @param ev log event to be sent to the console */ public static void send(ILogEvent ev) { diff --git a/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java b/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java index 2e87fc92c..df0179c95 100644 --- a/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java +++ b/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java @@ -30,14 +30,14 @@ import com.netscape.certsrv.common.NameValuePairs; /** * A log event listener which sends all log events to the system console/tty - * + * * @version $Revision$, $Date$ */ public class ConsoleLog implements ILogEventListener { /** * Log the given event. Usually called from a log manager. - * + * * @param ev log event */ public void log(ILogEvent ev) { @@ -46,7 +46,7 @@ public class ConsoleLog implements ILogEventListener { /** * Flush the system output stream. - * + * */ public void flush() { System.err.flush(); @@ -61,7 +61,7 @@ public class ConsoleLog implements ILogEventListener { /** * get the configuration store that is associated with this * log listener - * + * * @return the configuration store that is associated with this * log listener */ @@ -80,7 +80,7 @@ public class ConsoleLog implements ILogEventListener { * Retrieve last "maxLine" number of system log with log lever >"level" * and from source "source". If the parameter is omitted. All entries * are sent back. - * + * * @param req a Hashtable containing the required information such as * log entry, log level, log source, and log name * @return the content of the log that match the criteria in req diff --git a/base/common/src/com/netscape/certsrv/logging/ELogException.java b/base/common/src/com/netscape/certsrv/logging/ELogException.java index 717dbdfe2..f049e2e12 100644 --- a/base/common/src/com/netscape/certsrv/logging/ELogException.java +++ b/base/common/src/com/netscape/certsrv/logging/ELogException.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.base.MessageFormatter; * This class implements a Log exception. LogExceptions * should be caught by LogSubsystem managers. * <P> - * + * * @version $Revision$, $Date$ * @see java.text.MessageFormat */ @@ -44,7 +44,7 @@ public class ELogException extends EBaseException { /** * Constructs a log exception. * <P> - * + * * @param msgFormat Exception details. */ public ELogException(String msgFormat) { @@ -54,12 +54,12 @@ public class ELogException extends EBaseException { /** * Constructs a log exception with a parameter. For example, - * + * * <PRE> * new ELogException("failed to load {0}", fileName); * </PRE> * <P> - * + * * @param msgFormat Exception details in message string format. * @param param Message string parameter. */ @@ -73,7 +73,7 @@ public class ELogException extends EBaseException { * Constructs a log 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 ELogException extends EBaseException { * } * </PRE> * <P> - * + * * @param msgFormat Exception details in message string format. * @param param System exception. */ @@ -96,7 +96,7 @@ public class ELogException extends EBaseException { * Constructs a log exception with a list of parameters * that will be substituted into the message format. * <P> - * + * * @param msgFormat Exception details in message string format. * @param params List of message format parameters. */ @@ -108,7 +108,7 @@ public class ELogException extends EBaseException { /** * Returns a list of parameters. * <P> - * + * * @return list of message format parameters. */ public Object[] getParameters() { @@ -119,7 +119,7 @@ public class ELogException extends EBaseException { * Returns localized exception string. This method should * only be called if a localized string is necessary. * <P> - * + * * @return Details message. */ public String toString() { @@ -129,7 +129,7 @@ public class ELogException extends EBaseException { /** * Returns the string based on the given locale. * <P> - * + * * @param locale Locale. * @return Details message. */ @@ -141,7 +141,7 @@ public class ELogException extends EBaseException { /** * Retrieves resource bundle name. * Subclasses should override this as necessary - * + * * @return String containing name of resource bundle. */ diff --git a/base/common/src/com/netscape/certsrv/logging/ELogNotFound.java b/base/common/src/com/netscape/certsrv/logging/ELogNotFound.java index 7de84733c..5dc574e3a 100644 --- a/base/common/src/com/netscape/certsrv/logging/ELogNotFound.java +++ b/base/common/src/com/netscape/certsrv/logging/ELogNotFound.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.logging; /** * Exception for log not found. - * + * * @version $Revision$, $Date$ */ public class ELogNotFound extends ELogException { @@ -31,7 +31,7 @@ public class ELogNotFound extends ELogException { /** * Constructs a exception for a missing required log. - * + * * @param errorString Detailed error message. */ public ELogNotFound(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/logging/ELogPluginNotFound.java b/base/common/src/com/netscape/certsrv/logging/ELogPluginNotFound.java index 6c434aff9..138dd0831 100644 --- a/base/common/src/com/netscape/certsrv/logging/ELogPluginNotFound.java +++ b/base/common/src/com/netscape/certsrv/logging/ELogPluginNotFound.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.logging; /** * Exception for log plugin not found. - * + * * @version $Revision$, $Date$ */ public class ELogPluginNotFound extends ELogException { @@ -31,7 +31,7 @@ public class ELogPluginNotFound extends ELogException { /** * Constructs a exception for a missing log plugin. - * + * * @param errorString Detailed error message. */ public ELogPluginNotFound(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java b/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java index 9dd8595cf..a0aa8455d 100644 --- a/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java @@ -22,7 +22,7 @@ package com.netscape.certsrv.logging; * See ILogEvent class. * This class maintains a resource bundle name for given * event type. - * + * * @version $Revision$, $Date$ */ public interface IBundleLogEvent extends ILogEvent { @@ -30,7 +30,7 @@ public interface IBundleLogEvent extends ILogEvent { /** * Sets the name of the resource bundle to be associated * with this event type. - * + * * @param bundle name of resource bundle. */ public void setBundleName(String bundle); diff --git a/base/common/src/com/netscape/certsrv/logging/ILogEvent.java b/base/common/src/com/netscape/certsrv/logging/ILogEvent.java index 423918983..865d3dc9a 100644 --- a/base/common/src/com/netscape/certsrv/logging/ILogEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/ILogEvent.java @@ -27,14 +27,14 @@ import java.util.Locale; * A log event represents a certain kind of log message designed for a specific purpose. * For instance, an audit type event represents messages having to do with auditable CMS * actions. The resulting message will ultimately appear into a specific log file. - * + * * @version $Revision$, $Date$ */ public interface ILogEvent extends Serializable { /** * Retrieves event time stamp. - * + * * @return Long integer of the time the event was created. */ public long getTimeStamp(); @@ -43,7 +43,7 @@ public interface ILogEvent extends Serializable { * Retrieves log source. * This is an id of the subsystem responsible * for creating the log event. - * + * * @return Integer source id. */ public int getSource(); @@ -52,14 +52,14 @@ public interface ILogEvent extends Serializable { * Retrieves log level. * The log level of an event represents its relative importance * or severity within CMS. - * + * * @return Integer log level value. */ public int getLevel(); /** * Retrieves NT specific log event type. - * + * * @return Integer NTEventType value. */ public int getNTEventType(); @@ -67,7 +67,7 @@ public interface ILogEvent extends Serializable { /** * Retrieves multiline attribute. * Does this message consiste of more than one line. - * + * * @return Boolean of multiline status. */ public boolean getMultiline(); @@ -75,7 +75,7 @@ public interface ILogEvent extends Serializable { /** * Retrieves log event type. Each type of event * has an associated String type value. - * + * * @return String containing the type of event. */ public String getEventType(); @@ -83,7 +83,7 @@ public interface ILogEvent extends Serializable { /** * Sets log event type. Each type of event * has an associated String type value. - * + * * @param eventType String containing the type of event. */ public void setEventType(String eventType); @@ -92,7 +92,7 @@ public interface ILogEvent extends Serializable { * Returns localized message string. This method should * only be called if a localized string is necessary. * <P> - * + * * @return Details message. */ public String toContent(); @@ -100,7 +100,7 @@ public interface ILogEvent extends Serializable { /** * Returns the string based on the given locale. * <P> - * + * * @param locale locale * @return Details message. */ diff --git a/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java b/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java index bfd5be930..ea61d0f2f 100644 --- a/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java +++ b/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java @@ -23,14 +23,14 @@ import java.util.Properties; * An interface represents a log event factory. This * factory will be responsible for creating and returning ILogEvent objects * on demand. - * + * * @version $Revision$, $Date$ */ public interface ILogEventFactory { /** * Creates an event of a particular event type/class. - * + * * @param evtClass The event type. * @param prop The resource bundle. * @param source The subsystem ID who creates the log event. @@ -45,7 +45,7 @@ public interface ILogEventFactory { /** * Releases previously created event. - * + * * @param event The log event. */ public void release(ILogEvent event); diff --git a/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java b/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java index 15ff08ad5..a2d468955 100644 --- a/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java +++ b/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java @@ -37,14 +37,14 @@ import com.netscape.certsrv.common.NameValuePairs; * of the logged event. The listener will then proceed to * process the event accordingly which will result in a log * message existing in some file. - * + * * @version $Revision$, $Date$ */ public interface ILogEventListener extends EventListener { /** * The event notification method: Logs event. - * + * * @param event The log event to be processed. */ public void log(ILogEvent event) throws ELogException; @@ -62,14 +62,14 @@ public interface ILogEventListener extends EventListener { /** * Get the configuration store for the log event listener. - * + * * @return The configuration store of this log event listener. */ public IConfigStore getConfigStore(); /** * Initialize this log listener - * + * * @param owner The subsystem. * @param config Configuration store for this log listener. * @exception initialization error. @@ -87,7 +87,7 @@ public interface ILogEventListener extends EventListener { * Retrieve last "maxLine" number of system logs with log level >"level" * and from source "source". If the parameter is omitted. All entries * are sent back. - * + * * @param req a Hashtable containing the required information such as * log entry, log level, log source, and log name. * @return NameValue pair list of log messages. @@ -100,35 +100,35 @@ public interface ILogEventListener extends EventListener { /** * Retrieve list of log files. - * + * */ public NameValuePairs retrieveLogList(Hashtable<String, String> req) throws ServletException, IOException, EBaseException; /** * Returns implementation name. - * + * * @return String name of event listener implementation. */ public String getImplName(); /** * Returns the description of this log event listener. - * + * * @return String with listener description. */ public String getDescription(); /** * Return list of default config parameters for this log event listener. - * + * * @return Vector of default parameters. */ public Vector<String> getDefaultParams(); /** * Return list of instance config parameters for this log event listener. - * + * * @return Vector of instance parameters. */ public Vector<String> getInstanceParams(); diff --git a/base/common/src/com/netscape/certsrv/logging/ILogQueue.java b/base/common/src/com/netscape/certsrv/logging/ILogQueue.java index bca7a93df..9cdcb8a36 100644 --- a/base/common/src/com/netscape/certsrv/logging/ILogQueue.java +++ b/base/common/src/com/netscape/certsrv/logging/ILogQueue.java @@ -21,14 +21,14 @@ package com.netscape.certsrv.logging; * An interface represents a log queue. A log queue * is a queue of pending log events to be dispatched * to a set of registered ILogEventListeners. - * + * * @version $Revision$, $Date$ */ public interface ILogQueue { /** * Dispatch the log event to all registered log event listeners. - * + * * @param evt the log event */ public void log(ILogEvent evt); @@ -41,7 +41,7 @@ public interface ILogQueue { /** * Registers an event listener. - * + * * @param listener The log event listener to be registered * to this queue. */ @@ -49,7 +49,7 @@ public interface ILogQueue { /** * Removes an event listener. - * + * * @param listener The log event listener to be removed from this queue. */ public void removeLogEventListener(ILogEventListener listener); @@ -57,7 +57,7 @@ public interface ILogQueue { /** * Initializes the log queue. * <P> - * + * */ public void init(); diff --git a/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java b/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java index ce317a5b8..313f2688e 100644 --- a/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java +++ b/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.base.ISubsystem; * instances. Each log instance can be individually configured and is * associated with its own configuration entries in the configuration file. * <P> - * + * * @version $Revision$, $Date$ */ public interface ILogSubsystem extends ISubsystem { @@ -45,7 +45,7 @@ public interface ILogSubsystem extends ISubsystem { /** * Retrieve plugin name (implementation name) of the log event * listener. If no plug name found, an empty string is returned - * + * * @param log the log event listener * @return the log event listener's plugin name */ @@ -53,7 +53,7 @@ public interface ILogSubsystem extends ISubsystem { /** * Retrieve the log event listener by instance name - * + * * @param insName the log instance name in String * @return the log instance in ILogEventListener */ @@ -61,7 +61,7 @@ public interface ILogSubsystem extends ISubsystem { /** * get the list of log plugins that are available - * + * * @return log plugins in a Hashtable. Each entry in the * Hashtable contains the name/value pair of pluginName/LogPlugin * @see LogPlugin @@ -70,7 +70,7 @@ public interface ILogSubsystem extends ISubsystem { /** * get the list of log instances that are available - * + * * @return log instances in a Hashtable. Each entry in the * Hashtable contains the name/value pair of instName/ILogEventListener * @see LogPlugin @@ -82,7 +82,7 @@ public interface ILogSubsystem extends ISubsystem { * plugin. It is used by * administration servlet to handle log configuration when a new * log instance is added. - * + * * @param implName The implementation name for which the * configuration parameters are to be configured * @return a Vector of default configuration paramter names @@ -97,7 +97,7 @@ public interface ILogSubsystem extends ISubsystem { * Get the default configuration parameter names associated with a * log instance. It is used by administration servlet to handle * log instance configuration. - * + * * @param insName The instance name for which the configuration * parameters are to be configured * @return a Vector of default configuration paramter names diff --git a/base/common/src/com/netscape/certsrv/logging/ILogger.java b/base/common/src/com/netscape/certsrv/logging/ILogger.java index 4cdb4b80f..10ec35337 100644 --- a/base/common/src/com/netscape/certsrv/logging/ILogger.java +++ b/base/common/src/com/netscape/certsrv/logging/ILogger.java @@ -26,7 +26,7 @@ import java.util.Properties; * written to the destination log file. This object also maintains a collection of ILogFactory objects * which are used to create the supported types of ILogEvents. CMS comes out of the box with three event * types: "signedAudit", "system", and "audit". - * + * * @version $Revision$, $Date$ */ public interface ILogger { @@ -269,7 +269,7 @@ public interface ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM or EV_SIGNED_AUDIT. * @param source The source of the log event. * @param msg The detail message to be logged. @@ -278,7 +278,7 @@ public interface ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM or EV_SIGNED_AUDIT. * @param props The resource bundle used for the detailed message. * @param source The source of the log event. @@ -288,7 +288,7 @@ public interface ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM or EV_SIGNED_AUDIT. * @param source The source of the log event. * @param level The level of the log event. @@ -298,7 +298,7 @@ public interface ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM or EV_SIGNED_AUDIT. * @param props The resource bundle used for the detailed message. * @param source The source of the log event. @@ -309,7 +309,7 @@ public interface ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM or EV_SIGNED_AUDIT. * @param source The source of the log event. * @param level The level of the log event. @@ -320,7 +320,7 @@ public interface ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM or EV_SIGNED_AUDIT. * @param source The source of the log event. * @param level The level of the log event. @@ -331,7 +331,7 @@ public interface ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM or EV_SIGNED_AUDIT. * @param props The resource bundle used for the detailed message. * @param source The source of the log event. @@ -342,7 +342,7 @@ public interface ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM or EV_SIGNED_AUDIT. * @param props The resource bundle used for the detailed message. * @param source The source of the log event. @@ -355,7 +355,7 @@ public interface ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM or EV_SIGNED_AUDIT. * @param prop The resource bundle used for the detailed message. * @param source The source of the log event. @@ -370,7 +370,7 @@ public interface ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM or EV_SIGNED_AUDIT. * @param source The source of the log event. * @param msg The detail message to be logged. @@ -380,7 +380,7 @@ public interface ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM or EV_SIGNED_AUDIT. * @param props The resource bundle used for the detailed message. * @param source The source of the log event. @@ -391,7 +391,7 @@ public interface ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM or EV_SIGNED_AUDIT. * @param source The source of the log event. * @param level The level of the log event. @@ -402,7 +402,7 @@ public interface ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM or EV_SIGNED_AUDIT. * @param props The resource bundle used for the detailed message. * @param source The source of the log event. @@ -414,7 +414,7 @@ public interface ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM or EV_SIGNED_AUDIT. * @param source The source of the log event. * @param level The level of the log event. @@ -426,7 +426,7 @@ public interface ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM or EV_SIGNED_AUDIT. * @param props The resource bundle used for the detailed message. * @param source TTTTsource of the log event. @@ -438,7 +438,7 @@ public interface ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM or EV_SIGNED_AUDIT. * @param props The resource bundle used for the detailed message. * @param source The source of the log event. @@ -452,7 +452,7 @@ public interface ILogger { /** * Logs an event to the log queue. - * + * * @param evtClass What kind of event it is: EV_AUDIT or EV_SYSTEM or EV_SIGNED_AUDIT. * @param prop The resource bundle used for the detailed message. * @param source The source of the log event. diff --git a/base/common/src/com/netscape/certsrv/logging/LogPlugin.java b/base/common/src/com/netscape/certsrv/logging/LogPlugin.java index 9d7a5cc45..152ad4841 100644 --- a/base/common/src/com/netscape/certsrv/logging/LogPlugin.java +++ b/base/common/src/com/netscape/certsrv/logging/LogPlugin.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.base.Plugin; /** * This class represents a registered logger plugin. * <P> - * + * * @version $Revision$, $Date$ */ public class LogPlugin extends Plugin { diff --git a/base/common/src/com/netscape/certsrv/logging/LogResources.java b/base/common/src/com/netscape/certsrv/logging/LogResources.java index 899bf1893..005428d79 100644 --- a/base/common/src/com/netscape/certsrv/logging/LogResources.java +++ b/base/common/src/com/netscape/certsrv/logging/LogResources.java @@ -25,7 +25,7 @@ import com.netscape.certsrv.base.BaseResources; /** * This is the fallback resource bundle for all log events. * <P> - * + * * @version $Revision$, $Date$ * @see java.util.ListResourceBundle */ @@ -35,7 +35,7 @@ public class LogResources extends ListResourceBundle { /** * Contructs a log resource bundle and sets it's parent to the base * resource bundle. - * + * * @see com.netscape.certsrv.base.BaseResources */ public LogResources() { @@ -45,7 +45,7 @@ public class LogResources extends ListResourceBundle { /** * Returns the content of this resource. - * + * * @return Array of objects making up the contents of this resource. */ public Object[][] getContents() { diff --git a/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java b/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java index 8541eda34..b5483eb9f 100644 --- a/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java @@ -27,8 +27,8 @@ import com.netscape.certsrv.base.MessageFormatter; * The log event object that carries message detail of a log event * that goes into the Signed Audit Event log. This log has the * property of being digitally signed for security considerations. - * - * + * + * * @version $Revision$, $Date$ * @see java.text.MessageFormat * @see com.netscape.certsrv.logging.LogResources @@ -61,7 +61,7 @@ public class SignedAuditEvent implements IBundleLogEvent { /** * Constructs a SignedAuditEvent message event. * <P> - * + * * @param msgFormat The message string. */ public SignedAuditEvent(String msgFormat) { @@ -71,12 +71,12 @@ public class SignedAuditEvent implements IBundleLogEvent { /** * Constructs a message with a parameter. For example, - * + * * <PRE> * new SignedAuditEvent("failed to load {0}", fileName); * </PRE> * <P> - * + * * @param msgFormat Details in message string format. * @param param Message string parameter. */ @@ -90,7 +90,7 @@ public class SignedAuditEvent implements IBundleLogEvent { * Constructs a message from an exception. It can be used to carry * a signed audit exception that may contain information about * the context. For example, - * + * * <PRE> * try { * ... @@ -99,7 +99,7 @@ public class SignedAuditEvent implements IBundleLogEvent { * } * </PRE> * <P> - * + * * @param msgFormat Exception details in message string format. * @param exception System exception. */ @@ -112,7 +112,7 @@ public class SignedAuditEvent implements IBundleLogEvent { /** * Constructs a message from a base exception. This will use the msgFormat * from the exception itself. - * + * * <PRE> * try { * ... @@ -121,7 +121,7 @@ public class SignedAuditEvent implements IBundleLogEvent { * } * </PRE> * <P> - * + * * @param e CMS exception. */ public SignedAuditEvent(Exception e) { @@ -138,7 +138,7 @@ public class SignedAuditEvent implements IBundleLogEvent { * 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. */ @@ -150,7 +150,7 @@ public class SignedAuditEvent implements IBundleLogEvent { /** * Returns the current message format string. * <P> - * + * * @return Details message. */ public String getMessage() { @@ -161,7 +161,7 @@ public class SignedAuditEvent implements IBundleLogEvent { * Returns a list of parameters. These parameters can be * used to assist in formatting the message. * <P> - * + * * @return List of message format parameters. */ public Object[] getParameters() { @@ -172,7 +172,7 @@ public class SignedAuditEvent implements IBundleLogEvent { * Returns localized message string. This method should * only be called if a localized string is necessary. * <P> - * + * * @return Details message. */ public String toContent() { @@ -182,7 +182,7 @@ public class SignedAuditEvent implements IBundleLogEvent { /** * Returns the string based on the given locale. * <P> - * + * * @param locale Locale. * @return Details message. */ @@ -195,7 +195,7 @@ public class SignedAuditEvent implements IBundleLogEvent { /** * Sets the resource bundle name for this class instance. This should * be overridden by subclasses who have their own resource bundles. - * + * * @param bundle String with name of resource bundle. */ public void setBundleName(String bundle) { @@ -204,7 +204,7 @@ public class SignedAuditEvent implements IBundleLogEvent { /** * Retrieves bundle name. - * + * * @return String with name of resource bundle. */ protected String getBundleName() { @@ -215,7 +215,7 @@ public class SignedAuditEvent implements IBundleLogEvent { * Retrieves log source. * This is an id of the subsystem responsible * for creating the log event. - * + * * @return Integer source id. */ public int getSource() { @@ -224,7 +224,7 @@ public class SignedAuditEvent implements IBundleLogEvent { /** * Sets log source. - * + * * @param source Integer id of log source. */ public void setSource(int source) { @@ -235,7 +235,7 @@ public class SignedAuditEvent implements IBundleLogEvent { * Retrieves log level. * The log level of an event represents its relative importance * or severity within CMS. - * + * * @return Integer log level value. */ public int getLevel() { @@ -244,7 +244,7 @@ public class SignedAuditEvent implements IBundleLogEvent { /** * Retrieves NT specific log event type. - * + * * @return Integer NTEventType value. */ public int getNTEventType() { @@ -255,7 +255,7 @@ public class SignedAuditEvent implements IBundleLogEvent { * Sets log level, NT log event type. * For certain log levels the NT log event type gets * set as well. - * + * * @param level Integer log level value. */ public void setLevel(int level) { @@ -286,7 +286,7 @@ public class SignedAuditEvent implements IBundleLogEvent { /** * Retrieves log multiline attribute. - * + * * @return Boolean whether or not this event is multiline. * A multiline message simply consists of more than one line. */ @@ -297,7 +297,7 @@ public class SignedAuditEvent implements IBundleLogEvent { /** * Sets log multiline attribute. A multiline message consists of * more than one line. - * + * * @param multiline Boolean multiline value. */ public void setMultiline(boolean multiline) { @@ -306,7 +306,7 @@ public class SignedAuditEvent implements IBundleLogEvent { /** * Retrieves event time stamp. - * + * * @return Long integer of the time the event was created. */ public long getTimeStamp() { @@ -316,7 +316,7 @@ public class SignedAuditEvent implements IBundleLogEvent { /** * Retrieves log event type. Each type of event * has an associated String type value. - * + * * @return String containing the type of event. */ public String getEventType() { @@ -326,7 +326,7 @@ public class SignedAuditEvent implements IBundleLogEvent { /** * Sets log event type. Each type of event * has an associated String type value. - * + * * @param eventType String containing the type of event. */ public void setEventType(String eventType) { @@ -335,7 +335,7 @@ public class SignedAuditEvent implements IBundleLogEvent { /** * Return string representation of log message. - * + * * @return String containing log message. */ public String toString() { diff --git a/base/common/src/com/netscape/certsrv/logging/SystemEvent.java b/base/common/src/com/netscape/certsrv/logging/SystemEvent.java index 9f625cdfd..3704e60ca 100644 --- a/base/common/src/com/netscape/certsrv/logging/SystemEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/SystemEvent.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.base.MessageFormatter; * The log event object that carries a log message. * This class represents System events which are CMS events * which need to be logged to a log file. - * + * * @version $Revision$, $Date$ * @see java.text.MessageFormat * @see com.netscape.certsrv.logging.LogResources @@ -59,7 +59,7 @@ public class SystemEvent implements IBundleLogEvent { /** * Constructs a SystemEvent message event. * <P> - * + * * @param msgFormat The message string. */ public SystemEvent(String msgFormat) { @@ -69,12 +69,12 @@ public class SystemEvent implements IBundleLogEvent { /** * Constructs a SystemEvent message with a parameter. For example, - * + * * <PRE> * new SystemEvent("failed to load {0}", fileName); * </PRE> * <P> - * + * * @param msgFormat Details in message string format. * @param param Message string parameter. */ @@ -88,7 +88,7 @@ public class SystemEvent implements IBundleLogEvent { * Constructs a SystemEvent message from an exception. It can be used to carry * a system exception that may contain information about * the context. For example, - * + * * <PRE> * try { * ... @@ -97,7 +97,7 @@ public class SystemEvent implements IBundleLogEvent { * } * </PRE> * <P> - * + * * @param msgFormat Exception details in message string format. * @param exception System exception. */ @@ -110,7 +110,7 @@ public class SystemEvent implements IBundleLogEvent { /** * Constructs a SystemEvent message from a base exception. This will use the msgFormat * from the exception itself. - * + * * <PRE> * try { * ... @@ -119,7 +119,7 @@ public class SystemEvent implements IBundleLogEvent { * } * </PRE> * <P> - * + * * @param e CMS exception. */ public SystemEvent(Exception e) { @@ -136,7 +136,7 @@ public class SystemEvent implements IBundleLogEvent { * Constructs a SystemEvent 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. */ @@ -148,7 +148,7 @@ public class SystemEvent implements IBundleLogEvent { /** * Returns the current message format string. * <P> - * + * * @return Details message. */ public String getMessage() { @@ -159,7 +159,7 @@ public class SystemEvent implements IBundleLogEvent { * Returns a list of parameters. These parameters can be * used to assist in formatting the message. * <P> - * + * * @return List of message format parameters. */ public Object[] getParameters() { @@ -170,7 +170,7 @@ public class SystemEvent implements IBundleLogEvent { * Returns localized message string. This method should * only be called if a localized string is necessary. * <P> - * + * * @return Details message. */ public String toContent() { @@ -180,7 +180,7 @@ public class SystemEvent implements IBundleLogEvent { /** * Returns the string based on the given locale. * <P> - * + * * @param locale Locale. * @return Details message. */ @@ -193,7 +193,7 @@ public class SystemEvent implements IBundleLogEvent { /** * Sets the resource bundle name for this class instance. This should * be overridden by subclasses who have their own resource bundles. - * + * * @param bundle String with the name of resource bundle. */ public void setBundleName(String bundle) { @@ -202,7 +202,7 @@ public class SystemEvent implements IBundleLogEvent { /** * Retrieves bundle name. - * + * * @return String with name of resource bundle. */ protected String getBundleName() { @@ -213,7 +213,7 @@ public class SystemEvent implements IBundleLogEvent { * Retrieves log source. * This is an id of the subsystem responsible * for creating the log event. - * + * * @return Integer source id. */ public int getSource() { @@ -223,7 +223,7 @@ public class SystemEvent implements IBundleLogEvent { /** * Sets log source. * Sets the id of the subsystem issuing the event. - * + * * @param source Integer source id. */ public void setSource(int source) { @@ -234,7 +234,7 @@ public class SystemEvent implements IBundleLogEvent { * Retrieves log level. * The log level of an event represents its relative importance * or severity within CMS. - * + * * @return Integer log level value. */ public int getLevel() { @@ -243,7 +243,7 @@ public class SystemEvent implements IBundleLogEvent { /** * Retrieves NT specific log event type. - * + * * @return Integer NTEventType value. */ public int getNTEventType() { @@ -254,7 +254,7 @@ public class SystemEvent implements IBundleLogEvent { * Sets log level, NT log event type. * For certain log levels the NT log event type gets * set as well. - * + * * @param level Integer log level value. */ public void setLevel(int level) { @@ -285,7 +285,7 @@ public class SystemEvent implements IBundleLogEvent { /** * Retrieves log multiline attribute. - * + * * @return Boolean whether or not this event is multiline. * A multiline message simply consists of more than one line. */ @@ -296,7 +296,7 @@ public class SystemEvent implements IBundleLogEvent { /** * Sets log multiline attribute. A multiline message consists of * more than one line. - * + * * @param multiline Boolean multiline value. */ public void setMultiline(boolean multiline) { @@ -305,7 +305,7 @@ public class SystemEvent implements IBundleLogEvent { /** * Retrieves event time stamp. - * + * * @return Long integer of the time the event was created. */ public long getTimeStamp() { @@ -315,7 +315,7 @@ public class SystemEvent implements IBundleLogEvent { /** * Retrieves log event type. Each type of event * has an associated String type value. - * + * * @return String containing the type of event. */ public String getEventType() { @@ -325,7 +325,7 @@ public class SystemEvent implements IBundleLogEvent { /** * Sets log event type. Each type of event * has an associated String type value. - * + * * @param eventType String containing the type of event. */ public void setEventType(String eventType) { @@ -334,7 +334,7 @@ public class SystemEvent implements IBundleLogEvent { /** * Return string representation of log message. - * + * * @return String containing log message. */ public String toString() { diff --git a/base/common/src/com/netscape/certsrv/notification/ENotificationException.java b/base/common/src/com/netscape/certsrv/notification/ENotificationException.java index fffc8edeb..096d6e3a5 100644 --- a/base/common/src/com/netscape/certsrv/notification/ENotificationException.java +++ b/base/common/src/com/netscape/certsrv/notification/ENotificationException.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.base.EBaseException; /** * A class represents a notification exception. * <P> - * + * * @version $Revision$, $Date$ */ public class ENotificationException extends EBaseException { diff --git a/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java b/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java index 40114bd1e..74d29ecde 100644 --- a/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java +++ b/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java @@ -25,7 +25,7 @@ import java.util.Vector; * '$' is used preceeding a token name. A token name should not be a * substring of any other token name * <p> - * + * * @version $Revision$, $Date$ */ public interface IEmailFormProcessor { diff --git a/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java b/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java index 39e5bed37..c16307127 100644 --- a/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java +++ b/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java @@ -23,7 +23,7 @@ import com.netscape.certsrv.base.EBaseException; * An email resolver that first checks the request email, if none, * then follows by checking the subjectDN of the certificate * <p> - * + * * @version $Revision$, $Date$ */ public interface IEmailResolver { @@ -31,7 +31,7 @@ public interface 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) diff --git a/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java b/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java index 1363a9e09..f74d9d6e6 100644 --- a/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java +++ b/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.base.IAttrSet; * emails * e.g. request/cert, cert/request, request, request/cert/subjectalternatename etc. * <P> - * + * * @version $Revision$, $Date$ */ public interface IEmailResolverKeys extends IAttrSet { diff --git a/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java b/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java index cbdea8436..dac8b9ab9 100644 --- a/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java +++ b/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java @@ -20,7 +20,7 @@ package com.netscape.certsrv.notification; /** * Files to be processed and returned to the requested parties. It * is a template with $tokens to be used by the form/template processor. - * + * * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/certsrv/notification/IMailNotification.java b/base/common/src/com/netscape/certsrv/notification/IMailNotification.java index 356a6bba3..bc4664886 100644 --- a/base/common/src/com/netscape/certsrv/notification/IMailNotification.java +++ b/base/common/src/com/netscape/certsrv/notification/IMailNotification.java @@ -25,7 +25,7 @@ import java.util.Vector; * This class uses <b>smtp.host</b> in the configuration for smtp * host. The port default (25) is used. If no smtp specified, local * host is used - * + * * @version $Revision$, $Date$ */ public interface IMailNotification { @@ -37,42 +37,42 @@ public interface IMailNotification { /** * sets the "From" field - * + * * @param from email address of the sender */ public void setFrom(String from); /** * sets the "Subject" field - * + * * @param subject subject of the email */ public void setSubject(String subject); /** * sets the "Content-Type" field - * + * * @param contentType content type of the email */ public void setContentType(String contentType); /** * sets the content of the email - * + * * @param content the message content */ public void setContent(String content); /** * sets the recipients' email addresses - * + * * @param addresses a list of email addresses of the recipients */ public void setTo(Vector<String> addresses); /** * sets the recipient's email address - * + * * @param to address of the recipient email address */ public void setTo(String to); diff --git a/base/common/src/com/netscape/certsrv/notification/NotificationResources.java b/base/common/src/com/netscape/certsrv/notification/NotificationResources.java index b81443999..07ceebd0b 100644 --- a/base/common/src/com/netscape/certsrv/notification/NotificationResources.java +++ b/base/common/src/com/netscape/certsrv/notification/NotificationResources.java @@ -22,7 +22,7 @@ import java.util.ListResourceBundle; /** * A class represents a resource bundle for the * Mail Notification package - * + * * @version $Revision$, $Date$ */ public class NotificationResources extends ListResourceBundle { diff --git a/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java b/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java index ee4c76a08..76ece7510 100644 --- a/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java +++ b/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java @@ -30,14 +30,14 @@ import com.netscape.certsrv.dbs.repository.IRepositoryRecord; * This class defines an Online Certificate Status Protocol (OCSP) store which * has been extended to provide information from the internal database. * <P> - * + * * @version $Revision$, $Date$ */ public interface IDefStore extends IOCSPStore { /** * This method retrieves the number of CRL updates since startup. * <P> - * + * * @return count the number of OCSP default stores */ public int getStateCount(); @@ -45,7 +45,7 @@ public interface IDefStore extends IOCSPStore { /** * This method retrieves the number of OCSP requests since startup. * <P> - * + * * @param id a string associated with an OCSP request * @return count the number of this type of OCSP requests */ @@ -54,7 +54,7 @@ public interface IDefStore extends IOCSPStore { /** * This method creates a an OCSP default store repository record. * <P> - * + * * @return IRepositoryRecord an instance of the repository record object */ public IRepositoryRecord createRepositoryRecord(); @@ -62,7 +62,7 @@ public interface IDefStore extends IOCSPStore { /** * This method adds a request to the default OCSP store repository. * <P> - * + * * @param name a string representing the name of this request * @param thisUpdate the current request * @param rec an instance of the repository record object @@ -77,7 +77,7 @@ public interface IDefStore extends IOCSPStore { * This method specifies whether or not to wait for the Certificate * Revocation List (CRL) to be updated. * <P> - * + * * @return boolean true or false */ public boolean waitOnCRLUpdate(); @@ -85,7 +85,7 @@ public interface IDefStore extends IOCSPStore { /** * This method updates the specified CRL. * <P> - * + * * @param crl the CRL to be updated * @exception EBaseException occurs when the CRL cannot be updated */ @@ -94,7 +94,7 @@ public interface IDefStore extends IOCSPStore { /** * This method attempts to read the CRL issuing point. * <P> - * + * * @param name the name of the CRL to be read * @return ICRLIssuingPointRecord the CRL issuing point * @exception EBaseException occurs when the specified CRL cannot be located @@ -105,7 +105,7 @@ public interface IDefStore extends IOCSPStore { /** * This method searches all CRL issuing points. * <P> - * + * * @param maxSize specifies the largest number of hits from the search * @return Enumeration a list of the CRL issuing points * @exception EBaseException occurs when no CRL issuing point exists @@ -118,7 +118,7 @@ public interface IDefStore extends IOCSPStore { * This method searches all CRL issuing points constrained by the specified * filtering mechanism. * <P> - * + * * @param filter a string which constrains the search * @param maxSize specifies the largest number of hits from the search * @return Enumeration a list of the CRL issuing points @@ -131,7 +131,7 @@ public interface IDefStore extends IOCSPStore { /** * This method creates a CRL issuing point record. * <P> - * + * * @param name a string representation of this CRL issuing point record * @param crlNumber the number of this CRL issuing point record * @param crlSize the size of this CRL issuing point record @@ -146,7 +146,7 @@ public interface IDefStore extends IOCSPStore { /** * This method adds a CRL issuing point * <P> - * + * * @param name a string representation of this CRL issuing point record * @param rec this CRL issuing point record * @exception EBaseException occurs when the specified CRL issuing point @@ -158,7 +158,7 @@ public interface IDefStore extends IOCSPStore { /** * This method deletes a CRL issuing point record * <P> - * + * * @param id a string representation of this CRL issuing point record * @exception EBaseException occurs when the specified CRL issuing point * record cannot be deleted @@ -170,7 +170,7 @@ public interface IDefStore extends IOCSPStore { * This method checks to see if the OCSP response should return good * when the certificate is not found. * <P> - * + * * @return boolean true or false */ public boolean isNotFoundGood(); diff --git a/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java b/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java index 0219d357d..6164b4917 100644 --- a/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java +++ b/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java @@ -33,7 +33,7 @@ import com.netscape.cmsutil.ocsp.ResponseData; * This class represents the primary interface for the Online Certificate * Status Protocol (OCSP) server. * <P> - * + * * @version $Revision$, $Date$ */ public interface IOCSPAuthority extends ISubsystem { @@ -50,7 +50,7 @@ public interface IOCSPAuthority extends ISubsystem { /** * This method retrieves the OCSP store given its name. * <P> - * + * * @param id the string representation of an OCSP store * @return IOCSPStore an instance of an OCSP store object */ @@ -59,7 +59,7 @@ public interface IOCSPAuthority extends ISubsystem { /** * This method retrieves the signing unit. * <P> - * + * * @return ISigningUnit an instance of a signing unit object */ public ISigningUnit getSigningUnit(); @@ -67,7 +67,7 @@ public interface IOCSPAuthority extends ISubsystem { /** * This method retrieves the responder ID by its name. * <P> - * + * * @return ResponderID an instance of a responder ID */ public ResponderID getResponderIDByName(); @@ -75,7 +75,7 @@ public interface IOCSPAuthority extends ISubsystem { /** * This method retrieves the responder ID by its hash. * <P> - * + * * @return ResponderID an instance of a responder ID */ public ResponderID getResponderIDByHash(); @@ -84,7 +84,7 @@ public interface IOCSPAuthority extends ISubsystem { * This method retrieves the default OCSP store * (i. e. - information from the internal database). * <P> - * + * * @return IDefStore an instance of the default OCSP store */ public IDefStore getDefaultStore(); @@ -92,7 +92,7 @@ public interface IOCSPAuthority extends ISubsystem { /** * This method sets the supplied algorithm as the default signing algorithm. * <P> - * + * * @param algorithm a string representing the requested algorithm * @exception EBaseException if the algorithm is unknown or disallowed */ @@ -102,7 +102,7 @@ public interface IOCSPAuthority extends ISubsystem { /** * This method retrieves the default signing algorithm. * <P> - * + * * @return String the name of the default signing algorithm */ public String getDefaultAlgorithm(); @@ -110,7 +110,7 @@ public interface IOCSPAuthority extends ISubsystem { /** * This method retrieves all potential OCSP signing algorithms. * <P> - * + * * @return String[] the names of all potential OCSP signing algorithms */ public String[] getOCSPSigningAlgorithms(); @@ -118,7 +118,7 @@ public interface IOCSPAuthority extends ISubsystem { /** * This method logs the specified message at the specified level. * <P> - * + * * @param level the log level * @param msg the log message */ @@ -128,7 +128,7 @@ public interface IOCSPAuthority extends ISubsystem { * This method logs the specified message at the specified level given * the specified event. * <P> - * + * * @param event the log event * @param level the log message * @param msg the log message @@ -138,7 +138,7 @@ public interface IOCSPAuthority extends ISubsystem { /** * This method retrieves the X500Name of an OCSP server instance. * <P> - * + * * @return X500Name an instance of the X500 name object */ public X500Name getName(); @@ -146,7 +146,7 @@ public interface IOCSPAuthority extends ISubsystem { /** * This method retrieves an OCSP server instance digest name as a string. * <P> - * + * * @param alg the signing algorithm * @return String the digest name of the related OCSP server */ @@ -155,7 +155,7 @@ public interface IOCSPAuthority extends ISubsystem { /** * This method signs the basic OCSP response data provided as a parameter. * <P> - * + * * @param rd response data * @return BasicOCSPResponse signed response data * @exception EBaseException error associated with an inability to sign @@ -167,7 +167,7 @@ public interface IOCSPAuthority extends ISubsystem { /** * This method compares two byte arrays to see if they are equivalent. * <P> - * + * * @param bytes the first byte array * @param ints the second byte array * @return boolean true or false diff --git a/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java b/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java index 574289c29..b379ba42c 100644 --- a/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java +++ b/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java @@ -24,7 +24,7 @@ import com.netscape.cmsutil.ocsp.OCSPResponse; /** * This class represents the servlet that serves the Online Certificate * Status Protocol (OCSP) requests. - * + * * @version $Revision$ $Date$ */ public interface IOCSPService { @@ -32,7 +32,7 @@ public interface IOCSPService { * This method validates the information associated with the specified * OCSP request and returns an OCSP response. * <P> - * + * * @param r an OCSP request * @return OCSPResponse the OCSP response associated with the specified * OCSP request @@ -44,7 +44,7 @@ public interface IOCSPService { /** * Returns the in-memory count of the processed OCSP requests. - * + * * @return number of processed OCSP requests in memory */ public long getNumOCSPRequest(); @@ -52,7 +52,7 @@ public interface IOCSPService { /** * Returns the in-memory time (in mini-second) of * the processed time for OCSP requests. - * + * * @return processed times for OCSP requests */ public long getOCSPRequestTotalTime(); @@ -60,7 +60,7 @@ public interface IOCSPService { /** * Returns the in-memory time (in mini-second) of * the signing time for OCSP requests. - * + * * @return processed times for OCSP requests */ public long getOCSPTotalSignTime(); @@ -70,7 +70,7 @@ public interface IOCSPService { /** * Returns the total data signed * for OCSP requests. - * + * * @return processed times for OCSP requests */ public long getOCSPTotalData(); diff --git a/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java b/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java index 676122105..b94038473 100644 --- a/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java +++ b/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java @@ -31,7 +31,7 @@ import com.netscape.cmsutil.ocsp.OCSPResponse; * would merely create a new class that extends this class (e. g. - * "public interface ICorporateLDAPStore extends IOCSPStore"). * <P> - * + * * @version $Revision$, $Date$ */ public interface IOCSPStore extends ISubsystem { @@ -39,7 +39,7 @@ public interface IOCSPStore extends ISubsystem { * This method validates the information associated with the specified * OCSP request and returns an OCSP response. * <P> - * + * * @param req an OCSP request * @return OCSPResponse the OCSP response associated with the specified * OCSP request @@ -53,7 +53,7 @@ public interface IOCSPStore extends ISubsystem { * This method retrieves the configuration parameters associated with this * OCSP store. * <P> - * + * * @return NameValuePairs all configuration items */ public NameValuePairs getConfigParameters(); @@ -62,7 +62,7 @@ public interface IOCSPStore extends ISubsystem { * This method stores the configuration parameters specified by the * passed-in Name Value pairs object. * <P> - * + * * @param pairs a name-value pair object * @exception EBaseException an illegal name-value pair */ diff --git a/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java b/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java index 3dc028ffb..6b2459759 100644 --- a/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java +++ b/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java @@ -23,7 +23,7 @@ import com.netscape.certsrv.base.PasswordResources; /** * A class represents a password checker exception. * <P> - * + * * @version $Revision$, $Date$ */ public class EPasswordCheckException extends EBaseException { @@ -40,7 +40,7 @@ public class EPasswordCheckException extends EBaseException { /** * Constructs a password checker exception * <P> - * + * * @param msgFormat exception details */ public EPasswordCheckException(String msgFormat) { @@ -50,7 +50,7 @@ public class EPasswordCheckException extends EBaseException { /** * Constructs a password checker exception. * <P> - * + * * @param msgFormat exception details in message string format * @param param message string parameter */ @@ -61,7 +61,7 @@ public class EPasswordCheckException extends EBaseException { /** * Constructs a password checker exception. * <P> - * + * * @param msgFormat exception details in message string format * @param exception system exception */ @@ -72,7 +72,7 @@ public class EPasswordCheckException extends EBaseException { /** * Constructs a password checker exception. * <P> - * + * * @param msgFormat the message format. * @param params list of message format parameters */ @@ -82,7 +82,7 @@ public class EPasswordCheckException extends EBaseException { /** * Retrieves bundle name. - * + * * @return resource bundle name. */ protected String getBundleName() { diff --git a/base/common/src/com/netscape/certsrv/password/IConfigPasswordCheck.java b/base/common/src/com/netscape/certsrv/password/IConfigPasswordCheck.java index 8b23fa513..208f644d7 100644 --- a/base/common/src/com/netscape/certsrv/password/IConfigPasswordCheck.java +++ b/base/common/src/com/netscape/certsrv/password/IConfigPasswordCheck.java @@ -20,14 +20,14 @@ package com.netscape.certsrv.password; /** * Configuration Wizard Password quality checker interface. * <P> - * + * * @version $Revision$, $Date$ */ public interface IConfigPasswordCheck { /** * Check if the password meets the quality requirement - * + * * @param pwd the given password * @return true if the password meets the quality requirement; otherwise false */ @@ -35,7 +35,7 @@ public interface IConfigPasswordCheck { /** * Returns a reason if the password doesnt meet the quality requirement. - * + * * @param pwd the given password * @return a reason if the password quality requirement is not met. */ diff --git a/base/common/src/com/netscape/certsrv/password/IPasswordCheck.java b/base/common/src/com/netscape/certsrv/password/IPasswordCheck.java index d885d3fce..642cf6fc3 100644 --- a/base/common/src/com/netscape/certsrv/password/IPasswordCheck.java +++ b/base/common/src/com/netscape/certsrv/password/IPasswordCheck.java @@ -20,14 +20,14 @@ package com.netscape.certsrv.password; /** * Password quality checker interface. * <P> - * + * * @version $Revision$, $Date$ */ public interface IPasswordCheck { /** * Check if the password meets the quality requirement - * + * * @param pwd the given password * @return true if the password meets the quality requirement; otherwise false */ @@ -35,7 +35,7 @@ public interface IPasswordCheck { /** * Returns a reason if the password doesnt meet the quality requirement. - * + * * @param pwd the given password * @return a reason if the password quality requirement is not met. */ diff --git a/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java b/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java index 5f73fc257..036840633 100644 --- a/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java +++ b/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.base.IAttrSet; /** * This class represents a collection of attribute * sets. - * + * * @version $Revision$, $Date$ */ public class AttrSetCollection extends Hashtable<String, IAttrSet> { @@ -43,7 +43,7 @@ public class AttrSetCollection extends Hashtable<String, IAttrSet> { /** * Retrieves a attribute set from this collection. - * + * * @param name name of the attribute set * @return attribute set */ @@ -53,7 +53,7 @@ public class AttrSetCollection extends Hashtable<String, IAttrSet> { /** * Sets attribute set in this collection. - * + * * @param name set of the attribute set * @param set attribute set */ diff --git a/base/common/src/com/netscape/certsrv/pattern/Pattern.java b/base/common/src/com/netscape/certsrv/pattern/Pattern.java index bce3a426b..3d33bcae8 100644 --- a/base/common/src/com/netscape/certsrv/pattern/Pattern.java +++ b/base/common/src/com/netscape/certsrv/pattern/Pattern.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.base.IAttrSet; * <p> * $request.requestor_email$ $ctx.user_id$ * <p> - * + * * @version $Revision$, $Date$ */ public class Pattern { @@ -41,7 +41,7 @@ public class Pattern { /** * Constructs a pattern object with the given string. - * + * * @param s string with pattern (i.e. $request.requestor_email$) */ public Pattern(String s) { @@ -50,7 +50,7 @@ public class Pattern { /** * Subtitutes this pattern with the given attribute set. - * + * * @param key key name of the given attribute set * @param attrSet attribute set * @return substituted string @@ -61,7 +61,7 @@ public class Pattern { /** * Subtitutes this pattern with the given attribute set. - * + * * @param attrSetCollection attribute set collection * @return substituted string */ @@ -82,7 +82,7 @@ public class Pattern { /** * Subtitutes this pattern with the given attribute set. - * + * * This is an extended version of the substitute() method. * It takes a more flexible pattern format that could have * non-token ($...$) format. e.g. @@ -90,7 +90,7 @@ public class Pattern { * where "@redhat.com" is not in token pattern format, and will be * literally put in place. e.g. * TomRiddle@redhat.com - * + * * @param key key name of the given attribute set * @param attrSet attribute set * @return substituted string diff --git a/base/common/src/com/netscape/certsrv/policy/EPolicyException.java b/base/common/src/com/netscape/certsrv/policy/EPolicyException.java index f32f4f64f..c4de0e726 100644 --- a/base/common/src/com/netscape/certsrv/policy/EPolicyException.java +++ b/base/common/src/com/netscape/certsrv/policy/EPolicyException.java @@ -26,15 +26,15 @@ import com.netscape.certsrv.base.MessageFormatter; * This class represents Exceptions used by the policy package. * The policies themselves do not raise exceptions but use them * to format error messages. - * + * * Adapted from EBasException * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ * @see java.text.MessageFormat @@ -53,7 +53,7 @@ public class EPolicyException extends EBaseException { /** * Constructs a base exception. * <P> - * + * * @param msgFormat exception details */ public EPolicyException(String msgFormat) { @@ -63,12 +63,12 @@ public class EPolicyException extends EBaseException { /** * Constructs a base exception with a parameter. For example, - * + * * <PRE> * new EPolicyException("failed to load {0}", fileName); * </PRE> * <P> - * + * * @param msgFormat exception details in message string format * @param param message string parameter */ @@ -81,7 +81,7 @@ public class EPolicyException extends EBaseException { /** * Constructs a base exception with two String parameters. For example, * <P> - * + * * @param msgFormat exception details in message string format * @param param1 message string parameter * @param param2 message string parameter @@ -97,7 +97,7 @@ public class EPolicyException extends EBaseException { * Constructs a base exception. It can be used to carry * a system exception that may contain information about * the context. For example, - * + * * <PRE> * try { * ... @@ -106,7 +106,7 @@ public class EPolicyException extends EBaseException { * } * </PRE> * <P> - * + * * @param msgFormat exception details in message string format * @param param system exception */ @@ -120,7 +120,7 @@ public class EPolicyException extends EBaseException { * Constructs a base exception with a list of parameters * that will be substituted into the message format. * <P> - * + * * @param msgFormat exception details in message string format * @param params list of message format parameters */ @@ -132,7 +132,7 @@ public class EPolicyException extends EBaseException { /** * Returns a list of parameters. * <P> - * + * * @return list of message format parameters */ public Object[] getParameters() { @@ -143,7 +143,7 @@ public class EPolicyException extends EBaseException { * Returns localized exception string. This method should * only be called if a localized string is necessary. * <P> - * + * * @return details message */ public String toString() { @@ -153,7 +153,7 @@ public class EPolicyException extends EBaseException { /** * Returns the string based on the given locale. * <P> - * + * * @param locale locale * @return details message */ diff --git a/base/common/src/com/netscape/certsrv/policy/IEnrollmentPolicy.java b/base/common/src/com/netscape/certsrv/policy/IEnrollmentPolicy.java index 7c789932a..96da142ba 100644 --- a/base/common/src/com/netscape/certsrv/policy/IEnrollmentPolicy.java +++ b/base/common/src/com/netscape/certsrv/policy/IEnrollmentPolicy.java @@ -22,12 +22,12 @@ package com.netscape.certsrv.policy; * typing for rules so that a policy processor can group rules * based on a particular type. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/certsrv/policy/IExpression.java b/base/common/src/com/netscape/certsrv/policy/IExpression.java index 4075e8683..9bfe34611 100644 --- a/base/common/src/com/netscape/certsrv/policy/IExpression.java +++ b/base/common/src/com/netscape/certsrv/policy/IExpression.java @@ -22,12 +22,12 @@ import com.netscape.certsrv.request.IRequest; /** * Interface for a policy expression. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -47,7 +47,7 @@ public interface IExpression { /** * Evaluate the Expression. - * + * * @param req The PKIRequest on which we are applying the condition. * @return The return value. */ diff --git a/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java index 78ec31198..1e8a66666 100644 --- a/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java +++ b/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java @@ -25,12 +25,12 @@ import netscape.security.x509.GeneralName; * Class that can be used to form general names from configuration file. * Used by policies and extension commands. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -38,14 +38,14 @@ public interface IGeneralNameAsConstraintsConfig { /** * Retrieves instance parameters. - * + * * @param params parameters */ public void getInstanceParams(Vector<String> params); /** * Retrieves the general name. - * + * * @return general name */ public GeneralName getGeneralName(); diff --git a/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java index 193269bbd..f4f7362cc 100644 --- a/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java +++ b/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java @@ -27,12 +27,12 @@ import com.netscape.certsrv.base.EBaseException; * Class that can be used to form general names from configuration file. * Used by policies and extension commands. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -40,7 +40,7 @@ public interface IGeneralNameConfig { /** * Forms a general name from string. - * + * * @param value general name in string * @return general name object * @exception EBaseException failed to form general name @@ -50,7 +50,7 @@ public interface IGeneralNameConfig { /** * Forms general names from the given value. - * + * * @param value general name in string * @return a vector of general names * @exception EBaseException failed to form general name @@ -60,7 +60,7 @@ public interface IGeneralNameConfig { /** * Retrieves the instance parameters. - * + * * @param params parameters */ public void getInstanceParams(Vector<String> params); diff --git a/base/common/src/com/netscape/certsrv/policy/IGeneralNameUtil.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNameUtil.java index 102b25ccd..125a88511 100644 --- a/base/common/src/com/netscape/certsrv/policy/IGeneralNameUtil.java +++ b/base/common/src/com/netscape/certsrv/policy/IGeneralNameUtil.java @@ -21,12 +21,12 @@ package com.netscape.certsrv.policy; * Class that can be used to form general names from configuration file. * Used by policies and extension commands. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java index aeb7867e3..c3a35f913 100644 --- a/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java +++ b/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java @@ -25,12 +25,12 @@ import netscape.security.x509.GeneralNames; * Class that can be used to form general names from configuration file. * Used by policies and extension commands. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -38,14 +38,14 @@ public interface IGeneralNamesAsConstraintsConfig { /** * Retrieves a list of configured general names. - * + * * @return a list of general names */ public GeneralNames getGeneralNames(); /** * Retrieves instance parameters. - * + * * @param params instance parameters */ public void getInstanceParams(Vector<String> params); diff --git a/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java index 2074b9d19..e799195db 100644 --- a/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java +++ b/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java @@ -25,12 +25,12 @@ import netscape.security.x509.GeneralNames; * Class that can be used to form general names from configuration file. * Used by policies and extension commands. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -38,14 +38,14 @@ public interface IGeneralNamesConfig { /** * Retrieves a list of configured general names. - * + * * @return general names */ public GeneralNames getGeneralNames(); /** * Retrieves the instance parameters. - * + * * @param params instance parameters */ public void getInstanceParams(Vector<String> params); diff --git a/base/common/src/com/netscape/certsrv/policy/IKeyArchivalPolicy.java b/base/common/src/com/netscape/certsrv/policy/IKeyArchivalPolicy.java index 14a29256f..bdf8e12e5 100644 --- a/base/common/src/com/netscape/certsrv/policy/IKeyArchivalPolicy.java +++ b/base/common/src/com/netscape/certsrv/policy/IKeyArchivalPolicy.java @@ -20,12 +20,12 @@ package com.netscape.certsrv.policy; /** * Interface for a key recovery policy rule. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/certsrv/policy/IKeyRecoveryPolicy.java b/base/common/src/com/netscape/certsrv/policy/IKeyRecoveryPolicy.java index 6de615673..42d3e38e1 100644 --- a/base/common/src/com/netscape/certsrv/policy/IKeyRecoveryPolicy.java +++ b/base/common/src/com/netscape/certsrv/policy/IKeyRecoveryPolicy.java @@ -20,12 +20,12 @@ package com.netscape.certsrv.policy; /** * Interface for a key recovery policy rule. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/certsrv/policy/IPolicyPredicateParser.java b/base/common/src/com/netscape/certsrv/policy/IPolicyPredicateParser.java index 0992beaeb..f56de9811 100644 --- a/base/common/src/com/netscape/certsrv/policy/IPolicyPredicateParser.java +++ b/base/common/src/com/netscape/certsrv/policy/IPolicyPredicateParser.java @@ -20,12 +20,12 @@ package com.netscape.certsrv.policy; /** * Interface for policy predicate parsers. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -33,7 +33,7 @@ public interface IPolicyPredicateParser { /** * Parse the predicate expression and return a vector of expressions. - * + * * @param predicateExpression The predicate expression as read from the * config file. * @return expVector The vector of expressions. diff --git a/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java b/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java index 11927a03f..5ee591e86 100644 --- a/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java +++ b/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java @@ -30,16 +30,16 @@ import com.netscape.certsrv.base.ISubsystem; * which makes sense because a processor may be based on some rule * such as evaluate all policies before returning the final result or * return as soon as one of the policies return a failure and so on. - * + * * By making both processor and policy rules implement a common * interface, one can write rules that are processors as well. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -60,14 +60,14 @@ public interface IPolicyProcessor extends ISubsystem, /** * Returns the policy substore id. - * + * * @return storeID The policy store id used by this processor. */ String getPolicySubstoreId(); /** * Returns information on Policy impls. - * + * * @return An enumeration of strings describing the information * about policy implementations. Currently only the * the implementation id is expected. @@ -76,7 +76,7 @@ public interface IPolicyProcessor extends ISubsystem, /** * Returns the rule implementations registered with this processor. - * + * * @return An Enumeration of uninitialized IPolicyRule * objects. */ @@ -84,7 +84,7 @@ public interface IPolicyProcessor extends ISubsystem, /** * Returns an implementation identified by a given id. - * + * * @param id The implementation id. * @return The uninitialized instance of the policy rule. */ @@ -92,7 +92,7 @@ public interface IPolicyProcessor extends ISubsystem, /** * Returns configuration for an implmentation. - * + * * @param id The implementation id. * @return A vector of name/value pairs in the form of * name=value. @@ -101,8 +101,8 @@ public interface IPolicyProcessor extends ISubsystem, /** * Deletes a policy implementation identified by an impl id. - * - * + * + * * @param id The impl id of the policy to be deleted. * There shouldn't be any active instance for this * implementation. @@ -113,7 +113,7 @@ public interface IPolicyProcessor extends ISubsystem, /** * Adds a policy implementation identified by an impl id. - * + * * @param id The impl id of the policy to be added. * The id should be unique. * @param classPath The fully qualified path for the implementation. @@ -124,7 +124,7 @@ public interface IPolicyProcessor extends ISubsystem, /** * Returns information on Policy instances. - * + * * @return An Enumeration of Strings describing the information * about policy rule instances. */ @@ -132,14 +132,14 @@ public interface IPolicyProcessor extends ISubsystem, /** * Returns policy instances registered with this processor. - * + * * @return An Enumeration of policy instances. */ Enumeration<IPolicyRule> getPolicyInstances(); /** * Returns instance configuration for a given instance id. - * + * * @param id The rule id. * @return A vector of name/value pairs in the form of * name=value. @@ -148,7 +148,7 @@ public interface IPolicyProcessor extends ISubsystem, /** * Returns instance configuration for a given instance id. - * + * * @param id The rule id. * @return the policy instance identified by the id. */ @@ -156,7 +156,7 @@ public interface IPolicyProcessor extends ISubsystem, /** * Deletes a policy instance identified by an instance id. - * + * * @param id The instance id of the policy to be deleted. * @exception EBaseException is thrown if an error occurs in deletion. */ @@ -165,7 +165,7 @@ public interface IPolicyProcessor extends ISubsystem, /** * Adds a policy instance - * + * * @param id The impl id of the policy to be added. * The id should be unique. * @param ht a Hashtable of config params. @@ -176,7 +176,7 @@ public interface IPolicyProcessor extends ISubsystem, /** * Modifies a policy instance - * + * * @param id The impl id of the policy to be modified. * The policy instance with this id should be present. * @param ht a Hashtable of config params. @@ -187,9 +187,9 @@ public interface IPolicyProcessor extends ISubsystem, /** * Modifies policy ordering. - * + * * @param policyOrderStr The comma separated list of instance ids. - * + * */ void changePolicyInstanceOrdering(String policyOrderStr) throws EBaseException; diff --git a/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java b/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java index 7f7f888f6..601369813 100644 --- a/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java +++ b/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java @@ -28,12 +28,12 @@ import com.netscape.certsrv.request.PolicyResult; /** * Interface for a policy rule. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -46,7 +46,7 @@ public interface IPolicyRule /** * Initializes the policy rule. * <P> - * + * * @param config The config store reference */ void init(ISubsystem owner, IConfigStore config) @@ -55,7 +55,7 @@ public interface IPolicyRule /** * Gets the description for this policy rule. * <P> - * + * * @return The Description for this rule. */ String getDescription(); @@ -63,7 +63,7 @@ public interface IPolicyRule /** * Returns the name of the policy rule class. * <P> - * + * * @return The name of the policy class. */ String getName(); @@ -71,17 +71,17 @@ public interface IPolicyRule /** * Returns the name of the policy rule instance. * <P> - * + * * @return The name of the policy rule instance. If none * is set the name of the implementation will be returned. - * + * */ String getInstanceName(); /** * Sets a predicate expression for rule matching. * <P> - * + * * @param exp The predicate expression for the rule. */ void setPredicate(IExpression exp); @@ -89,7 +89,7 @@ public interface IPolicyRule /** * Returns the predicate expression for the rule. * <P> - * + * * @return The predicate expression for the rule. */ IExpression getPredicate(); @@ -98,7 +98,7 @@ public interface IPolicyRule * Applies the policy on the given Request. This may modify * the request appropriately. * <P> - * + * * @param req The request on which to apply policy. * @return The PolicyResult object. */ @@ -106,7 +106,7 @@ public interface IPolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. Each name/value * pair is constructed as a String in name=value format. */ @@ -114,7 +114,7 @@ public interface IPolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. Each name/value * pair is constructed as a String in name=value. */ diff --git a/base/common/src/com/netscape/certsrv/policy/IPolicySet.java b/base/common/src/com/netscape/certsrv/policy/IPolicySet.java index a9fb6a2d2..5170153ff 100644 --- a/base/common/src/com/netscape/certsrv/policy/IPolicySet.java +++ b/base/common/src/com/netscape/certsrv/policy/IPolicySet.java @@ -32,12 +32,12 @@ import com.netscape.certsrv.request.PolicyResult; * them in increasing order of priority and presenting an ordered vector of rules * via the IPolicySet interface. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -46,7 +46,7 @@ public interface IPolicySet { /** * Returns the name of the rule set. * <P> - * + * * @return The name of the rule set. */ String getName(); @@ -54,7 +54,7 @@ public interface IPolicySet { /** * Returns the no of rules in a set. * <P> - * + * * @return the no of rules. */ int count(); @@ -62,7 +62,7 @@ public interface IPolicySet { /** * Add a policy rule. * <P> - * + * * @param ruleName The name of the rule to be added. * @param rule The rule to be added. */ @@ -70,7 +70,7 @@ public interface IPolicySet { /** * Removes a policy rule identified by the given name. - * + * * @param ruleName The name of the rule to be removed. */ void removeRule(String ruleName); @@ -78,7 +78,7 @@ public interface IPolicySet { /** * Returns the rule identified by a given name. * <P> - * + * * @param ruleName The name of the rule to be return. * @return The rule identified by the given name or null if none exists. */ @@ -87,7 +87,7 @@ public interface IPolicySet { /** * Returns an enumeration of rules. * <P> - * + * * @return An enumeration of rules. */ Enumeration<IPolicyRule> getRules(); @@ -95,9 +95,9 @@ public interface IPolicySet { /** * Apply policy rules on a request. This call may modify * the request content. - * + * * @param req The request to apply policies on. - * + * * <P> * @return The policy result. */ diff --git a/base/common/src/com/netscape/certsrv/policy/IRenewalPolicy.java b/base/common/src/com/netscape/certsrv/policy/IRenewalPolicy.java index 28f56fe73..6f47ff6d9 100644 --- a/base/common/src/com/netscape/certsrv/policy/IRenewalPolicy.java +++ b/base/common/src/com/netscape/certsrv/policy/IRenewalPolicy.java @@ -20,12 +20,12 @@ package com.netscape.certsrv.policy; /** * Interface for a renewal policy rule. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/certsrv/policy/IRevocationPolicy.java b/base/common/src/com/netscape/certsrv/policy/IRevocationPolicy.java index 7e6084c76..d573c4bd2 100644 --- a/base/common/src/com/netscape/certsrv/policy/IRevocationPolicy.java +++ b/base/common/src/com/netscape/certsrv/policy/IRevocationPolicy.java @@ -20,12 +20,12 @@ package com.netscape.certsrv.policy; /** * Interface for a revocation policy rule. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java b/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java index 0fee01be2..be6e5f214 100644 --- a/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java +++ b/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java @@ -21,12 +21,12 @@ package com.netscape.certsrv.policy; * Class that can be used to form general names from configuration file. * Used by policies and extension commands. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -34,14 +34,14 @@ public interface ISubjAltNameConfig extends IGeneralNameConfig { /** * Retrieves configuration prefix. - * + * * @return prefix */ public String getPfx(); /** * Retrieves configuration attribute. - * + * * @return attribute */ public String getAttr(); diff --git a/base/common/src/com/netscape/certsrv/policy/PolicyResources.java b/base/common/src/com/netscape/certsrv/policy/PolicyResources.java index d330b719f..acaf6d92b 100644 --- a/base/common/src/com/netscape/certsrv/policy/PolicyResources.java +++ b/base/common/src/com/netscape/certsrv/policy/PolicyResources.java @@ -22,12 +22,12 @@ import java.util.ListResourceBundle; /** * Error messages for Policies. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ * @see java.util.ListResourceBundle diff --git a/base/common/src/com/netscape/certsrv/profile/EDeferException.java b/base/common/src/com/netscape/certsrv/profile/EDeferException.java index c92630b97..f3f4e5c1a 100644 --- a/base/common/src/com/netscape/certsrv/profile/EDeferException.java +++ b/base/common/src/com/netscape/certsrv/profile/EDeferException.java @@ -24,7 +24,7 @@ package com.netscape.certsrv.profile; * <p> * A deferred request will not be processed immediately. Manual approval is required for processing the request again. * <p> - * + * * @version $Revision$, $Date$ */ public class EDeferException extends EProfileException { @@ -36,7 +36,7 @@ public class EDeferException extends EProfileException { /** * Creates a defer exception. - * + * * @param msg localized message that will be * displayed to end user. This message * should indicate the reason why a request diff --git a/base/common/src/com/netscape/certsrv/profile/EProfileException.java b/base/common/src/com/netscape/certsrv/profile/EProfileException.java index 37f968a67..0363139cb 100644 --- a/base/common/src/com/netscape/certsrv/profile/EProfileException.java +++ b/base/common/src/com/netscape/certsrv/profile/EProfileException.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.base.EBaseException; * <p> * This is the base class for all profile-specific exception. * <p> - * + * * @version $Revision$, $Date$ */ public class EProfileException extends EBaseException { @@ -36,7 +36,7 @@ public class EProfileException extends EBaseException { /** * Creates a profile exception. - * + * * @param msg additional message for the handler * of the exception. The message may * or may not be localized. diff --git a/base/common/src/com/netscape/certsrv/profile/ERejectException.java b/base/common/src/com/netscape/certsrv/profile/ERejectException.java index 59b35bcdb..cceeb12ab 100644 --- a/base/common/src/com/netscape/certsrv/profile/ERejectException.java +++ b/base/common/src/com/netscape/certsrv/profile/ERejectException.java @@ -23,7 +23,7 @@ package com.netscape.certsrv.profile; * <p> * A rejected request cannot be reprocessed. Rejected request is considered as a request in its terminal state. * <p> - * + * * @version $Revision$, $Date$ */ public class ERejectException extends EProfileException { @@ -35,7 +35,7 @@ public class ERejectException extends EProfileException { /** * Creates a rejection exception. - * + * * @param msg localized message that indicates * the reason why a request is * rejected. diff --git a/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java b/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java index 189530f7a..cc61f0a86 100644 --- a/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java +++ b/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.request.IRequest; * This interface also defines a set of enrollment specific attribute names that can be used to retrieve values from an * enrollment request. * <p> - * + * * @version $Revision$, $Date$ */ public interface IEnrollProfile extends IProfile { @@ -149,7 +149,7 @@ public interface IEnrollProfile extends IProfile { /** * Set Default X509CertInfo in the request. - * + * * @param request profile-based certificate request. * @exception EProfileException failed to set the X509CertInfo. */ diff --git a/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java b/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java index bf2374652..320b211c3 100644 --- a/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java +++ b/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java @@ -28,14 +28,14 @@ import com.netscape.certsrv.request.IRequest; * validates if the given request conforms to the set * rules. * <p> - * + * * @version $Revision$, $Date$ */ public interface IPolicyConstraint extends IConfigTemplate { /** * Initializes this constraint policy. - * + * * @param profile owner of this policy * @param config configuration store for this constraint * @exception EProfileException failed to initialize @@ -46,7 +46,7 @@ public interface IPolicyConstraint extends IConfigTemplate { /** * Returns the corresponding configuration store * of this constraint policy. - * + * * @return config store of this constraint */ public IConfigStore getConfigStore(); @@ -54,7 +54,7 @@ public interface IPolicyConstraint extends IConfigTemplate { /** * Validates the request. The request is not modified * during the validation. - * + * * @param request request to be validated * @exception ERejectException reject the given request */ @@ -63,7 +63,7 @@ public interface IPolicyConstraint extends IConfigTemplate { /** * Returns localized description of this constraint. - * + * * @param locale locale of the end-user * @return localized description of this constraint */ @@ -71,7 +71,7 @@ public interface IPolicyConstraint extends IConfigTemplate { /** * Returns localized name of this constraint. - * + * * @param locale locale of the end-user * @return localized name of this constraint */ @@ -80,7 +80,7 @@ public interface IPolicyConstraint extends IConfigTemplate { /** * Checks if this constraint is applicable to the * given default policy. - * + * * @param def default policy to be checked * @return true if this constraint can be applied to * the given default policy diff --git a/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java b/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java index 469d6dded..e18534d66 100644 --- a/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java +++ b/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java @@ -30,28 +30,28 @@ import com.netscape.certsrv.request.IRequest; * This represents a default policy that populates * the request with additional values. * <p> - * + * * During request submission process, a default policy is invoked to populate the default values in the request. The * default values will later on be used for execution. The default values are like the parameters for the request. * <p> - * + * * This policy is called in 2 places. For automated enrollment request, this policy is invoked to populate the HTTP * parameters into the request. For request that cannot be executed immediately, this policy will be invoked again right * after the agent's approval. * <p> - * + * * Each default policy may contain zero or more properties that describe the default value. For example, a X509 Key can * be described by its key type, key length, and key data. The properties help to describe the default value into human * readable values. * <p> - * + * * @version $Revision$, $Date$ */ public interface IPolicyDefault extends IConfigTemplate { /** * Initializes this default policy. - * + * * @param profile owner of this default policy * @param config configuration store for this default * @exception EProfileException failed to initialize @@ -61,14 +61,14 @@ public interface IPolicyDefault extends IConfigTemplate { /** * Retrieves the configuration store of this default. - * + * * @return configuration store of this default policy */ public IConfigStore getConfigStore(); /** * Populates the request with this policy default. - * + * * @param request request to be populated * @exception EProfileException failed to populate */ @@ -77,7 +77,7 @@ public interface IPolicyDefault extends IConfigTemplate { /** * Retrieves the localizable name of this policy. - * + * * @param locale locale of the end user * @return localized name of this default policy */ @@ -85,7 +85,7 @@ public interface IPolicyDefault extends IConfigTemplate { /** * Retrieves the localizable description of this policy. - * + * * @param locale locale of the end user * @return localized description of this default policy */ @@ -93,7 +93,7 @@ public interface IPolicyDefault extends IConfigTemplate { /** * Retrieves a list of names of the property. - * + * * @return a list of property names. The values are * of type java.lang.String */ @@ -103,7 +103,7 @@ public interface IPolicyDefault extends IConfigTemplate { * Retrieves the descriptor of the given property * by name. The descriptor contains syntax * information. - * + * * @param locale locale of the end user * @param name name of property * @return descriptor of the property @@ -112,7 +112,7 @@ public interface IPolicyDefault extends IConfigTemplate { /** * Sets the value of the given value property by name. - * + * * @param name name of property * @param locale locale of the end user * @param request request @@ -125,7 +125,7 @@ public interface IPolicyDefault extends IConfigTemplate { /** * Retrieves the value of the given value * property by name. - * + * * @param name name of property * @param locale locale of the end user * @param request request diff --git a/base/common/src/com/netscape/certsrv/profile/IProfile.java b/base/common/src/com/netscape/certsrv/profile/IProfile.java index 0cd39c091..9125b2f69 100644 --- a/base/common/src/com/netscape/certsrv/profile/IProfile.java +++ b/base/common/src/com/netscape/certsrv/profile/IProfile.java @@ -33,30 +33,30 @@ import com.netscape.cms.profile.common.ProfilePolicy; * a list of input policies, default policies, constraint * policies and output policies. * <p> - * + * * The input policy is for building the enrollment page. * <p> - * + * * The default policy is for populating user-supplied and system-supplied values into the request. * <p> - * + * * The constraint policy is for validating the request before processing. * <p> - * + * * The output policy is for building the result page. * <p> - * + * * Each profile can have multiple policy set. Each set is composed of zero or more default policies and zero or more * constraint policies. * <p> - * + * * @version $Revision$, $Date$ */ public interface IProfile { /** * Initializes this profile. - * + * * @param owner profile subsystem * @param config configuration store for this profile * @exception EBaseException failed to initialize @@ -68,21 +68,21 @@ public interface IProfile { * Retrieves the request queue that is associated with * this profile. The request queue is for creating * new requests. - * + * * @return request queue */ public IRequestQueue getRequestQueue(); /** * Sets id of this profile. - * + * * @param id profile identifier */ public void setId(String id); /** * Returns the identifier of this profile. - * + * * @return profile id */ public String getId(); @@ -91,7 +91,7 @@ public interface IProfile { * Retrieves a localized string that represents * requestor's distinguished name. This string * displayed in the request listing user interface. - * + * * @param request request * @return distringuished name of the request owner */ @@ -99,14 +99,14 @@ public interface IProfile { /** * Retrieves the configuration store of this profile. - * + * * @return configuration store */ public IConfigStore getConfigStore(); /** * Retrieves the instance id of the authenticator for this profile. - * + * * @return authenticator instance id */ public String getAuthenticatorId(); @@ -115,14 +115,14 @@ public interface IProfile { /** * Sets the instance id of the authenticator for this profile. - * + * * @param id authenticator instance id */ public void setAuthenticatorId(String id); /** * Retrieves the associated authenticator instance. - * + * * @return profile authenticator instance. * if no associated authenticator, null is returned * @exception EProfileException failed to retrieve @@ -132,14 +132,14 @@ public interface IProfile { /** * Retrieves a list of input policy IDs. - * + * * @return input policy id list */ public Enumeration<String> getProfileInputIds(); /** * Retrieves input policy by id. - * + * * @param id input policy id * @return input policy instance */ @@ -147,14 +147,14 @@ public interface IProfile { /** * Retrieves a list of output policy IDs. - * + * * @return output policy id list */ public Enumeration<String> getProfileOutputIds(); /** * Retrieves output policy by id. - * + * * @param id output policy id * @return output policy instance */ @@ -165,14 +165,14 @@ public interface IProfile { * End-user profile will be displayed to the end user. * Non end-user profile mainly is for registration * manager. - * + * * @return end-user profile or not */ public boolean isVisible(); /** * Sets this profile end-user profile or not. - * + * * @param v end-user profile or not */ public void setVisible(boolean v); @@ -180,7 +180,7 @@ public interface IProfile { /** * Retrieves the user id of the person who * approves this profile. - * + * * @return user id of the approver of this profile */ public String getApprovedBy(); @@ -197,7 +197,7 @@ public interface IProfile { /** * Returns the profile name. - * + * * @param locale end-user locale * @param name profile name */ @@ -205,7 +205,7 @@ public interface IProfile { /** * Retrieves the profile name. - * + * * @param locale end-user locale * @return localized profile name */ @@ -213,7 +213,7 @@ public interface IProfile { /** * Returns the profile description. - * + * * @param locale end-user locale * @param desc profile description */ @@ -221,7 +221,7 @@ public interface IProfile { /** * Retrieves the profile description. - * + * * @param locale end-user locale * @return localized profile description */ @@ -231,21 +231,21 @@ public interface IProfile { * Retrieves profile context. The context stores * information about the requestor before the * actual request is created. - * + * * @return profile context. */ public IProfileContext createContext(); /** * Returns the profile policy set identifiers. - * + * * @return a list of policy set id */ public Enumeration<String> getProfilePolicySetIds(); /** * Creates a profile policy. - * + * * @param setId id of the policy set that owns this policy * @param id policy id * @param defaultClassId id of the registered default implementation @@ -259,7 +259,7 @@ public interface IProfile { /** * Deletes input policy by id. - * + * * @param inputId id of the input policy * @exception EProfileException failed to delete */ @@ -267,7 +267,7 @@ public interface IProfile { /** * Deletes output policy by id. - * + * * @param outputId id of the output policy * @exception EProfileException failed to delete */ @@ -275,7 +275,7 @@ public interface IProfile { /** * Creates a input policy. - * + * * @param id input policy id * @param inputClassId id of the registered input implementation * @param nvp default parameters @@ -288,7 +288,7 @@ public interface IProfile { /** * Creates a output policy. - * + * * @param id output policy id * @param outputClassId id of the registered output implementation * @param nvp default parameters @@ -300,7 +300,7 @@ public interface IProfile { /** * Deletes a policy. - * + * * @param setId id of the policy set * @param policyId id of policy to delete * @exception EProfileException failed to delete @@ -310,7 +310,7 @@ public interface IProfile { /** * Retrieves a policy. - * + * * @param setId set id * @param id policy id * @return profile policy @@ -319,7 +319,7 @@ public interface IProfile { /** * Retrieves all the policy id within a set. - * + * * @param setId set id * @return a list of policy id */ @@ -329,7 +329,7 @@ public interface IProfile { * Retrieves a default set id for the given request. * It is the profile's responsibility to return * an appropriate set id for the request. - * + * * @param req request * @return policy set id */ @@ -337,7 +337,7 @@ public interface IProfile { /** * Returns a list of profile policies. - * + * * @param setId set id * @return a list of policies */ @@ -347,7 +347,7 @@ public interface IProfile { * Creates one or more requests. Normally, only one request will * be created. In case of CRMF request, multiple requests may be * created for one submission. - * + * * @param ctx profile context * @param locale user locale * @return a list of requests @@ -358,7 +358,7 @@ public interface IProfile { /** * Populates user-supplied input values into the requests. - * + * * @param ctx profile context * @param request request * @exception EProfileException failed to populate @@ -369,7 +369,7 @@ public interface IProfile { /** * Passes the request to the set of default policies that * populate the profile information against the profile. - * + * * @param request request * @exception EProfileException failed to populate default values */ @@ -379,7 +379,7 @@ public interface IProfile { /** * Passes the request to the set of constraint policies * that validate the request against the profile. - * + * * @param request request * @exception ERejectException validation violation */ @@ -388,7 +388,7 @@ public interface IProfile { /** * Process a request after validation. - * + * * @param request request to be processed * @exception EProfileException failed to process */ @@ -397,7 +397,7 @@ public interface IProfile { /** * Handles end-user request submission. - * + * * @param token authentication token * @param request request to be processed * @exception EDeferException defer request diff --git a/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java b/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java index 98546c601..2d8a7d0b3 100644 --- a/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java +++ b/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.request.IRequest; * the end-user. If authentication is successful, request * can be processed immediately. Otherwise, the request will * be defered and manual approval is then required. - * + * * @version $Revision$, $Date$ */ public interface IProfileAuthenticator extends IAuthManager { @@ -41,7 +41,7 @@ public interface IProfileAuthenticator extends IAuthManager { /** * Initializes this default policy. - * + * * @param profile owner of this authenticator * @param config configuration store * @exception EProfileException failed to initialize @@ -51,7 +51,7 @@ public interface IProfileAuthenticator extends IAuthManager { /** * Retrieves the configuration store. - * + * * @return configuration store */ public IConfigStore getConfigStore(); @@ -59,7 +59,7 @@ public interface IProfileAuthenticator extends IAuthManager { /** * Populates authentication specific information into the * request for auditing purposes. - * + * * @param token authentication token * @param request request * @exception EProfileException failed to populate @@ -69,7 +69,7 @@ public interface IProfileAuthenticator extends IAuthManager { /** * Retrieves the localizable name of this policy. - * + * * @param locale end user locale * @return localized authenticator name */ @@ -77,7 +77,7 @@ public interface IProfileAuthenticator extends IAuthManager { /** * Retrieves the localizable description of this policy. - * + * * @param locale end user locale * @return localized authenticator description */ @@ -85,7 +85,7 @@ public interface IProfileAuthenticator extends IAuthManager { /** * Retrieves a list of names of the property. - * + * * @return a list of property names */ public Enumeration<String> getValueNames(); @@ -95,7 +95,7 @@ public interface IProfileAuthenticator extends IAuthManager { * serializable into the request. Passsword or other * security-related value may not be desirable for * storage. - * + * * @param name property name * @return true if the property is not security related */ @@ -104,7 +104,7 @@ public interface IProfileAuthenticator extends IAuthManager { /** * Retrieves the descriptor of the given value * property by name. - * + * * @param locale user locale * @param name property name * @return descriptor of the requested property @@ -113,7 +113,7 @@ public interface IProfileAuthenticator extends IAuthManager { /** * Checks if this authenticator requires SSL client authentication. - * + * * @return client authentication required or not */ public boolean isSSLClientRequired(); diff --git a/base/common/src/com/netscape/certsrv/profile/IProfileContext.java b/base/common/src/com/netscape/certsrv/profile/IProfileContext.java index b3c27d040..981365173 100644 --- a/base/common/src/com/netscape/certsrv/profile/IProfileContext.java +++ b/base/common/src/com/netscape/certsrv/profile/IProfileContext.java @@ -21,14 +21,14 @@ package com.netscape.certsrv.profile; * This interface represents a profile context which * stores system-wide and user-provided information for * assisting request creation. - * + * * @version $Revision$, $Date$ */ public interface IProfileContext { /** * Sets a value into the context. - * + * * @param name property name * @param value property value */ @@ -36,7 +36,7 @@ public interface IProfileContext { /** * Retrieves a value from the context. - * + * * @param name property name * @return property value */ diff --git a/base/common/src/com/netscape/certsrv/profile/IProfileEx.java b/base/common/src/com/netscape/certsrv/profile/IProfileEx.java index 79e4f4175..8ce3262ec 100644 --- a/base/common/src/com/netscape/certsrv/profile/IProfileEx.java +++ b/base/common/src/com/netscape/certsrv/profile/IProfileEx.java @@ -23,7 +23,7 @@ import com.netscape.certsrv.base.EBaseException; * This interface represents the extension version of * profile. * <p> - * + * * @version $Revision$, $Date$ */ public interface IProfileEx extends IProfile { diff --git a/base/common/src/com/netscape/certsrv/profile/IProfileInput.java b/base/common/src/com/netscape/certsrv/profile/IProfileInput.java index 4ef598698..09b42806d 100644 --- a/base/common/src/com/netscape/certsrv/profile/IProfileInput.java +++ b/base/common/src/com/netscape/certsrv/profile/IProfileInput.java @@ -30,14 +30,14 @@ import com.netscape.certsrv.request.IRequest; * This interface represents a input policy which * provides information on how to create the * end-user enrollment page. - * + * * @version $Revision$, $Date$ */ public interface IProfileInput extends IConfigTemplate { /** * Initializes this default policy. - * + * * @param profile owner of this input * @param config configuration store * @exception EProfileException failed to initialize @@ -47,14 +47,14 @@ public interface IProfileInput extends IConfigTemplate { /** * Returns configuration store. - * + * * @return configuration store */ public IConfigStore getConfigStore(); /** * Populates the request with this policy default. - * + * * @param ctx profile context * @param request request * @exception EProfileException failed to populate @@ -64,7 +64,7 @@ public interface IProfileInput extends IConfigTemplate { /** * Retrieves the localizable name of this policy. - * + * * @param locale user locale * @return localized input name */ @@ -72,7 +72,7 @@ public interface IProfileInput extends IConfigTemplate { /** * Retrieves the localizable description of this policy. - * + * * @param locale user locale * @return localized input description */ @@ -80,7 +80,7 @@ public interface IProfileInput extends IConfigTemplate { /** * Retrieves a list of names of the property. - * + * * @return a list of property names */ public Enumeration<String> getValueNames(); @@ -88,7 +88,7 @@ public interface IProfileInput extends IConfigTemplate { /** * Retrieves the descriptor of the given value * property by name. - * + * * @param locale user locale * @param name property name * @return descriptor of the property @@ -97,7 +97,7 @@ public interface IProfileInput extends IConfigTemplate { /** * Retrieves value from the request. - * + * * @param name property name * @param locale user locale * @param request request @@ -108,7 +108,7 @@ public interface IProfileInput extends IConfigTemplate { /** * Sets the value of the given property by name. - * + * * @param name property name * @param locale user locale * @param request request diff --git a/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java b/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java index b60e4475b..dd3b47c54 100644 --- a/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java +++ b/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java @@ -30,14 +30,14 @@ import com.netscape.certsrv.request.IRequest; * This interface represents a output policy which * provides information on how to build the result * page for the enrollment. - * + * * @version $Revision$, $Date$ */ public interface IProfileOutput extends IConfigTemplate { /** * Initializes this default policy. - * + * * @param profile owner of this policy * @param config configuration store * @exception EProfileException failed to initialize @@ -47,14 +47,14 @@ public interface IProfileOutput extends IConfigTemplate { /** * Retrieves configuration store. - * + * * @return configuration store */ public IConfigStore getConfigStore(); /** * Populates the request with this policy default. - * + * * @param ctx profile context * @param request request * @exception EProfileException failed to populate @@ -64,7 +64,7 @@ public interface IProfileOutput extends IConfigTemplate { /** * Retrieves the localizable name of this policy. - * + * * @param locale user locale * @return output policy name */ @@ -72,7 +72,7 @@ public interface IProfileOutput extends IConfigTemplate { /** * Retrieves the localizable description of this policy. - * + * * @param locale user locale * @return output policy description */ @@ -80,7 +80,7 @@ public interface IProfileOutput extends IConfigTemplate { /** * Retrieves a list of names of the value parameter. - * + * * @return a list of property names */ public Enumeration<String> getValueNames(); @@ -88,7 +88,7 @@ public interface IProfileOutput extends IConfigTemplate { /** * Retrieves the descriptor of the given value * parameter by name. - * + * * @param locale user locale * @param name property name * @return property descriptor @@ -97,7 +97,7 @@ public interface IProfileOutput extends IConfigTemplate { /** * Retrieves the value of the given value parameter by name. - * + * * @param name property name * @param locale user locale * @param request request @@ -109,7 +109,7 @@ public interface IProfileOutput extends IConfigTemplate { /** * Sets the value of the given value parameter by name. - * + * * @param name property name * @param locale user locale * @param request request diff --git a/base/common/src/com/netscape/certsrv/profile/IProfilePolicy.java b/base/common/src/com/netscape/certsrv/profile/IProfilePolicy.java index d231f8d55..2dd7b3787 100644 --- a/base/common/src/com/netscape/certsrv/profile/IProfilePolicy.java +++ b/base/common/src/com/netscape/certsrv/profile/IProfilePolicy.java @@ -21,28 +21,28 @@ package com.netscape.certsrv.profile; * This interface represents a profile policy * which consists a default policy and a * constraint policy. - * + * * @version $Revision$, $Date$ */ public interface IProfilePolicy { /** * Retrieves the policy id - * + * * @return policy id */ public String getId(); /** * Retrieves the default policy. - * + * * @return default policy */ public IPolicyDefault getDefault(); /** * Retrieves the constraint policy. - * + * * @return constraint policy */ public IPolicyConstraint getConstraint(); diff --git a/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java b/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java index b7a68445b..3238fb2e6 100644 --- a/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java +++ b/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.base.ISubsystem; /** * This represents the profile subsystem that manages * a list of profiles. - * + * * @version $Revision$, $Date$ */ public interface IProfileSubsystem extends ISubsystem { @@ -32,7 +32,7 @@ public interface IProfileSubsystem extends ISubsystem { /** * Retrieves a profile by id. - * + * * @return profile * @exception EProfileException failed to retrieve */ @@ -41,7 +41,7 @@ public interface IProfileSubsystem extends ISubsystem { /** * Checks if a profile is approved by an agent or not. - * + * * @param id profile id * @return true if profile is approved */ @@ -49,7 +49,7 @@ public interface IProfileSubsystem extends ISubsystem { /** * Retrieves the approver of the given profile. - * + * * @param id profile id * @return user id of the agent who has approved the profile */ @@ -57,7 +57,7 @@ public interface IProfileSubsystem extends ISubsystem { /** * Creates new profile. - * + * * @param id profile id * @param classid implementation id * @param className class Name @@ -70,7 +70,7 @@ public interface IProfileSubsystem extends ISubsystem { /** * Deletes profile. - * + * * @param id profile id * @param configFile configuration file * @exception EProfileException failed to delete profile @@ -80,7 +80,7 @@ public interface IProfileSubsystem extends ISubsystem { /** * Creates a new profile configuration file. - * + * * @param id profile id * @param classId implementation id * @param configPath location to create the configuration file @@ -91,7 +91,7 @@ public interface IProfileSubsystem extends ISubsystem { /** * Enables a profile. - * + * * @param id profile id * @param enableBy agent's user id * @exception EProfileException failed to enable profile @@ -101,7 +101,7 @@ public interface IProfileSubsystem extends ISubsystem { /** * Disables a profile. - * + * * @param id profile id * @exception EProfileException failed to disable */ @@ -110,7 +110,7 @@ public interface IProfileSubsystem extends ISubsystem { /** * Retrieves the id of the implementation of the given profile. - * + * * @param id profile id * @return implementation id managed by the registry */ @@ -119,14 +119,14 @@ public interface IProfileSubsystem extends ISubsystem { /** * Retrieves a list of profile ids. The return * list is of type String. - * + * * @return a list of profile ids */ public Enumeration<String> getProfileIds(); /** * 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/certsrv/profile/IProfileUpdater.java b/base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java index 3749cd1d2..7c6084363 100644 --- a/base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java +++ b/base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java @@ -27,14 +27,14 @@ import com.netscape.certsrv.request.RequestStatus; /** * This interface represents an updater that will be * called when the request's state changes. - * + * * @version $Revision$, $Date$ */ public interface IProfileUpdater extends IConfigTemplate { /** * Initializes this default policy. - * + * * @param profile owner of this policy * @param config configuration store * @exception EProfileException failed to initialize @@ -44,14 +44,14 @@ public interface IProfileUpdater extends IConfigTemplate { /** * Retrieves configuration store. - * + * * @return configuration store */ public IConfigStore getConfigStore(); /** * Notifies of state change. - * + * * @param req request * @param status The status to check for. * @exception EProfileException failed to populate @@ -61,7 +61,7 @@ public interface IProfileUpdater extends IConfigTemplate { /** * Retrieves the localizable name of this policy. - * + * * @param locale user locale * @return output policy name */ @@ -69,7 +69,7 @@ public interface IProfileUpdater extends IConfigTemplate { /** * Retrieves the localizable description of this policy. - * + * * @param locale user locale * @return output policy description */ diff --git a/base/common/src/com/netscape/certsrv/property/Descriptor.java b/base/common/src/com/netscape/certsrv/property/Descriptor.java index bd2b56340..4b2baf561 100644 --- a/base/common/src/com/netscape/certsrv/property/Descriptor.java +++ b/base/common/src/com/netscape/certsrv/property/Descriptor.java @@ -22,7 +22,7 @@ import java.util.Locale; /** * This interface represents a property descriptor. A descriptor * includes information that describe a property. - * + * * @version $Revision$, $Date$ */ public class Descriptor implements IDescriptor { @@ -34,7 +34,7 @@ public class Descriptor implements IDescriptor { /** * Constructs a descriptor. - * + * * @param syntax syntax * @param constraint constraint * @param defValue default value @@ -49,7 +49,7 @@ public class Descriptor implements IDescriptor { /** * Returns the syntax of the property. - * + * * @return syntax */ public String getSyntax() { @@ -58,7 +58,7 @@ public class Descriptor implements IDescriptor { /** * Returns the default value of the property. - * + * * @return default value */ public String getDefaultValue() { @@ -74,7 +74,7 @@ public class Descriptor implements IDescriptor { * <p> * If null, no constraint shall be enforced. * <p> - * + * * @return constraint */ public String getConstraint() { @@ -83,7 +83,7 @@ public class Descriptor implements IDescriptor { /** * Retrieves the description of the property. - * + * * @param locale user locale * @return description */ diff --git a/base/common/src/com/netscape/certsrv/property/EPropertyException.java b/base/common/src/com/netscape/certsrv/property/EPropertyException.java index 23f59a25f..ad0617b5f 100644 --- a/base/common/src/com/netscape/certsrv/property/EPropertyException.java +++ b/base/common/src/com/netscape/certsrv/property/EPropertyException.java @@ -21,7 +21,7 @@ import com.netscape.certsrv.base.EBaseException; /** * This is the base exception for property handling. - * + * * @version $Revision$, $Date$ */ public class EPropertyException extends EBaseException { @@ -33,7 +33,7 @@ public class EPropertyException extends EBaseException { /** * Constructs property exception - * + * * @param msg exception message */ public EPropertyException(String msg) { diff --git a/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java b/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java index 431c90de9..70d4040ae 100644 --- a/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java +++ b/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java @@ -28,21 +28,21 @@ import java.util.Locale; * <p> * A plugin, for example, can be described as a property template. * <p> - * + * * @version $Revision$, $Date$ */ public interface IConfigTemplate { /** * Returns a list of configuration parameter names. - * + * * @return parameter names */ public Enumeration<String> getConfigNames(); /** * Returns the descriptors of configuration parameter. - * + * * @param locale user locale * @param name configuration parameter name * @return descriptor @@ -51,7 +51,7 @@ public interface IConfigTemplate { /** * Sets configuration parameter. - * + * * @param name parameter name * @param value parameter value * @exception EPropertyException failed to set parameter @@ -61,7 +61,7 @@ public interface IConfigTemplate { /** * Retrieves configuration parameter by name. - * + * * @return parameter */ public String getConfig(String name); diff --git a/base/common/src/com/netscape/certsrv/property/IDescriptor.java b/base/common/src/com/netscape/certsrv/property/IDescriptor.java index 727c1130d..830ecdb27 100644 --- a/base/common/src/com/netscape/certsrv/property/IDescriptor.java +++ b/base/common/src/com/netscape/certsrv/property/IDescriptor.java @@ -21,7 +21,7 @@ import java.util.Locale; /** * This interface represents a property descriptor. - * + * * @version $Revision$, $Date$ */ public interface IDescriptor { @@ -56,7 +56,7 @@ public interface IDescriptor { /** * Returns the syntax of the property. - * + * * @return syntax */ public String getSyntax(); @@ -68,14 +68,14 @@ public interface IDescriptor { * - choice(cert,crl): cert,crl is the constraint * for choice * If null, no constraint shall be enforced. - * + * * @return constraint */ public String getConstraint(); /** * Retrieves the description of the property. - * + * * @param locale user locale * @return localized description */ @@ -83,7 +83,7 @@ public interface IDescriptor { /** * Retrieves the default value of the property. - * + * * @return default value */ public String getDefaultValue(); diff --git a/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java b/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java index a3a109900..81e8a9a84 100644 --- a/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java +++ b/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.ldap.ELdapException; * error is found while evaluating a PKI component. An example * would be in trying to evaluate a PKI authentication message and * the parsing operation fails due to a missing token. - * + * * @version $Revision$ $Date$ */ public class ECompSyntaxErr extends ELdapException { @@ -36,7 +36,7 @@ public class ECompSyntaxErr extends ELdapException { /** * Construct a ECompSyntaxErr - * + * * @param errorString The descriptive error condition. */ diff --git a/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java b/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java index fdf4a1b9f..39738bb72 100644 --- a/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java +++ b/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java @@ -21,7 +21,7 @@ import com.netscape.certsrv.ldap.ELdapException; /** * Exception for Publish Mapper not found. - * + * * @version $Revision$ $Date$ */ public class EMapperNotFound extends ELdapException { @@ -33,7 +33,7 @@ public class EMapperNotFound extends ELdapException { /** * Constructs a exception for a missing required mapper - * + * * @param errorString Detailed error message. */ public EMapperNotFound(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java b/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java index f8f18c5ff..dfa710578 100644 --- a/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java +++ b/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java @@ -21,7 +21,7 @@ import com.netscape.certsrv.ldap.ELdapException; /** * Exception for Mapper Plugin not found. - * + * * @version $Revision$ $Date$ */ public class EMapperPluginNotFound extends ELdapException { @@ -33,7 +33,7 @@ public class EMapperPluginNotFound extends ELdapException { /** * Constructs a exception for a missing mapper plugin - * + * * @param errorString Detailed error message. */ public EMapperPluginNotFound(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java b/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java index 176001e99..2f25afd95 100644 --- a/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java +++ b/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java @@ -21,7 +21,7 @@ import com.netscape.certsrv.ldap.ELdapException; /** * Exception for Publisher not found. Required for successful publishing. - * + * * @version $Revision$ $Date$ */ public class EPublisherNotFound extends ELdapException { @@ -33,7 +33,7 @@ public class EPublisherNotFound extends ELdapException { /** * Constructs a exception for a missing required publisher. - * + * * @param errorString Detailed error message. */ public EPublisherNotFound(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java b/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java index 56076863a..a6385b187 100644 --- a/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java +++ b/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java @@ -21,7 +21,7 @@ import com.netscape.certsrv.ldap.ELdapException; /** * Exception for Publisher Plugin not found. Plugin implementation is required to actually publish. - * + * * @version $Revision$ $Date$ */ public class EPublisherPluginNotFound extends ELdapException { @@ -33,7 +33,7 @@ public class EPublisherPluginNotFound extends ELdapException { /** * Constructs a exception for a missing publisher plugin. - * + * * @param errorString Detailed error message. */ public EPublisherPluginNotFound(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java b/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java index 01c9897eb..4a975e512 100644 --- a/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java +++ b/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java @@ -21,7 +21,7 @@ import com.netscape.certsrv.ldap.ELdapException; /** * Exception for Ldap Publishing Rule not found. - * + * * @version $Revision$ $Date$ */ public class ERuleNotFound extends ELdapException { @@ -33,7 +33,7 @@ public class ERuleNotFound extends ELdapException { /** * Constructs a exception for a missing required rule, which links a publisher and mapper. - * + * * @param errorString Detailed error message. */ public ERuleNotFound(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java b/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java index f619e7f4a..ca66dbaf5 100644 --- a/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java +++ b/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java @@ -21,7 +21,7 @@ import com.netscape.certsrv.ldap.ELdapException; /** * Exception for Publisher Rule plugin not found. Plugin required to implement Ldap Rule. - * + * * @version $Revision$ $Date$ */ public class ERulePluginNotFound extends ELdapException { @@ -33,7 +33,7 @@ public class ERulePluginNotFound extends ELdapException { /** * Constructs a exception for a missing rule plugin. - * + * * @param errorString Detailed error message. */ public ERulePluginNotFound(String errorString) { diff --git a/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java b/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java index cd5763cdb..ca13886e0 100644 --- a/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java +++ b/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java @@ -31,57 +31,57 @@ import com.netscape.certsrv.base.ISubsystem; * Certificiate Manager/LDAP Publishing panel. This * interface provides administrator additional capability * of publishing CRL to different destinations. - * + * * The CRL publishing frequency is configured via * Netscape Certificate Server Console's * Certificate Manager/Revocation List panel. * The CRL publishing may occur either everytime a * certificate is revoked or at a pre-defined interval. - * + * * To try out this new CRL publisher mechanism, do * the following: * (1) Write a sample CRL publisher class that implements * ICRLPublisher interface. For example, - * + * * <code> * public class CRLPublisher implements ICRLPublisher * { - * public void init(ISubsystem owner, IConfigStore config) + * public void init(ISubsystem owner, IConfigStore config) * throws EBaseException * { * log(ILogger.LL_DEBUG, "CRLPublisher: Initialized"); * } - * - * public void publish(String issuingPointId, X509CRLImpl crl) - * throws EBaseException + * + * public void publish(String issuingPointId, X509CRLImpl crl) + * throws EBaseException * { - * log(ILogger.LL_DEBUG, "CRLPublisher: " + issuingPointId + + * log(ILogger.LL_DEBUG, "CRLPublisher: " + issuingPointId + * " crl=" + crl); * } - * + * * public void log(int level, String msg) * { - * Logger.getLogger().log(ILogger.EV_SYSTEM, + * Logger.getLogger().log(ILogger.EV_SYSTEM, * null, ILogger.S_OTHER, level, * msg); * } * } * </code> - * + * * (2) Compile the class and place the class into * <server-root>\bin\cert\classes directory. * (3) Add the following parameter to CMS.cfg * ca.crlPublisher.class=<implementation class> * For example, * ca.crlPublisher.class=myCRLPublisher - * + * * @version $Revision$, $Date$ */ public interface ICRLPublisher { /** * Initializes this CRL publisher. - * + * * @param owner parent of the publisher. An object of type * CertificateAuthority. * @param config config store for this publisher. If this @@ -96,7 +96,7 @@ public interface ICRLPublisher { /** * Publishes CRL. This method is invoked by CMS based * on the configured CRL publishing frequency. - * + * * @param issuingPointId CRL issuing point identifier * (i.e. MasterCRL) * @param crl CRL that is publishing diff --git a/base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java b/base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java index 3acaeb580..edf28de90 100644 --- a/base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java +++ b/base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.ldap.ELdapException; /** * Interface for mapping a X509 certificate to a LDAP entry. - * + * * @version $Revision$ $Date$ */ public interface ILdapCertMapper extends ILdapPlugin { @@ -54,7 +54,7 @@ public interface ILdapCertMapper extends ILdapPlugin { /** * maps a certificate to a LDAP entry. * returns dn of the mapped LDAP entry. - * + * * @param conn the LDAP connection * @param cert the certificate to map * @param checkForCert whether to check for the presence of the cert diff --git a/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java b/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java index 252a09ec3..93133c552 100644 --- a/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java +++ b/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.ldap.ELdapException; /** * Interface for mapping a CRL to a LDAP entry. - * + * * @version $Revision$ $Date$ */ public interface ILdapCrlMapper { @@ -34,7 +34,7 @@ public interface ILdapCrlMapper { /** * maps a crl to a LDAP entry. * returns dn of the mapped LDAP entry. - * + * * @param conn the LDAP connection * @param crl the CRL to map * @param checkForCrl whether to check for the presence of the CRL @@ -50,7 +50,7 @@ public interface ILdapCrlMapper { /** * initialize from config store. - * + * * @param config the configuration store to initialize from. * @exception ELdapException Initialization failed due to Ldap error. * @exception EBaseException Initialization failed. diff --git a/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java b/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java index 4537636c1..068507e9e 100644 --- a/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java +++ b/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java @@ -23,7 +23,7 @@ import com.netscape.certsrv.request.IRequest; /** * Interface for a Ldap predicate expression. - * + * * @version $Revision$, $Date$ */ public interface ILdapExpression { @@ -42,7 +42,7 @@ public interface ILdapExpression { /** * Evaluate the Expression. - * + * * @param sc The SessionContext on which we are applying the condition. * @return The return value. * @exception ELdapExeption Failed to evaluate expression. @@ -52,7 +52,7 @@ public interface ILdapExpression { /** * Evaluate the Expression. - * + * * @param req The PKIRequest on which we are applying the condition. * @return The return value. * @exception ELdapExeption Failed to evaluate expression. @@ -62,7 +62,7 @@ public interface ILdapExpression { /** * Convert to a string. - * + * * @return String representation of expression. */ public String toString(); diff --git a/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java b/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java index 09238421f..186af8825 100644 --- a/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java +++ b/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.request.IRequest; /** * Interface for mapping a X509 certificate to a LDAP entry. - * + * * @version $Revision$ $Date$ */ public interface ILdapMapper extends ILdapPlugin { @@ -54,7 +54,7 @@ public interface ILdapMapper extends ILdapPlugin { /** * maps a certificate to a LDAP entry. * returns dn of the mapped LDAP entry. - * + * * @param conn the LDAP connection * @param obj the object to map * @return dn indicates whether a mapping was successful @@ -67,7 +67,7 @@ public interface ILdapMapper extends ILdapPlugin { /** * maps a certificate to a LDAP entry. * returns dn of the mapped LDAP entry. - * + * * @param conn the LDAP connection * @param r the request to map * @param obj the object to map diff --git a/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java b/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java index b0a9fe73b..f0c53f804 100644 --- a/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java +++ b/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java @@ -23,14 +23,14 @@ import com.netscape.certsrv.ldap.ELdapException; /** * Interface for any Ldap plugin. - * + * * @version $Revision$ $Date$ */ public interface ILdapPlugin { /** * Initialize from config store. - * + * * @param config the configuration store to initialize from. * @exception ELdapException initialization failed due to Ldap error. * @exception EBaseException initialization failed. diff --git a/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java b/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java index db52a9106..5287383b4 100644 --- a/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java +++ b/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java @@ -25,14 +25,14 @@ import com.netscape.certsrv.ldap.ELdapException; /** * Interface for any ldap plugin. Plugin implementation is defined here. - * + * * @version $Revision$ $Date$ */ public interface ILdapPluginImpl extends IPluginImpl { /** * initialize from config store. - * + * * @param config the configuration store to initialize from. * @exception ELdapException initializtion failed due to Ldap error. * @exception EBaseException initialization failed. @@ -42,7 +42,7 @@ public interface ILdapPluginImpl extends IPluginImpl { /** * initialize from config store and Isubsystem. - * + * * @param config the configuration store to initialize from. * @exception ELdapException initializtion failed due to Ldap error. * @exception EBaseException initialization failed. diff --git a/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java b/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java index 81e5be952..e918973cd 100644 --- a/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java +++ b/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.request.IRequestListener; /** * Handles requests to perform Ldap publishing. - * + * * @version $Revision$ $Date$ */ public interface ILdapPublishModule extends IRequestListener { @@ -30,13 +30,13 @@ public interface ILdapPublishModule extends IRequestListener { /** * initialize ldap publishing module with config store */ - // public void init(ICertAuthority owner, IConfigStore config) + // public void init(ICertAuthority owner, IConfigStore config) // throws EBaseException, ELdapException; /** * Accepts completed requests from an authority and * performs ldap publishing. - * + * * @param request The publishing request. */ public void accept(IRequest request); diff --git a/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java b/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java index 398d86453..38b278634 100644 --- a/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java +++ b/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java @@ -25,7 +25,7 @@ import com.netscape.certsrv.ldap.ELdapException; /** * Interface for publishing certificate or crl to database store. - * + * * @version $Revision$ $Date$ */ public interface ILdapPublisher extends ILdapPlugin { @@ -55,7 +55,7 @@ public interface ILdapPublisher extends ILdapPlugin { /** * Publish an object. - * + * * @param conn a Ldap connection * (null for non-LDAP publishing) * @param dn dn of the ldap entry to publish cert @@ -70,7 +70,7 @@ public interface ILdapPublisher extends ILdapPlugin { /** * Unpublish an object. - * + * * @param conn the Ldap connection * (null for non-LDAP publishing) * @param dn dn of the ldap entry to unpublish cert diff --git a/base/common/src/com/netscape/certsrv/publish/ILdapRule.java b/base/common/src/com/netscape/certsrv/publish/ILdapRule.java index 7bf19b070..69aae10f4 100644 --- a/base/common/src/com/netscape/certsrv/publish/ILdapRule.java +++ b/base/common/src/com/netscape/certsrv/publish/ILdapRule.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.base.IConfigStore; /** * Interface for publishing rule which associates a Publisher with a Mapper. - * + * * @version $Revision$ $Date$ */ public interface ILdapRule extends ILdapPlugin { @@ -34,7 +34,7 @@ public interface ILdapRule extends ILdapPlugin { /** * Initialize the plugin. - * + * * @exception EBaseException Initialization failed. */ public void init(IPublisherProcessor processor, IConfigStore diff --git a/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java b/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java index 911d4e132..affe35132 100644 --- a/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java +++ b/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java @@ -41,7 +41,7 @@ import com.netscape.certsrv.request.IRequest; * checked in the order to find the first matched publishing rule as the * mapping rule to (un)publish the object. * <P> - * + * * @version $Revision$, $Date$ */ public interface IPublishRuleSet { @@ -50,7 +50,7 @@ public interface IPublishRuleSet { /** * Returns the name of the publishing rule set. * <P> - * + * * @return The name of the publishing rule set. */ String getName(); @@ -58,7 +58,7 @@ public interface IPublishRuleSet { /** * Returns the no of publishing rules in a set. * <P> - * + * * @return the no of publishing rules. */ int count(); @@ -66,7 +66,7 @@ public interface IPublishRuleSet { /** * Add a publishing rule * <P> - * + * * @param aliasName The name of the publishing rule to be added. * @param rule rule The publishing rule to be added. */ @@ -74,7 +74,7 @@ public interface IPublishRuleSet { /** * Removes a publishing rule identified by the given name. - * + * * @param ruleName The name of the publishing rule to be removed. */ void removeRule(String ruleName); @@ -82,7 +82,7 @@ public interface IPublishRuleSet { /** * Get the publishing rule identified by a given name. * <P> - * + * * @param ruleName The name of the publishing rule to be return. * @return The publishing rule identified by the given name or null if none exists. */ @@ -91,7 +91,7 @@ public interface IPublishRuleSet { /** * Get the publishing rule identified by a corresponding request. * <P> - * + * * @param req The request from which rule will be identified. * @return The publishing rule or null if none exists. */ @@ -100,7 +100,7 @@ public interface IPublishRuleSet { /** * Get an enumeration of publishing rules. * <P> - * + * * @return An enumeration of publishing rules. */ Enumeration<ILdapRule> getRules(); @@ -112,7 +112,7 @@ public interface IPublishRuleSet { * Use the mapper to find the dn of the LDAP entry and use the publisher * to publish the object in the request. * <P> - * + * * @param conn The Ldap connection * @param req The request to apply policies on. * @exception ELdapException publish failed due to Ldap error. diff --git a/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java b/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java index 3ed985403..a2f8fcc71 100644 --- a/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java +++ b/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.request.IRequest; /** * Controls the publishing process from the top level. Maintains * a collection of Publishers , Mappers, and Publish Rules. - * + * * @version $Revision$ $Date$ */ @@ -62,66 +62,66 @@ public interface IPublisherProcessor extends ISubsystem { public static final String PROP_TYPE = "type"; /** - * + * * Returns Hashtable of rule plugins. */ public Hashtable<String, RulePlugin> getRulePlugins(); /** - * + * * Returns Hashtable of rule instances. */ public Hashtable<String, ILdapRule> getRuleInsts(); /** - * + * * Returns Hashtable of mapper plugins. */ public Hashtable<String, MapperPlugin> getMapperPlugins(); /** - * + * * Returns Hashtable of publisher plugins. */ public Hashtable<String, PublisherPlugin> getPublisherPlugins(); /** - * + * * Returns Hashtable of rule mapper instances. */ public Hashtable<String, MapperProxy> getMapperInsts(); /** - * + * * Returns Hashtable of rule publisher instances. */ public Hashtable<String, PublisherProxy> getPublisherInsts(); /** - * + * * Returns list of rules based on publishing type. - * + * * @param publishingType Type for which to retrieve rule list. */ public Enumeration<ILdapRule> getRules(String publishingType); /** - * + * * Returns list of rules based on publishing type and publishing request. - * + * * @param publishingType Type for which to retrieve rule list. * @param req Corresponding publish request. */ public Enumeration<ILdapRule> getRules(String publishingType, IRequest req); /** - * + * * Returns mapper initial default parameters. - * + * * @param implName name of MapperPlugin. */ @@ -129,9 +129,9 @@ public interface IPublisherProcessor extends ISubsystem { ELdapException; /** - * + * * Returns mapper current instance parameters. - * + * * @param insName name of MapperProxy. * @exception ELdapException failed due to Ldap error. */ @@ -140,9 +140,9 @@ public interface IPublisherProcessor extends ISubsystem { ELdapException; /** - * + * * Returns publisher initial default parameters. - * + * * @param implName name of PublisherPlugin. * @exception ELdapException failed due to Ldap error. */ @@ -150,9 +150,9 @@ public interface IPublisherProcessor extends ISubsystem { ELdapException; /** - * + * * Returns true if MapperInstance is enabled. - * + * * @param insName name of MapperProxy. * @return true if enabled. false if disabled. */ @@ -160,54 +160,54 @@ public interface IPublisherProcessor extends ISubsystem { public boolean isMapperInstanceEnable(String insName); /** - * + * * Returns ILdapMapper instance that is currently active. - * + * * @param insName name of MapperProxy. * @return instance of ILdapMapper. */ public ILdapMapper getActiveMapperInstance(String insName); /** - * + * * Returns ILdapMapper instance based on name of MapperProxy. - * + * * @param insName name of MapperProxy. * @return instance of ILdapMapper. */ public ILdapMapper getMapperInstance(String insName); /** - * + * * Returns true publisher instance is currently enabled. - * + * * @param insName name of PublisherProxy. * @return true if enabled. */ public boolean isPublisherInstanceEnable(String insName); /** - * + * * Returns ILdapPublisher instance that is currently active. - * + * * @param insName name of PublisherProxy. * @return instance of ILdapPublisher. */ public ILdapPublisher getActivePublisherInstance(String insName); /** - * + * * Returns ILdapPublisher instance. - * + * * @param insName name of PublisherProxy. * @return instance of ILdapPublisher. */ public ILdapPublisher getPublisherInstance(String insName); /** - * + * * Returns Vector of PublisherIntance's current instance parameters. - * + * * @param insName name of PublisherProxy. * @return Vector of current instance parameters. */ @@ -215,9 +215,9 @@ public interface IPublisherProcessor extends ISubsystem { ELdapException; /** - * + * * Returns Vector of RulePlugin's initial default parameters. - * + * * @param implName name of RulePlugin. * @return Vector of initial default parameters. * @exception ELdapException failed due to Ldap error. @@ -226,9 +226,9 @@ public interface IPublisherProcessor extends ISubsystem { ELdapException; /** - * + * * Returns Vector of RulePlugin's current instance parameters. - * + * * @param implName name of RulePlugin. * @return Vector of current instance parameters. * @exception ELdapException failed due to Ldap error. @@ -239,7 +239,7 @@ public interface IPublisherProcessor extends ISubsystem { /** * Set published flag - true when published, false when unpublished. * Not exist means not published. - * + * * @param serialNo serial number of publishable object. * @param published true for published, false for not. */ @@ -247,7 +247,7 @@ public interface IPublisherProcessor extends ISubsystem { /** * Publish ca cert, UpdateDir.java, jobs, request listeners - * + * * @param cert X509 certificate to be published. * @exception ELdapException publish failed due to Ldap error. */ @@ -264,7 +264,7 @@ public interface IPublisherProcessor extends ISubsystem { /** * Publishs regular user certificate based on the criteria * set in the request. - * + * * @param cert X509 certificate to be published. * @param req request which provides the criteria * @exception ELdapException publish failed due to Ldap error. @@ -275,7 +275,7 @@ public interface IPublisherProcessor extends ISubsystem { /** * Unpublish user certificate. This is used by * UnpublishExpiredJob. - * + * * @param cert X509 certificate to be unpublished. * @param req request which provides the criteria * @exception ELdapException unpublish failed due to Ldap error. @@ -287,7 +287,7 @@ public interface IPublisherProcessor extends ISubsystem { * publishes a crl by mapping the issuer name in the crl to an entry * and publishing it there. entry must be a certificate authority. * Note that this is used by cmsgateway/cert/UpdateDir.java - * + * * @param crl Certificate Revocation List * @param crlIssuingPointId name of the issuing point. * @exception ELdapException publish failed due to Ldap error. @@ -298,7 +298,7 @@ public interface IPublisherProcessor extends ISubsystem { /** * publishes a crl by mapping the issuer name in the crl to an entry * and publishing it there. entry must be a certificate authority. - * + * * @param dn Distinguished name to publish. * @param crl Certificate Revocation List * @exception ELdapException publish failed due to Ldap error. @@ -307,36 +307,36 @@ public interface IPublisherProcessor extends ISubsystem { throws ELdapException; /** - * + * * Return true if Ldap is enabled. - * + * * @return true if Ldap is enabled,otherwise false. */ public boolean ldapEnabled(); /** - * + * * Return true of PublisherProcessor is enabled. - * + * * @return true if is enabled, otherwise false. - * + * */ public boolean enabled(); /** - * + * * Return Authority for which this Processor operates. - * + * * @return Authority. */ public ISubsystem getAuthority(); /** - * + * * Perform logging function for this Processor. - * + * * @param level Log level to be used for this message * @param msg Message to be logged. */ @@ -344,16 +344,16 @@ public interface IPublisherProcessor extends ISubsystem { public void log(int level, String msg); /** - * + * * Returns LdapConnModule belonging to this Processor. - * + * * @return LdapConnModule. */ public ILdapConnModule getLdapConnModule(); /** * Sets the LdapConnModule belonging to this Processor. - * + * * @param m ILdapConnModule. */ public void setLdapConnModule(ILdapConnModule m); diff --git a/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java b/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java index b70a0626d..352ec02a8 100644 --- a/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java +++ b/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java @@ -22,14 +22,14 @@ import com.netscape.certsrv.ldap.ELdapException; /** * Interface for a publisher that has the capability of publishing * cross certs - * + * * @version $Revision$, $Date$ */ public interface IXcertPublisherProcessor extends IPublisherProcessor { /** * Publish crossCertificatePair. - * + * * @param pair Byte array representing cert pair. * @exception EldapException publish failed due to Ldap error. */ diff --git a/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java b/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java index 84a866095..1c2286a0d 100644 --- a/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java +++ b/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java @@ -21,7 +21,7 @@ package com.netscape.certsrv.publish; * Class that represents the result of a Ldap Mapping operation. * certificate map result: * Represented by a mapped entry as a DN and whether entry has the certificate. - * + * * @version $Revision$ $Date$ */ public class LdapCertMapResult { @@ -38,7 +38,7 @@ public class LdapCertMapResult { /** * Gets DN from the result. - * + * * @return Distinguished Name. */ public String getDn() { @@ -47,7 +47,7 @@ public class LdapCertMapResult { /** * Gets whether the ldap entry had a certificate from result. - * + * * @return true if cert is present, false otherwise. */ public boolean hasCert() { diff --git a/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java b/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java index b193e1b5f..3a489bce7 100644 --- a/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java +++ b/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java @@ -22,14 +22,14 @@ import com.netscape.certsrv.base.Plugin; /** * This class represents a registered mapper plugin. * <P> - * + * * @version $Revision$, $Date$ */ public class MapperPlugin extends Plugin { /** * Constructs a MapperPlugin based on a name and a path. - * + * * @param id Name of plugin. * @param path Classpath of plugin. */ diff --git a/base/common/src/com/netscape/certsrv/publish/MapperProxy.java b/base/common/src/com/netscape/certsrv/publish/MapperProxy.java index 95dc98d9c..df549e354 100644 --- a/base/common/src/com/netscape/certsrv/publish/MapperProxy.java +++ b/base/common/src/com/netscape/certsrv/publish/MapperProxy.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.publish; /** - * + * * Class representing a LdapMapper. - * + * * @version $Revision$ $Date$ */ @@ -29,9 +29,9 @@ public class MapperProxy { private ILdapMapper mMapper; /** - * + * * Contructs MapperProxy . - * + * * @param enable Enabled or not. * @param mapper Corresponding ILdapMapper object. */ @@ -41,9 +41,9 @@ public class MapperProxy { } /** - * + * * Returns if enabled. - * + * * @return true if enabled, otherwise false. */ public boolean isEnable() { @@ -51,9 +51,9 @@ public class MapperProxy { } /** - * + * * Returns ILdapMapper object. - * + * * @return Intance of ILdapMapper object. */ public ILdapMapper getMapper() { diff --git a/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java b/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java index 5a163b80c..173643a6b 100644 --- a/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java +++ b/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java @@ -22,15 +22,15 @@ import com.netscape.certsrv.base.Plugin; /** * This class represents a registered publisher plugin. * <P> - * + * * @version $Revision$, $Date$ */ public class PublisherPlugin extends Plugin { /** - * + * * Constructs a PublisherPlugin based on name and classpath. - * + * * @param id name of plugin. * @param path Classpath of plugin. */ diff --git a/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java b/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java index eb71f3e56..8c05d7ce9 100644 --- a/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java +++ b/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.publish; /** - * + * * Class representing a proxy for a ILdapPublisher. - * + * * @version $Revision$ $Date$ */ @@ -29,9 +29,9 @@ public class PublisherProxy { private ILdapPublisher mPublisher; /** - * + * * Constructs a PublisherProxy based on a ILdapPublisher object and enabled boolean. - * + * * @param enable Proxy is enabled or not. * @param publisher Corresponding ILdapPublisher object. */ @@ -42,7 +42,7 @@ public class PublisherProxy { /** * Return if enabled or not. - * + * * @return true if enabled, otherwise false. */ public boolean isEnable() { @@ -51,7 +51,7 @@ public class PublisherProxy { /** * Return ILdapPublisher object. - * + * * @return Instance of ILdapPublisher. */ public ILdapPublisher getPublisher() { diff --git a/base/common/src/com/netscape/certsrv/publish/RulePlugin.java b/base/common/src/com/netscape/certsrv/publish/RulePlugin.java index b37a24d51..7856fc7d3 100644 --- a/base/common/src/com/netscape/certsrv/publish/RulePlugin.java +++ b/base/common/src/com/netscape/certsrv/publish/RulePlugin.java @@ -22,15 +22,15 @@ import com.netscape.certsrv.base.Plugin; /** * This class represents a registered Publishing Rule plugin. * <P> - * + * * @version $Revision$, $Date$ */ public class RulePlugin extends Plugin { /** - * + * * Constructs a RulePlugin based on name and classpath. - * + * * @param id name of RulePlugin. * @param path Classpath of RulePlugin. */ diff --git a/base/common/src/com/netscape/certsrv/ra/IRAService.java b/base/common/src/com/netscape/certsrv/ra/IRAService.java index 4bab4745c..8a851d918 100644 --- a/base/common/src/com/netscape/certsrv/ra/IRAService.java +++ b/base/common/src/com/netscape/certsrv/ra/IRAService.java @@ -25,21 +25,21 @@ import com.netscape.certsrv.request.IService; /** * An interface representing a RA request services. * <P> - * + * * @version $Revision$, $Date$ */ public interface IRAService extends IService { /** * Services request. - * + * * @param req request data */ public boolean serviceRequest(IRequest req); /** * Services profile request. - * + * * @param request profile enrollment request information * @exception EBaseException failed to service profile enrollment request */ @@ -48,14 +48,14 @@ public interface IRAService extends IService { /** * Returns CA connector. - * + * * @return CA connector */ public IConnector getCAConnector(); /** * Returns KRA connector. - * + * * @return KRA connector */ public IConnector getKRAConnector(); diff --git a/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java b/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java index 8302e2d23..4f121378b 100644 --- a/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java +++ b/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.request.IRequestQueue; * An interface represents a Registration Authority that is * responsible for certificate enrollment operations. * <P> - * + * * @version $Revision$, $Date$ */ public interface IRegistrationAuthority extends ISubsystem { @@ -55,14 +55,14 @@ public interface IRegistrationAuthority extends ISubsystem { /** * Retrieves the request queue of this registration authority. - * + * * @return RA's request queue */ public IRequestQueue getRequestQueue(); /** * Retrieves the publishing processor of this registration authority. - * + * * @return RA's publishing processor */ public IPublisherProcessor getPublisherProcessor(); @@ -76,42 +76,42 @@ public interface IRegistrationAuthority extends ISubsystem { /** * Retrieves the RA certificate. - * + * * @return the RA certificate */ public org.mozilla.jss.crypto.X509Certificate getRACert(); /** * Retrieves the request in queue listener. - * + * * @return the request in queue listener */ public IRequestListener getRequestInQListener(); /** * Retrieves the request listener for issued certificates. - * + * * @return the request listener for issued certificates */ public IRequestListener getCertIssuedListener(); /** * Retrieves the request listener for revoked certificates. - * + * * @return the request listener for revoked certificates */ public IRequestListener getCertRevokedListener(); /** * Returns the nickname of the RA certificate. - * + * * @return the nickname of the RA certificate */ public String getNickname(); /** * Retrieves the nickname of the RA certificate from configuration store. - * + * * @return the nickname of the RA certificate * @exception EBaseException failed to get nickname */ @@ -119,28 +119,28 @@ public interface IRegistrationAuthority extends ISubsystem { /** * Sets the new nickname of the RA certifiate. - * + * * @param name new nickname */ public void setNewNickName(String name); /** * Sets the nickname of the RA certifiate. - * + * * @param str nickname */ public void setNickname(String str); /** * Retrieves the default validity period. - * + * * @return the default validity length in days */ public long getDefaultValidity(); /** * Retrieves the issuer name of this registration authority. - * + * * @return the issuer name of this registration authority */ public X500Name getX500Name(); @@ -148,14 +148,14 @@ public interface IRegistrationAuthority extends ISubsystem { /** * Retrieves the RA service object that is responsible for * processing requests. - * + * * @return RA service object */ public IRAService getRAService(); /** * Retrieves the request listener by name. - * + * * @param name request listener name * @return the request listener */ @@ -163,7 +163,7 @@ public interface IRegistrationAuthority extends ISubsystem { /** * Retrieves all request listeners. - * + * * @return name enumeration of all request listeners */ public Enumeration<String> getRequestListenerNames(); diff --git a/base/common/src/com/netscape/certsrv/registry/ERegistryException.java b/base/common/src/com/netscape/certsrv/registry/ERegistryException.java index 5d2e2c91c..fe09f8d4b 100644 --- a/base/common/src/com/netscape/certsrv/registry/ERegistryException.java +++ b/base/common/src/com/netscape/certsrv/registry/ERegistryException.java @@ -21,7 +21,7 @@ import com.netscape.certsrv.base.EBaseException; /** * This represents a registry exception. - * + * * @version $Revision$, $Date$ */ public class ERegistryException extends EBaseException { @@ -33,7 +33,7 @@ public class ERegistryException extends EBaseException { /** * Constructs a registry exception. - * + * * @param msg message carried along with the exception */ public ERegistryException(String msg) { diff --git a/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java b/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java index 8e6a87365..ff1aa574a 100644 --- a/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java +++ b/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java @@ -25,17 +25,17 @@ import java.util.Locale; * name and description are information * for end-users. * <p> - * + * * The class name can be used to create an instance of the plugin. * <p> - * + * * @version $Revision$, $Date$ */ public interface IPluginInfo { /** * Retrieves the localized plugin name. - * + * * @param locale end-user locale * @return plugin name */ @@ -43,7 +43,7 @@ public interface IPluginInfo { /** * Retrieves the localized plugin description. - * + * * @param locale end-user locale * @return plugin description */ @@ -54,7 +54,7 @@ public interface IPluginInfo { * Instance of plugin can be created with * <p> * Class.forName(info.getClassName()); - * + * * @return java class name */ public String getClassName(); diff --git a/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java b/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java index 1c85aeba9..4f014d3f3 100644 --- a/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java +++ b/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java @@ -25,10 +25,10 @@ import com.netscape.certsrv.base.ISubsystem; /** * This represents the registry subsystem that manages * mulitple types of plugin information. - * + * * The plugin information includes id, name, * classname, and description. - * + * * @version $Revision$, $Date$ */ public interface IPluginRegistry extends ISubsystem { @@ -37,21 +37,21 @@ public interface IPluginRegistry extends ISubsystem { /** * Returns handle to the registry configuration file. - * + * * @return configuration store of registry subsystem */ public IConfigStore getFileConfigStore(); /** * Returns all type names. - * + * * @return a list of String-based names */ public Enumeration<String> getTypeNames(); /** * Returns a list of plugin identifiers of the given type. - * + * * @param type plugin type * @return a list of plugin IDs */ @@ -59,7 +59,7 @@ public interface IPluginRegistry extends ISubsystem { /** * Retrieves the plugin information. - * + * * @param type plugin type * @param id plugin id * @return plugin info @@ -68,7 +68,7 @@ public interface IPluginRegistry extends ISubsystem { /** * Adds plugin info. - * + * * @param type plugin type * @param id plugin id * @param info plugin info diff --git a/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java b/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java index a50996f2b..98338601a 100644 --- a/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java +++ b/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.publish.IPublisherProcessor; /** * The ARequestNotifier class implements the IRequestNotifier interface, * which notifies all registered request listeners. - * + * * @version $Revision$, $Date$ */ public class ARequestNotifier implements IRequestNotifier { @@ -106,18 +106,18 @@ public class ARequestNotifier implements IRequestNotifier { /** * Registers a request listener. - * + * * @param listener listener to be registered */ public void registerListener(IRequestListener listener) { // XXX should check for duplicates here or allow listeners - // to register twice and call twice ? + // to register twice and call twice ? mListeners.put(listener.getClass().getName(), listener); } /** * Registers a request listener. - * + * * @param name listener name * @param listener listener to be registered */ @@ -127,18 +127,18 @@ public class ARequestNotifier implements IRequestNotifier { /** * Removes listener from the list of registered listeners. - * + * * @param listener listener to be removed from the list */ public void removeListener(IRequestListener listener) { // XXX should check for duplicates here or allow listeners - // to register twice and call twice ? + // to register twice and call twice ? mListeners.remove(listener.getClass().getName()); } /** * Gets list of listener names. - * + * * @return enumeration of listener names */ public Enumeration<String> getListenerNames() { @@ -147,7 +147,7 @@ public class ARequestNotifier implements IRequestNotifier { /** * Removes listener from the list of registered listeners. - * + * * @param name listener name to be removed from the list */ public void removeListener(String name) { @@ -156,7 +156,7 @@ public class ARequestNotifier implements IRequestNotifier { /** * Gets listener from the list of registered listeners. - * + * * @param name listener name * @return listener */ @@ -166,7 +166,7 @@ public class ARequestNotifier implements IRequestNotifier { /** * Gets list of listeners. - * + * * @return enumeration of listeners */ public Enumeration<IRequestListener> getListeners() { @@ -196,7 +196,7 @@ public class ARequestNotifier implements IRequestNotifier { /** * Gets request from publishing queue. - * + * * @return request */ public synchronized IRequest getRequest() { @@ -232,7 +232,7 @@ public class ARequestNotifier implements IRequestNotifier { if (!(requestType.equals(IRequest.ENROLLMENT_REQUEST) || requestType.equals(IRequest.RENEWAL_REQUEST) || requestType.equals(IRequest.REVOCATION_REQUEST) || - requestType.equals(IRequest.CMCREVOKE_REQUEST) || + requestType.equals(IRequest.CMCREVOKE_REQUEST) || requestType.equals(IRequest.UNREVOCATION_REQUEST))) { continue; } @@ -287,7 +287,7 @@ public class ARequestNotifier implements IRequestNotifier { /** * Gets number of requests in publishing queue. - * + * * @return number of requests in publishing queue */ public int getNumberOfRequests() { @@ -296,7 +296,7 @@ public class ARequestNotifier implements IRequestNotifier { /** * Checks if publishing queue is enabled. - * + * * @return true if publishing queue is enabled, false otherwise */ public boolean isPublishingQueueEnabled() { @@ -305,7 +305,7 @@ public class ARequestNotifier implements IRequestNotifier { /** * Removes a notifier thread from the pool of publishing queue threads. - * + * * @param notifierThread Thread */ public void removeNotifierThread(Thread notifierThread) { @@ -320,7 +320,7 @@ public class ARequestNotifier implements IRequestNotifier { /** * Notifies all registered listeners about request. - * + * * @param r request */ public void notify(IRequest r) { @@ -345,7 +345,7 @@ public class ARequestNotifier implements IRequestNotifier { /* CMS.getLogger().log( - ILogger.EV_SYSTEM, ILogger.S_REQQUEUE, ILogger.LL_FAILURE, + ILogger.EV_SYSTEM, ILogger.S_REQQUEUE, ILogger.LL_FAILURE, "Could not run listeners for request " + r.getRequestId() + ". Error " + e + ";" + e.getMessage()); */ @@ -355,7 +355,7 @@ public class ARequestNotifier implements IRequestNotifier { /** * Checks for available publishing connections - * + * * @return true if there are available publishing connections, false otherwise */ private boolean checkAvailablePublishingConnections() { @@ -390,7 +390,7 @@ public class ARequestNotifier implements IRequestNotifier { /** * Checks if more publishing threads can be added. - * + * * @return true if more publishing threads can be added, false otherwise */ private boolean morePublishingThreads() { @@ -417,7 +417,7 @@ public class ARequestNotifier implements IRequestNotifier { /** * Notifies all registered listeners about request. - * + * * @param r request */ public synchronized void addToNotify(IRequest r) { @@ -449,7 +449,7 @@ public class ARequestNotifier implements IRequestNotifier { /** * Recovers publishing queue. - * + * * @param id request request */ public void recoverPublishingQueue(String id) { @@ -490,7 +490,7 @@ class RunListeners implements Runnable { /** * RunListeners class constructor. - * + * * @param r request * @param listeners list of listeners */ @@ -501,7 +501,7 @@ class RunListeners implements Runnable { /** * RunListeners class constructor. - * + * * @param r request * @param listeners list of listeners */ diff --git a/base/common/src/com/netscape/certsrv/request/AgentApproval.java b/base/common/src/com/netscape/certsrv/request/AgentApproval.java index eb3ca06a8..cfe52b3b0 100644 --- a/base/common/src/com/netscape/certsrv/request/AgentApproval.java +++ b/base/common/src/com/netscape/certsrv/request/AgentApproval.java @@ -23,7 +23,7 @@ import java.util.Date; /** * The AgentApproval class contains the record of a * single agent approval. - * + * * @version $Revision$, $Date$ */ public class AgentApproval @@ -36,7 +36,7 @@ public class AgentApproval /** * Returns the approving agent's user name. - * + * * @return an identifier for the agent */ public String getUserName() { @@ -45,7 +45,7 @@ public class AgentApproval /** * Returns the date of the approval - * + * * @return date and time of the approval */ public Date getDate() { @@ -54,7 +54,7 @@ public class AgentApproval /** * AgentApproval class constructor - * + * * @param userName user name of the approving agent */ AgentApproval(String userName) { diff --git a/base/common/src/com/netscape/certsrv/request/AgentApprovals.java b/base/common/src/com/netscape/certsrv/request/AgentApprovals.java index d6fa41b8f..2c957b6ee 100644 --- a/base/common/src/com/netscape/certsrv/request/AgentApprovals.java +++ b/base/common/src/com/netscape/certsrv/request/AgentApprovals.java @@ -25,7 +25,7 @@ import java.util.Vector; /** * A collection of AgentApproval objects. * <single-threaded> - * + * * @version $Revision$, $Date$ */ public class AgentApprovals @@ -41,7 +41,7 @@ public class AgentApprovals * <p> * If an approval is already present for this user, it is updated with a new date. Otherwise a new value is * inserted. - * + * * @param userName user name of the approving agent */ public void addApproval(String userName) { @@ -61,7 +61,7 @@ public class AgentApprovals * Removes an approval from approval's list. * <p> * If there is no approval for this userName, this call does nothing. - * + * * @param userName user name of the approving agent */ public void removeApproval(String userName) { @@ -73,7 +73,7 @@ public class AgentApprovals /** * Finds an existing AgentApproval for the named user. - * + * * @param userName user name of the approving agent * @return an AgentApproval object */ @@ -93,7 +93,7 @@ public class AgentApprovals /** * Returns an enumeration of the agent approvals - * + * * @return an enumeration of the agent approvals */ public Enumeration<AgentApproval> elements() { @@ -107,7 +107,7 @@ public class AgentApprovals * where epoch is the date.getTime() * <p> * This is used for serialization in Request.setExtData(). - * + * * @return The string vector. */ public Vector<String> toStringVector() { @@ -123,7 +123,7 @@ public class AgentApprovals /** * Recreates an AgentApprovals instance from a Vector of strings that * was created by toStringVector(). - * + * * @param stringVector The vector of strings to translate * @return the AgentApprovals instance or null if it can't be translated. */ diff --git a/base/common/src/com/netscape/certsrv/request/IEnrollmentRequest.java b/base/common/src/com/netscape/certsrv/request/IEnrollmentRequest.java index 32c3f53a9..f63fc0076 100644 --- a/base/common/src/com/netscape/certsrv/request/IEnrollmentRequest.java +++ b/base/common/src/com/netscape/certsrv/request/IEnrollmentRequest.java @@ -22,7 +22,7 @@ package com.netscape.certsrv.request; * This version (currently) doesn't supply any additional * data, but is implementated only for testing and * demonstration purposes. - * + * * @version $Revision$, $Date$ */ public interface IEnrollmentRequest diff --git a/base/common/src/com/netscape/certsrv/request/INotify.java b/base/common/src/com/netscape/certsrv/request/INotify.java index 938cd855b..aaeb44051 100644 --- a/base/common/src/com/netscape/certsrv/request/INotify.java +++ b/base/common/src/com/netscape/certsrv/request/INotify.java @@ -23,7 +23,7 @@ package com.netscape.certsrv.request; * this interface may be registered with a IRequestQueue. * The interface will be invoked when a request is completely * serviced by the IService object. - * + * * @version $Revision$ $Date$ */ public interface INotify { @@ -33,7 +33,7 @@ public interface INotify { * The implementation may use values stored in the IRequest * object, and may implement any type publishing (such as email * or writing values into a directory) - * + * * @param request the request that is completed. */ public void notify(IRequest request); diff --git a/base/common/src/com/netscape/certsrv/request/IPolicy.java b/base/common/src/com/netscape/certsrv/request/IPolicy.java index 9998abee7..647d8f0c8 100644 --- a/base/common/src/com/netscape/certsrv/request/IPolicy.java +++ b/base/common/src/com/netscape/certsrv/request/IPolicy.java @@ -28,7 +28,7 @@ package com.netscape.certsrv.request; * of agents allowed to perform further processing. If none * is set, a default value ("defaultAgentGroup") will be * set instead. - * + * * @version $Revision$, $Date$ */ public interface IPolicy { @@ -41,7 +41,7 @@ public interface IPolicy { * The policy can update fields in the request, to add additional values or to restrict the values to pre-determined * ranges. * <p> - * + * * @param request * the request to check * @return diff --git a/base/common/src/com/netscape/certsrv/request/IRequest.java b/base/common/src/com/netscape/certsrv/request/IRequest.java index 8759c1490..ded0145ab 100644 --- a/base/common/src/com/netscape/certsrv/request/IRequest.java +++ b/base/common/src/com/netscape/certsrv/request/IRequest.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.base.IAttrSet; /** * An interface that defines abilities of request objects, - * + * * @version $Revision$, $Date$ */ public interface IRequest { @@ -75,7 +75,7 @@ public interface IRequest { public static final String REQUESTOR_EMAIL = "csrRequestorEmail"; public static final String REQUESTOR_COMMENTS = "csrRequestorComments"; - // request attributes for all + // request attributes for all public static final String AUTH_TOKEN = "AUTH_TOKEN"; public static final String HTTP_PARAMS = "HTTP_PARAMS"; public static final String HTTP_HEADERS = "HTTP_HEADERS"; @@ -111,7 +111,7 @@ public interface IRequest { public static final String REQUEST_TRUSTEDMGR_PRIVILEGE = "requestTrustedManagerPrivilege"; public static final String FINGERPRINTS = "fingerprints"; - // enrollment request values + // enrollment request values public static final String SERVER_CERT = "server"; public static final String CLIENT_CERT = "client"; public static final String CA_CERT = "ca"; @@ -185,14 +185,14 @@ public interface IRequest { /** * Gets the primary identifier for this request. - * + * * @return request id */ RequestId getRequestId(); /** * Gets the current state of this request. - * + * * @return request status */ RequestStatus getRequestStatus(); @@ -205,7 +205,7 @@ public interface IRequest { * The sourceId should be unique so that it can be used to retrieve request later without knowing the locally * assigned primary id (RequestID) * <p> - * + * * @return * the sourceId value (or null if none has been set) */ @@ -216,21 +216,21 @@ public interface IRequest { * in the database for this change to take effect. This can be done * by calling IRequestQueue.update() or by performing one of the * other operations like processRequest or approveRequest. - * + * * @param id source id for this request */ public void setSourceId(String id); /** * Gets the current owner of this request. - * + * * @return request owner */ public String getRequestOwner(); /** * Sets the current owner of this request. - * + * * @param owner * The new owner of this request. If this value is set to null * there will be no current owner @@ -239,28 +239,28 @@ public interface IRequest { /** * Gets the type of this request. - * + * * @return request type */ public String getRequestType(); /** * Sets the type or this request. - * + * * @param type request type */ public void setRequestType(String type); /** * Gets the version of this request. - * + * * @return request version */ public String getRequestVersion(); /** * Gets the time this request was created. - * + * * @return request creation time */ Date getCreationTime(); @@ -268,7 +268,7 @@ public interface IRequest { /** * Gets the time this request was last modified (defined * as updated in the queue) (See IRequestQueue.update) - * + * * @return request last modification time */ Date getModificationTime(); @@ -291,42 +291,42 @@ public interface IRequest { /** * Copies meta attributes (excluding request Id, etc.) of another request * to this request. - * + * * @param req another request */ public void copyContents(IRequest req); /** * Gets context of this request. - * + * * @return request context */ public String getContext(); /** * Sets context of this request. - * + * * @param ctx request context */ public void setContext(String ctx); /** * Sets status of this request. - * + * * @param s request status */ public void setRequestStatus(RequestStatus s); /** * Gets status of connector transfer. - * + * * @return status of connector transfer */ public boolean isSuccess(); /** * Gets localized error message from connector transfer. - * + * * @param locale request locale * @return error message from connector transfer */ @@ -334,15 +334,15 @@ public interface IRequest { /************************************************************** * ExtData data methods: - * + * * These methods should be used in place of the mAttrData methods * deprecated above. - * + * * These methods all store Strings in LDAP. This means they can no longer * be used as a garbage dump for all sorts of objects. A limited number * of helper methods are provided for Vectors/Arrays/Hashtables but the * keys and values for all of these should be Strings. - * + * * The keys are used in the LDAP attribute names, and so much obey LDAP * key syntax rules: A-Za-z0-9 and hyphen. */ @@ -350,7 +350,7 @@ public interface IRequest { /** * Sets an Extended Data string-key string-value pair. * All keys are lower cased because LDAP does not preserve case. - * + * * @param key The extended data key * @param value The extended data value * @return false if key is invalid. @@ -361,7 +361,7 @@ public interface IRequest { * Sets an Extended Data string-key string-value pair. * The key and hashtable keys are all lowercased because LDAP does not * preserve case. - * + * * @param key The extended data key * @param value The extended data value * the Hashtable contains an illegal key. @@ -372,7 +372,7 @@ public interface IRequest { /** * Checks whether the key is storing a simple String value, or a complex * (Vector/hashtable) structure. - * + * * @param key The key to check for. * @return True if the key maps to a string. False if it maps to a * hashtable. @@ -383,7 +383,7 @@ public interface IRequest { * Returns the String value stored for the String key. Returns null * if not found. Throws exception if key stores a complex data structure * (Vector/Hashtable). - * + * * @param key The key to lookup (case-insensitive) * @return The value associated with the key. null if not found or if the * key is associated with a non-string value. @@ -393,12 +393,12 @@ public interface IRequest { /** * Returns the Hashtable value for the String key. Returns null if not * found. Throws exception if the key stores a String value. - * + * * The Hashtable returned is actually a subclass of Hashtable that * lowercases all keys used to access the hashtable. Its purpose is to * to make lookups seemless, but be aware it is not a normal hashtable and * might behave strangely in some cases (e.g., iterating keys) - * + * * @param key The key to lookup (case-insensitive) * @return The hashtable value associated with the key. null if not found * or if the key is associated with a string-value. @@ -407,7 +407,7 @@ public interface IRequest { /** * Returns all the keys stored in ExtData - * + * * @return Enumeration of all the keys. */ public Enumeration<String> getExtDataKeys(); @@ -415,7 +415,7 @@ public interface IRequest { /** * Stores an array of Strings in ExtData. * The indices of the array are used as subkeys. - * + * * @param key the ExtData key * @param values the array of string values to store * @return False if the key is invalid @@ -426,7 +426,7 @@ public interface IRequest { * Retrieves an array of Strings stored with the key. * This only works if the data was stored as an array. If the data * is not correct, this method will return null. - * + * * @param key The ExtData key * @return The value. Null if not found or the data isn't an array. */ @@ -434,7 +434,7 @@ public interface IRequest { /** * Removes the value of an extdata attribute. - * + * * @param type key to delete */ void deleteExtData(String type); @@ -447,9 +447,9 @@ public interface IRequest { * Helper method to add subkey/value pair to a ExtData hashtable. * If the hashtable it exists, the subkey/value are added to it. Otherwise * a new hashtable is created. - * + * * The key and subkey are lowercased because LDAP does not preserve case. - * + * * @param key The top level key * @param subkey The hashtable data key * @param value The hashtable value @@ -459,7 +459,7 @@ public interface IRequest { /** * Helper method to retrieve an individual value from a Hashtable value. - * + * * @param key the ExtData key * @param subkey the key in the Hashtable value (case insensitive) * @return the value corresponding to the key/subkey @@ -469,7 +469,7 @@ public interface IRequest { /** * Helper method to store an Integer value. It converts the integer value * to a String and stores it. - * + * * @param key the ExtData key * @param value the Integer to store (as a String) * @return False if the key or value are invalid @@ -479,7 +479,7 @@ public interface IRequest { /** * Retrieves an integer value. Returns null if not found or * the value can't be represented as an Integer. - * + * * @param key The ExtData key to lookup * @return The integer value or null if not possible. */ @@ -487,7 +487,7 @@ public interface IRequest { /** * Stores an array of Integers - * + * * @param key The extdata key * @param values The array of Integers to store * @return false if the key is invalid @@ -496,7 +496,7 @@ public interface IRequest { /** * Retrieves an array of Integers - * + * * @param key The extdata key * @return The array of Integers or null on error. */ @@ -505,7 +505,7 @@ public interface IRequest { /** * Helper method to store a BigInteger value. It converts the integer value * to a String and stores it. - * + * * @param key the ExtData key * @param value the BigInteger to store (as a String) * @return False if the key or value are invalid @@ -515,7 +515,7 @@ public interface IRequest { /** * Retrieves a BigInteger value. Returns null if not found or * the value can't be represented as a BigInteger. - * + * * @param key The ExtData key to lookup * @return The integer value or null if not possible. */ @@ -523,7 +523,7 @@ public interface IRequest { /** * Stores an array of BigIntegers - * + * * @param key The extdata key * @param values The array of BigIntegers to store * @return false if the key is invalid @@ -532,7 +532,7 @@ public interface IRequest { /** * Retrieves an array of BigIntegers - * + * * @param key The extdata key * @return The array of BigIntegers or null on error. */ @@ -541,7 +541,7 @@ public interface IRequest { /** * Helper method to store an exception. * It actually stores the e.toString() value. - * + * * @param key The ExtData key to store under * @param e The throwable to store * @return False if the key is invalid. @@ -550,7 +550,7 @@ public interface IRequest { /** * Stores a byte array as base64 encoded text - * + * * @param key The ExtData key * @param data The byte array to store * @return False if the key is invalid. @@ -559,7 +559,7 @@ public interface IRequest { /** * Retrieves the data, which should be base64 encoded as a byte array. - * + * * @param key The ExtData key * @return The data, or null if an error occurs. */ @@ -568,7 +568,7 @@ public interface IRequest { /** * Stores a X509CertImpl as base64 encoded text using the getEncode() * method. - * + * * @param key The ExtData key * @param data certificate * @return False if the key is invalid. @@ -577,7 +577,7 @@ public interface IRequest { /** * Retrieves the data, which should be base64 encoded as a byte array. - * + * * @param key The ExtData key * @return The data, or null if an error occurs. */ @@ -585,7 +585,7 @@ public interface IRequest { /** * Stores an array of X509CertImpls as a base64 encoded text. - * + * * @param key The ExtData key * @param data The array of certs to store * @return False if the key or data is invalid. @@ -594,7 +594,7 @@ public interface IRequest { /** * Retrieves an array of X509CertImpl. - * + * * @param key The ExtData key * @return Array of certs, or null if not found or invalid data. */ @@ -603,7 +603,7 @@ public interface IRequest { /** * Stores a X509CertInfo as base64 encoded text using the getEncodedInfo() * method. - * + * * @param key The ExtData key * @param data certificate * @return False if the key is invalid. @@ -612,7 +612,7 @@ public interface IRequest { /** * Retrieves the data, which should be base64 encoded as a byte array. - * + * * @param key The ExtData key * @return The data, or null if an error occurs. */ @@ -620,7 +620,7 @@ public interface IRequest { /** * Stores an array of X509CertInfos as a base64 encoded text. - * + * * @param key The ExtData key * @param data The array of cert infos to store * @return False if the key or data is invalid. @@ -629,7 +629,7 @@ public interface IRequest { /** * Retrieves an array of X509CertInfo. - * + * * @param key The ExtData key * @return Array of cert infos, or null if not found or invalid data. */ @@ -637,7 +637,7 @@ public interface IRequest { /** * Stores an array of RevokedCertImpls as a base64 encoded text. - * + * * @param key The ExtData key * @param data The array of cert infos to store * @return False if the key or data is invalid. @@ -646,7 +646,7 @@ public interface IRequest { /** * Retrieves an array of RevokedCertImpl. - * + * * @param key The ExtData key * @return Array of cert infos, or null if not found or invalid data. */ @@ -656,10 +656,10 @@ public interface IRequest { * Stores the contents of the String Vector in ExtData. * TODO - as soon as we're allowed to use JDK5 this should be changed * to use Vector<String> data. - * + * * Note that modifications to the Vector are not automatically reflected * after it is stored. You must call set() again to make the changes. - * + * * @param key The extdata key to store * @param data A vector of Strings to store * @return False on key error or invalid data. @@ -671,7 +671,7 @@ public interface IRequest { * Note that the returned vector, if modified, does not make changes * in ExtData. You must call setExtData() to propogate changes back * into ExtData. - * + * * @param key The extdata key * @return A Vector of strings, or null on error. */ @@ -680,7 +680,7 @@ public interface IRequest { /** * Gets boolean value for given type or default value * if attribute is absent. - * + * * @param type attribute type * @param defVal default attribute value * @return attribute value @@ -690,7 +690,7 @@ public interface IRequest { /** * Gets extdata boolean value for given type or default value * if attribute is absent for this request with this prefix. - * + * * @param prefix request prefix * @param type attribute type * @param defVal default attribute value @@ -700,7 +700,7 @@ public interface IRequest { /** * Stores an AuthToken the same as a Hashtable. - * + * * @param key The ExtData key * @param data The authtoken to store * @return False if the key or data is invalid. @@ -709,7 +709,7 @@ public interface IRequest { /** * Retrieves an authtoken. - * + * * @param key The ExtData key * @return AuthToken, or null if not found or invalid data. */ @@ -717,7 +717,7 @@ public interface IRequest { /** * Stores a CertificateExtensions in extdata. - * + * * @param key The ExtData key * @param data The CertificateExtensions to store * @return False if the key or data is invalid. @@ -726,7 +726,7 @@ public interface IRequest { /** * Retrieves the CertificateExtensions associated with the key. - * + * * @param key The ExtData key * @return the object, or null if not found or invalid data. */ @@ -734,7 +734,7 @@ public interface IRequest { /** * Stores a CertificateSubjectName in extdata. - * + * * @param key The ExtData key * @param data The CertificateSubjectName to store * @return False if the key or data is invalid. @@ -743,7 +743,7 @@ public interface IRequest { /** * Retrieves the CertificateSubjectName associated with the key. - * + * * @param key The ExtData key * @return the object, or null if not found or invalid data. */ diff --git a/base/common/src/com/netscape/certsrv/request/IRequestList.java b/base/common/src/com/netscape/certsrv/request/IRequestList.java index 5f265941a..6c3d113ea 100644 --- a/base/common/src/com/netscape/certsrv/request/IRequestList.java +++ b/base/common/src/com/netscape/certsrv/request/IRequestList.java @@ -23,7 +23,7 @@ import java.util.Enumeration; * An interface providing a list of RequestIds that match * some criteria. It could be a list of all elements in a * queue, or just some defined sub-set. - * + * * @version $Revision$, $Date$ */ public interface IRequestList @@ -35,21 +35,21 @@ public interface IRequestList * <p> * Callers should be sure there is another element in the list by calling hasMoreElements first. * <p> - * + * * @return next request id */ RequestId nextRequestId(); /** * Gets next request from the list. - * + * * @return next request */ public Object nextRequest(); /** * Gets next request Object from the list. - * + * * @return next request */ public IRequest nextRequestObject(); diff --git a/base/common/src/com/netscape/certsrv/request/IRequestListener.java b/base/common/src/com/netscape/certsrv/request/IRequestListener.java index 8dc8a42a9..9afe0cd73 100644 --- a/base/common/src/com/netscape/certsrv/request/IRequestListener.java +++ b/base/common/src/com/netscape/certsrv/request/IRequestListener.java @@ -23,7 +23,7 @@ import com.netscape.certsrv.base.ISubsystem; /** * An interface that defines abilities of request listener, - * + * * @version $Revision$, $Date$ */ public interface IRequestListener { @@ -31,7 +31,7 @@ public interface IRequestListener { /** * Initializes request listener for the specific subsystem * and configuration store. - * + * * @param sub subsystem * @param config configuration store */ @@ -39,14 +39,14 @@ public interface IRequestListener { /** * Accepts request. - * + * * @param request request */ public void accept(IRequest request); /** * Sets attribute. - * + * * @param name attribute name * @param val attribute value */ diff --git a/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java b/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java index 66bd35432..02e0e814a 100644 --- a/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java +++ b/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java @@ -21,21 +21,21 @@ import java.util.Enumeration; /** * IRequestNotifier interface defines methods to register listeners, - * + * * @version $Revision$, $Date$ */ public interface IRequestNotifier extends INotify { /** * Registers a request listener. - * + * * @param listener listener to be registered */ public void registerListener(IRequestListener listener); /** * Registers a request listener. - * + * * @param name listener name * @param listener listener to be registered */ @@ -43,28 +43,28 @@ public interface IRequestNotifier extends INotify { /** * Removes listener from the list of registered listeners. - * + * * @param listener listener to be removed from the list */ public void removeListener(IRequestListener listener); /** * Removes listener from the list of registered listeners. - * + * * @param name listener name to be removed from the list */ public void removeListener(String name); /** * Gets list of listener names. - * + * * @return enumeration of listener names */ public Enumeration<String> getListenerNames(); /** * Gets listener from the list of registered listeners. - * + * * @param name listener name * @return listener */ @@ -72,49 +72,49 @@ public interface IRequestNotifier extends INotify { /** * Gets list of listeners. - * + * * @return enumeration of listeners */ public Enumeration<IRequestListener> getListeners(); /** * Gets request from publishing queue. - * + * * @return request */ public IRequest getRequest(); /** * Gets number of requests in publishing queue. - * + * * @return number of requests in publishing queue */ public int getNumberOfRequests(); /** * Checks if publishing queue is enabled. - * + * * @return true if publishing queue is enabled, false otherwise */ public boolean isPublishingQueueEnabled(); /** * Removes a notifier thread from the pool of publishing queue threads. - * + * * @param notifierThread Thread */ public void removeNotifierThread(Thread notifierThread); /** * Notifies all registered listeners about request. - * + * * @param r request */ public void addToNotify(IRequest r); /** * Sets publishing queue parameters. - * + * * @param isPublishingQueueEnabled publishing queue switch * @param publishingQueuePriorityLevel publishing queue priority level * @param maxNumberOfPublishingThreads maximum number of publishing threads diff --git a/base/common/src/com/netscape/certsrv/request/IRequestQueue.java b/base/common/src/com/netscape/certsrv/request/IRequestQueue.java index a8f5f7332..844f90f18 100644 --- a/base/common/src/com/netscape/certsrv/request/IRequestQueue.java +++ b/base/common/src/com/netscape/certsrv/request/IRequestQueue.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.dbs.repository.IRepository; * provides an interface for creating and viewing requests, * as well as performing operations on them. * <p> - * + * * @version $Revision$ $Date$ */ public interface IRequestQueue { @@ -45,7 +45,7 @@ public interface IRequestQueue { * The request is LOCKED. The caller MUST release the request object by calling releaseRequest(). * <p> * TODO: provide other required values (such as type and sourceId) - * + * * @param requestType request type * @return new request * @exception EBaseException failed to create new request @@ -61,7 +61,7 @@ public interface IRequestQueue { * <p> * The cloned request that is returned is LOCKED. The caller MUST release the request object by calling * releaseRequest(). - * + * * @param r request to be cloned * @return cloned request * @exception EBaseException failed to clone request @@ -75,7 +75,7 @@ public interface IRequestQueue { * to a valid request id. * <p> * Errors may be generated for other conditions. - * + * * @param id request id * @return found request * @exception EBaseException failed to access request queue @@ -87,7 +87,7 @@ public interface IRequestQueue { * Begins processing for this request. This call * is valid only on requests with status BEGIN * An error is generated for other cases. - * + * * @param req request to be processed * @exception EBaseException failed to process request */ @@ -96,14 +96,14 @@ public interface IRequestQueue { /** * Sets request scheduler. - * + * * @param scheduler request scheduler */ public void setRequestScheduler(IRequestScheduler scheduler); /** * Gets request scheduler. - * + * * @return request scheduler */ public IRequestScheduler getRequestScheduler(); @@ -115,7 +115,7 @@ public interface IRequestQueue { * <p> * This call might be used by agent servlets that want to copy a previous request, and resubmit it. By putting it * into PENDING state, the normal agent screens can be used for further processing. - * + * * @param req * the request to mark PENDING * @exception EBaseException failed to mark request as pending @@ -131,7 +131,7 @@ public interface IRequestQueue { * <p> * The cloned request that is returned is LOCKED. The caller MUST release the request object by calling * releaseRequest(). - * + * * @param r request to be cloned * @return cloned request mark PENDING * @exception EBaseException failed to clone or mark request @@ -149,7 +149,7 @@ public interface IRequestQueue { * <p> * The request processing code adds an AgentApproval to this request that contains the authentication id of the * agent. This data is retrieved from the Session object (qv). - * + * * @param request * the request that is being approved * @exception EBaseException failed to approve request @@ -164,7 +164,7 @@ public interface IRequestQueue { * <p> * The agent servlet (or other application) may wish to store AgentMessage values to indicate the reason for the * action - * + * * @param request * the request that is being rejected * @exception EBaseException failed to reject request @@ -179,7 +179,7 @@ public interface IRequestQueue { * <p> * The agent servlet (or other application) may wish to store AgentMessage values to indicate the reason for the * action - * + * * @param request * the request that is being canceled * @exception EBaseException failed to cancel request @@ -193,7 +193,7 @@ public interface IRequestQueue { * This call can be made after changing a value like source id or owner, to force the new value to be written. * <p> * The request must be locked to make this call. - * + * * @param request * the request that is being updated * @exception EBaseException failed to update request @@ -208,7 +208,7 @@ public interface IRequestQueue { * <p> * NOTE: This interface will not be useful for large databases. This needs to be replace by a VLV (paged) search * object. - * + * * @return request list */ public IRequestList listRequests(); @@ -221,7 +221,7 @@ public interface IRequestQueue { * <p> * NOTE: This interface will not be useful for large databases. This needs to be replace by a VLV (paged) search * object. - * + * * @param status request status * @return request list */ @@ -233,7 +233,7 @@ public interface IRequestQueue { * <p> * NOTE: This interface will not be useful for large databases. This needs to be replace by a VLV (paged) search * object. - * + * * @param filter search filter * @return request list */ @@ -245,7 +245,7 @@ public interface IRequestQueue { * <p> * NOTE: This interface will not be useful for large databases. This needs to be replace by a VLV (paged) search * object. - * + * * @param filter search filter * @param maxSize max size to return * @return request list @@ -258,7 +258,7 @@ public interface IRequestQueue { * <p> * NOTE: This interface will not be useful for large databases. This needs to be replace by a VLV (paged) search * object. - * + * * @param filter search filter * @param maxSize max size to return * @param timeLimit timeout value for the search @@ -269,14 +269,14 @@ public interface IRequestQueue { /** * Gets requests that are pending on handling by the service * <p> - * + * * @return list of pending requests */ // public IRequestList listServicePendingRequests(); /** * Locates a request from the SourceId. - * + * * @param id * a unique identifier for the record that is based on the source * of the request, and possibly an identify assigned by the source. @@ -289,7 +289,7 @@ public interface IRequestQueue { /** * Locates all requests with a particular SourceId. * <p> - * + * * @param id * an identifier for the record that is based on the source * of the request @@ -303,7 +303,7 @@ public interface IRequestQueue { * Releases the LOCK on a request obtained from findRequest() or * newRequest() * <p> - * + * * @param r request */ public void releaseRequest(IRequest r); @@ -311,7 +311,7 @@ public interface IRequestQueue { /** * Marks as serviced after destination authority has serviced request. * Used by connector. - * + * * @param r request */ public void markAsServiced(IRequest r); @@ -323,7 +323,7 @@ public interface IRequestQueue { /** * Gets a pageable list of IRequest entries in this queue. - * + * * @param pageSize page size * @return request list */ @@ -331,7 +331,7 @@ public interface IRequestQueue { /** * Gets a pageable list of IRequest entries in this queue. - * + * * @param filter search filter * @param pageSize page size * @param sortKey the attributes to sort by @@ -343,7 +343,7 @@ public interface IRequestQueue { /** * Gets a pageable list of IRequest entries in this queue. - * + * * @param fromId request id to start with * @param filter search filter * @param pageSize page size @@ -358,7 +358,7 @@ public interface IRequestQueue { /** * Gets a pageable list of IRequest entries in this queue. This * jumps right to the end of the list - * + * * @param fromId request id to start with * @param jumpToEnd jump to end of list (set fromId to null) * @param filter search filter @@ -373,7 +373,7 @@ public interface IRequestQueue { /** * Retrieves the notifier for pending request. - * + * * @return notifier for pending request */ public INotify getPendingNotify(); @@ -392,7 +392,7 @@ public interface IRequestQueue { /** * Gets request repository. - * + * * @return request repository */ public IRepository getRequestRepository(); diff --git a/base/common/src/com/netscape/certsrv/request/IRequestRecord.java b/base/common/src/com/netscape/certsrv/request/IRequestRecord.java index 53531b133..eba6cabb8 100644 --- a/base/common/src/com/netscape/certsrv/request/IRequestRecord.java +++ b/base/common/src/com/netscape/certsrv/request/IRequestRecord.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.dbs.IDBObj; * It has a set of attributes that are mapped into LDAP * attributes for actual directory operations. * <p> - * + * * @version $Revision$ $Date$ */ public interface IRequestRecord @@ -63,21 +63,21 @@ public interface IRequestRecord /** * Gets the request id. - * + * * @return request id */ public RequestId getRequestId(); /** * Gets attribute names of the request. - * + * * @return list of attribute names */ public Enumeration<String> getAttrNames(); /** * Gets the request attribute value by the name. - * + * * @param name attribute name * @return attribute value */ @@ -85,7 +85,7 @@ public interface IRequestRecord /** * Sets new attribute for the request. - * + * * @param name attribute name * @param o attribute value */ @@ -93,7 +93,7 @@ public interface IRequestRecord /** * Removes attribute from the request. - * + * * @param name attribute name */ public void delete(String name) @@ -101,7 +101,7 @@ public interface IRequestRecord /** * Gets attribute list of the request. - * + * * @return attribute list */ public Enumeration<String> getElements(); diff --git a/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java b/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java index 5012f5b0c..72216fcd3 100644 --- a/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java +++ b/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java @@ -24,21 +24,21 @@ package com.netscape.certsrv.request; * the threads based on the request processing order. * The request that enters the request queue first should * be processed first. - * + * * @version $Revision$ $Date$ */ public interface IRequestScheduler { /** * Request entered the request queue processing. - * + * * @param r request */ public void requestIn(IRequest r); /** * Request exited the request queue processing. - * + * * @param r request */ public void requestOut(IRequest r); diff --git a/base/common/src/com/netscape/certsrv/request/IRequestSubsystem.java b/base/common/src/com/netscape/certsrv/request/IRequestSubsystem.java index 164e84a37..969be8713 100644 --- a/base/common/src/com/netscape/certsrv/request/IRequestSubsystem.java +++ b/base/common/src/com/netscape/certsrv/request/IRequestSubsystem.java @@ -23,7 +23,7 @@ import com.netscape.certsrv.base.EBaseException; * This interface defines storage of request objects * in the local database. * <p> - * + * * @version $Revision$, $Date$ */ public interface IRequestSubsystem { @@ -34,7 +34,7 @@ public interface IRequestSubsystem { * (Currently unimplemented. Just use getRequestQueue to create * an in-memory queue.) * <p> - * + * * @param name The name of the queue object. This name can be used * in getRequestQueue to retrieve the queue later. * @exception EBaseException failed to create request queue @@ -50,7 +50,7 @@ public interface IRequestSubsystem { * <p> * WARNING: retrieving the same queue twice with result in multi-thread race conditions. * <p> - * + * * @param name * the name of the request queue. (Ex: "ca" "ra") * @param p @@ -78,7 +78,7 @@ public interface IRequestSubsystem { * <p> * WARNING: retrieving the same queue twice with result in multi-thread race conditions. * <p> - * + * * @param name * the name of the request queue. (Ex: "ca" "ra") * @param p diff --git a/base/common/src/com/netscape/certsrv/request/IRequestVirtualList.java b/base/common/src/com/netscape/certsrv/request/IRequestVirtualList.java index 540ec679c..23bfd2732 100644 --- a/base/common/src/com/netscape/certsrv/request/IRequestVirtualList.java +++ b/base/common/src/com/netscape/certsrv/request/IRequestVirtualList.java @@ -20,7 +20,7 @@ package com.netscape.certsrv.request; /** * This interface defines access to request virtual list. * <p> - * + * * @version $Revision$, $Date$ */ public interface IRequestVirtualList { @@ -28,14 +28,14 @@ public interface IRequestVirtualList { /** * Gets the total size of the result set. Elements of the * list are numbered from 0..(size-1) - * + * * @return size of the result set */ int getSize(); /** * Gets the element at the specified index - * + * * @param index index of the element * @return specified request */ @@ -43,7 +43,7 @@ public interface IRequestVirtualList { /** * Gets the current index - * + * * @return current index */ int getCurrentIndex(); diff --git a/base/common/src/com/netscape/certsrv/request/IService.java b/base/common/src/com/netscape/certsrv/request/IService.java index adf2c5095..0756be893 100644 --- a/base/common/src/com/netscape/certsrv/request/IService.java +++ b/base/common/src/com/netscape/certsrv/request/IService.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.base.EBaseException; * This covers certificate generation, revocation, renewals, * revocation checking, and much more. * <p> - * + * * @version $Revision$, $Date$ */ public interface IService { @@ -33,7 +33,7 @@ public interface IService { * Performs the service (such as certificate generation) * represented by this request. * <p> - * + * * @param request * The request that needs service. The service may use * attributes stored in the request, and may update the diff --git a/base/common/src/com/netscape/certsrv/request/PolicyMessage.java b/base/common/src/com/netscape/certsrv/request/PolicyMessage.java index c21b8ca4d..396603f50 100644 --- a/base/common/src/com/netscape/certsrv/request/PolicyMessage.java +++ b/base/common/src/com/netscape/certsrv/request/PolicyMessage.java @@ -23,7 +23,7 @@ import com.netscape.certsrv.base.EBaseException; * A (localizable) message recorded by a policy module that describes * the reason for rejecting a request. * <p> - * + * * @version $Revision$, $Date$ */ public class PolicyMessage @@ -37,7 +37,7 @@ public class PolicyMessage /** * Class constructor that registers policy message. * <p> - * + * * @param message message string */ public PolicyMessage(String message) { diff --git a/base/common/src/com/netscape/certsrv/request/PolicyResult.java b/base/common/src/com/netscape/certsrv/request/PolicyResult.java index c7cad94f2..79b378390 100644 --- a/base/common/src/com/netscape/certsrv/request/PolicyResult.java +++ b/base/common/src/com/netscape/certsrv/request/PolicyResult.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.request; /** * This class defines results for policy actions. - * + * * @version $Revision$, $Date$ */ public final class PolicyResult { diff --git a/base/common/src/com/netscape/certsrv/request/RequestId.java b/base/common/src/com/netscape/certsrv/request/RequestId.java index b643fa30d..795fdaa2a 100644 --- a/base/common/src/com/netscape/certsrv/request/RequestId.java +++ b/base/common/src/com/netscape/certsrv/request/RequestId.java @@ -24,7 +24,7 @@ import java.math.BigInteger; * request within a request queue. This identifier may be used to * retrieve the request object itself from the request queue. * <p> - * + * * @version $Revision$ $Date$ */ public class RequestId { @@ -34,7 +34,7 @@ public class RequestId { /** * Creates a new RequestId from its string representation. * <p> - * + * * @param id * a string containing the decimal or hex value for the identifier. */ @@ -86,7 +86,7 @@ public class RequestId { * Converts the RequestId into its string representation. The string * form can be stored in a database (such as the LDAP directory) * <p> - * + * * @return * a string containing the decimal (base 10) value for the identifier. */ diff --git a/base/common/src/com/netscape/certsrv/request/RequestStatus.java b/base/common/src/com/netscape/certsrv/request/RequestStatus.java index f58a568d8..fd501ef0f 100644 --- a/base/common/src/com/netscape/certsrv/request/RequestStatus.java +++ b/base/common/src/com/netscape/certsrv/request/RequestStatus.java @@ -21,16 +21,16 @@ package com.netscape.certsrv.request; * The RequestStatus class represents the current state of a request * in a request queue. The state of the request changes as actions * are performed on it. - * + * * The request is created in the BEGIN state, then general progresses * through the PENDING, APPROVED, SVC_PENDING, and COMPLETE states. * Some requests may bypass the PENDING state if no agent action is * required. - * + * * Requests may be CANCELED (not implemented) or REJECTED. These are * error conditions, and usually result because the request was invalid * or was not approved by an agent. - * + * * @version $Revision$ $Date$ */ public final class RequestStatus { @@ -45,7 +45,7 @@ public final class RequestStatus { /** * The initial state of a request. Requests in this state have not * been review by policy. - * + * * While in this state the source of the request (usually the servlet, * but it could be some other protocol module, such as email) * should populate the request with data need to service it. @@ -56,7 +56,7 @@ public final class RequestStatus { * The state of a request that is waiting for action by an agent. * When the agent approves or rejects the request, process will * continue as appropriate. - * + * * In this state there may be PolicyMessages present that indicate * the reason for the pending status. */ @@ -66,7 +66,7 @@ public final class RequestStatus { * The state of a request that has been approved by an agent, or * automatically by the policy engine, but have not been successfully * transmitted to the service module. - * + * * These requests are resent to the service during the recovery * process that runs at server startup. */ @@ -91,7 +91,7 @@ public final class RequestStatus { * The state of a request after it is rejected. When a request is * rejected, the notifier is called prior to making the finl status * change. - * + * * Rejected requests may have PolicyMessages indicating the reason for * the rejection, or AgentMessages, which allow the agent to give * reasons for the action. @@ -110,7 +110,7 @@ public final class RequestStatus { * Converts a string name for a request status into the * request status enum object. * <p> - * + * * @param s * The string representation of the state. * @return @@ -138,7 +138,7 @@ public final class RequestStatus { /** * Returns the string form of the RequestStatus, which may be used * to record the status in a database. - * + * * @return request status */ public String toString() { @@ -147,7 +147,7 @@ public final class RequestStatus { /** * Class constructor. Creates request status from the string. - * + * * @param string string describing request status */ private RequestStatus(String string) { @@ -158,7 +158,7 @@ public final class RequestStatus { /** * Compares request status with specified string. - * + * * @param string string describing request status */ public boolean equals(String string) { @@ -170,7 +170,7 @@ public final class RequestStatus { /** * Compares current request status with request status. - * + * * @param rs request status */ public boolean equals(RequestStatus rs) { diff --git a/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java b/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java index c1e153a81..9da90e774 100644 --- a/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java +++ b/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java @@ -25,13 +25,13 @@ import com.netscape.certsrv.request.RequestStatus; /** * This interface defines how to update request record. * <p> - * + * * @version $Revision$, $Date$ */ public interface IRequestMod { /** * Modifies request status. - * + * * @param r request * @param s request status */ @@ -39,7 +39,7 @@ public interface IRequestMod { /** * Modifies request creation time. - * + * * @param r request * @param d date */ @@ -47,7 +47,7 @@ public interface IRequestMod { /** * Modifies request modification time. - * + * * @param r request * @param d date */ diff --git a/base/common/src/com/netscape/certsrv/security/Credential.java b/base/common/src/com/netscape/certsrv/security/Credential.java index 48038a40b..4d8d30bb8 100644 --- a/base/common/src/com/netscape/certsrv/security/Credential.java +++ b/base/common/src/com/netscape/certsrv/security/Credential.java @@ -21,7 +21,7 @@ package com.netscape.certsrv.security; * A class represents a credential. A credential contains * information that identifies a user. In this case, * identifier and password are used. - * + * * @version $Revision$, $Date$ */ public class Credential implements java.io.Serializable { @@ -35,7 +35,7 @@ public class Credential implements java.io.Serializable { /** * Constructs credential object. - * + * * @param id user id * @param password user password */ @@ -46,7 +46,7 @@ public class Credential implements java.io.Serializable { /** * Retrieves identifier. - * + * * @return user id */ public String getIdentifier() { @@ -55,7 +55,7 @@ public class Credential implements java.io.Serializable { /** * Retrieves password. - * + * * @return user password */ public String getPassword() { diff --git a/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java b/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java index 3d26d6f3a..32b6a212f 100644 --- a/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java +++ b/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java @@ -39,7 +39,7 @@ import com.netscape.certsrv.common.NameValuePairs; /** * This interface represents the cryptographics subsystem * that provides all the security related functions. - * + * * @version $Revision$, $Date$ */ public interface ICryptoSubsystem extends ISubsystem { @@ -49,7 +49,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Retrieves a list of nicknames of certificates that are * in the installed tokens. - * + * * @return a list of comma-separated nicknames * @exception EBaseException failed to retrieve nicknames */ @@ -57,7 +57,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Retrieves certificate in pretty-print format by the nickname. - * + * * @param nickname nickname of certificate * @param date not after of the returned certificate must be date * @param locale user locale @@ -78,7 +78,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Retrieves the certificate in the pretty print format. - * + * * @param b64E certificate in mime-64 encoded format * @param locale end user locale * @return certificate in pretty-print format @@ -89,7 +89,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Imports certificate into the server. - * + * * @param b64E certificate in mime-64 encoded format * @param nickname nickname for the importing certificate * @param certType certificate type @@ -100,7 +100,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Imports certificate into the server. - * + * * @param signedCert certificate * @param nickname nickname for the importing certificate * @param certType certificate type @@ -111,7 +111,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Generates a key pair based on the given parameters. - * + * * @param properties key parameters * @return key pair * @exception EBaseException failed to generate key pair @@ -120,7 +120,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Retrieves the key pair based on the given nickname. - * + * * @param nickname nickname of the public key * @exception EBaseException failed to retrieve key pair */ @@ -128,7 +128,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Generates a key pair based on the given parameters. - * + * * @param tokenName name of token where key is generated * @param alg key algorithm * @param keySize key size @@ -140,7 +140,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Generates a key pair based on the given parameters. - * + * * @param tokenName name of token where key is generated * @param alg key algorithm * @param keySize key size @@ -153,7 +153,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Generates an ECC key pair based on the given parameters. - * + * * @param properties key parameters * @return key pair * @exception EBaseException failed to generate key pair @@ -162,7 +162,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Generates an ECC key pair based on the given parameters. - * + * * @param token token name * @param curveName curve name * @param certType type of cert(sslserver etc..) @@ -174,7 +174,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Retrieves the signature algorithm of the certificate named * by the given nickname. - * + * * @param nickname nickname of the certificate * @return signature algorithm * @exception EBaseException failed to retrieve signature @@ -183,7 +183,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Checks if the given dn is a valid distinguished name. - * + * * @param dn distinguished name * @exception EBaseException failed to check */ @@ -193,7 +193,7 @@ public interface ICryptoSubsystem extends ISubsystem { * Retrieves CA's signing algorithm id. If it is DSA algorithm, * algorithm is constructed by reading the parameters * ca.dsaP, ca.dsaQ, ca.dsaG. - * + * * @param algname DSA or RSA * @param store configuration store. * @return algorithm id @@ -204,7 +204,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Retrieves subject name of the certificate that is identified by * the given nickname. - * + * * @param tokenname name of token where the nickname is valid * @param nickname nickname of the certificate * @return subject name @@ -216,7 +216,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Retrieves extensions of the certificate that is identified by * the given nickname. - * + * * @param tokenname name of token where the nickname is valid * @param nickname nickname of the certificate * @return certificate extensions @@ -228,7 +228,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Deletes certificate of the given nickname. - * + * * @param nickname nickname of the certificate * @param pathname path where a copy of the deleted certificate is stored * @exception EBaseException failed to delete certificate @@ -238,7 +238,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Delete certificate of the given nickname. - * + * * @param nickname nickname of the certificate * @param notAfterTime The notAfter of the certificate. It * is possible to ge t multiple certificates under @@ -254,7 +254,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Retrieves the subject DN of the certificate identified by * the nickname. - * + * * @param nickname nickname of the certificate * @return subject distinguished name * @exception EBaseException failed to retrieve subject DN @@ -263,7 +263,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Trusts a certificate for all available purposes. - * + * * @param nickname nickname of the certificate * @param date certificate's not before * @param trust "Trust" or other @@ -275,7 +275,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Checks if the given base-64 encoded string contains an extension * or a sequence of extensions. - * + * * @param ext extension or sequence of extension encoded in base-64 * @exception EBaseException failed to check encoding */ @@ -283,7 +283,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Gets all certificates on all tokens for Certificate Database Management. - * + * * @return all certificates * @exception EBaseException failed to retrieve certificates */ @@ -293,7 +293,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Gets all CA certificates on all tokens. - * + * * @return all CA certificates * @exception EBaseException failed to retrieve certificates */ @@ -312,7 +312,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Retrieves PQG parameters based on key size. - * + * * @param keysize key size * @return pqg parameters */ @@ -320,7 +320,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Retrieves PQG parameters based on key size. - * + * * @param keysize key size * @param store configuration store * @return pqg parameters @@ -331,7 +331,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Retrieves extensions of the certificate that is identified by * the given nickname. - * + * * @param tokenname token name * @param nickname nickname * @return certificate extensions @@ -344,7 +344,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Checks if the given token is logged in. - * + * * @param name token name * @return true if token is logged in * @exception EBaseException failed to login @@ -353,7 +353,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Logs into token. - * + * * @param tokenName name of the token * @param pwd token password * @exception EBaseException failed to login @@ -363,7 +363,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Generates certificate request from the given key pair. - * + * * @param subjectName subject name to use in the request * @param kp key pair that contains public key material * @return certificate request in base-64 encoded format @@ -374,28 +374,28 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Checks if fortezza is enabled. - * + * * @return "true" if fortezza is enabled */ public String isCipherFortezza() throws EBaseException; /** * Retrieves the SSL cipher version. - * + * * @return cipher version (i.e. "cipherdomestic") */ public String getCipherVersion() throws EBaseException; /** * Retrieves the cipher preferences. - * + * * @return cipher preferences (i.e. "rc4export,rc2export,...") */ public String getCipherPreferences() throws EBaseException; /** * Sets the current SSL cipher preferences. - * + * * @param cipherPrefs cipher preferences (i.e. "rc4export,rc2export,...") * @exception EBaseException failed to set cipher preferences */ @@ -404,7 +404,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Retrieves a list of currently registered token names. - * + * * @return list of token names * @exception EBaseException failed to retrieve token list */ @@ -413,7 +413,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Retrieves all certificates. The result list will not * contain the token tag. - * + * * @param name token name * @return list of certificates without token tag * @exception EBaseException failed to retrieve @@ -422,7 +422,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Retrieves the token name of the internal (software) token. - * + * * @return the token name * @exception EBaseException failed to retrieve token name */ @@ -431,7 +431,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Checks to see if the certificate of the given nickname is a * CA certificate. - * + * * @param fullNickname nickname of the certificate to check * @return true if it is a CA certificate * @exception EBaseException failed to check @@ -444,7 +444,7 @@ public interface ICryptoSubsystem extends ISubsystem { * The default token is set using the modutil command. * Note that the system entropy generator (usually /dev/random) * will block until sufficient entropy is collected. - * + * * @param bits number of bits of entropy * @exception org.mozilla.jss.util.NotImplementedException If the Crypto device does not support * adding entropy @@ -460,7 +460,7 @@ public interface ICryptoSubsystem extends ISubsystem { /** * Signs the certificate template into the given data and returns * a signed certificate. - * + * * @param data data that contains certificate template * @param certType certificate type * @param priKey CA signing key diff --git a/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java b/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java index 0a526e582..6b96dbc11 100644 --- a/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java +++ b/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java @@ -26,14 +26,14 @@ import com.netscape.certsrv.base.EBaseException; /** * An interface represents a encryption unit. - * + * * @version $Revision$, $Date$ */ public interface IEncryptionUnit extends IToken { /** * Retrieves the public key in this unit. - * + * * @return public key */ public PublicKey getPublicKey(); @@ -41,7 +41,7 @@ public interface IEncryptionUnit extends IToken { /** * Wraps data. The given key will be wrapped by the * private key in this unit. - * + * * @param priKey private key to be wrapped * @return wrapped data * @exception EBaseException failed to wrap @@ -60,7 +60,7 @@ public interface IEncryptionUnit extends IToken { /** * Verifies the given key pair. - * + * * @param publicKey public key * @param privateKey private key */ @@ -70,7 +70,7 @@ public interface IEncryptionUnit extends IToken { /** * Unwraps data. This method rebuilds the private key by * unwrapping the private key data. - * + * * @param sessionKey session key that unwrap the private key * @param symmAlgOID symmetric algorithm * @param symmAlgParams symmetric algorithm parameters @@ -127,7 +127,7 @@ public interface IEncryptionUnit extends IToken { /** * Unwraps data. This method rebuilds the private key by * unwrapping the private key data. - * + * * @param privateKey private key data * @param pubKey public key object * @return private key object @@ -139,7 +139,7 @@ public interface IEncryptionUnit extends IToken { /** * Encrypts the internal private key (private key to the KRA's * internal storage). - * + * * @param rawPrivate user's private key (key to be archived) * @return encrypted data * @exception EBaseException failed to encrypt @@ -150,7 +150,7 @@ public interface IEncryptionUnit extends IToken { /** * Decrypts the internal private key (private key from the KRA's * internal storage). - * + * * @param wrappedPrivateData unwrapped private key data (key to be recovered) * @return raw private key * @exception EBaseException failed to decrypt @@ -160,7 +160,7 @@ public interface IEncryptionUnit extends IToken { /** * Decrypts the external private key (private key from the end-user). - * + * * @param sessionKey session key that protects the user private * @param symmAlgOID symmetric algorithm * @param symmAlgParams symmetric algorithm parameters diff --git a/base/common/src/com/netscape/certsrv/security/ISigningUnit.java b/base/common/src/com/netscape/certsrv/security/ISigningUnit.java index 7fbed0b6c..34d2a5109 100644 --- a/base/common/src/com/netscape/certsrv/security/ISigningUnit.java +++ b/base/common/src/com/netscape/certsrv/security/ISigningUnit.java @@ -29,7 +29,7 @@ import com.netscape.certsrv.base.EBaseException; /** * A class represents the signing unit which is * capable of signing data. - * + * * @version $Revision$, $Date$ */ public interface ISigningUnit { @@ -49,7 +49,7 @@ public interface ISigningUnit { /** * Retrieves the new nickname in the renewal process. - * + * * @return new nickname * @exception EBaseException failed to get new nickname */ @@ -57,28 +57,28 @@ public interface ISigningUnit { /** * Sets new nickname of the signing certificate. - * + * * @param name nickname */ public void setNewNickName(String name); /** * Retrieves the signing certificate. - * + * * @return signing certificate */ public X509Certificate getCert(); /** * Retrieves the signing certificate. - * + * * @return signing certificate */ public X509CertImpl getCertImpl(); /** * Signs the given data in specific algorithm. - * + * * @param data data to be signed * @param algname signing algorithm to be used * @return signed data @@ -89,7 +89,7 @@ public interface ISigningUnit { /** * Verifies the signed data. - * + * * @param data signed data * @param signature signature * @param algname signing algorithm @@ -101,21 +101,21 @@ public interface ISigningUnit { /** * Retrieves the default algorithm. - * + * * @return default signing algorithm */ public SignatureAlgorithm getDefaultSignatureAlgorithm(); /** * Retrieves the default algorithm name. - * + * * @return default signing algorithm name */ public String getDefaultAlgorithm(); /** * Set default signing algorithm. - * + * * @param algorithm signing algorithm * @exception EBaseException failed to set default signing algorithm */ @@ -123,7 +123,7 @@ public interface ISigningUnit { /** * Retrieves all supported signing algorithm of this unit. - * + * * @return a list of signing algorithms * @exception EBaseException failed to list */ @@ -131,7 +131,7 @@ public interface ISigningUnit { /** * Retrieves the token name of this unit. - * + * * @return token name * @exception EBaseException failed to retrieve name */ @@ -139,7 +139,7 @@ public interface ISigningUnit { /** * Updates new nickname and tokename in the configuration file. - * + * * @param nickname new nickname * @param tokenname new tokenname */ @@ -147,7 +147,7 @@ public interface ISigningUnit { /** * Checks if the given algorithm name is supported. - * + * * @param algname algorithm name * @return signing algorithm * @exception EBaseException failed to check signing algorithm @@ -157,7 +157,7 @@ public interface ISigningUnit { /** * Retrieves the public key associated in this unit. - * + * * @return public key */ public PublicKey getPublicKey(); diff --git a/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java b/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java index 5f3b0ec48..4e651d394 100644 --- a/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java +++ b/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java @@ -27,14 +27,14 @@ import com.netscape.certsrv.base.EBaseException; * An interface represents a storage key unit. This storage * unit contains a storage key pair that is used for * encrypting the user private key for long term storage. - * + * * @version $Revision$, $Date$ */ public interface IStorageKeyUnit extends IEncryptionUnit { /** * Retrieves total number of recovery agents. - * + * * @return total number of recovery agents */ public int getNoOfAgents() throws EBaseException; @@ -42,28 +42,28 @@ public interface IStorageKeyUnit extends IEncryptionUnit { /** * Retrieves number of recovery agents required to * perform recovery operation. - * + * * @return required number of recovery agents for recovery operation */ public int getNoOfRequiredAgents() throws EBaseException; /** * Sets the numer of required recovery agents - * + * * @param number number of required agents */ public void setNoOfRequiredAgents(int number); /** * Retrieves a list of agents in this unit. - * + * * @return a list of string-based agent identifiers */ public Enumeration<String> getAgentIdentifiers(); /** * Changes agent password. - * + * * @param id agent id * @param oldpwd old password * @param newpwd new password @@ -75,7 +75,7 @@ public interface IStorageKeyUnit extends IEncryptionUnit { /** * Changes M-N recovery scheme. - * + * * @param n total number of agents * @param m required number of agents for recovery operation * @param oldcreds all old credentials @@ -88,7 +88,7 @@ public interface IStorageKeyUnit extends IEncryptionUnit { /** * Logins to this unit. - * + * * @param ac agent's credentials * @exception EBaseException failed to login */ diff --git a/base/common/src/com/netscape/certsrv/security/IToken.java b/base/common/src/com/netscape/certsrv/security/IToken.java index 05aff64f9..a27514f31 100644 --- a/base/common/src/com/netscape/certsrv/security/IToken.java +++ b/base/common/src/com/netscape/certsrv/security/IToken.java @@ -21,14 +21,14 @@ import com.netscape.certsrv.base.EBaseException; /** * An interface represents a generic token unit. - * + * * @version $Revision$, $Date$ */ public interface IToken { /** * Logins to the token unit. - * + * * @param pin password to access the token * @exception EBaseException failed to login to this token */ diff --git a/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java b/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java index 6e1c7ab4a..e7bf77b49 100644 --- a/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java +++ b/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java @@ -29,14 +29,14 @@ import com.netscape.certsrv.base.EBaseException; * An interface represents the transport key pair. * This key pair is used to protected EE's private * key in transit. - * + * * @version $Revision$, $Date$ */ public interface ITransportKeyUnit extends IEncryptionUnit { /** * Retrieves public key. - * + * * @return certificate */ public org.mozilla.jss.crypto.X509Certificate getCertificate(); diff --git a/base/common/src/com/netscape/certsrv/security/KeyCertData.java b/base/common/src/com/netscape/certsrv/security/KeyCertData.java index dbcc0118f..af09d3598 100644 --- a/base/common/src/com/netscape/certsrv/security/KeyCertData.java +++ b/base/common/src/com/netscape/certsrv/security/KeyCertData.java @@ -33,7 +33,7 @@ import com.netscape.certsrv.common.Constants; /** * This class represents a container for storaging * data in the security package. - * + * * @version $Revision$, $Date$ */ public class KeyCertData extends Properties { @@ -52,7 +52,7 @@ public class KeyCertData extends Properties { /** * Retrieves the key pair from this container. - * + * * @return key pair */ public KeyPair getKeyPair() { @@ -61,7 +61,7 @@ public class KeyCertData extends Properties { /** * Sets key pair into this container. - * + * * @param keypair key pair */ public void setKeyPair(KeyPair keypair) { @@ -70,7 +70,7 @@ public class KeyCertData extends Properties { /** * Retrieves the issuer name from this container. - * + * * @return issuer name */ public String getIssuerName() { @@ -79,7 +79,7 @@ public class KeyCertData extends Properties { /** * Sets the issuer name in this container. - * + * * @param name issuer name */ public void setIssuerName(String name) { @@ -88,7 +88,7 @@ public class KeyCertData extends Properties { /** * Retrieves certificate server instance name. - * + * * @return instance name */ public String getCertInstanceName() { @@ -97,7 +97,7 @@ public class KeyCertData extends Properties { /** * Sets certificate server instance name. - * + * * @param name instance name */ public void setCertInstanceName(String name) { @@ -106,7 +106,7 @@ public class KeyCertData extends Properties { /** * Retrieves certificate nickname. - * + * * @return certificate nickname */ public String getCertNickname() { @@ -115,7 +115,7 @@ public class KeyCertData extends Properties { /** * Sets certificate nickname. - * + * * @param nickname certificate nickname */ public void setCertNickname(String nickname) { @@ -124,7 +124,7 @@ public class KeyCertData extends Properties { /** * Retrieves key length. - * + * * @return key length */ public String getKeyLength() { @@ -133,7 +133,7 @@ public class KeyCertData extends Properties { /** * Sets key length. - * + * * @param len key length */ public void setKeyLength(String len) { @@ -142,7 +142,7 @@ public class KeyCertData extends Properties { /** * Retrieves key type. - * + * * @return key type */ public String getKeyType() { @@ -151,7 +151,7 @@ public class KeyCertData extends Properties { /** * Sets key type. - * + * * @param type key type */ public void setKeyType(String type) { @@ -160,7 +160,7 @@ public class KeyCertData extends Properties { /** * Retrieves key curve name. - * + * * @return key curve name */ public String getKeyCurveName() { @@ -169,7 +169,7 @@ public class KeyCertData extends Properties { /** * Sets key curvename. - * + * * @param len key curvename */ public void setKeyCurveName(String len) { @@ -178,7 +178,7 @@ public class KeyCertData extends Properties { /** * Retrieves signature algorithm. - * + * * @return signature algorithm */ public SignatureAlgorithm getSignatureAlgorithm() { @@ -187,7 +187,7 @@ public class KeyCertData extends Properties { /** * Sets signature algorithm - * + * * @param alg signature algorithm */ public void setSignatureAlgorithm(SignatureAlgorithm alg) { @@ -196,7 +196,7 @@ public class KeyCertData extends Properties { /** * Retrieves algorithm used to sign the root CA Cert. - * + * * @return signature algorithm */ public String getSignedBy() { @@ -205,7 +205,7 @@ public class KeyCertData extends Properties { /** * Sets signature algorithm used to sign root CA cert - * + * * @param alg signature algorithm */ public void setSignedBy(String alg) { @@ -214,7 +214,7 @@ public class KeyCertData extends Properties { /** * Retrieves signature algorithm. - * + * * @return signature algorithm */ public AlgorithmId getAlgorithmId() { @@ -223,7 +223,7 @@ public class KeyCertData extends Properties { /** * Sets algorithm identifier - * + * * @param id signature algorithm */ public void setAlgorithmId(AlgorithmId id) { @@ -232,7 +232,7 @@ public class KeyCertData extends Properties { /** * Retrieves serial number. - * + * * @return serial number */ public BigInteger getSerialNumber() { @@ -241,7 +241,7 @@ public class KeyCertData extends Properties { /** * Sets serial number. - * + * * @param num serial number */ public void setSerialNumber(BigInteger num) { @@ -250,7 +250,7 @@ public class KeyCertData extends Properties { /** * Retrieves configuration file. - * + * * @return configuration file */ public IConfigStore getConfigFile() { @@ -259,7 +259,7 @@ public class KeyCertData extends Properties { /** * Sets configuration file. - * + * * @param file configuration file */ public void setConfigFile(IConfigStore file) { @@ -268,7 +268,7 @@ public class KeyCertData extends Properties { /** * Retrieves begining year of validity. - * + * * @return begining year */ public String getBeginYear() { @@ -277,7 +277,7 @@ public class KeyCertData extends Properties { /** * Sets begining year of validity. - * + * * @param year begining year */ public void setBeginYear(String year) { @@ -286,7 +286,7 @@ public class KeyCertData extends Properties { /** * Retrieves ending year of validity. - * + * * @return ending year */ public String getAfterYear() { @@ -295,7 +295,7 @@ public class KeyCertData extends Properties { /** * Sets ending year of validity. - * + * * @param year ending year */ public void setAfterYear(String year) { @@ -304,7 +304,7 @@ public class KeyCertData extends Properties { /** * Retrieves begining month of validity. - * + * * @return begining month */ public String getBeginMonth() { @@ -313,7 +313,7 @@ public class KeyCertData extends Properties { /** * Sets begining month of validity. - * + * * @param month begining month */ public void setBeginMonth(String month) { @@ -322,7 +322,7 @@ public class KeyCertData extends Properties { /** * Retrieves ending month of validity. - * + * * @return ending month */ public String getAfterMonth() { @@ -331,7 +331,7 @@ public class KeyCertData extends Properties { /** * Sets ending month of validity. - * + * * @param month ending month */ public void setAfterMonth(String month) { @@ -340,7 +340,7 @@ public class KeyCertData extends Properties { /** * Retrieves begining date of validity. - * + * * @return begining date */ public String getBeginDate() { @@ -349,7 +349,7 @@ public class KeyCertData extends Properties { /** * Sets begining date of validity. - * + * * @param date begining date */ public void setBeginDate(String date) { @@ -358,7 +358,7 @@ public class KeyCertData extends Properties { /** * Retrieves ending date of validity. - * + * * @return ending date */ public String getAfterDate() { @@ -367,7 +367,7 @@ public class KeyCertData extends Properties { /** * Sets ending date of validity. - * + * * @param date ending date */ public void setAfterDate(String date) { @@ -376,7 +376,7 @@ public class KeyCertData extends Properties { /** * Retrieves starting hour of validity. - * + * * @return starting hour */ public String getBeginHour() { @@ -385,7 +385,7 @@ public class KeyCertData extends Properties { /** * Sets starting hour of validity. - * + * * @param hour starting hour */ public void setBeginHour(String hour) { @@ -394,7 +394,7 @@ public class KeyCertData extends Properties { /** * Retrieves ending hour of validity. - * + * * @return ending hour */ public String getAfterHour() { @@ -403,7 +403,7 @@ public class KeyCertData extends Properties { /** * Sets ending hour of validity. - * + * * @param hour ending hour */ public void setAfterHour(String hour) { @@ -412,7 +412,7 @@ public class KeyCertData extends Properties { /** * Retrieves starting minute of validity. - * + * * @return starting minute */ public String getBeginMin() { @@ -421,7 +421,7 @@ public class KeyCertData extends Properties { /** * Sets starting minute of validity. - * + * * @param min starting minute */ public void setBeginMin(String min) { @@ -430,7 +430,7 @@ public class KeyCertData extends Properties { /** * Retrieves ending minute of validity. - * + * * @return ending minute */ public String getAfterMin() { @@ -439,7 +439,7 @@ public class KeyCertData extends Properties { /** * Sets ending minute of validity. - * + * * @param min ending minute */ public void setAfterMin(String min) { @@ -448,7 +448,7 @@ public class KeyCertData extends Properties { /** * Retrieves starting second of validity. - * + * * @return starting second */ public String getBeginSec() { @@ -457,7 +457,7 @@ public class KeyCertData extends Properties { /** * Sets starting second of validity. - * + * * @param sec starting second */ public void setBeginSec(String sec) { @@ -466,7 +466,7 @@ public class KeyCertData extends Properties { /** * Retrieves ending second of validity. - * + * * @return ending second */ public String getAfterSec() { @@ -475,7 +475,7 @@ public class KeyCertData extends Properties { /** * Sets ending second of validity. - * + * * @param sec ending second */ public void setAfterSec(String sec) { @@ -484,7 +484,7 @@ public class KeyCertData extends Properties { /** * Retrieves CA key pair - * + * * @return CA key pair */ public KeyPair getCAKeyPair() { @@ -493,7 +493,7 @@ public class KeyCertData extends Properties { /** * Sets CA key pair - * + * * @param keypair key pair */ public void setCAKeyPair(KeyPair keypair) { @@ -502,7 +502,7 @@ public class KeyCertData extends Properties { /** * Retrieves extensions - * + * * @return extensions */ public String getDerExtension() { @@ -511,7 +511,7 @@ public class KeyCertData extends Properties { /** * Sets extensions - * + * * @param ext extensions */ public void setDerExtension(String ext) { @@ -520,7 +520,7 @@ public class KeyCertData extends Properties { /** * Retrieves isCA - * + * * @return "true" if it is CA */ public String isCA() { @@ -529,7 +529,7 @@ public class KeyCertData extends Properties { /** * Sets isCA - * + * * @param ext "true" if it is CA */ public void setCA(String ext) { @@ -538,7 +538,7 @@ public class KeyCertData extends Properties { /** * Retrieves key length - * + * * @return certificate's key length */ public String getCertLen() { @@ -547,7 +547,7 @@ public class KeyCertData extends Properties { /** * Sets key length - * + * * @param len certificate's key length */ public void setCertLen(String len) { @@ -556,7 +556,7 @@ public class KeyCertData extends Properties { /** * Retrieves SSL Client bit - * + * * @return SSL Client bit */ public String getSSLClientBit() { @@ -565,7 +565,7 @@ public class KeyCertData extends Properties { /** * Sets SSL Client bit - * + * * @param sslClientBit SSL Client bit */ public void setSSLClientBit(String sslClientBit) { @@ -574,7 +574,7 @@ public class KeyCertData extends Properties { /** * Retrieves SSL Server bit - * + * * @return SSL Server bit */ public String getSSLServerBit() { @@ -583,7 +583,7 @@ public class KeyCertData extends Properties { /** * Sets SSL Server bit - * + * * @param sslServerBit SSL Server bit */ public void setSSLServerBit(String sslServerBit) { @@ -592,7 +592,7 @@ public class KeyCertData extends Properties { /** * Retrieves SSL Mail bit - * + * * @return SSL Mail bit */ public String getSSLMailBit() { @@ -601,7 +601,7 @@ public class KeyCertData extends Properties { /** * Sets SSL Mail bit - * + * * @param sslMailBit SSL Mail bit */ public void setSSLMailBit(String sslMailBit) { @@ -610,7 +610,7 @@ public class KeyCertData extends Properties { /** * Retrieves SSL CA bit - * + * * @return SSL CA bit */ public String getSSLCABit() { @@ -619,7 +619,7 @@ public class KeyCertData extends Properties { /** * Sets SSL CA bit - * + * * @param cabit SSL CA bit */ public void setSSLCABit(String cabit) { @@ -628,7 +628,7 @@ public class KeyCertData extends Properties { /** * Retrieves SSL Signing bit - * + * * @return SSL Signing bit */ public String getObjectSigningBit() { @@ -637,7 +637,7 @@ public class KeyCertData extends Properties { /** * Retrieves Time Stamping bit - * + * * @return Time Stamping bit */ public String getTimeStampingBit() { @@ -646,7 +646,7 @@ public class KeyCertData extends Properties { /** * Sets SSL Signing bit - * + * * @param objectSigningBit SSL Signing bit */ public void setObjectSigningBit(String objectSigningBit) { @@ -655,7 +655,7 @@ public class KeyCertData extends Properties { /** * Retrieves SSL Mail CA bit - * + * * @return SSL Mail CA bit */ public String getMailCABit() { @@ -664,7 +664,7 @@ public class KeyCertData extends Properties { /** * Sets SSL Mail CA bit - * + * * @param mailCABit SSL Mail CA bit */ public void setMailCABit(String mailCABit) { @@ -673,7 +673,7 @@ public class KeyCertData extends Properties { /** * Retrieves SSL Object Signing bit - * + * * @return SSL Object Signing bit */ public String getObjectSigningCABit() { @@ -682,7 +682,7 @@ public class KeyCertData extends Properties { /** * Sets SSL Object Signing bit - * + * * @param bit SSL Object Signing bit */ public void setObjectSigningCABit(String bit) { @@ -691,7 +691,7 @@ public class KeyCertData extends Properties { /** * Retrieves OCSP Signing flag - * + * * @return OCSP Signing flag */ public String getOCSPSigning() { @@ -700,7 +700,7 @@ public class KeyCertData extends Properties { /** * Sets OCSP Signing flag - * + * * @param aki OCSP Signing flag */ public void setOCSPSigning(String aki) { @@ -709,7 +709,7 @@ public class KeyCertData extends Properties { /** * Retrieves OCSP No Check flag - * + * * @return OCSP No Check flag */ public String getOCSPNoCheck() { @@ -718,7 +718,7 @@ public class KeyCertData extends Properties { /** * Sets OCSP No Check flag - * + * * @param noCheck OCSP No Check flag */ public void setOCSPNoCheck(String noCheck) { @@ -727,7 +727,7 @@ public class KeyCertData extends Properties { /** * Retrieves Authority Information Access flag - * + * * @return Authority Information Access flag */ public String getAIA() { @@ -736,7 +736,7 @@ public class KeyCertData extends Properties { /** * Sets Authority Information Access flag - * + * * @param aia Authority Information Access flag */ public void setAIA(String aia) { @@ -745,7 +745,7 @@ public class KeyCertData extends Properties { /** * Retrieves Authority Key Identifier flag - * + * * @return Authority Key Identifier flag */ public String getAKI() { @@ -754,7 +754,7 @@ public class KeyCertData extends Properties { /** * Sets Authority Key Identifier flag - * + * * @param aki Authority Key Identifier flag */ public void setAKI(String aki) { @@ -763,7 +763,7 @@ public class KeyCertData extends Properties { /** * Retrieves Subject Key Identifier flag - * + * * @return Subject Key Identifier flag */ public String getSKI() { @@ -772,7 +772,7 @@ public class KeyCertData extends Properties { /** * Sets Subject Key Identifier flag - * + * * @param ski Subject Key Identifier flag */ public void setSKI(String ski) { @@ -781,7 +781,7 @@ public class KeyCertData extends Properties { /** * Retrieves key usage extension - * + * * @return true if key usage extension set */ public boolean getKeyUsageExtension() { @@ -794,7 +794,7 @@ public class KeyCertData extends Properties { /** * Sets CA extensions - * + * * @param ext CA extensions */ public void setCAExtensions(CertificateExtensions ext) { @@ -803,7 +803,7 @@ public class KeyCertData extends Properties { /** * Retrieves CA extensions - * + * * @return CA extensions */ public CertificateExtensions getCAExtensions() { @@ -812,7 +812,7 @@ public class KeyCertData extends Properties { /** * Retrieves hash type - * + * * @return hash type */ public String getHashType() { diff --git a/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java b/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java index 958919e1e..3233f0bed 100644 --- a/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java +++ b/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java @@ -32,10 +32,10 @@ package com.netscape.certsrv.selftests; * This class implements a duplicate self test exception. * EDuplicateSelfTestExceptions are derived from ESelfTestExceptions * in order to allow users to easily do self tests without try-catch clauses. - * + * * EDuplicateSelfTestExceptions should be caught by SelfTestSubsystem managers. * <P> - * + * * @version $Revision$, $Date$ */ public class EDuplicateSelfTestException @@ -72,7 +72,7 @@ public class EDuplicateSelfTestException /** * Constructs a "duplicate" self test exception. * <P> - * + * * @param instanceName duplicate "instanceName" exception details */ public EDuplicateSelfTestException(String instanceName) { @@ -94,7 +94,7 @@ public class EDuplicateSelfTestException * Constructs a "duplicate" self test exception where the value is always * a duplicate from a name/value pair * <P> - * + * * @param instanceName duplicate "instanceName" exception details * @param instanceValue duplicate "instanceValue" exception details */ @@ -125,7 +125,7 @@ public class EDuplicateSelfTestException * duplicate from a substore.parameter/value pair; (the value passed in may * be null). * <P> - * + * * @param instanceStore duplicate "instanceStore" exception details * @param instanceParameter duplicate "instanceParameter" exception details * @param instanceValue duplicate "instanceValue" exception details @@ -163,7 +163,7 @@ public class EDuplicateSelfTestException /** * Returns the instance name associated with this self test. * <P> - * + * * @return name portion of the name/value pair */ public String getInstanceName() { @@ -173,7 +173,7 @@ public class EDuplicateSelfTestException /** * Returns the store associated with this self test. * <P> - * + * * @return substore portion of the substore.parameter/value pair */ public String getInstanceStore() { @@ -183,7 +183,7 @@ public class EDuplicateSelfTestException /** * Returns the parameter associated with this self test. * <P> - * + * * @return parameter portion of the substore.parameter/value pair */ public String getInstanceParameter() { @@ -193,7 +193,7 @@ public class EDuplicateSelfTestException /** * Returns the value associated with this self test. * <P> - * + * * @return value portion of the name/value pair */ public String getInstanceValue() { diff --git a/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java b/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java index 58592b89b..fcb4948d7 100644 --- a/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java +++ b/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java @@ -32,10 +32,10 @@ package com.netscape.certsrv.selftests; * This class implements an invalid self test exception. * EInvalidSelfTestExceptions are derived from ESelfTestExceptions * in order to allow users to easily do self tests without try-catch clauses. - * + * * EInvalidSelfTestExceptions should be caught by SelfTestSubsystem managers. * <P> - * + * * @version $Revision$, $Date$ */ public class EInvalidSelfTestException @@ -72,7 +72,7 @@ public class EInvalidSelfTestException /** * Constructs an "invalid" self test exception. * <P> - * + * * @param instanceName invalid "instanceName" exception details */ public EInvalidSelfTestException(String instanceName) { @@ -94,7 +94,7 @@ public class EInvalidSelfTestException * Constructs a "invalid" self test exception where the value is always * invalid from a name/value pair * <P> - * + * * @param instanceName invalid "instanceName" exception details * @param instanceValue invalid "instanceValue" exception details */ @@ -125,7 +125,7 @@ public class EInvalidSelfTestException * invalid from a substore.parameter/value pair; (the value passed in may * be null). * <P> - * + * * @param instanceStore invalid "instanceStore" exception details * @param instanceParameter invalid "instanceParameter" exception details * @param instanceValue invalid "instanceValue" exception details @@ -163,7 +163,7 @@ public class EInvalidSelfTestException /** * Returns the instance name associated with this self test. * <P> - * + * * @return name portion of the name/value pair */ public String getInstanceName() { @@ -173,7 +173,7 @@ public class EInvalidSelfTestException /** * Returns the store associated with this self test. * <P> - * + * * @return substore portion of the substore.parameter/value pair */ public String getInstanceStore() { @@ -183,7 +183,7 @@ public class EInvalidSelfTestException /** * Returns the parameter associated with this self test. * <P> - * + * * @return parameter portion of the substore.parameter/value pair */ public String getInstanceParameter() { @@ -193,7 +193,7 @@ public class EInvalidSelfTestException /** * Returns the value associated with this self test. * <P> - * + * * @return value portion of the name/value pair */ public String getInstanceValue() { diff --git a/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java b/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java index c15852f4f..ea5be7b77 100644 --- a/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java +++ b/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java @@ -32,10 +32,10 @@ package com.netscape.certsrv.selftests; * This class implements a missing self test exception. * EMissingSelfTestExceptions are derived from ESelfTestExceptions * in order to allow users to easily do self tests without try-catch clauses. - * + * * EMissingSelfTestExceptions should be caught by SelfTestSubsystem managers. * <P> - * + * * @version $Revision$, $Date$ */ public class EMissingSelfTestException @@ -72,7 +72,7 @@ public class EMissingSelfTestException /** * Constructs a "missing" self test exception where the name is null * <P> - * + * */ public EMissingSelfTestException() { super("The self test plugin property name is null."); @@ -82,7 +82,7 @@ public class EMissingSelfTestException * Constructs a "missing" self test exception where the name is always * missing from a name/value pair. * <P> - * + * * @param instanceName missing "instanceName" exception details */ public EMissingSelfTestException(String instanceName) { @@ -104,7 +104,7 @@ public class EMissingSelfTestException * Constructs a "missing" self test exception where the value is always * missing from a name/value pair; (the value passed in is always null). * <P> - * + * * @param instanceName missing "instanceName" exception details * @param instanceValue missing "instanceValue" exception details * (always null) @@ -134,7 +134,7 @@ public class EMissingSelfTestException * missing from a substore.parameter/value pair; (the value passed in may * be null). * <P> - * + * * @param instanceStore missing "instanceStore" exception details * @param instanceParameter missing "instanceParameter" exception details * @param instanceValue missing "instanceValue" exception details @@ -172,7 +172,7 @@ public class EMissingSelfTestException /** * Returns the instance name associated with this self test. * <P> - * + * * @return name portion of the name/value pair */ public String getInstanceName() { @@ -182,7 +182,7 @@ public class EMissingSelfTestException /** * Returns the store associated with this self test. * <P> - * + * * @return substore portion of the substore.parameter/value pair */ public String getInstanceStore() { @@ -192,7 +192,7 @@ public class EMissingSelfTestException /** * Returns the parameter associated with this self test. * <P> - * + * * @return parameter portion of the substore.parameter/value pair */ public String getInstanceParameter() { @@ -202,7 +202,7 @@ public class EMissingSelfTestException /** * Returns the value associated with this self test. * <P> - * + * * @return value portion of the name/value pair */ public String getInstanceValue() { diff --git a/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java b/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java index 6c4f6bf2f..ed97a83a1 100644 --- a/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java +++ b/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java @@ -34,10 +34,10 @@ import com.netscape.certsrv.base.EBaseException; * This class implements a self test exception. ESelfTestExceptions * are derived from EBaseExceptions in order to allow users * to easily do self tests without try-catch clauses. - * + * * ESelfTestExceptions should be caught by SelfTestSubsystem managers. * <P> - * + * * @version $Revision$, $Date$ */ public class ESelfTestException @@ -73,7 +73,7 @@ public class ESelfTestException /** * Constructs a self test exception. * <P> - * + * * @param msg exception details */ public ESelfTestException(String msg) { @@ -87,7 +87,7 @@ public class ESelfTestException /** * Returns the bundle file name. * <P> - * + * * @return name of bundle class associated with this exception. */ protected String getBundleName() { diff --git a/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java b/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java index 04285a9dc..24ad623e4 100644 --- a/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java +++ b/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java @@ -36,7 +36,7 @@ import com.netscape.certsrv.logging.ILogEventListener; /** * This class defines the interface of an individual self test. * <P> - * + * * @version $Revision$, $Date$ */ public interface ISelfTest { @@ -62,7 +62,7 @@ public interface ISelfTest { * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -80,7 +80,7 @@ public interface ISelfTest { /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public void startupSelfTest() @@ -97,7 +97,7 @@ public interface ISelfTest { * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName(); @@ -106,7 +106,7 @@ public interface ISelfTest { * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore(); @@ -115,7 +115,7 @@ public interface ISelfTest { * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -124,7 +124,7 @@ public interface ISelfTest { /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java b/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java index d16627ab5..214ee1764 100644 --- a/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java +++ b/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.logging.ILogEventListener; /** * This class defines the interface of a container for self tests. * <P> - * + * * @version $Revision$, $Date$ */ public interface ISelfTestSubsystem @@ -76,7 +76,7 @@ public interface ISelfTestSubsystem * 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(); @@ -84,7 +84,7 @@ public interface ISelfTestSubsystem /** * 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) @@ -98,7 +98,7 @@ public interface ISelfTestSubsystem /** * 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 */ @@ -108,7 +108,7 @@ public interface ISelfTestSubsystem /** * 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 @@ -120,7 +120,7 @@ public interface ISelfTestSubsystem * 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 @@ -132,7 +132,7 @@ public interface ISelfTestSubsystem /** * Execute all self tests specified to be run on demand. * <P> - * + * * @exception EMissingSelfTestException subsystem has missing name * @exception ESelfTestException self test exception */ @@ -147,7 +147,7 @@ public interface ISelfTestSubsystem * 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(); @@ -155,7 +155,7 @@ public interface ISelfTestSubsystem /** * 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) @@ -169,7 +169,7 @@ public interface ISelfTestSubsystem /** * Disable the specified self test at server startup. * <P> - * + * * @param instanceName instance name of self test * @exception EMissingSelfTestException subsystem has missing name */ @@ -180,7 +180,7 @@ public interface ISelfTestSubsystem * 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 @@ -192,7 +192,7 @@ public interface ISelfTestSubsystem * 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 @@ -204,7 +204,7 @@ public interface ISelfTestSubsystem /** * Execute all self tests specified to be run at server startup. * <P> - * + * * @exception EMissingSelfTestException subsystem has missing name * @exception ESelfTestException self test exception */ @@ -219,7 +219,7 @@ public interface ISelfTestSubsystem * Retrieve an individual self test from the instances list * given its instance name. * <P> - * + * * @param instanceName instance name of self test * @return individual self test */ @@ -233,7 +233,7 @@ public interface ISelfTestSubsystem * Returns the ILogEventListener of this subsystem. * This method may return null. * <P> - * + * * @return ILogEventListener of this subsystem */ public ILogEventListener getSelfTestLogger(); @@ -241,7 +241,7 @@ public interface ISelfTestSubsystem /** * This method represents the log interface for the self test subsystem. * <P> - * + * * @param logger log event listener * @param msg self test log message */ @@ -252,7 +252,7 @@ public interface ISelfTestSubsystem * 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) @@ -273,7 +273,7 @@ public interface ISelfTestSubsystem * 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 */ @@ -285,7 +285,7 @@ public interface ISelfTestSubsystem * 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) @@ -306,7 +306,7 @@ public interface ISelfTestSubsystem * 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 */ diff --git a/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java b/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java index c7c4d372d..4107bfbb2 100644 --- a/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java +++ b/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java @@ -22,7 +22,7 @@ import java.util.ListResourceBundle; /** * A class represents a resource bundle for Self Tests. * <P> - * + * * @version $Revision$, $Date$ */ public class SelfTestResources extends ListResourceBundle { diff --git a/base/common/src/com/netscape/certsrv/template/ArgList.java b/base/common/src/com/netscape/certsrv/template/ArgList.java index 586bf7663..03b2b5645 100644 --- a/base/common/src/com/netscape/certsrv/template/ArgList.java +++ b/base/common/src/com/netscape/certsrv/template/ArgList.java @@ -24,7 +24,7 @@ import java.util.Vector; * that will be returned to the end-user via * the template framework. * <p> - * + * * @version $Revision$, $Date$ */ public class ArgList implements IArgValue { @@ -39,7 +39,7 @@ public class ArgList implements IArgValue { /** * Adds an argument to the list. - * + * * @param arg argument to be added */ public void add(IArgValue arg) { @@ -48,7 +48,7 @@ public class ArgList implements IArgValue { /** * Returns the number of arguments in the list. - * + * * @return size of the list */ public int size() { @@ -58,7 +58,7 @@ public class ArgList implements IArgValue { /** * Returns the argument at the given position * Position starts from 0. - * + * * @param pos position * @return argument */ diff --git a/base/common/src/com/netscape/certsrv/template/ArgSet.java b/base/common/src/com/netscape/certsrv/template/ArgSet.java index 333a51e50..8f3ff8b04 100644 --- a/base/common/src/com/netscape/certsrv/template/ArgSet.java +++ b/base/common/src/com/netscape/certsrv/template/ArgSet.java @@ -27,7 +27,7 @@ import java.util.Hashtable; * <p> * Each argument in the set is tagged with a name (key). * <p> - * + * * @version $Revision$, $Date$ */ public class ArgSet implements IArgValue { @@ -35,7 +35,7 @@ public class ArgSet implements IArgValue { /** * Returns a list of argument names. - * + * * @return list of argument names */ public Enumeration<String> getNames() { @@ -44,7 +44,7 @@ public class ArgSet implements IArgValue { /** * Sets string argument into the set with the given name. - * + * * @param name argument name * @param arg argument in string */ @@ -54,7 +54,7 @@ public class ArgSet implements IArgValue { /** * Sets argument into the set with the given name. - * + * * @param name argument name * @param arg argument value */ @@ -64,7 +64,7 @@ public class ArgSet implements IArgValue { /** * Retrieves argument from the set. - * + * * @param name argument name * @return argument value */ diff --git a/base/common/src/com/netscape/certsrv/template/ArgString.java b/base/common/src/com/netscape/certsrv/template/ArgString.java index 4fb982eb6..e37ee3fc3 100644 --- a/base/common/src/com/netscape/certsrv/template/ArgString.java +++ b/base/common/src/com/netscape/certsrv/template/ArgString.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.template; /** * This class represents a string-based argument. - * + * * @version $Revision$, $Date$ */ public class ArgString implements IArgValue { @@ -27,7 +27,7 @@ public class ArgString implements IArgValue { /** * Constructs a string-based argument value. - * + * * @param value argument value */ public ArgString(String value) { @@ -36,7 +36,7 @@ public class ArgString implements IArgValue { /** * Returns the argument value. - * + * * @return argument value */ public String getValue() { diff --git a/base/common/src/com/netscape/certsrv/template/IArgValue.java b/base/common/src/com/netscape/certsrv/template/IArgValue.java index e820ce69f..30589b26b 100644 --- a/base/common/src/com/netscape/certsrv/template/IArgValue.java +++ b/base/common/src/com/netscape/certsrv/template/IArgValue.java @@ -21,7 +21,7 @@ package com.netscape.certsrv.template; * This interface presents a generic argument value. * Argument value can be in string, in a list, or * in a set. - * + * * @version $Revision$, $Date$ */ public interface IArgValue { diff --git a/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java b/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java index 0a045a6fb..fe77607b7 100644 --- a/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java +++ b/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.request.IRequestQueue; * An interface represents a Registration Authority that is * responsible for certificate enrollment operations. * <P> - * + * * @version $Revision$, $Date$ */ public interface ITKSAuthority extends ISubsystem { @@ -41,14 +41,14 @@ public interface ITKSAuthority extends ISubsystem { /** * Retrieves the request queue of this registration authority. - * + * * @return RA's request queue */ public IRequestQueue getRequestQueue(); /** * Returns the nickname of the RA certificate. - * + * * @return the nickname of the RA certificate */ public String getNickname(); diff --git a/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java b/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java index fdfa3cd38..c8719b509 100644 --- a/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java +++ b/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java @@ -22,7 +22,7 @@ import java.security.cert.X509Certificate; /** * This class defines the strong authentication basic elements, * the X509 certificates. - * + * * @version $Revision$, $Date$ */ public class Certificates { @@ -31,7 +31,7 @@ public class Certificates { /** * Constructs strong authenticator. - * + * * @param certs a list of X509Certificates */ public Certificates(X509Certificate certs[]) { @@ -40,7 +40,7 @@ public class Certificates { /** * Retrieves certificates. - * + * * @return a list of X509Certificates */ public X509Certificate[] getCertificates() { diff --git a/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java b/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java index a25a1a6b3..bae8ba085 100644 --- a/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java +++ b/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.base.EBaseException; /** * A class represents a Identity exception. * <P> - * + * * @version $Revision$, $Date$ */ public class EUsrGrpException extends EBaseException { @@ -38,7 +38,7 @@ public class EUsrGrpException extends EBaseException { /** * Constructs a usr/grp management exception - * + * * @param msgFormat exception details in message string format * <P> */ @@ -48,7 +48,7 @@ public class EUsrGrpException extends EBaseException { /** * Constructs a Identity exception. - * + * * @param msgFormat exception details in message string format * @param param message string parameter * <P> @@ -59,7 +59,7 @@ public class EUsrGrpException extends EBaseException { /** * Constructs a Identity exception. - * + * * @param e system exception * <P> */ @@ -69,7 +69,7 @@ public class EUsrGrpException extends EBaseException { /** * Constructs a Identity exception. - * + * * @param msgFormat exception details in message string format * @param params list of message format parameters * <P> diff --git a/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java b/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java index dbbd068c4..ccf504229 100644 --- a/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java +++ b/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java @@ -24,14 +24,14 @@ import com.netscape.certsrv.ldap.ELdapException; /** * This interface defines a certificate mapping strategy to locate * a user - * + * * @version $Revision$, $Date$ */ public interface ICertUserLocator { /** * Returns a user whose certificates match with the given certificates - * + * * @return an user interface * @exception EUsrGrpException thrown when failed to build user * @exception LDAPException thrown when LDAP internal database is not available @@ -42,7 +42,7 @@ public interface ICertUserLocator { /** * Retrieves description. - * + * * @return description */ public String getDescription(); diff --git a/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java b/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java index 522d0fc89..86bf5c878 100644 --- a/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java +++ b/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java @@ -24,35 +24,35 @@ import com.netscape.certsrv.base.IAttrSet; /** * This interface defines the basic interfaces for * an identity group. (get/set methods for a group entry attributes) - * + * * @version $Revision$, $Date$ */ public interface IGroup extends IAttrSet, IGroupConstants { /** * Retrieves the group name. - * + * * @return the group name */ public String getName(); /** * Retrieves group identifier. - * + * * @return the group id */ public String getGroupID(); /** * Retrieves group description. - * + * * @return description */ public String getDescription(); /** * Checks if the given name is member of this group. - * + * * @param name the given name * @return true if the given name is the member of this group; otherwise false. */ @@ -60,14 +60,14 @@ public interface IGroup extends IAttrSet, IGroupConstants { /** * Adds new member. - * + * * @param name the given name. */ public void addMemberName(String name); /** * Retrieves a list of member names. - * + * * @return a list of member names for this group. */ public Enumeration<String> getMemberNames(); diff --git a/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java b/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java index 22d89455c..7118db230 100644 --- a/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java +++ b/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.usrgrp; /** * This interface defines the attribute names for a group entry - * + * * @version $Revision$, $Date$ */ public interface IGroupConstants { diff --git a/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java b/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java index 41209b4b9..5c4885573 100644 --- a/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java +++ b/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java @@ -20,7 +20,7 @@ package com.netscape.certsrv.usrgrp; /** * A class represents an ID evaluator. * <P> - * + * * @version $Revision$, $Date$ */ public interface IIdEvaluator { @@ -28,7 +28,7 @@ public interface IIdEvaluator { /** * Evaluates if the given value satisfies the ID evaluation: * is a user a member of a group - * + * * @param type the type of evaluator, in this case, it is group * @param id the user id for the given user * @param op operator, only "=" and "!=" are supported diff --git a/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java b/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java index 282d672f1..aa8b65575 100644 --- a/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java +++ b/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.base.ISubsystem; * This class defines low-level LDAP usr/grp management * usr/grp information is located remotely on another * LDAP server. - * + * * @version $Revision$, $Date$ */ public interface IUGSubsystem extends ISubsystem, IUsrGrp { @@ -45,7 +45,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Retrieves a user from LDAP - * + * * @param userid the given user id * @exception EUsrGrpException thrown when failed to find the user */ @@ -53,7 +53,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Searches for users that matches the filter. - * + * * @param filter search filter for efficiency * @return list of users * @exception EUsrGrpException thrown when any internal error occurs @@ -62,7 +62,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Adds the given user to the internal database - * + * * @param identity the given user * @exception EUsrGrpException thrown when failed to add user to the group * @exception LDAPException thrown when the LDAP internal database is not available @@ -71,7 +71,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Adds a user certificate to user - * + * * @param identity user interface * @exception EUsrGrpException thrown when failed to add the user certificate to the given user * @exception LDAPException thrown when the LDAP internal database is not available @@ -91,7 +91,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { * Removes a user certificate for a user entry * given a user certificate DN (actually, a combination of version, * serialNumber, issuerDN, and SubjectDN), and it gets removed - * + * * @param identity the given user whose user certificate is going to be * be removed. * @exception EUsrGrpException thrown when failed to remove user certificate @@ -100,7 +100,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Removes identity. - * + * * @param userid the given user id * @exception EUsrGrpException thrown when failed to remove user */ @@ -108,7 +108,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Modifies user attributes. Certs are handled separately - * + * * @param identity the given identity which contains all the user * attributes being modified * @exception EUsrGrpException thrown when modification failed @@ -117,7 +117,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Finds groups that match the filter. - * + * * @param filter the search filter * @return a list of groups that match the given search filter */ @@ -125,7 +125,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Find a group for the given name - * + * * @param name the given name * @return a group that matched the given name */ @@ -135,7 +135,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { * List groups. This method is more efficient than findGroups because * this method retrieves group names and description only. Each * retrieved group just contains group name and description. - * + * * @param filter the search filter * @return a list of groups, each group just contains group name and * its description. @@ -145,7 +145,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Retrieves a group from LDAP for the given group name - * + * * @param name the given group name * @return a group interface */ @@ -153,7 +153,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Retrieves a group from LDAP for the given DN. - * + * * @param DN the given DN * @return a group interface for the given DN. */ @@ -161,7 +161,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Checks if the given group exists. - * + * * @param name the given group name * @return true if the given group exists in the internal database; otherwise false. */ @@ -169,7 +169,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Checks if the given context is a member of the given group - * + * * @param uid the given user id * @param name the given group name * @return true if the user with the given user id is a member of the given @@ -181,7 +181,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Adds a group of identities. - * + * * @param group the given group * @exception EUsrGrpException thrown when failed to add group. */ @@ -189,7 +189,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Removes a group. Can't remove SUPER_CERT_ADMINS - * + * * @param name the given group name * @exception EUsrGrpException thrown when the given group failed to remove */ @@ -197,7 +197,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Modifies a group. - * + * * @param group the given group which contain all group attributes being * modified. * @exception EUsrGrpException thrown when failed to modify group. @@ -206,7 +206,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Removes the user with the given id from the given group - * + * * @param grp the given group * @param userid the given user id * @exception EUsrGrpException thrown when failed to remove the user from @@ -217,7 +217,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Create user with the given id. - * + * * @param id the user with the given id. * @return a new user */ @@ -225,7 +225,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Create group with the given id. - * + * * @param id the group with the given id. * @return a new group */ @@ -233,7 +233,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Get string representation of the given certificate - * + * * @param cert given certificate * @return the string representation of the given certificate */ @@ -242,7 +242,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Searchs for identities that matches the certificate locater * generated filter. - * + * * @param filter search filter * @return an user * @exception EUsrGrpException thrown when failed to find user @@ -253,7 +253,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { /** * Get user locator which does the mapping between the user and the certificate. - * + * * @return CertUserLocator */ public ICertUserLocator getCertUserLocator(); diff --git a/base/common/src/com/netscape/certsrv/usrgrp/IUser.java b/base/common/src/com/netscape/certsrv/usrgrp/IUser.java index 9370a6718..7c957fd8a 100644 --- a/base/common/src/com/netscape/certsrv/usrgrp/IUser.java +++ b/base/common/src/com/netscape/certsrv/usrgrp/IUser.java @@ -24,147 +24,147 @@ import com.netscape.certsrv.base.IAttrSet; /** * This interface defines the basic interfaces for * a user identity. (get/set methods for a user entry attributes) - * + * * @version $Revision$, $Date$ */ public interface IUser extends IAttrSet, IUserConstants { /** * Retrieves name. - * + * * @return user name */ public String getName(); /** * Retrieves user identifier. - * + * * @return user id */ public String getUserID(); /** * Retrieves user full name. - * + * * @return user fullname */ public String getFullName(); /** * Retrieves user phonenumber. - * + * * @return user phonenumber */ public String getPhone(); /** * Retrieves user state - * + * * @return user state */ public String getState(); /** * Sets user full name. - * + * * @param name the given full name */ public void setFullName(String name); /** * Sets user ldap DN. - * + * * @param userdn the given user DN */ public void setUserDN(String userdn); /** * Gets user ldap dn - * + * * @return user DN */ public String getUserDN(); /** * Retrieves user password. - * + * * @return user password */ public String getPassword(); /** * Sets user password. - * + * * @param p the given password */ public void setPassword(String p); /** * Sets user phonenumber - * + * * @param p user phonenumber */ public void setPhone(String p); /** * Sets user state - * + * * @param p the given user state */ public void setState(String p); /** * Sets user type - * + * * @param userType the given user type */ public void setUserType(String userType); /** * Gets user email address. - * + * * @return email address */ public String getEmail(); /** * Sets user email address. - * + * * @param email the given email address */ public void setEmail(String email); /** * Gets list of certificates from this user - * + * * @return list of certificates */ public X509Certificate[] getX509Certificates(); /** * Sets list of certificates in this user - * + * * @param certs list of certificates */ public void setX509Certificates(X509Certificate certs[]); /** * Get certificate DN - * + * * @return certificate DN */ public String getCertDN(); /** * Set certificate DN - * + * * @param userdn the given DN */ public void setCertDN(String userdn); /** * Get user type - * + * * @return user type. */ public String getUserType(); diff --git a/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java b/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java index f66f01c73..dbfe9a38b 100644 --- a/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java +++ b/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.usrgrp; /** * This interface defines the attribute names for a user entry - * + * * @version $Revision$, $Date$ */ public interface IUserConstants { diff --git a/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java b/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java index f6cef0d46..d5d37614e 100644 --- a/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java +++ b/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java @@ -22,28 +22,28 @@ import netscape.ldap.LDAPException; /** * This interface defines the basic capabilities of * a usr/group manager. (get/add/modify/remove users or groups) - * + * * @version $Revision$, $Date$ */ public interface IUsrGrp extends IIdEvaluator { /** * Retrieves usr/grp manager identifier. - * + * * @return id */ public String getId(); /** * Retrieves the description - * + * * @return description */ public String getDescription(); /** * Retrieves an identity - * + * * @param userid the user id for the given user * @return user interface */ @@ -56,7 +56,7 @@ public interface IUsrGrp extends IIdEvaluator { * user.setPassword("secret"); * usrgrp.addUser(user); * </code> - * + * * @param user an user interface * @exception EUsrGrpException thrown when some of the user attribute values * are null @@ -67,7 +67,7 @@ public interface IUsrGrp extends IIdEvaluator { /** * Removes a user. - * + * * @param userid the user id for the given user * @exception EUsrGrpException thrown when failed to remove user */ @@ -75,7 +75,7 @@ public interface IUsrGrp extends IIdEvaluator { /** * Modifies user. - * + * * @param user the user interface which contains the modified information * @exception EUsrGrpException thrown when failed to modify user */ @@ -83,7 +83,7 @@ public interface IUsrGrp extends IIdEvaluator { /** * Retrieves an identity group - * + * * @param groupid the given group id. * @return the group interface */ @@ -91,7 +91,7 @@ public interface IUsrGrp extends IIdEvaluator { /** * Adds a group - * + * * @param group the given group * @exception EUsrGrpException thrown when failed to add the group. */ @@ -99,7 +99,7 @@ public interface IUsrGrp extends IIdEvaluator { /** * Modifies a group - * + * * @param group the given group contains the new information for modification. * @exception EUsrGrpException thrown when failed to modify the group. */ @@ -107,7 +107,7 @@ public interface IUsrGrp extends IIdEvaluator { /** * Removes a group - * + * * @param name the group name * @exception EUsrGrpException thrown when failed to remove the given * group. diff --git a/base/common/src/com/netscape/certsrv/usrgrp/UsrGrpResources.java b/base/common/src/com/netscape/certsrv/usrgrp/UsrGrpResources.java index 11a3da23b..f85f7116c 100644 --- a/base/common/src/com/netscape/certsrv/usrgrp/UsrGrpResources.java +++ b/base/common/src/com/netscape/certsrv/usrgrp/UsrGrpResources.java @@ -22,7 +22,7 @@ import java.util.ListResourceBundle; /** * A class represents a resource bundle for the * user/group manager - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -30,7 +30,7 @@ public class UsrGrpResources extends ListResourceBundle { /** * Returns the content of this resource. - * + * * @return the content of this resource. */ public Object[][] getContents() { diff --git a/base/common/src/com/netscape/certsrv/util/HttpInput.java b/base/common/src/com/netscape/certsrv/util/HttpInput.java index 7e7fe7c4a..e5ae780c8 100644 --- a/base/common/src/com/netscape/certsrv/util/HttpInput.java +++ b/base/common/src/com/netscape/certsrv/util/HttpInput.java @@ -175,7 +175,7 @@ public class HttpInput { } /* - if (i.equals("256") || i.equals("384") || i.equals("521")) { + if (i.equals("256") || i.equals("384") || i.equals("521")) { return i; } else { throw new IOException("Invalid key length '" + i + "'. Currently supported ECC key lengths are 256, 384, 521."); diff --git a/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java b/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java index 989d7a4a1..bee1661b1 100644 --- a/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java +++ b/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.base.ISubsystem; * can be loaded into cert server kernel to perform * statistics collection. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/certsrv/util/StatsEvent.java b/base/common/src/com/netscape/certsrv/util/StatsEvent.java index eafd90d05..3ee6e0d30 100644 --- a/base/common/src/com/netscape/certsrv/util/StatsEvent.java +++ b/base/common/src/com/netscape/certsrv/util/StatsEvent.java @@ -23,7 +23,7 @@ import java.util.Vector; /** * A statistics transaction. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cms/authentication/AVAPattern.java b/base/common/src/com/netscape/cms/authentication/AVAPattern.java index 6a8bbcbf2..55c62eeb1 100644 --- a/base/common/src/com/netscape/cms/authentication/AVAPattern.java +++ b/base/common/src/com/netscape/cms/authentication/AVAPattern.java @@ -39,45 +39,45 @@ import com.netscape.certsrv.authentication.ECompSyntaxErr; * class for parsing a DN pattern used to construct a certificate * subject name from ldap attributes and dn. * <p> - * + * * dnpattern is a string representing a subject name pattern to formulate from the directory attributes and entry dn. If * empty or not set, the ldap entry DN will be used as the certificate subject name. * <p> - * + * * The syntax is - * + * * <pre> * dnPattern := rdnPattern *[ "," rdnPattern ] * rdnPattern := avaPattern *[ "+" avaPattern ] - * avaPattern := name "=" value | - * name "=" "$attr" "." attrName [ "." attrNumber ] | - * name "=" "$dn" "." attrName [ "." attrNumber ] | + * avaPattern := name "=" value | + * name "=" "$attr" "." attrName [ "." attrNumber ] | + * name "=" "$dn" "." attrName [ "." attrNumber ] | * "$dn" "." "$rdn" "." number * </pre> - * + * * <pre> * Example1: <i>E=$attr.mail.1, CN=$attr.cn, OU=$dn.ou.2, O=$dn.o, C=US </i> * Ldap entry: dn: UID=jjames, OU=IS, OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * E=jjames@acme.org, CN=Jesse James, OU=people, O=acme.org, C=US - * <p> + * <p> * E = the first 'mail' ldap attribute value in user's entry. <br> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> * OU = the second 'ou' value in the user's entry DN. <br> * O = the (first) 'o' value in the user's entry DN. <br> - * C = the string "US" + * C = the string "US" * <p> * Example2: <i>E=$attr.mail.1, CN=$attr.cn, OU=$dn.ou.2, O=$dn.o, C=US</i> * Ldap entry: dn: UID=jjames, OU=IS+OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * E=jjames@acme.org, CN=Jesse James, OU=people, O=acme.org, C=US - * <p> + * <p> * E = the first 'mail' ldap attribute value in user's entry. <br> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> * OU = the second 'ou' value in the user's entry DN. note multiple AVAs @@ -86,40 +86,40 @@ import com.netscape.certsrv.authentication.ECompSyntaxErr; * C = the string "US" * <p> * </pre> - * + * * <pre> * Example3: <i>CN=$attr.cn, $rdn.2, O=$dn.o, C=US</i> * Ldap entry: dn: UID=jjames, OU=IS+OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * CN=Jesse James, OU=IS+OU=people, O=acme.org, C=US - * <p> + * <p> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> * followed by the second RDN in the user's entry DN. <br> * O = the (first) 'o' value in the user's entry DN. <br> - * C = the string "US" + * C = the string "US" * <p> * Example4: <i>CN=$attr.cn, OU=$dn.ou.2+OU=$dn.ou.1, O=$dn.o, C=US</i> * Ldap entry: dn: UID=jjames, OU=IS+OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * CN=Jesse James, OU=people+OU=IS, O=acme.org, C=US - * <p> + * <p> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> - * OU = the second 'ou' value in the user's entry DN followed by the + * OU = the second 'ou' value in the user's entry DN followed by the * first 'ou' value in the user's entry. note multiple AVAs * in a RDN in this example. <br> * O = the (first) 'o' value in the user's entry DN. <br> * C = the string "US" * <p> * </pre> - * + * * If an attribute or subject DN component does not exist the attribute is skipped. - * + * * @version $Revision$, $Date$ */ class AVAPattern { @@ -184,7 +184,7 @@ class AVAPattern { if (c == -1) throw new ECompSyntaxErr(CMS.getUserMessage("CMS_AUTHENTICATION_COMPONENT_SYNTAX", "All blank")); - // $rdn "." number syntax. + // $rdn "." number syntax. if (c == '$') { //System.out.println("$rdn syntax"); @@ -228,9 +228,9 @@ class AVAPattern { return; } - // name "=" ... syntax. + // name "=" ... syntax. - // read name + // read name //System.out.println("reading name"); StringBuffer attrBuf = new StringBuffer(); @@ -250,10 +250,10 @@ class AVAPattern { throw new ECompSyntaxErr(CMS.getUserMessage("CMS_AUTHENTICATION_COMPONENT_SYNTAX", "Missing \"=\" in ava pattern")); - // read value + // read value //System.out.println("reading value"); - // skip spaces + // skip spaces //System.out.println("skip spaces for value"); try { while ((c = in.read()) == ' ' || c == '\t') {//System.out.println("spaces2 read "+(char)c); @@ -267,7 +267,7 @@ class AVAPattern { "no value after = in ava pattern")); if (c == '$') { - // check for $dn or $attr + // check for $dn or $attr try { c = in.read(); //System.out.println("check $dn or $attr read "+(char)c); @@ -306,7 +306,7 @@ class AVAPattern { "unknown keyword. expecting $dn or $attr.")); } - // get attr name of dn pattern from above. + // get attr name of dn pattern from above. String attrName = attrBuf.toString().trim(); //System.out.println("----- attrName "+attrName); @@ -333,7 +333,7 @@ class AVAPattern { valueBuf.append((char) c); } if (c == '+' || c == ',') // either ',' or '+' - in.unread(c); // pushback last , or + + in.unread(c); // pushback last , or + } catch (IOException e) { throw new EAuthException(CMS.getUserMessage("CMS_AUTHENTICATION_INTERNAL_ERROR", e.toString())); } @@ -375,7 +375,7 @@ class AVAPattern { // value is constant. treat as regular ava. mType = TYPE_CONSTANT; //System.out.println("----- mType constant"); - // parse ava value. + // parse ava value. StringBuffer valueBuf = new StringBuffer(); valueBuf.append((char) c); diff --git a/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java b/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java index 65ef434a9..03428102d 100644 --- a/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java @@ -52,7 +52,7 @@ import com.netscape.certsrv.usrgrp.IUser; * Maps a SSL client authenticate certificate to a user (agent) entry in the * internal database. * <P> - * + * * @version $Revision$, $Date$ */ public class AgentCertAuthentication implements IAuthManager, @@ -90,7 +90,7 @@ public class AgentCertAuthentication implements IAuthManager, * initializes the CertUserDBAuthentication 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. @@ -127,11 +127,11 @@ public class AgentCertAuthentication 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 EMissingCredential If a required credential for this * authentication manager is missing. * @exception EInvalidCredentials If credentials cannot be authenticated. @@ -207,7 +207,7 @@ public class AgentCertAuthentication implements IAuthManager, 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) { throw new EInvalidCredentials(CMS.getUserMessage("CMS_AUTHENTICATION_INVALID_CREDENTIAL")); @@ -248,7 +248,7 @@ public class AgentCertAuthentication 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() { @@ -261,7 +261,7 @@ public class AgentCertAuthentication 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 @@ -280,7 +280,7 @@ public class AgentCertAuthentication 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/cms/authentication/Crypt.java b/base/common/src/com/netscape/cms/authentication/Crypt.java index e6dd7087d..867181138 100644 --- a/base/common/src/com/netscape/cms/authentication/Crypt.java +++ b/base/common/src/com/netscape/cms/authentication/Crypt.java @@ -178,7 +178,7 @@ public class Crypt { /** * Create a Crypt object with specified salt. Use setPasswd() before * getEncryptedPasswd(). - * + * * @param salt the salt string for encryption */ public Crypt(String salt) { @@ -191,7 +191,7 @@ public class Crypt { * Create a Crypt object with specified passwd and salt (often the * already encypted passwd). Get the encrypted result with * getEncryptedPasswd(). - * + * * @param passwd the passwd to encrypt * @param salt the salt string for encryption */ @@ -203,7 +203,7 @@ public class Crypt { /** * Retrieve the passwd string currently being encrypted. - * + * * @return the current passwd string */ public String getPasswd() { @@ -212,7 +212,7 @@ public class Crypt { /** * Retrieve the salt string currently being used for encryption. - * + * * @return the current salt string */ public String getSalt() { @@ -222,7 +222,7 @@ public class Crypt { /** * Retrieve the resulting encrypted string from the current passwd and * salt settings. - * + * * @return the encrypted passwd */ public String getEncryptedPasswd() { @@ -232,7 +232,7 @@ public class Crypt { /** * Set a new passwd string for encryption. Use getEncryptedPasswd() to * retrieve the new result. - * + * * @param passwd the new passwd string */ public void setPasswd(String passwd) { @@ -243,7 +243,7 @@ public class Crypt { /** * Set a new salt string for encryption. Use getEncryptedPasswd() to * retrieve the new result. - * + * * @param salt the new salt string */ public void setSalt(String salt) { diff --git a/base/common/src/com/netscape/cms/authentication/DNPattern.java b/base/common/src/com/netscape/cms/authentication/DNPattern.java index 480b5b909..e44f40e9d 100644 --- a/base/common/src/com/netscape/cms/authentication/DNPattern.java +++ b/base/common/src/com/netscape/cms/authentication/DNPattern.java @@ -31,45 +31,45 @@ import com.netscape.certsrv.base.EBaseException; * class for parsing a DN pattern used to construct a certificate * subject name from ldap attributes and dn. * <p> - * + * * dnpattern is a string representing a subject name pattern to formulate from the directory attributes and entry dn. If * empty or not set, the ldap entry DN will be used as the certificate subject name. * <p> - * + * * The syntax is - * + * * <pre> * dnPattern := rdnPattern *[ "," rdnPattern ] * rdnPattern := avaPattern *[ "+" avaPattern ] - * avaPattern := name "=" value | - * name "=" "$attr" "." attrName [ "." attrNumber ] | - * name "=" "$dn" "." attrName [ "." attrNumber ] | + * avaPattern := name "=" value | + * name "=" "$attr" "." attrName [ "." attrNumber ] | + * name "=" "$dn" "." attrName [ "." attrNumber ] | * "$dn" "." "$rdn" "." number * </pre> - * + * * <pre> * Example1: <i>E=$attr.mail.1, CN=$attr.cn, OU=$dn.ou.2, O=$dn.o, C=US </i> * Ldap entry: dn: UID=jjames, OU=IS, OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * E=jjames@acme.org, CN=Jesse James, OU=people, O=acme.org, C=US - * <p> + * <p> * E = the first 'mail' ldap attribute value in user's entry. <br> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> * OU = the second 'ou' value in the user's entry DN. <br> * O = the (first) 'o' value in the user's entry DN. <br> - * C = the string "US" + * C = the string "US" * <p> * Example2: <i>E=$attr.mail.1, CN=$attr.cn, OU=$dn.ou.2, O=$dn.o, C=US</i> * Ldap entry: dn: UID=jjames, OU=IS+OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * E=jjames@acme.org, CN=Jesse James, OU=people, O=acme.org, C=US - * <p> + * <p> * E = the first 'mail' ldap attribute value in user's entry. <br> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> * OU = the second 'ou' value in the user's entry DN. note multiple AVAs @@ -78,40 +78,40 @@ import com.netscape.certsrv.base.EBaseException; * C = the string "US" * <p> * </pre> - * + * * <pre> * Example3: <i>CN=$attr.cn, $rdn.2, O=$dn.o, C=US</i> * Ldap entry: dn: UID=jjames, OU=IS+OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * CN=Jesse James, OU=IS+OU=people, O=acme.org, C=US - * <p> + * <p> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> * followed by the second RDN in the user's entry DN. <br> * O = the (first) 'o' value in the user's entry DN. <br> - * C = the string "US" + * C = the string "US" * <p> * Example4: <i>CN=$attr.cn, OU=$dn.ou.2+OU=$dn.ou.1, O=$dn.o, C=US</i> * Ldap entry: dn: UID=jjames, OU=IS+OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * CN=Jesse James, OU=people+OU=IS, O=acme.org, C=US - * <p> + * <p> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> - * OU = the second 'ou' value in the user's entry DN followed by the + * OU = the second 'ou' value in the user's entry DN followed by the * first 'ou' value in the user's entry. note multiple AVAs * in a RDN in this example. <br> * O = the (first) 'o' value in the user's entry DN. <br> * C = the string "US" * <p> * </pre> - * + * * If an attribute or subject DN component does not exist the attribute is skipped. - * + * * @version $Revision$, $Date$ */ public class DNPattern { @@ -129,14 +129,14 @@ public class DNPattern { /** * Construct a DN pattern by parsing a pattern string. - * + * * @param pattern the DN pattern * @exception EBaseException If parsing error occurs. */ public DNPattern(String pattern) throws EAuthException { if (pattern == null || pattern.equals("")) { - // create an attribute list that is the dn. + // create an attribute list that is the dn. mLdapAttrs = new String[] { "dn" }; } else { mPatternString = pattern; @@ -185,7 +185,7 @@ public class DNPattern { /** * Form a Ldap v3 DN string from results of a ldap search. - * + * * @param entry LDAPentry from a ldap search * @return Ldap v3 DN string to use for a subject name. */ diff --git a/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java b/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java index da8d5bd51..f52904718 100644 --- a/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java @@ -61,9 +61,9 @@ import com.netscape.cmsutil.util.Utils; * Uses a pattern for formulating subject names. * The pattern is read from configuration file. * Syntax of the pattern is described in the init() method. - * + * * <P> - * + * * @version $Revision$, $Date$ */ public abstract class DirBasedAuthentication @@ -78,7 +78,7 @@ public abstract class DirBasedAuthentication protected static final String PROP_LDAPSTRINGATTRS = "ldapStringAttributes"; protected static final String PROP_LDAPBYTEATTRS = "ldapByteAttributes"; - // members + // members /* name of this authentication manager instance */ protected String mName = null; @@ -104,11 +104,11 @@ public abstract class DirBasedAuthentication /* the subject DN pattern */ protected DNPattern mPattern = null; - /* the list of LDAP attributes with string values to retrieve to + /* the list of LDAP attributes with string values to retrieve to * save in the auth token including ones from the dn pattern. */ protected String[] mLdapStringAttrs = null; - /* the list of LDAP attributes with byte[] values to retrive to save + /* the list of LDAP attributes with byte[] values to retrive to save * in authtoken. */ protected String[] mLdapByteAttrs = null; @@ -160,14 +160,14 @@ public abstract class DirBasedAuthentication /** * Initializes the UidPwdDirBasedAuthentication auth manager. - * + * * Takes the following configuration parameters: <br> - * + * * <pre> * ldap.basedn - the ldap base dn. * ldap.ldapconn.host - the ldap host. - * ldap.ldapconn.port - the ldap port - * ldap.ldapconn.secureConn - whether port should be secure + * ldap.ldapconn.port - the ldap port + * ldap.ldapconn.secureConn - whether port should be secure * ldap.minConns - minimum connections * ldap.maxConns - max connections * dnpattern - dn pattern. @@ -177,33 +177,33 @@ public abstract class DirBasedAuthentication * attributes and entry dn. If empty or not set, the ldap entry DN will be used as the certificate subject name. * <p> * The syntax is - * + * * <pre> * dnpattern = SubjectNameComp *[ "," SubjectNameComp ] - * - * SubjectNameComponent = DnComp | EntryComp | ConstantComp + * + * SubjectNameComponent = DnComp | EntryComp | ConstantComp * DnComp = CertAttr "=" "$dn" "." DnAttr "." Num * EntryComp = CertAttr "=" "$attr" "." EntryAttr "." Num * ConstantComp = CertAttr "=" Constant * DnAttr = an attribute in the Ldap entry dn - * EntryAttr = an attribute in the Ldap entry + * EntryAttr = an attribute in the Ldap entry * CertAttr = a Component in the Certificate Subject Name - * (multiple AVA in one RDN not supported) + * (multiple AVA in one RDN not supported) * Num = the nth value of tha attribute in the dn or entry. * Constant = Constant String, with any accepted ldap string value. - * + * * </pre> * <p> * <b>Example:</b> - * + * * <pre> - * dnpattern: + * dnpattern: * E=$attr.mail.1, CN=$attr.cn, OU=$attr.ou.2, O=$dn.o, C=US * <br> - * Ldap entry dn: + * Ldap entry dn: * UID=joesmith, OU=people, O=Acme.com * <br> - * Ldap attributes: + * Ldap attributes: * cn: Joe Smith * sn: Smith * mail: joesmith@acme.com @@ -214,17 +214,17 @@ public abstract class DirBasedAuthentication * </pre> * <p> * The subject name formulated in the cert will be : <br> - * + * * <pre> * E=joesmith@acme.com, CN=Joe Smith, OU=Human Resources, O=Acme.com, C=US - * - * E = the first 'mail' ldap attribute value in user's entry - joesmithe@acme.com - * CN = the (first) 'cn' ldap attribute value in the user's entry - Joe Smith + * + * E = the first 'mail' ldap attribute value in user's entry - joesmithe@acme.com + * CN = the (first) 'cn' ldap attribute value in the user's entry - Joe Smith * OU = the second 'ou' value in the ldap entry - IS - * O = the (first) 'o' value in the user's entry DN - "Acme.com" + * O = the (first) 'o' value in the user's entry DN - "Acme.com" * C = the constant string "US" * </pre> - * + * * @param name The name for this authentication manager instance. * @param implName The name of the authentication manager plugin. * @param config - The configuration store for this instance. @@ -326,7 +326,7 @@ public abstract class DirBasedAuthentication * Authenticates user through LDAP by a set of credentials. * Resulting AuthToken a TOKEN_CERTINFO field of a X509CertInfo * <p> - * + * * @param authCred Authentication credentials, CRED_UID and CRED_PWD. * @return A AuthToken with a TOKEN_SUBJECT of X500name type. * @exception com.netscape.certsrv.authentication.EMissingCredential @@ -374,14 +374,14 @@ public abstract class DirBasedAuthentication } catch (IOException e) { } - // set validity if any + // set validity if any try { CertificateValidity validity = (CertificateValidity) certInfo.get(X509CertInfo.VALIDITY); if (validity != null) { - // the gets throws IOException but only if attribute - // not recognized. In these cases they are always. + // the gets throws IOException but only if attribute + // not recognized. In these cases they are always. authToken.set(AuthToken.TOKEN_CERT_NOTBEFORE, (Date) validity.get(CertificateValidity.NOT_BEFORE)); authToken.set(AuthToken.TOKEN_CERT_NOTAFTER, @@ -414,7 +414,7 @@ public abstract class DirBasedAuthentication /** * get the list of required credentials. - * + * * @return list of required credentials as strings. */ public abstract String[] getRequiredCreds(); @@ -423,7 +423,7 @@ public abstract class DirBasedAuthentication * 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 abstract String[] getConfigParams(); @@ -445,7 +445,7 @@ public abstract class DirBasedAuthentication /** * Gets the configuration substore used by this authentication manager - * + * * @return configuration store */ public IConfigStore getConfigStore() { @@ -454,7 +454,7 @@ public abstract class DirBasedAuthentication /** * Authenticates a user through directory based a set of credentials. - * + * * @param authCreds The authentication credentials. * @return The user's ldap entry dn. * @exception EInvalidCredentials If the uid and password are not valid @@ -466,7 +466,7 @@ public abstract class DirBasedAuthentication /** * Formulate the cert info. - * + * * @param conn A LDAP Connection authenticated to user to use. * @param userdn The user's dn. * @param certinfo A certinfo object to fill. @@ -482,7 +482,7 @@ public abstract class DirBasedAuthentication // get ldap attributes to retrieve. String[] attrs = getLdapAttrs(); - // retrieve the attributes. + // retrieve the attributes. try { if (conn != null) { LDAPEntry entry = null; @@ -496,7 +496,7 @@ public abstract class DirBasedAuthentication } entry = results.next(); - // formulate the subject dn + // formulate the subject dn try { dn = formSubjectName(entry); } catch (EBaseException e) { @@ -510,7 +510,7 @@ public abstract class DirBasedAuthentication } // add anything else in cert info such as validity, extensions - // (nothing now) + // (nothing now) // pack the dn into X500name and set subject name. if (dn.length() == 0) { @@ -610,7 +610,7 @@ public abstract class DirBasedAuthentication /** * Return a list of LDAP attributes with String values to retrieve. * Subclasses can override to return any set of attributes. - * + * * @return Array of LDAP attributes to retrieve from the directory. */ protected String[] getLdapAttrs() { @@ -620,7 +620,7 @@ public abstract class DirBasedAuthentication /** * Return a list of LDAP attributes with byte[] values to retrieve. * Subclasses can override to return any set of attributes. - * + * * @return Array of LDAP attributes to retrieve from the directory. */ protected String[] getLdapByteAttrs() { @@ -629,7 +629,7 @@ public abstract class DirBasedAuthentication /** * Formulate the subject name - * + * * @param entry The LDAP entry * @return The subject name string. * @exception EBaseException If an internal error occurs. @@ -654,7 +654,7 @@ public abstract class DirBasedAuthentication /** * Logs a message for this class in the system log file. - * + * * @param level The log level. * @param msg The message to log. * @see com.netscape.certsrv.logging.ILogger diff --git a/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java b/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java index f60110b0b..2394ede4c 100644 --- a/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java +++ b/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java @@ -51,7 +51,7 @@ import com.netscape.certsrv.request.IRequest; /** * This represents the authentication manager that authenticates * user against a file where id, and password are stored. - * + * * @version $Revision$, $Date$ */ public class FlatFileAuth @@ -110,7 +110,7 @@ public class FlatFileAuth /** * This array is created as to include all the requested attributes - * + * */ String[] reqCreds = null; @@ -127,7 +127,7 @@ public class FlatFileAuth * Get the named property * If the property is not set, use s as the default, and create * a new value for the property in the config file. - * + * * @param propertyName Property name * @param s The default value of the property */ @@ -152,7 +152,7 @@ public class FlatFileAuth * Get the named property, * If the property is not set, use b as the default, and create * a new value for the property in the config file. - * + * * @param propertyName Property name * @param b The default value of the property */ @@ -220,7 +220,7 @@ public class FlatFileAuth /** * Log a message. - * + * * @param level The logging level. * @param msg The message to log. */ @@ -398,7 +398,7 @@ public class FlatFileAuth /** * Read a file with the following format: * <p> - * + * * <pre> * param1: valuea * param2: valueb @@ -406,7 +406,7 @@ public class FlatFileAuth * param1: valuec * param2: valued * </pre> - * + * * @param f The file to read * @param keys The parameters to concat together to form the hash * key @@ -506,7 +506,7 @@ public class FlatFileAuth /** * Compare attributes provided by the user with those in * in flat file. - * + * */ private IAuthToken doAuthentication(Hashtable<String, String> user, IAuthCredentials authCred) @@ -543,7 +543,7 @@ public class FlatFileAuth /** * Authenticate the request - * + * */ public IAuthToken authenticate(IAuthCredentials authCred) throws EMissingCredential, EInvalidCredentials, EBaseException { @@ -586,7 +586,7 @@ public class FlatFileAuth } } - // if a dn was specified in the password file for this user, + // if a dn was specified in the password file for this user, // replace the requested dn with the one in the pwfile if (user != null) { String dn = (String) user.get("dn"); @@ -610,7 +610,7 @@ public class FlatFileAuth /** * Return a list of HTTP parameters which will be taken from the * request posting and placed into the AuthCredentials block - * + * * Note that this method will not be called until after the * init() method is called */ diff --git a/base/common/src/com/netscape/cms/authentication/HashAuthData.java b/base/common/src/com/netscape/cms/authentication/HashAuthData.java index 3a447d282..0635c445a 100644 --- a/base/common/src/com/netscape/cms/authentication/HashAuthData.java +++ b/base/common/src/com/netscape/cms/authentication/HashAuthData.java @@ -26,7 +26,7 @@ import java.util.Vector; * the agent-initiated user enrollment, and whom agents enable this feature, * and the value of the timeout. * <P> - * + * * @version $Revision$, $Date$ */ public class HashAuthData extends Hashtable<String, Vector<Object>> { diff --git a/base/common/src/com/netscape/cms/authentication/HashAuthentication.java b/base/common/src/com/netscape/cms/authentication/HashAuthentication.java index 2537efa10..b9808e639 100644 --- a/base/common/src/com/netscape/cms/authentication/HashAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/HashAuthentication.java @@ -42,7 +42,7 @@ import com.netscape.cmsutil.util.Utils; /** * Hash uid/pwd directory based authentication manager * <P> - * + * * @version $Revision$, $Date$ */ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo { @@ -210,7 +210,7 @@ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo { /** * Authenticates a user based on uid, pwd in the directory. - * + * * @param authCreds The authentication credentials. * @return The user's ldap entry dn. * @exception EInvalidCredentials If the uid and password are not valid @@ -238,7 +238,7 @@ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo { /** * Returns array of required credentials for this authentication manager. - * + * * @return Array of required credentials. */ public String[] getRequiredCreds() { @@ -247,7 +247,7 @@ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo { /** * Gets the configuration substore used by this authentication manager - * + * * @return configuration store */ public IConfigStore getConfigStore() { @@ -279,7 +279,7 @@ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo { * 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() { diff --git a/base/common/src/com/netscape/cms/authentication/PortalEnroll.java b/base/common/src/com/netscape/cms/authentication/PortalEnroll.java index 38a3e6fcf..2e5b9d394 100644 --- a/base/common/src/com/netscape/cms/authentication/PortalEnroll.java +++ b/base/common/src/com/netscape/cms/authentication/PortalEnroll.java @@ -51,7 +51,7 @@ import com.netscape.certsrv.logging.ILogger; /** * uid/pwd directory based authentication manager * <P> - * + * * @version $Revision$, $Date$ */ public class PortalEnroll extends DirBasedAuthentication { @@ -125,7 +125,7 @@ public class PortalEnroll extends DirBasedAuthentication { /** * Initializes the PortalEnrollment auth manager. * <p> - * + * * @param name - The name for this authentication manager instance. * @param implName - The name of the authentication manager plugin. * @param config - The configuration store for this instance. @@ -161,7 +161,7 @@ public class PortalEnroll extends DirBasedAuthentication { /** * Authenticates a user based on uid, pwd in the directory. - * + * * @param authCreds The authentication credentials. * @return The user's ldap entry dn. * @exception EInvalidCredentials If the uid and password are not valid @@ -259,7 +259,7 @@ public class PortalEnroll extends DirBasedAuthentication { * 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() { @@ -306,7 +306,7 @@ public class PortalEnroll extends DirBasedAuthentication { /** * Returns array of required credentials for this authentication manager. - * + * * @return Array of required credentials. */ public String[] getRequiredCreds() { @@ -315,7 +315,7 @@ public class PortalEnroll extends DirBasedAuthentication { /** * adds a user to the directory. - * + * * @return dn upon success and null upon failure. * @param token authentication token * @param uid the user's id. diff --git a/base/common/src/com/netscape/cms/authentication/RDNPattern.java b/base/common/src/com/netscape/cms/authentication/RDNPattern.java index 722aefbc3..35e3eb59a 100644 --- a/base/common/src/com/netscape/cms/authentication/RDNPattern.java +++ b/base/common/src/com/netscape/cms/authentication/RDNPattern.java @@ -32,45 +32,45 @@ import com.netscape.certsrv.base.EBaseException; * class for parsing a DN pattern used to construct a certificate * subject name from ldap attributes and dn. * <p> - * + * * dnpattern is a string representing a subject name pattern to formulate from the directory attributes and entry dn. If * empty or not set, the ldap entry DN will be used as the certificate subject name. * <p> - * + * * The syntax is - * + * * <pre> * dnPattern := rdnPattern *[ "," rdnPattern ] * rdnPattern := avaPattern *[ "+" avaPattern ] - * avaPattern := name "=" value | - * name "=" "$attr" "." attrName [ "." attrNumber ] | - * name "=" "$dn" "." attrName [ "." attrNumber ] | + * avaPattern := name "=" value | + * name "=" "$attr" "." attrName [ "." attrNumber ] | + * name "=" "$dn" "." attrName [ "." attrNumber ] | * "$dn" "." "$rdn" "." number * </pre> - * + * * <pre> * Example1: <i>E=$attr.mail.1, CN=$attr.cn, OU=$dn.ou.2, O=$dn.o, C=US </i> * Ldap entry: dn: UID=jjames, OU=IS, OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * E=jjames@acme.org, CN=Jesse James, OU=people, O=acme.org, C=US - * <p> + * <p> * E = the first 'mail' ldap attribute value in user's entry. <br> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> * OU = the second 'ou' value in the user's entry DN. <br> * O = the (first) 'o' value in the user's entry DN. <br> - * C = the string "US" + * C = the string "US" * <p> * Example2: <i>E=$attr.mail.1, CN=$attr.cn, OU=$dn.ou.2, O=$dn.o, C=US</i> * Ldap entry: dn: UID=jjames, OU=IS+OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * E=jjames@acme.org, CN=Jesse James, OU=people, O=acme.org, C=US - * <p> + * <p> * E = the first 'mail' ldap attribute value in user's entry. <br> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> * OU = the second 'ou' value in the user's entry DN. note multiple AVAs @@ -79,40 +79,40 @@ import com.netscape.certsrv.base.EBaseException; * C = the string "US" * <p> * </pre> - * + * * <pre> * Example3: <i>CN=$attr.cn, $rdn.2, O=$dn.o, C=US</i> * Ldap entry: dn: UID=jjames, OU=IS+OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * CN=Jesse James, OU=IS+OU=people, O=acme.org, C=US - * <p> + * <p> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> * followed by the second RDN in the user's entry DN. <br> * O = the (first) 'o' value in the user's entry DN. <br> - * C = the string "US" + * C = the string "US" * <p> * Example4: <i>CN=$attr.cn, OU=$dn.ou.2+OU=$dn.ou.1, O=$dn.o, C=US</i> * Ldap entry: dn: UID=jjames, OU=IS+OU=people, O=acme.org - * Ldap attributes: cn: Jesse James + * Ldap attributes: cn: Jesse James * Ldap attributes: mail: jjames@acme.org * <p> * The subject name formulated will be : <br> * CN=Jesse James, OU=people+OU=IS, O=acme.org, C=US - * <p> + * <p> * CN = the (first) 'cn' ldap attribute value in the user's entry. <br> - * OU = the second 'ou' value in the user's entry DN followed by the + * OU = the second 'ou' value in the user's entry DN followed by the * first 'ou' value in the user's entry. note multiple AVAs * in a RDN in this example. <br> * O = the (first) 'o' value in the user's entry DN. <br> * C = the string "US" * <p> * </pre> - * + * * If an attribute or subject DN component does not exist the attribute is skipped. - * + * * @version $Revision$, $Date$ */ class RDNPattern { @@ -130,14 +130,14 @@ class RDNPattern { /** * Construct a DN pattern by parsing a pattern string. - * + * * @param pattenr the DN pattern * @exception EBaseException If parsing error occurs. */ public RDNPattern(String pattern) throws EAuthException { if (pattern == null || pattern.equals("")) { - // create an attribute list that is the dn. + // create an attribute list that is the dn. mLdapAttrs = new String[] { "dn" }; } else { mPatternString = pattern; @@ -179,7 +179,7 @@ class RDNPattern { if (lastChar != -1) { try { - in.unread(lastChar); // pushback last , + in.unread(lastChar); // pushback last , } catch (IOException e) { throw new EAuthException(CMS.getUserMessage("CMS_AUTHENTICATION_INTERNAL_ERROR", e.toString())); } @@ -203,7 +203,7 @@ class RDNPattern { /** * Form a Ldap v3 DN string from results of a ldap search. - * + * * @param entry LDAPentry from a ldap search * @return Ldap v3 DN string to use for a subject name. */ diff --git a/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java b/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java index 35c23bd0f..dbae4a1ca 100644 --- a/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java @@ -48,10 +48,10 @@ import com.netscape.certsrv.usrgrp.Certificates; /** * Certificate server SSL client authentication. - * + * * @author Christina Fu * <P> - * + * */ public class SSLclientCertAuthentication implements IAuthManager, IProfileAuthenticator { @@ -85,7 +85,7 @@ public class SSLclientCertAuthentication implements IAuthManager, * initializes the SSLClientCertAuthentication 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. @@ -119,11 +119,11 @@ public class SSLclientCertAuthentication implements IAuthManager, * authenticates user by certificate * <p> * called by other subsystems or their servlets to authenticate users - * + * * @param authCred - authentication credential that contains * an usrgrp.Certificates of the user (agent) * @return the authentication token that contains the following - * + * * @exception EMissingCredential If a required credential for this * authentication manager is missing. * @exception EInvalidCredentials If credentials cannot be authenticated. @@ -270,7 +270,7 @@ public class SSLclientCertAuthentication 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() { @@ -283,7 +283,7 @@ public class SSLclientCertAuthentication 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 @@ -302,7 +302,7 @@ public class SSLclientCertAuthentication 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/cms/authentication/TokenAuthentication.java b/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java index f8e0669e9..10cb94299 100644 --- a/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java @@ -49,7 +49,7 @@ import com.netscape.cmsutil.xml.XMLObject; * Token authentication. * Checked if the given token is valid. * <P> - * + * * @version $Revision$, $Date$ */ public class TokenAuthentication implements IAuthManager, @@ -80,7 +80,7 @@ public class TokenAuthentication implements IAuthManager, * initializes the TokenAuthentication 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. @@ -116,7 +116,7 @@ public class TokenAuthentication 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 @@ -217,7 +217,7 @@ public class TokenAuthentication 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() { @@ -230,7 +230,7 @@ public class TokenAuthentication 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 @@ -249,7 +249,7 @@ public class TokenAuthentication 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/cms/authentication/UdnPwdDirAuthentication.java b/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java index c9fbbf9ac..2f9fc43bd 100644 --- a/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.logging.ILogger; /** * udn/pwd directory based authentication manager * <P> - * + * * @version $Revision$, $Date$ */ public class UdnPwdDirAuthentication extends DirBasedAuthentication { @@ -81,7 +81,7 @@ public class UdnPwdDirAuthentication extends DirBasedAuthentication { /** * Initializes the UdnPwdDirAuthentication auth manager. * <p> - * + * * @param name - The name for this authentication manager instance. * @param implName - The name of the authentication manager plugin. * @param config - The configuration store for this instance. @@ -94,7 +94,7 @@ public class UdnPwdDirAuthentication extends DirBasedAuthentication { /** * Authenticates a user based on udn, pwd in the directory. - * + * * @param authCreds The authentication credentials. * @return The user's ldap entry dn. * @exception EInvalidCredentials If the udn and password are not valid @@ -170,7 +170,7 @@ public class UdnPwdDirAuthentication extends DirBasedAuthentication { * 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() { @@ -179,7 +179,7 @@ public class UdnPwdDirAuthentication extends DirBasedAuthentication { /** * Returns array of required credentials for this authentication manager. - * + * * @return Array of required credentials. */ public String[] getRequiredCreds() { diff --git a/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java b/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java index d4a9de108..ffa8ea42f 100644 --- a/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java @@ -49,7 +49,7 @@ import com.netscape.certsrv.request.IRequest; /** * uid/pwd directory based authentication manager * <P> - * + * * @version $Revision$, $Date$ */ public class UidPwdDirAuthentication extends DirBasedAuthentication @@ -96,7 +96,7 @@ public class UidPwdDirAuthentication extends DirBasedAuthentication /** * Authenticates a user based on uid, pwd in the directory. - * + * * @param authCreds The authentication credentials. * @return The user's ldap entry dn. * @exception EInvalidCredentials If the uid and password are not valid @@ -185,7 +185,7 @@ public class UidPwdDirAuthentication extends DirBasedAuthentication * 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() { @@ -194,7 +194,7 @@ public class UidPwdDirAuthentication extends DirBasedAuthentication /** * Returns array of required credentials for this authentication manager. - * + * * @return Array of required credentials. */ public String[] getRequiredCreds() { diff --git a/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java b/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java index 880b7c767..65cf75651 100644 --- a/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java @@ -55,7 +55,7 @@ import com.netscape.certsrv.request.IRequest; /** * uid/pwd/pin directory based authentication manager * <P> - * + * * @version $Revision$, $Date$ */ public class UidPwdPinDirAuthentication extends DirBasedAuthentication @@ -179,7 +179,7 @@ public class UidPwdPinDirAuthentication extends DirBasedAuthentication /** * Authenticates a user based on its uid, pwd, pin in the directory. - * + * * @param authCreds The authentication credentials with uid, pwd, pin. * @return The user's ldap entry dn. * @exception EInvalidCredentials If the uid and password are not valid @@ -242,7 +242,7 @@ public class UidPwdPinDirAuthentication extends DirBasedAuthentication log(ILogger.LL_SECURITY, CMS.getLogMessage("CMS_AUTH_AUTHENTICATED", uid)); // log(ILogger.LL_SECURITY, "found user : " + userdn); - // check pin. + // check pin. checkpin(conn, userdn, uid, pin); // set uid in the token. @@ -376,7 +376,7 @@ public class UidPwdPinDirAuthentication extends DirBasedAuthentication * 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() { @@ -385,7 +385,7 @@ public class UidPwdPinDirAuthentication extends DirBasedAuthentication /** * Returns array of required credentials for this authentication manager. - * + * * @return Array of required credentials. */ public String[] getRequiredCreds() { diff --git a/base/common/src/com/netscape/cms/authorization/AAclAuthz.java b/base/common/src/com/netscape/cms/authorization/AAclAuthz.java index 570fe3a88..2e6636f27 100644 --- a/base/common/src/com/netscape/cms/authorization/AAclAuthz.java +++ b/base/common/src/com/netscape/cms/authorization/AAclAuthz.java @@ -45,19 +45,19 @@ import com.netscape.cmsutil.util.Utils; * actions. * <P> * Here is a sample resourceACLS for a resource - * + * * <PRE> * certServer.UsrGrpAdminServlet: * execute: * deny (execute) user="tempAdmin"; * allow (execute) group="Administrators"; * </PRE> - * + * * To perform permission checking, code call authz mgr authorize() method to verify access. See AuthzMgr for calling * example. * <P> * default "evaluators" are used to evaluate the "group=.." or "user=.." rules. See evaluator for more info - * + * * @version $Revision$, $Date$ * @see <A HREF="http://developer.netscape.com/library/documentation/enterprise/admnunix/aclfiles.htm">ACL Files</A> */ @@ -122,7 +122,7 @@ public abstract class AAclAuthz { type + "." + PROP_CLASS)); } - // instantiate evaluator + // instantiate evaluator try { evaluator = (IAccessEvaluator) Class.forName(evalClassPath).newInstance(); @@ -152,7 +152,7 @@ public abstract class AAclAuthz { * <resource ID>:right-1[,right-n]:[allow,deny](right(s))<evaluatorType>=<value>:<comment for this resource acl * <P> * Example: resTurnKnob:left,right:allow(left) group="lefties":door knobs for lefties - * + * * @param resACLs same format as the resourceACLs attribute * @throws EBaseException parsing error from <code>parseACL</code> */ @@ -200,7 +200,7 @@ public abstract class AAclAuthz { * 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() { @@ -244,7 +244,7 @@ public abstract class AAclAuthz { * <p> * If there are multiple aci's for a resource, ALL aci's will be checked, and only if all passed permission checks, * will the eventual access be granted. - * + * * @param name resource name * @param perm permission requested * @exception EACLsException access permission denied @@ -301,7 +301,7 @@ public abstract class AAclAuthz { * negative ("deny") aclEntries are treated differently than positive ("allow") statements. If a negative aclEntries * fails the acl check, the permission check will return "false" right away; while in the case of a positive * aclEntry, if the the aclEntry fails the acl check, the next aclEntry will be evaluated. - * + * * @param name resource name * @param perm permission requested * @return true if access allowed @@ -463,7 +463,7 @@ public abstract class AAclAuthz { * <p> * If there are multiple aci's for a resource, ALL aci's will be checked, and only if all passed permission checks, * will the eventual access be granted. - * + * * @param authToken authentication token gotten from authentication * @param name resource name * @param perm permission requested @@ -768,7 +768,7 @@ public abstract class AAclAuthz { /** * gets an enumeration of resources - * + * * @return an enumeration of resources contained in the ACL table */ public Enumeration<ACL> aclResElements() { @@ -777,7 +777,7 @@ public abstract class AAclAuthz { /** * gets an enumeration of access evaluators - * + * * @return an enumeraton of access evaluators */ public Enumeration<IAccessEvaluator> aclEvaluatorElements() { @@ -786,7 +786,7 @@ public abstract class AAclAuthz { /** * gets the access evaluators - * + * * @return handle to the access evaluators table */ public Hashtable<String, IAccessEvaluator> getAccessEvaluators() { @@ -795,7 +795,7 @@ public abstract class AAclAuthz { /** * is this resource name unique - * + * * @return true if unique; false otherwise */ public boolean isTypeUnique(String type) { @@ -828,7 +828,7 @@ public abstract class AAclAuthz { * an abstract class that enforces implementation of the * authorize() method that will authorize an operation on a * particular resource - * + * * @param authToken the authToken associated with a user * @param resource - the protected resource name * @param operation - the protected resource operation name diff --git a/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java b/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java index f6b1b6713..dae24678d 100644 --- a/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java +++ b/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.logging.ILogger; /** * A class for basic acls authorization manager - * + * * @version $Revision$, $Date$ */ public class BasicAclAuthz extends AAclAuthz @@ -112,7 +112,7 @@ public class BasicAclAuthz extends AAclAuthz * Example: * <p> * For example, if UsrGrpAdminServlet needs to authorize the caller it would do be done in the following fashion: - * + * * <PRE> * try { * authzTok = mAuthz.authorize("DirACLBasedAuthz", authToken, RES_GROUP, "read"); @@ -120,7 +120,7 @@ public class BasicAclAuthz extends AAclAuthz * log(ILogger.LL_FAILURE, "authorize call: " + e.toString()); * } * </PRE> - * + * * @param authToken the authToken associated with a user * @param resource - the protected resource name * @param operation - the protected resource operation name @@ -143,7 +143,7 @@ public class BasicAclAuthz extends AAclAuthz authzToken.set(AuthzToken.TOKEN_AUTHZ_STATUS, AuthzToken.AUTHZ_STATUS_SUCCESS); } catch (EACLsException e) { - // audit here later + // audit here later log(ILogger.LL_FAILURE, CMS.getLogMessage("AUTHZ_EVALUATOR_AUTHORIZATION_FAILED")); String params[] = { resource, operation }; @@ -165,7 +165,7 @@ public class BasicAclAuthz extends AAclAuthz /** * This currently does not flush to permanent storage - * + * * @param id is the resource id * @param strACLs */ @@ -203,7 +203,7 @@ public class BasicAclAuthz extends AAclAuthz /** * Logs a message for this class in the system log file. - * + * * @param level The log level. * @param msg The message to log. * @see com.netscape.certsrv.logging.ILogger diff --git a/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java b/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java index acc3ffbb7..040ff5297 100644 --- a/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java +++ b/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java @@ -46,7 +46,7 @@ import com.netscape.certsrv.logging.ILogger; /** * A class for ldap acls based authorization manager * The ldap server used for acls is the cms internal ldap db. - * + * * @version $Revision$, $Date$ */ public class DirAclAuthz extends AAclAuthz @@ -203,7 +203,7 @@ public class DirAclAuthz extends AAclAuthz * Example: * <p> * For example, if UsrGrpAdminServlet needs to authorize the caller it would do be done in the following fashion: - * + * * <PRE> * try { * authzTok = mAuthz.authorize("DirAclAuthz", authToken, RES_GROUP, "read"); @@ -211,7 +211,7 @@ public class DirAclAuthz extends AAclAuthz * log(ILogger.LL_FAILURE, "authorize call: " + e.toString()); * } * </PRE> - * + * * @param authToken the authToken associated with a user * @param resource - the protected resource name * @param operation - the protected resource operation name @@ -230,7 +230,7 @@ public class DirAclAuthz extends AAclAuthz authzToken.set(AuthzToken.TOKEN_AUTHZ_STATUS, AuthzToken.AUTHZ_STATUS_SUCCESS); CMS.debug("DirAclAuthz: authorization passed"); } catch (EACLsException e) { - // audit here later + // audit here later log(ILogger.LL_FAILURE, CMS.getLogMessage("AUTHZ_EVALUATOR_AUTHORIZATION_FAILED")); String params[] = { resource, operation }; @@ -256,7 +256,7 @@ public class DirAclAuthz extends AAclAuthz * Currently, it is possible that when the memory is updated successfully, and the ldap isn't, the memory upates * lingers. The result is that the changes will only be done on ldap at the next update, or when the system shuts * down, another flush will be attempted. - * + * * @param id is the resource id * @param rights The allowable rights for this resource * @param strACLs has the same format as a resourceACLs entry acis @@ -352,7 +352,7 @@ public class DirAclAuthz extends AAclAuthz /** * Logs a message for this class in the system log file. - * + * * @param level The log level. * @param msg The message to log. * @see com.netscape.certsrv.logging.ILogger diff --git a/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java b/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java index d4cef0148..8a8de4174 100644 --- a/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a Authority Information Access CRL extension. - * + * * @version $Revision$, $Date$ */ public class CMSAuthInfoAccessExtension diff --git a/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java b/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java index 26c8c1d0e..3f5ea2399 100644 --- a/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents an authority key identifier extension. - * + * * @version $Revision$, $Date$ */ public class CMSAuthorityKeyIdentifierExtension diff --git a/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java b/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java index e7f4e7b3f..4e51b5c9b 100644 --- a/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a CRL number extension. - * + * * @version $Revision$, $Date$ */ public class CMSCRLNumberExtension diff --git a/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java b/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java index 6ed993d54..02bd40927 100644 --- a/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a CRL reason extension. - * + * * @version $Revision$, $Date$ */ public class CMSCRLReasonExtension diff --git a/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java b/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java index b0bf20856..84181a8dd 100644 --- a/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a certificate issuer extension. - * + * * @version $Revision$, $Date$ */ public class CMSCertificateIssuerExtension diff --git a/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java b/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java index 8672502ab..e3e8d2311 100644 --- a/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a delta CRL indicator extension. - * + * * @version $Revision$, $Date$ */ public class CMSDeltaCRLIndicatorExtension diff --git a/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java b/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java index 72dbe5502..50031c61a 100644 --- a/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java @@ -40,7 +40,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a freshest CRL extension. - * + * * @version $Revision$, $Date$ */ public class CMSFreshestCRLExtension diff --git a/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java b/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java index 4023e3b2f..b7945c0b6 100644 --- a/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java @@ -36,7 +36,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a hold instruction extension. - * + * * @version $Revision$, $Date$ */ public class CMSHoldInstructionExtension @@ -116,7 +116,7 @@ public class CMSHoldInstructionExtension } if (instruction != null) { if (!(instruction.equalsIgnoreCase(PROP_INSTR_NONE) || - instruction.equalsIgnoreCase(PROP_INSTR_CALLISSUER) || + instruction.equalsIgnoreCase(PROP_INSTR_CALLISSUER) || instruction.equalsIgnoreCase(PROP_INSTR_REJECT))) { instruction = PROP_INSTR_NONE; } diff --git a/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java b/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java index 083873c31..6ff61fb44 100644 --- a/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a invalidity date extension. - * + * * @version $Revision$, $Date$ */ public class CMSInvalidityDateExtension diff --git a/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java b/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java index 64252a0b9..fb2a6e0d5 100644 --- a/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java @@ -48,7 +48,7 @@ import com.netscape.cmsutil.util.Utils; /** * This represents a issuer alternative name extension. - * + * * @version $Revision$, $Date$ */ public class CMSIssuerAlternativeNameExtension diff --git a/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java b/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java index 4253584ce..02cc129c4 100644 --- a/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a issuing distribution point extension. - * + * * @version $Revision$, $Date$ */ public class CMSIssuingDistributionPointExtension diff --git a/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java b/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java index 530ca9447..e8a32d752 100644 --- a/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java +++ b/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java @@ -30,7 +30,7 @@ import com.netscape.cmsutil.util.Utils; /** * A class represents a group acls evaluator. * <P> - * + * * @version $Revision$, $Date$ */ public class GroupAccessEvaluator implements IAccessEvaluator { @@ -60,7 +60,7 @@ public class GroupAccessEvaluator implements IAccessEvaluator { /** * gets the type name for this acl evaluator - * + * * @return type for this acl evaluator: "group" or "at_group" */ public String getType() { @@ -69,7 +69,7 @@ public class GroupAccessEvaluator implements IAccessEvaluator { /** * gets the description for this acl evaluator - * + * * @return description for this acl evaluator */ public String getDescription() { @@ -87,7 +87,7 @@ public class GroupAccessEvaluator implements IAccessEvaluator { /** * evaluates uid in AuthToken to see if it has membership in * group value - * + * * @param authToken authentication token * @param type must be "at_group" * @param op must be "=" @@ -145,7 +145,7 @@ public class GroupAccessEvaluator implements IAccessEvaluator { /** * evaluates uid in SessionContext to see if it has membership in * group value - * + * * @param type must be "group" * @param op must be "=" * @param value the group name diff --git a/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java b/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java index 17d383688..fe784f3a9 100644 --- a/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java +++ b/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java @@ -27,7 +27,7 @@ import com.netscape.cmsutil.util.Utils; /** * A class represents a IP address acls evaluator. * <P> - * + * * @version $Revision$, $Date$ */ public class IPAddressAccessEvaluator implements IAccessEvaluator { @@ -49,7 +49,7 @@ public class IPAddressAccessEvaluator implements IAccessEvaluator { /** * gets the type name for this acl evaluator - * + * * @return type for this acl evaluator: ipaddress */ public String getType() { @@ -58,7 +58,7 @@ public class IPAddressAccessEvaluator implements IAccessEvaluator { /** * gets the description for this acl evaluator - * + * * @return description for this acl evaluator */ public String getDescription() { @@ -75,7 +75,7 @@ public class IPAddressAccessEvaluator implements IAccessEvaluator { /** * Gets the IP address from session context - * + * * @param authToken authentication token * @param type must be "ipaddress" * @param op must be "=" or "!=" @@ -89,7 +89,7 @@ public class IPAddressAccessEvaluator implements IAccessEvaluator { /** * evaluates uid in SessionContext to see if it has membership in * group value - * + * * @param type must be "group" * @param op must be "=" * @param value the group name diff --git a/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java b/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java index bf7727c92..c343b110a 100644 --- a/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java +++ b/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java @@ -28,7 +28,7 @@ import com.netscape.cmsutil.util.Utils; /** * A class represents a user acls evaluator. * <P> - * + * * @version $Revision$, $Date$ */ public class UserAccessEvaluator implements IAccessEvaluator { @@ -54,7 +54,7 @@ public class UserAccessEvaluator implements IAccessEvaluator { /** * gets the type name for this acl evaluator - * + * * @return type for this acl evaluator: "user" or "at_user" */ public String getType() { @@ -63,7 +63,7 @@ public class UserAccessEvaluator implements IAccessEvaluator { /** * gets the description for this acl evaluator - * + * * @return description for this acl evaluator */ public String getDescription() { @@ -80,7 +80,7 @@ public class UserAccessEvaluator implements IAccessEvaluator { /** * Evaluates the user in AuthToken to see if it's equal to value - * + * * @param authToken AuthToken from authentication * @param type must be "at_user" * @param op must be "=" @@ -116,7 +116,7 @@ public class UserAccessEvaluator implements IAccessEvaluator { /** * Evaluates the user in session context to see if it's equal to value - * + * * @param type must be "user" * @param op must be "=" * @param value the user id diff --git a/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java b/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java index 442828e75..d3f004619 100644 --- a/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java +++ b/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java @@ -31,7 +31,7 @@ import com.netscape.cmsutil.util.Utils; * uid is placed in the SessionContext of the renewal session context * to be evaluated by this evaluator * <P> - * + * * @author Christina Fu * @version $Revision$, $Date$ */ @@ -58,7 +58,7 @@ public class UserOrigReqAccessEvaluator implements IAccessEvaluator { /** * gets the type name for this acl evaluator - * + * * @return type for this acl evaluator: "user_origreq" or "at_user_origreq" */ public String getType() { @@ -67,7 +67,7 @@ public class UserOrigReqAccessEvaluator implements IAccessEvaluator { /** * gets the description for this acl evaluator - * + * * @return description for this acl evaluator */ public String getDescription() { @@ -84,7 +84,7 @@ public class UserOrigReqAccessEvaluator implements IAccessEvaluator { /** * Evaluates the user in AuthToken to see if it's equal to value - * + * * @param authToken AuthToken from authentication * @param type must be "at_userreq" * @param op must be "=" @@ -132,7 +132,7 @@ public class UserOrigReqAccessEvaluator implements IAccessEvaluator { /** * Evaluates the user in session context to see if it's equal to value - * + * * @param type must be "user_origreq" * @param op must be "=" * @param value the user id diff --git a/base/common/src/com/netscape/cms/jobs/AJobBase.java b/base/common/src/com/netscape/cms/jobs/AJobBase.java index 0da5d2028..bd319b94e 100644 --- a/base/common/src/com/netscape/cms/jobs/AJobBase.java +++ b/base/common/src/com/netscape/cms/jobs/AJobBase.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.request.IRequest; /** * This abstract class is a base job for real job extentions for the * Jobs Scheduler. - * + * * @version $Revision$, $Date$ * @see com.netscape.certsrv.jobs.IJob */ @@ -55,7 +55,7 @@ public abstract class AJobBase implements IJob, Runnable { protected static final String STATUS_FAILURE = "failed"; protected static final String STATUS_SUCCESS = "succeeded"; - // variables used by the Job Scheduler Daemon + // variables used by the Job Scheduler Daemon protected String mImplName = null; protected IConfigStore mConfig; protected String mId = null; @@ -81,7 +81,7 @@ public abstract class AJobBase implements IJob, Runnable { /** * tells if the job is enabled - * + * * @return a boolean value indicating whether the job is enabled * or not */ @@ -109,7 +109,7 @@ public abstract class AJobBase implements IJob, Runnable { /** * get instance id. - * + * * @return a String identifier */ public String getId() { @@ -118,7 +118,7 @@ public abstract class AJobBase implements IJob, Runnable { /** * set instance id. - * + * * @param id String id of the instance */ public void setId(String id) { @@ -127,7 +127,7 @@ public abstract class AJobBase implements IJob, Runnable { /** * get cron string associated with this job - * + * * @return a JobCron object that represents the schedule of this job */ public IJobCron getJobCron() { @@ -136,7 +136,7 @@ public abstract class AJobBase implements IJob, Runnable { /** * gets the plugin name of this job. - * + * * @return a String that is the name of this implementation */ public String getImplName() { @@ -145,7 +145,7 @@ public abstract class AJobBase implements IJob, Runnable { /** * Gets the configuration substore used by this job - * + * * @return configuration store */ public IConfigStore getConfigStore() { @@ -265,7 +265,7 @@ public abstract class AJobBase implements IJob, Runnable { /** * logs an entry in the log file. Used by classes extending this class. - * + * * @param level log level * @param msg log message in String */ @@ -278,7 +278,7 @@ public abstract class AJobBase implements IJob, Runnable { /** * capable of logging multiline entry in the log file. Used by classes extending this class. - * + * * @param level log level * @param msg log message in String * @param multiline boolean indicating whether the message is a diff --git a/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java b/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java index 28268dfab..25c80817b 100644 --- a/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java +++ b/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java @@ -56,7 +56,7 @@ import com.netscape.certsrv.request.RequestId; * <UL> * $SerialNumber $IssuerDN $SubjectDN $NotAfter $NotBefore $RequestorEmail $CertType * </UL> - * + * * @version $Revision$, $Date$ */ public class PublishCertsJob extends AJobBase @@ -383,7 +383,7 @@ public class PublishCertsJob extends AJobBase * 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() { diff --git a/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java b/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java index 5ca581445..2f1d479a4 100644 --- a/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java +++ b/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java @@ -50,7 +50,7 @@ import com.netscape.certsrv.request.RequestId; * A job for the Jobs Scheduler. This job checks in the internal ldap * db for certs about to expire within the next configurable days and * sends email notifications to the appropriate recipients. - * + * * the $TOKENS that are available for the this jobs's summary outer form are:<br > * <UL> @@ -75,7 +75,7 @@ import com.netscape.certsrv.request.RequestId; * <LI>$HttpHost * <LI>$HttpPort * </UL> - * + * * @version $Revision$, $Date$ * @see com.netscape.certsrv.jobs.IJob * @see com.netscape.cms.jobs.AJobBase @@ -248,7 +248,7 @@ public class RenewalNotificationJob /** * Initialize from the configuration file. - * + * * @param id String name of this instance * @param implName string name of this implementation * @param config configuration store for this instance @@ -289,7 +289,7 @@ public class RenewalNotificationJob mHttpHost = CMS.getEEHost(); mHttpPort = CMS.getEESSLPort(); - // read from the configuration file + // read from the configuration file try { mPreDays = mConfig.getInteger(PROP_NOTIFYTRIGGEROFFSET, 30); // in days mPostDays = mConfig.getInteger(PROP_NOTIFYENDOFFSET, 15); // in days @@ -354,7 +354,7 @@ public class RenewalNotificationJob // All cert records which: // 1) expire before the deadline // 2) have not already been renewed - // filter format: + // filter format: // (& (notafter<='time')(!(certAutoRenew=DONE))(!certAutoRenew=DISABLED)) StringBuffer f = new StringBuffer(); @@ -480,7 +480,7 @@ public class RenewalNotificationJob /** * get instance id. - * + * * @return a String identifier */ public String getId() { @@ -489,7 +489,7 @@ public class RenewalNotificationJob /** * set instance id. - * + * * @param id String id of the instance */ public void setId(String id) { @@ -498,7 +498,7 @@ public class RenewalNotificationJob /** * get cron string associated with this job - * + * * @return a JobCron object that represents the schedule of this job */ public IJobCron getJobCron() { @@ -507,7 +507,7 @@ public class RenewalNotificationJob /** * gets the plugin name of this job. - * + * * @return a String that is the name of this implementation */ public String getImplName() { @@ -516,7 +516,7 @@ public class RenewalNotificationJob /** * Gets the configuration substore used by this job - * + * * @return configuration store */ public IConfigStore getConfigStore() { @@ -585,7 +585,7 @@ public class RenewalNotificationJob * 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() { diff --git a/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java b/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java index b04461941..5d1ea2f2b 100644 --- a/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java +++ b/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.request.RequestStatus; * <UL> * $InstanceID $SummaryTotalNum $ExecutionTime * </UL> - * + * * @version $Revision$, $Date$ * @see com.netscape.certsrv.jobs.IJob * @see com.netscape.cms.jobs.AJobBase @@ -104,7 +104,7 @@ public class RequestInQueueJob extends AJobBase /** * initialize from the configuration file - * + * * @param id String name of this instance * @param implName string name of this implementation * @param config configuration store for this instance @@ -208,7 +208,7 @@ public class RequestInQueueJob extends AJobBase * 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() { diff --git a/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java b/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java index 2f4a6ad75..cddb8d56a 100644 --- a/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java +++ b/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java @@ -57,7 +57,7 @@ import com.netscape.certsrv.request.RequestId; * <UL> * $SerialNumber $IssuerDN $SubjectDN $NotAfter $NotBefore $RequestorEmail $CertType * </UL> - * + * * @version $Revision$, $Date$ */ public class UnpublishExpiredJob extends AJobBase @@ -376,7 +376,7 @@ public class UnpublishExpiredJob extends AJobBase * 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() { diff --git a/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java b/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java index 91526d583..dc0222dda 100644 --- a/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java +++ b/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java @@ -68,7 +68,7 @@ import com.netscape.certsrv.request.RequestId; * <LI>$RequestId * <LI>$InstanceID * </UL> - * + * * @version $Revision$, $Date$ */ public class CertificateIssuedListener implements IRequestListener { diff --git a/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java b/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java index da041b85d..ad91738e9 100644 --- a/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java +++ b/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java @@ -70,7 +70,7 @@ import com.netscape.certsrv.request.RequestId; * <LI>$RequestId * <LI>$InstanceID * </UL> - * + * * @version $Revision$, $Date$ */ public class CertificateRevokedListener implements IRequestListener { diff --git a/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java b/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java index 662e762b0..2f82307f2 100644 --- a/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java +++ b/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.RequestId; /** * This represnets a listener that removes pin from LDAP directory. - * + * * @version $Revision$, $Date$ */ public class PinRemovalListener implements IRequestListener { diff --git a/base/common/src/com/netscape/cms/listeners/RequestInQListener.java b/base/common/src/com/netscape/cms/listeners/RequestInQListener.java index 7ff13db54..3d236baea 100644 --- a/base/common/src/com/netscape/cms/listeners/RequestInQListener.java +++ b/base/common/src/com/netscape/cms/listeners/RequestInQListener.java @@ -52,7 +52,7 @@ import com.netscape.cms.profile.input.SubmitterInfoInput; * <LI>$SenderEmail * <LI>$RecipientEmail * </UL> - * + * */ public class RequestInQListener implements IRequestListener { protected static final String PROP_ENABLED = "enabled"; @@ -127,7 +127,7 @@ public class RequestInQListener implements IRequestListener { /** * carries out the operation when the listener is triggered. - * + * * @param r IRequest structure holding the request information * @see com.netscape.certsrv.request.IRequest */ @@ -203,8 +203,8 @@ public class RequestInQListener implements IRequestListener { if (profileId == null) { val = r.getExtDataInString(IRequest.HTTP_PARAMS, "csrRequestorEmail"); } else { - // use the submitter info if available, otherwise, use the - // subject name input email + // use the submitter info if available, otherwise, use the + // subject name input email val = r.getExtDataInString(SubmitterInfoInput.EMAIL); if ((val == null) || (((String) val).compareTo("") == 0)) { @@ -250,7 +250,7 @@ public class RequestInQListener implements IRequestListener { /** * sets the configurable parameters - * + * * @param name a String represents the name of the configuration parameter to be set * @param val a String containing the value to be set for name */ diff --git a/base/common/src/com/netscape/cms/logging/LogEntry.java b/base/common/src/com/netscape/cms/logging/LogEntry.java index d91bd7406..ac8d16f54 100644 --- a/base/common/src/com/netscape/cms/logging/LogEntry.java +++ b/base/common/src/com/netscape/cms/logging/LogEntry.java @@ -25,7 +25,7 @@ import java.util.Vector; /** * A log entry of LogFile - * + * * @version $Revision$, $Date$ */ public class LogEntry { @@ -41,7 +41,7 @@ public class LogEntry { /** * Constructor for a LogEntry. - * + * */ public LogEntry(String entry) throws ParseException { mEntry = entry; @@ -50,7 +50,7 @@ public class LogEntry { /** * parse a log entry - * + * * return a vector of the segments of the entry */ diff --git a/base/common/src/com/netscape/cms/logging/LogFile.java b/base/common/src/com/netscape/cms/logging/LogFile.java index 5144bf16d..fa5531a8e 100644 --- a/base/common/src/com/netscape/cms/logging/LogFile.java +++ b/base/common/src/com/netscape/cms/logging/LogFile.java @@ -80,7 +80,7 @@ import com.netscape.cmsutil.util.Utils; /** * A log event listener which write logs to log files - * + * * @version $Revision$, $Date$ **/ public class LogFile implements ILogEventListener, IExtendedPluginInfo { @@ -229,7 +229,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Constructor for a LogFile. - * + * */ public LogFile() { } @@ -310,7 +310,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * add the event to the selected events list - * + * * @param event to be selected */ public void selectEvent(String event) { @@ -320,7 +320,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * remove the event from the selected events list - * + * * @param event to be de-selected */ public void deselectEvent(String event) { @@ -330,7 +330,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * replace the selected events list - * + * * @param events comma-separated event list */ public void replaceEvents(String events) { @@ -386,7 +386,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Initialize and open the log using the parameters from a config store - * + * * @param config The property config store to find values in */ public void init(IConfigStore config) throws IOException, @@ -506,7 +506,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Initialize and open the log - * + * * @param bufferSize The buffer size for the output stream in bytes * @param flushInterval The interval in seconds to flush the log */ @@ -628,11 +628,11 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Startup the instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_AUDIT_LOG_STARTUP used at audit function startup * </ul> - * + * * @exception EBaseException if an internal error occurred */ public void startup() throws EBaseException { @@ -690,12 +690,12 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Record that the signed audit log has been signed * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_SIGNING used when a signature on the audit log is generated (same as * "flush" time) * </ul> - * + * * @exception IOException for input/output problems * @exception ELogException when plugin implementation fails * @exception SignatureException when signing fails @@ -756,7 +756,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Open the log file. This creates the buffered FileWriter - * + * */ protected synchronized void open() throws IOException { RandomAccessFile out; @@ -804,7 +804,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Flush the log file. Also update the MAC for hash protected logs - * + * */ public synchronized void flush() { try { @@ -838,7 +838,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Close the log file - * + * */ protected synchronized void close() { try { @@ -855,7 +855,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Shutdown this log file. * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_AUDIT_LOG_SHUTDOWN used at audit function shutdown * </ul> @@ -881,7 +881,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Set the flush interval * <P> - * + * * @param flushInterval The amount of time in seconds until the log * is flush. A value of 0 will disable autoflush. This will also set * the update period for hash protected logs. @@ -940,7 +940,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Synchronized method to write a string to the log file. All I18N * should take place before this call. - * + * * @param entry The log entry string */ protected synchronized void log(String entry) throws ELogException { @@ -1053,7 +1053,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Write an event to the log file - * + * * @param ev The event to be logged. */ public void log(ILogEvent ev) throws ELogException { @@ -1116,7 +1116,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * change multi-line log entry by replace "\n" with "\n " - * + * * @param original The original multi-line log entry. */ private String prepareMultiline(String original) { @@ -1134,7 +1134,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { * Read all entries whose logLevel>=lowLevel && log source = source * to at most maxLine entries(from end) * If the parameter is -1, it's ignored and return all entries - * + * * @param maxLine The maximum lines to be returned * @param lowLevel The lowest log level to be returned * @param source The particular log source to be returned @@ -1302,7 +1302,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Retrieves the configuration store of this subsystem. * <P> - * + * * @return configuration store */ public IConfigStore getConfigStore() { @@ -1510,11 +1510,11 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { /** * Signed Audit Log - * + * * This method is inherited by all classes that extend this "LogFile" * class, and is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ protected void audit(String msg) { diff --git a/base/common/src/com/netscape/cms/logging/RollingLogFile.java b/base/common/src/com/netscape/cms/logging/RollingLogFile.java index 93455e9fe..312978fae 100644 --- a/base/common/src/com/netscape/cms/logging/RollingLogFile.java +++ b/base/common/src/com/netscape/cms/logging/RollingLogFile.java @@ -44,7 +44,7 @@ import com.netscape.cmsutil.util.Utils; * A rotating log file for Certificate log events. This class loosely follows * the Netscape Common Log API implementing rollover interval, size and file * naming conventions. It does not yet implement Disk Usage. - * + * * @version $Revision$, $Date$ */ public class RollingLogFile extends LogFile { @@ -113,7 +113,7 @@ public class RollingLogFile extends LogFile { /** * Initialize and open a RollingLogFile using the prop config store - * + * * @param config The property config store to find values in */ public void init(IConfigStore config) throws IOException, @@ -151,7 +151,7 @@ public class RollingLogFile extends LogFile { /** * Set the rollover interval - * + * * @param rolloverSeconds The amount of time in seconds until the log * is rotated. A value of 0 will disable log rollover. **/ @@ -169,7 +169,7 @@ public class RollingLogFile extends LogFile { /** * Get the rollover interval - * + * * @return The interval in seconds in which the log is rotated **/ public synchronized int getRolloverTime() { @@ -178,7 +178,7 @@ public class RollingLogFile extends LogFile { /** * Set the file expiration time - * + * * @param expirationSeconds The amount of time in seconds until log files * are deleted **/ @@ -203,7 +203,7 @@ public class RollingLogFile extends LogFile { /** * Get the expiration time - * + * * @return The age in seconds in which log files are delete **/ public int getExpirationTime() { @@ -280,15 +280,15 @@ public class RollingLogFile extends LogFile { * Remove any log files which have not been modified in the specified * time * <P> - * + * * NOTE: automatic removal of log files is currently NOT supported! * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_LOG_DELETE used AFTER audit log expires (authorization should not allow, * but in case authorization gets compromised make sure it is written AFTER the log expiration happens) * </ul> - * + * * @param expirationSeconds The number of seconds since the expired files * have been modified. * @return the time in milliseconds when the next file expires @@ -496,7 +496,7 @@ public class RollingLogFile extends LogFile { /** * Write an event to the log file - * + * * @param ev The event to be logged. **/ public synchronized void log(ILogEvent ev) throws ELogException { @@ -531,7 +531,7 @@ public class RollingLogFile extends LogFile { /** * Get the log file list in the log directory - * + * * @return an array of filenames with related path to cert server root */ protected String[] fileList() { diff --git a/base/common/src/com/netscape/cms/notification/MailNotification.java b/base/common/src/com/netscape/cms/notification/MailNotification.java index ef09d8f71..cd4ee431c 100644 --- a/base/common/src/com/netscape/cms/notification/MailNotification.java +++ b/base/common/src/com/netscape/cms/notification/MailNotification.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.notification.IMailNotification; * This class uses <b>smtp.host</b> in the configuration for smtp * host. The port default (25) is used. If no smtp specified, local * host is used - * + * * @version $Revision$, $Date$ */ public class MailNotification implements IMailNotification { @@ -134,7 +134,7 @@ public class MailNotification implements IMailNotification { /** * sets the "From" field - * + * * @param from email address of the sender */ public void setFrom(String from) { @@ -143,7 +143,7 @@ public class MailNotification implements IMailNotification { /** * sets the "Subject" field - * + * * @param subject subject of the email */ public void setSubject(String subject) { @@ -152,7 +152,7 @@ public class MailNotification implements IMailNotification { /** * sets the "Content-Type" field - * + * * @param contentType content type of the email */ public void setContentType(String contentType) { @@ -161,7 +161,7 @@ public class MailNotification implements IMailNotification { /** * sets the content of the email - * + * * @param content the message content */ public void setContent(String content) { @@ -170,7 +170,7 @@ public class MailNotification implements IMailNotification { /** * sets the recipients' email addresses - * + * * @param addresses a list of email addresses of the recipients */ public void setTo(Vector<String> addresses) { @@ -180,7 +180,7 @@ public class MailNotification implements IMailNotification { /** * sets the recipient's email address - * + * * @param to address of the recipient email address */ public void setTo(String to) { diff --git a/base/common/src/com/netscape/cms/ocsp/DefStore.java b/base/common/src/com/netscape/cms/ocsp/DefStore.java index 21f7023d8..f9798270a 100644 --- a/base/common/src/com/netscape/cms/ocsp/DefStore.java +++ b/base/common/src/com/netscape/cms/ocsp/DefStore.java @@ -76,13 +76,13 @@ import com.netscape.cmsutil.ocsp.UnknownInfo; /** * This is the default OCSP store that stores revocation information * as certificate record (CMS internal data structure). - * + * * @version $Revision$, $Date$ */ public class DefStore implements IDefStore, IExtendedPluginInfo { // refreshInSec is useful in the master-clone situation. - // clone does not know that the CRL has been updated in + // clone does not know that the CRL has been updated in // the master (by default no refresh) private static final String PROP_USE_CACHE = "useCache"; diff --git a/base/common/src/com/netscape/cms/ocsp/LDAPStore.java b/base/common/src/com/netscape/cms/ocsp/LDAPStore.java index bca02f4a6..c9f97c541 100644 --- a/base/common/src/com/netscape/cms/ocsp/LDAPStore.java +++ b/base/common/src/com/netscape/cms/ocsp/LDAPStore.java @@ -74,7 +74,7 @@ import com.netscape.cmsutil.ocsp.UnknownInfo; /** * This is the LDAP OCSP store. It reads CA certificate and * revocation list attributes from the CA entry. - * + * * @version $Revision$, $Date$ */ public class LDAPStore implements IDefStore, IExtendedPluginInfo { diff --git a/base/common/src/com/netscape/cms/password/PasswordChecker.java b/base/common/src/com/netscape/cms/password/PasswordChecker.java index 847f3a2c1..ae379761d 100644 --- a/base/common/src/com/netscape/cms/password/PasswordChecker.java +++ b/base/common/src/com/netscape/cms/password/PasswordChecker.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.password.IPasswordCheck; * For example, it can also specify the format of the password which has to * be 8 characters long and must be in alphanumeric. * <P> - * + * * @version $Revision$, $Date$ */ public class PasswordChecker implements IPasswordCheck, IConfigPasswordCheck { @@ -67,7 +67,7 @@ public class PasswordChecker implements IPasswordCheck, IConfigPasswordCheck { /** * Returns true if the given password meets the quality requirement; * otherwise returns false. - * + * * @param mPassword The given password being checked. * @return true if the password meets the quality requirement; otherwise * returns false. @@ -83,7 +83,7 @@ public class PasswordChecker implements IPasswordCheck, IConfigPasswordCheck { /** * Returns a reason if the password doesnt meet the quality requirement. - * + * * @return string as a reason if the password quality requirement is not met. */ public String getReason(String mPassword) { diff --git a/base/common/src/com/netscape/cms/policy/APolicyRule.java b/base/common/src/com/netscape/cms/policy/APolicyRule.java index 0faf7591d..8ed943503 100644 --- a/base/common/src/com/netscape/cms/policy/APolicyRule.java +++ b/base/common/src/com/netscape/cms/policy/APolicyRule.java @@ -45,12 +45,12 @@ import com.netscape.certsrv.request.PolicyResult; * The abstract policy rule that concrete implementations will * extend. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -67,7 +67,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Initializes the policy rule. * <P> - * + * * @param config The config store reference */ public abstract void init(ISubsystem owner, IConfigStore config) @@ -76,7 +76,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Gets the description for this policy rule. * <P> - * + * * @return The Description for this rule. */ public String getDescription() { @@ -86,7 +86,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Sets a predicate expression for rule matching. * <P> - * + * * @param exp The predicate expression for the rule. */ public void setPredicate(IExpression exp) { @@ -96,7 +96,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Returns the predicate expression for the rule. * <P> - * + * * @return The predicate expression for the rule. */ public IExpression getPredicate() { @@ -106,7 +106,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Returns the name of the policy rule. * <P> - * + * * @return The name of the policy class. */ public String getName() { @@ -116,7 +116,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Sets the instance name for a policy rule. * <P> - * + * * @param instanceName The name of the rule instance. */ public void setInstanceName(String instanceName) { @@ -126,7 +126,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Returns the name of the policy rule instance. * <P> - * + * * @return The name of the policy rule instance if set, else * the name of the rule class. */ @@ -137,7 +137,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -145,14 +145,14 @@ public abstract class APolicyRule implements IPolicyRule { /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public abstract Vector<String> getInstanceParams(); /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public abstract Vector<String> getDefaultParams(); @@ -263,7 +263,7 @@ public abstract class APolicyRule implements IPolicyRule { * Form a byte array of octet string key identifier from the sha-1 hash of * the Subject Public Key INFO. (including algorithm ID, etc.) * <p> - * + * * @param certInfo cert info of the certificate. * @return A Key identifier with the sha-1 hash of subject public key. */ @@ -314,7 +314,7 @@ public abstract class APolicyRule implements IPolicyRule { * Form a byte array of octet string key identifier from the sha-1 hash of * the Subject Public Key BIT STRING. * <p> - * + * * @param certInfo cert info of the certificate. * @return A Key identifier with the sha-1 hash of subject public key. */ diff --git a/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java b/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java index b7a24bd65..f8cd03f75 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java +++ b/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java @@ -36,12 +36,12 @@ import com.netscape.cms.policy.APolicyRule; * for agent approvals is done. If any are found, the request * is approved. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -55,13 +55,13 @@ public class AgentPolicy extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ra.Policy.rule.<ruleName>.implName=AgentPolicy ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.predicate= ou == engineering AND o == netscape.com ra.Policy.rule.<ruleName>.class=xxxx * ra.Policy.rule.<ruleName>.params.* - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -105,7 +105,7 @@ public class AgentPolicy extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -141,7 +141,7 @@ public class AgentPolicy extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -150,7 +150,7 @@ public class AgentPolicy extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java index 93327445e..4ee689915 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java @@ -46,12 +46,12 @@ import com.netscape.cms.policy.APolicyRule; /** * This checks if attribute present. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java index 387b702bf..9b5fbd152 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java @@ -42,12 +42,12 @@ import com.netscape.cms.policy.APolicyRule; /** * DSAKeyConstraints policy enforces min and max size of the key. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -94,12 +94,12 @@ public class DSAKeyConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form ra.Policy.rule.<ruleName>.implName=DSAKeyConstraints * ra.Policy.rule.<ruleName>.enable=true ra.Policy.rule.<ruleName>.minSize=512 * ra.Policy.rule.<ruleName>.maxSize=1024 ra.Policy.rule.<ruleName>.predicate= ou == engineering AND o == * netscape.com - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -157,7 +157,7 @@ public class DSAKeyConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -226,7 +226,7 @@ public class DSAKeyConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -243,7 +243,7 @@ public class DSAKeyConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java b/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java index 2af145475..fecb59049 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java +++ b/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java @@ -34,12 +34,12 @@ import com.netscape.cms.policy.APolicyRule; * nothing. We can later add checks like whether or not to * revoke expired certs ..etc here. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -53,12 +53,12 @@ public class DefaultRevocation extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ra.Policy.rule.<ruleName>.implName=DefaultRevocation ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.predicate= ou == engineering AND o == netscape.com - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -68,7 +68,7 @@ public class DefaultRevocation extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -78,7 +78,7 @@ public class DefaultRevocation extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -87,7 +87,7 @@ public class DefaultRevocation extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java index a08bde78c..43b7e1fd6 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java @@ -38,12 +38,12 @@ import com.netscape.cms.policy.APolicyRule; * IssuerConstraints is a rule for restricting the issuers of the * certificates used for certificate-based enrollments. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$ $Date$ */ @@ -81,7 +81,7 @@ public class IssuerConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -108,7 +108,7 @@ public class IssuerConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -190,7 +190,7 @@ public class IssuerConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -203,7 +203,7 @@ public class IssuerConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java index 3779b16e3..d656ed463 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java @@ -41,12 +41,12 @@ import com.netscape.cms.policy.APolicyRule; * honor only the keys generated using one of the permitted algorithms * such as RSA, DSA or DH. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -86,11 +86,11 @@ public class KeyAlgorithmConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form ra.Policy.rule.<ruleName>.implName=KeyAlgorithmConstraints * ra.Policy.rule.<ruleName>.algorithms=RSA,DSA ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.predicate=ou==Sales - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -151,7 +151,7 @@ public class KeyAlgorithmConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -197,7 +197,7 @@ public class KeyAlgorithmConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -216,7 +216,7 @@ public class KeyAlgorithmConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java b/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java index 3af9e636f..56b96f95f 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java +++ b/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java @@ -34,12 +34,12 @@ import com.netscape.cms.policy.APolicyRule; * is present. The policy rejects a request if any of the auth tokens * indicates authentication failure. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -53,12 +53,12 @@ public class ManualAuthentication extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ra.Policy.rule.<ruleName>.implName=ManualAuthentication ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.predicate= ou == engineering AND o == netscape.com - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -68,7 +68,7 @@ public class ManualAuthentication extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -83,7 +83,7 @@ public class ManualAuthentication extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -92,7 +92,7 @@ public class ManualAuthentication extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java index 7c53808c5..a1f0805d0 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java @@ -44,12 +44,12 @@ import com.netscape.cms.policy.APolicyRule; * RSAKeyConstraints policy enforces min and max size of the key. * Optionally checks the exponents. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -97,13 +97,13 @@ public class RSAKeyConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form: - * + * * ra.Policy.rule.<ruleName>.implName=RSAKeyConstraints ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.minSize=512 ra.Policy.rule.<ruleName>.maxSize=2048 * ra.Policy.rule.<ruleName>.predicate=ou==Marketing - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -158,7 +158,7 @@ public class RSAKeyConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -249,7 +249,7 @@ public class RSAKeyConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -271,7 +271,7 @@ public class RSAKeyConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java index f3e5efc9b..3ff977df5 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java @@ -38,15 +38,15 @@ import com.netscape.cms.policy.APolicyRule; /** * Whether to allow renewal of an expired cert. - * + * * @version $Revision$, $Date$ * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -93,12 +93,12 @@ public class RenewalConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form: - * + * * ra.Policy.rule.<ruleName>.implName=ValidityConstraints ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.allowExpiredCerts=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -125,7 +125,7 @@ public class RenewalConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -218,7 +218,7 @@ public class RenewalConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -233,7 +233,7 @@ public class RenewalConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java index 0265ff855..2810fae10 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java @@ -42,19 +42,19 @@ import com.netscape.cmsutil.util.Utils; * currently active certificate can be renewed and sets new validity * period for the renewed certificate starting from the the ending * period in the old certificate. - * + * * The main parameters are: - * + * * The renewal leadtime in days: - i.e how many days before the * expiry of the current certificate can one request the renewal. * min and max validity duration. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -112,13 +112,13 @@ public class RenewalValidityConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form: - * + * * ra.Policy.rule.<ruleName>.implName=ValidityConstraints ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.minValidity=30 ra.Policy.rule.<ruleName>.maxValidity=180 * ra.Policy.rule.<ruleName>.renewalInterval=15 ra.Policy.rule.<ruleName>.predicate=ou==Sales - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -177,7 +177,7 @@ public class RenewalValidityConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -253,7 +253,7 @@ public class RenewalValidityConstraints extends APolicyRule Date renewedNotAfter = new Date(notAfter.getTime() + mMaxValidity); - // If the new notAfter is within renewal interval days from + // If the new notAfter is within renewal interval days from // today or already expired, set the notBefore to today. if (renewedNotAfter.before(now) || (renewedNotAfter.getTime() - now.getTime()) <= @@ -278,7 +278,7 @@ public class RenewalValidityConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -295,7 +295,7 @@ public class RenewalValidityConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java index 513e199c4..88c59b2fd 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java @@ -40,12 +40,12 @@ import com.netscape.cms.policy.APolicyRule; /** * Whether to allow revocation of an expired cert. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -88,12 +88,12 @@ public class RevocationConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form: - * + * * ra.Policy.rule.<ruleName>.implName=ValidityConstraints ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.allowExpiredCerts=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -115,7 +115,7 @@ public class RevocationConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -191,7 +191,7 @@ public class RevocationConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -206,7 +206,7 @@ public class RevocationConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java index 8b504eb50..90a8cc167 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java @@ -44,12 +44,12 @@ import com.netscape.cms.policy.APolicyRule; * SigningAlgorithmConstraints enforces that only a supported * signing algorithm be requested. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -93,11 +93,11 @@ public class SigningAlgorithmConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form ra.Policy.rule.<ruleName>.implName=SigningAlgorithmConstraints * ra.Policy.rule.<ruleName>.algorithms=SHA-1WithRSA, SHA-1WithDSA ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.predicate=ou==Sales - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -183,7 +183,7 @@ public class SigningAlgorithmConstraints extends APolicyRule ((ICertAuthority) mAuthority).getCASigningAlgorithms(); if (allowedByKey != null) { - // don't show algorithms that don't match CA's key in UI. + // don't show algorithms that don't match CA's key in UI. mDefaultAllowedAlgs = new String[allowedByKey.length]; for (int i = 0; i < allowedByKey.length; i++) mDefaultAllowedAlgs[i] = allowedByKey[i]; @@ -200,7 +200,7 @@ public class SigningAlgorithmConstraints extends APolicyRule /** * Winnows out of mAllowedAlgorithms those algorithms that aren't allowed * for some reason. - * + * * @param allowed An array of allowed algorithms. Only algorithms in this * list will survive the winnowing process. * @param reason A string describing the problem with an algorithm @@ -247,7 +247,7 @@ public class SigningAlgorithmConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -321,7 +321,7 @@ public class SigningAlgorithmConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -340,7 +340,7 @@ public class SigningAlgorithmConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java index da63f6f24..07cc3b956 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java @@ -44,12 +44,12 @@ import com.netscape.cms.policy.APolicyRule; * This simple policy checks the subordinate CA CSR to see * if it is the same as the local CA. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -77,11 +77,11 @@ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPoli /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form ra.Policy.rule.<ruleName>.implName=KeyAlgorithmConstraints * ra.Policy.rule.<ruleName>.algorithms=RSA,DSA ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.predicate=ou==Sales - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -121,7 +121,7 @@ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPoli /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -154,7 +154,7 @@ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPoli if (certSubjectName.equalsIgnoreCase(mIssuerNameStr)) { log(ILogger.LL_FAILURE, CMS.getLogMessage("POLICY_SUBJECT_NAME_EXIST_1", mIssuerNameStr)); - setError(req, + setError(req, CMS.getUserMessage("CMS_POLICY_SUBJECT_NAME_EXIST", NAME + ":" + "Same As Issuer Name " + mIssuerNameStr), ""); result = PolicyResult.REJECTED; @@ -173,7 +173,7 @@ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPoli /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -184,7 +184,7 @@ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPoli /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java b/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java index 9afbf7650..27b5d1a92 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java +++ b/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java @@ -20,12 +20,12 @@ package com.netscape.cms.policy.constraints; /** * This class is used to help migrate CMS4.1 to CMS4.2. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java index 8c106800a..fb52b1302 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java @@ -47,22 +47,22 @@ import com.netscape.cms.policy.APolicyRule; * Checks the uniqueness of the subject name. This policy * can only be used (installed) in Certificate Authority * subsystem. - * + * * This policy can perform pre-agent-approval checking or * post-agent-approval checking based on configuration * setting. - * + * * In some situations, user may want to have 2 certificates with * the same subject name. For example, one key for encryption, * and one for signing. This policy does not deal with this case * directly. But it can be easily extended to do that. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -103,13 +103,13 @@ public class UniqueSubjectNameConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form: - * + * * ca.Policy.rule.<ruleName>.implName=UniqueSubjectName ca.Policy.rule.<ruleName>.enable=true * ca.Policy.rule.<ruleName>.enable=true ca.Policy.rule.<ruleName>.enablePreAgentApprovalChecking=true * ca.Policy.rule.<ruleName>.enableKeyUsageExtensionChecking=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -146,7 +146,7 @@ public class UniqueSubjectNameConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -195,15 +195,15 @@ public class UniqueSubjectNameConstraints extends APolicyRule if (status.equals(ICertRecord.STATUS_REVOKED) || status.equals(ICertRecord.STATUS_EXPIRED) || status.equals(ICertRecord.STATUS_REVOKED_EXPIRED)) { - // accept this only if we have a REVOKED, + // accept this only if we have a REVOKED, // EXPIRED or REVOKED_EXPIRED certificate continue; } // you already have an VALID or INVALID (not yet valid) certificate if (mKeyUsageExtensionChecking && agentApproved(req)) { - // This request is agent approved which - // means all requested extensions are finalized + // This request is agent approved which + // means all requested extensions are finalized // to the request, // We will accept duplicated subject name with // different keyUsage extension if @@ -285,7 +285,7 @@ public class UniqueSubjectNameConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -300,7 +300,7 @@ public class UniqueSubjectNameConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java index 0409f3c33..72be9d75a 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java @@ -38,17 +38,17 @@ import com.netscape.cms.policy.APolicyRule; * ValidityConstraints is a default rule for Enrollment and * Renewal that enforces minimum and maximum validity periods * and changes them if not met. - * + * * Optionally the lead and lag times - i.e how far back into the * front or back the notBefore date could go in minutes can also * be specified. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -115,13 +115,13 @@ public class ValidityConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form: - * + * * ra.Policy.rule.<ruleName>.implName=ValidityConstraints ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.minValidity=30 ra.Policy.rule.<ruleName>.maxValidity=180 * ra.Policy.rule.<ruleName>.predicate=ou==Sales - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -171,7 +171,7 @@ public class ValidityConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -257,7 +257,7 @@ public class ValidityConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -278,7 +278,7 @@ public class ValidityConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { @@ -287,10 +287,10 @@ public class ValidityConstraints extends APolicyRule /** * Create a default validity value for a request - * + * * This code can be easily overridden in a derived class, if the * calculations here aren't accepatble. - * + * * TODO: it might be good to base this calculation on the creation * time of the request. */ diff --git a/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java b/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java index fea126567..21e4ad920 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java @@ -47,9 +47,9 @@ import com.netscape.cms.policy.APolicyRule; * Authority Information Access extension policy. * If this policy is enabled, it adds an authority * information access extension to the certificate. - * + * * The following listed sample configuration parameters: - * + * * ca.Policy.impl.AuthInfoAccess.class=com.netscape.certsrv.policy.AuthInfoAccessExt * ca.Policy.rule.aia.ad0_location=uriName:http://ocsp1.netscape.com * ca.Policy.rule.aia.ad0_method=ocsp @@ -66,16 +66,16 @@ import com.netscape.cms.policy.APolicyRule; * ca.Policy.rule.aia.enable=true * ca.Policy.rule.aia.implName=AuthInfoAccess * ca.Policy.rule.aia.predicate= - * + * * Currently, this policy only supports the following location: * uriName:[URI], dirName:[DN] * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -134,12 +134,12 @@ public class AuthInfoAccessExt extends APolicyRule implements /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.implName=AuthInfoAccessExt ca.Policy.rule.<ruleName>.enable=true * ca.Policy.rule.<ruleName>.predicate= - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -214,7 +214,7 @@ public class AuthInfoAccessExt extends APolicyRule implements * If this policy is enabled, add the authority information * access extension to the certificate. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -305,7 +305,7 @@ public class AuthInfoAccessExt extends APolicyRule implements /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -367,7 +367,7 @@ public class AuthInfoAccessExt extends APolicyRule implements /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java b/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java index 971379a46..d7e058bf8 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java @@ -48,12 +48,12 @@ import com.netscape.cms.policy.APolicyRule; * Authority Public Key Extension Policy * Adds the subject public key id extension to certificates. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -76,7 +76,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule protected boolean mCritical = DEF_CRITICAL; protected String mAltKeyIdType = DEF_ALT_KEYID_TYPE; - // the extension to add to certs. + // the extension to add to certs. protected AuthorityKeyIdentifierExtension mTheExtension = null; // instance params for console @@ -105,13 +105,13 @@ public class AuthorityKeyIdentifierExt extends APolicyRule * (what communicator expects if the CA does not have a subject key * identifier extension) or (2) No extension set (3) Empty sequence * in Authority Key Identifier extension. - * + * * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.predicate= ca.Policy.rule.<ruleName>.implName= ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -181,7 +181,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule } else { } - // form instance params + // form instance params mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical); mInstanceParams.addElement(PROP_ALT_KEYID_TYPE + "=" + mAltKeyIdType); } @@ -190,7 +190,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule * Adds Authority Key Identifier Extension to a certificate. * If the extension is already there, accept it if it's from the agent, * else replace it. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -216,7 +216,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule public PolicyResult applyCert(IRequest req, X509CertInfo certInfo) { try { - // if authority key id extension already exists, leave it if + // if authority key id extension already exists, leave it if // from agent. else replace it. AuthorityKeyIdentifierExtension authorityKeyIdExt = null; CertificateExtensions extensions = (CertificateExtensions) @@ -228,7 +228,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule extensions.get(AuthorityKeyIdentifierExtension.NAME); } } catch (IOException e) { - // extension isn't there. + // extension isn't there. } if (authorityKeyIdExt != null) { if (agentApproved(req)) { @@ -245,8 +245,8 @@ public class AuthorityKeyIdentifierExt extends APolicyRule } } - // if no authority key identifier should be set b/c CA does not - // have a subject key identifier, return here. + // if no authority key identifier should be set b/c CA does not + // have a subject key identifier, return here. if (mTheExtension == null) return PolicyResult.ACCEPTED; @@ -281,7 +281,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule * Form the Key Identifier in the Authority Key Identifier extension. * from the CA's cert. * <p> - * + * * @param caCertImpl Certificate Info * @return A Key Identifier. * @throws com.netscape.certsrv.base.EBaseException on error @@ -335,7 +335,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule /** * Get the Key Identifier in a subject key identifier extension from a * CertInfo. - * + * * @param certInfo the CertInfo structure. * @return Key Identifier in a Subject Key Identifier extension if any. */ @@ -375,7 +375,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule keyId = (KeyIdentifier) subjKeyIdExt.get( SubjectKeyIdentifierExtension.KEY_ID); } catch (IOException e) { - // no key identifier in subject key id extension. + // no key identifier in subject key id extension. String msg = NAME + ": " + "Bad Subject Key Identifier Extension found. Error: " + e; @@ -387,7 +387,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -396,7 +396,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java index f830b7e3d..eeee26994 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java @@ -50,12 +50,12 @@ import com.netscape.cms.policy.APolicyRule; * Basic Constraints policy. * Adds the Basic constraints extension. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -95,10 +95,10 @@ public class BasicConstraintsExt extends APolicyRule * Initializes this policy rule. * <p> * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.implName=BasicConstraintsExtImpl ca.Policy.rule.<ruleName>.pathLen=<n>, -1 for * undefined. ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -127,21 +127,21 @@ public class BasicConstraintsExt extends APolicyRule mCAPathLen = caCert.getBasicConstraints(); } - // set default to one less than the CA's pathlen or 0 if CA's - // pathlen is 0. + // set default to one less than the CA's pathlen or 0 if CA's + // pathlen is 0. // If it's unlimited default the max pathlen also to unlimited. if (mCAPathLen < 0) mDefaultMaxPathLen = -1; else if (mCAPathLen > 0) mDefaultMaxPathLen = mCAPathLen - 1; - else // (mCAPathLen == 0) + else // (mCAPathLen == 0) { log(ILogger.LL_WARN, CMS.getLogMessage("POLICY_PATHLEN_ZERO")); //return; } - // get configured max path len, use defaults if not configured. + // get configured max path len, use defaults if not configured. boolean pathLenConfigured = true; try { @@ -173,9 +173,9 @@ public class BasicConstraintsExt extends APolicyRule // check if configured path len is valid. if (pathLenConfigured) { - // if CA's pathlen is unlimited, any max pathlen is ok. - // else maxPathlen must be at most one less than the CA's - // pathlen or 0 if CA's pathlen is 0. + // if CA's pathlen is unlimited, any max pathlen is ok. + // else maxPathlen must be at most one less than the CA's + // pathlen or 0 if CA's pathlen is 0. if (mCAPathLen > 0 && (mMaxPathLen >= mCAPathLen || mMaxPathLen < 0)) { @@ -205,7 +205,7 @@ public class BasicConstraintsExt extends APolicyRule * Checks if the basic contraints extension in certInfo is valid and * add the basic constraints extension for CA certs if none exists. * Non-CA certs do not get a basic constraints extension. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -263,7 +263,7 @@ public class BasicConstraintsExt extends APolicyRule // no extensions or basic constraints extension. } - // for non-CA certs, pkix says it SHOULD NOT have the extension + // for non-CA certs, pkix says it SHOULD NOT have the extension // so remove it. if (!isCA) { if (extensions == null) { @@ -275,7 +275,7 @@ public class BasicConstraintsExt extends APolicyRule certInfo.set(X509CertInfo.EXTENSIONS, extensions); } catch (CertificateException e) { } catch (IOException e) { - // not possible + // not possible } } if (basicExt != null) { @@ -309,11 +309,11 @@ public class BasicConstraintsExt extends APolicyRule } // For CA certs, check if existing extension is valid, and adjust. - // Extension must be marked critial and pathlen must be < CA's pathlen. + // Extension must be marked critial and pathlen must be < CA's pathlen. // if CA's pathlen is 0 all ca certs are rejected. if (mCAPathLen == 0) { - // reject all subordinate CA cert requests because CA's + // reject all subordinate CA cert requests because CA's // path length is 0. log(ILogger.LL_FAILURE, CMS.getLogMessage("POLICY_NO_SUB_CA_CERTS_ALLOWED_1", NAME)); @@ -399,7 +399,7 @@ public class BasicConstraintsExt extends APolicyRule } catch (CertificateException e) { // not possible } catch (IOException e) { - // not possible + // not possible } } @@ -460,7 +460,7 @@ public class BasicConstraintsExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -476,7 +476,7 @@ public class BasicConstraintsExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java b/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java index 1ede3d5d0..7cf50385e 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java @@ -55,12 +55,12 @@ import com.netscape.cms.policy.APolicyRule; * to tell whether the simple string should be stored in an X.500 Name, * a URL, or an RDN. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -475,7 +475,7 @@ public class CRLDistributionPointsExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java b/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java index 597357318..4124d430d 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java @@ -53,12 +53,12 @@ import com.netscape.cms.policy.APolicyRule; * Certificate Policies. * Adds certificate policies extension. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -90,12 +90,12 @@ public class CertificatePoliciesExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.predicate=certType==ca ca.Policy.rule.<ruleName>.implName= * ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -115,7 +115,7 @@ public class CertificatePoliciesExt extends APolicyRule "value must be greater than or equal to 1")); } - // init Policy Mappings, check values if enabled. + // init Policy Mappings, check values if enabled. mCertPolicies = new CertPolicy[mNumCertPolicies]; for (int i = 0; i < mNumCertPolicies; i++) { String subtreeName = PROP_CERTPOLICY + i; @@ -147,7 +147,7 @@ public class CertificatePoliciesExt extends APolicyRule } } - // form instance params + // form instance params mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical); mInstanceParams.addElement( PROP_NUM_CERTPOLICIES + "=" + mNumCertPolicies); @@ -159,7 +159,7 @@ public class CertificatePoliciesExt extends APolicyRule /** * Applies the policy on the given Request. * <p> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -203,7 +203,7 @@ public class CertificatePoliciesExt extends APolicyRule extensions.delete(CertificatePoliciesExtension.NAME); } catch (IOException e) { // this is the hack: for some reason, the key which is the name - // of the policy has been converted into the OID + // of the policy has been converted into the OID try { extensions.delete("2.5.29.32"); } catch (IOException ee) { @@ -236,7 +236,7 @@ public class CertificatePoliciesExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -271,7 +271,7 @@ public class CertificatePoliciesExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { @@ -335,7 +335,7 @@ class CertPolicy { /** * forms policy map parameters. - * + * * @param name name of this policy map, for example certPolicy0 * @param config parent's config from where we find this configuration. * @param enabled whether policy was enabled. diff --git a/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java b/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java index 28366ade8..58ce112f3 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java @@ -42,12 +42,12 @@ import com.netscape.cms.policy.APolicyRule; /** * Certificate Renewal Window Extension Policy * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -74,7 +74,7 @@ public class CertificateRenewalWindowExt extends APolicyRule /** * Initializes this policy rule. - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -88,7 +88,7 @@ public class CertificateRenewalWindowExt extends APolicyRule /** * Applies the policy on the given Request. * <p> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -139,7 +139,7 @@ public class CertificateRenewalWindowExt extends APolicyRule } catch (IOException e) { // this is the hack: for some reason, the key which is the name - // of the policy has been converted into the OID + // of the policy has been converted into the OID try { extensions.delete("2.16.840.1.113730.1.15"); } catch (IOException ee) { @@ -218,7 +218,7 @@ public class CertificateRenewalWindowExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -240,7 +240,7 @@ public class CertificateRenewalWindowExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java b/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java index b385923af..779be165b 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java @@ -46,12 +46,12 @@ import com.netscape.cms.policy.APolicyRule; * Certificate Scope Of Use extension policy. This extension * is defined in draft-thayes-cert-scope-00.txt * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -100,12 +100,12 @@ public class CertificateScopeOfUseExt extends APolicyRule implements /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.implName=AuthInfoAccessExt ca.Policy.rule.<ruleName>.enable=true * ca.Policy.rule.<ruleName>.predicate= - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -157,7 +157,7 @@ public class CertificateScopeOfUseExt extends APolicyRule implements * If this policy is enabled, add the authority information * access extension to the certificate. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -244,7 +244,7 @@ public class CertificateScopeOfUseExt extends APolicyRule implements /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -300,7 +300,7 @@ public class CertificateScopeOfUseExt extends APolicyRule implements /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java b/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java index 65ef6b937..93267bd1e 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java @@ -42,12 +42,12 @@ import com.netscape.cms.policy.APolicyRule; /** * This implements the extended key usage extension. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java b/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java index 0202ee784..eb8ab2285 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java +++ b/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java @@ -49,9 +49,9 @@ import com.netscape.cms.policy.APolicyRule; * Private Integer extension policy. * If this policy is enabled, it adds an Private Integer * extension to the certificate. - * + * * The following listed sample configuration parameters: - * + * * ca.Policy.impl.privateInteger.class=com.netscape.certsrv.policy.genericASNExt * ca.Policy.rule.genericASNExt.enable=true * ca.Policy.rule.genericASNExt.name=myIntegerExtension @@ -76,12 +76,12 @@ import com.netscape.cms.policy.APolicyRule; * ca.Policy.rule.genericASNExt.implName=genericASNExt * ca.Policy.rule.genericASNExt.predicate= * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -210,12 +210,12 @@ public class GenericASN1Ext extends APolicyRule implements /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.implName=genericASNExt ca.Policy.rule.<ruleName>.enable=true * ca.Policy.rule.<ruleName>.predicate= - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -256,7 +256,7 @@ public class GenericASN1Ext extends APolicyRule implements log(ILogger.LL_FAILURE, "" + e.toString()); } - // Check OID value + // Check OID value CMS.checkOID(name, oid); pattern = mConfig.getString(PROP_PATTERN, null); checkOID(0); @@ -341,7 +341,7 @@ public class GenericASN1Ext extends APolicyRule implements * If this policy is enabled, add the private Integer * information extension to the certificate. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -453,7 +453,7 @@ public class GenericASN1Ext extends APolicyRule implements /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -485,7 +485,7 @@ public class GenericASN1Ext extends APolicyRule implements /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java b/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java index bb9abd9cf..9ceaf99bd 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java @@ -42,16 +42,16 @@ import com.netscape.cms.policy.APolicyRule; /** * Issuer Alt Name Extension policy. - * + * * This extension is used to associate Internet-style identities * with the Certificate issuer. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -101,7 +101,7 @@ public class IssuerAltNameExt extends APolicyRule /** * Initializes this policy rule. - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -139,7 +139,7 @@ public class IssuerAltNameExt extends APolicyRule /** * Adds a extension if none exists. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -224,7 +224,7 @@ public class IssuerAltNameExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return Empty Vector since this policy has no configuration parameters. * for this policy instance. */ @@ -234,7 +234,7 @@ public class IssuerAltNameExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return Empty Vector since this policy implementation has no * configuration parameters. */ diff --git a/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java b/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java index 6594cc4a2..24e5f45ed 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java @@ -47,12 +47,12 @@ import com.netscape.cms.policy.APolicyRule; * Policy to add Key Usage Extension. * Adds the key usage extension based on what's requested. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -96,11 +96,11 @@ public class KeyUsageExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.implName=KeyUsageExt ca.Policy.rule.<ruleName>.enable=true ca.Policy.rule.<ruleName>. - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -120,9 +120,9 @@ public class KeyUsageExt extends APolicyRule CertificateChain caChain = certAuthority.getCACertChain(); X509Certificate caCert = null; - // Note that in RA the chain could be null if CA was not up when - // RA was started. In that case just set the length to -1 and let - // CA reject if it does not allow any subordinate CA certs. + // Note that in RA the chain could be null if CA was not up when + // RA was started. In that case just set the length to -1 and let + // CA reject if it does not allow any subordinate CA certs. if (caChain != null) { caCert = caChain.getFirstCertificate(); mCAPathLen = caCert.getBasicConstraints(); @@ -147,14 +147,14 @@ public class KeyUsageExt extends APolicyRule * or RA could have set the extension.) * If not set, set from http input parameters or use default if * no http input parameters are set. - * + * * Note: this allows any bits requested - does not check if user * authenticated is allowed to have a Key Usage Extension with * those bits. Unless the CA's certificate path length is 0, then * we do not allow CA sign or CRL sign bits in any request. - * + * * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -191,7 +191,7 @@ public class KeyUsageExt extends APolicyRule // extension isn't there. ext = null; } - // check if CA does not allow subordinate CA certs. + // check if CA does not allow subordinate CA certs. // otherwise accept existing key usage extension. if (ext != null) { if (mCAPathLen == 0) { @@ -239,7 +239,7 @@ public class KeyUsageExt extends APolicyRule bits[KeyUsageExtension.DECIPHER_ONLY_BIT] = getBit("decipher_only", mDecipherOnly, req); - // don't allow no bits set or the extension does not + // don't allow no bits set or the extension does not // encode/decode properlly. boolean bitset = false; @@ -278,7 +278,7 @@ public class KeyUsageExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -344,7 +344,7 @@ public class KeyUsageExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java b/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java index ecc084d29..ca18b8023 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java @@ -47,12 +47,12 @@ import com.netscape.cms.policy.APolicyRule; * Netscape comment * Adds Netscape comment policy * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -89,10 +89,10 @@ public class NSCCommentExt extends APolicyRule * Initializes this policy rule. * <p> * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.implName=NSCCommentExtImpl ca.Policy.rule.<ruleName>.displayText=<n> * ca.Policy.rule.<ruleName>.commentFile=<n> ca.Policy.rule.<ruleName>.enable=false - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -147,7 +147,7 @@ public class NSCCommentExt extends APolicyRule /** * Applies the policy on the given Request. * <p> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -199,7 +199,7 @@ public class NSCCommentExt extends APolicyRule } catch (IOException e) { // this is the hack: for some reason, the key which is the name - // of the policy has been converted into the OID + // of the policy has been converted into the OID try { extensions.delete("2.16.840.1.113730.1.13"); } catch (IOException ee) { @@ -269,7 +269,7 @@ public class NSCCommentExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -278,7 +278,7 @@ public class NSCCommentExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java b/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java index 2fb09b2b7..c5daabed9 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java @@ -49,12 +49,12 @@ import com.netscape.cms.policy.APolicyRule; * NS Cert Type policy. * Adds the ns cert type extension depending on cert type requested. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -70,20 +70,20 @@ public class NSCertTypeExt extends APolicyRule protected static final boolean[] DEF_BITS = new boolean[NSCertTypeExtension.NBITS]; - // XXX for future use. currenlty always allow. + // XXX for future use. currenlty always allow. protected static final String PROP_AGENT_OVERR = "allowAgentOverride"; protected static final String PROP_EE_OVERR = "AllowEEOverride"; - // XXX for future use. currently always critical - // (standard says SHOULD be marked critical if included.) + // XXX for future use. currently always critical + // (standard says SHOULD be marked critical if included.) protected static final String PROP_CRITICAL = "critical"; - // XXX for future use to allow overrides from forms. + // XXX for future use to allow overrides from forms. // request must be agent approved or authenticated. protected boolean mAllowAgentOverride = false; protected boolean mAllowEEOverride = false; - // XXX for future use. currently always non-critical + // XXX for future use. currently always non-critical protected boolean mCritical = false; protected int mCAPathLen = -1; @@ -111,11 +111,11 @@ public class NSCertTypeExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ra.Policy.rule.<ruleName>.implName=nsCertTypeExt ra.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -153,7 +153,7 @@ public class NSCertTypeExt extends APolicyRule * reads ns cert type choices from form. If no choices from form * will defaults to all. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -224,7 +224,7 @@ public class NSCertTypeExt extends APolicyRule bits = getBitsFromRequest(req, mSetDefaultBits); - // check if ca doesn't allow any subordinate ca + // check if ca doesn't allow any subordinate ca if (mCAPathLen == 0 && bits != null) { if (bits[NSCertTypeExtension.SSL_CA_BIT] || bits[NSCertTypeExtension.EMAIL_CA_BIT] || @@ -283,7 +283,7 @@ public class NSCertTypeExt extends APolicyRule // always return false for now to make sure minimum is set. // agents and ee can add others. - // must be agent approved or authenticated for allowing extensions + // must be agent approved or authenticated for allowing extensions // which is always the case if we get to this point. IAuthToken token = req.getExtDataInAuthToken(IRequest.AUTH_TOKEN); @@ -448,7 +448,7 @@ public class NSCertTypeExt extends APolicyRule if (certType.equals(IRequest.CLIENT_CERT)) { CMS.debug("NSCertTypeExt: setting bits for client cert"); - // we can only guess here when it's client. + // we can only guess here when it's client. // sets all client bit for default. bits[NSCertTypeExtension.SSL_CLIENT_BIT] = true; bits[NSCertTypeExtension.EMAIL_BIT] = true; @@ -488,7 +488,7 @@ public class NSCertTypeExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -526,7 +526,7 @@ public class NSCertTypeExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java index f010bf3f1..1b132e835 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java @@ -47,12 +47,12 @@ import com.netscape.cms.policy.APolicyRule; * Adds the name constraints extension to a (CA) certificate. * Filtering of CA certificates is done through predicates. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -89,21 +89,21 @@ public class NameConstraintsExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.predicate=certType==ca ca.Policy.rule.<ruleName>.implName= * ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) throws EBaseException { mConfig = config; - // XXX should do do this ? - // if CA does not allow subordinate CAs by way of basic constraints, - // this policy always rejects + // XXX should do do this ? + // if CA does not allow subordinate CAs by way of basic constraints, + // this policy always rejects /***** * ICertAuthority certAuthority = (ICertAuthority) * ((IPolicyProcessor)owner).getAuthority(); @@ -192,7 +192,7 @@ public class NameConstraintsExt extends APolicyRule } } - // form instance params + // form instance params mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical); mInstanceParams.addElement( PROP_NUM_PERMITTEDSUBTREES + "=" + mNumPermittedSubtrees); @@ -225,15 +225,15 @@ public class NameConstraintsExt extends APolicyRule /** * Adds Name Constraints Extension to a (CA) certificate. - * + * * If a Name constraints Extension is already there, accept it if * it's been approved by agent, else replace it. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ public PolicyResult apply(IRequest req) { - // if extension hasn't been properly configured reject requests until + // if extension hasn't been properly configured reject requests until // it has been resolved (or disabled). if (mNameConstraintsExtension == null) { //setError(req, PolicyResources.EXTENSION_NOT_INITED_1, NAME); @@ -275,7 +275,7 @@ public class NameConstraintsExt extends APolicyRule extensions.get(NameConstraintsExtension.NAME); } } catch (IOException e) { - // extension isn't there. + // extension isn't there. } if (nameConstraintsExt != null) { @@ -320,7 +320,7 @@ public class NameConstraintsExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -350,7 +350,7 @@ public class NameConstraintsExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java b/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java index 33f2f85e0..aece9664a 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java @@ -42,12 +42,12 @@ import com.netscape.cms.policy.APolicyRule; * This implements an OCSP Signing policy, it * adds the OCSP Signing extension to the certificate. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$ $Date$ */ diff --git a/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java index 861107b8e..0bb77e207 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java @@ -44,12 +44,12 @@ import com.netscape.cms.policy.APolicyRule; * Adds the policy constraints extension to (CA) certificates. * Filtering of CA certificates is done through predicates. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -90,21 +90,21 @@ public class PolicyConstraintsExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.predicate=certType==ca ca.Policy.rule.<ruleName>.implName= * ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) throws EBaseException { mConfig = config; - // XXX should do do this ? - // if CA does not allow subordinate CAs by way of basic constraints, - // this policy always rejects + // XXX should do do this ? + // if CA does not allow subordinate CAs by way of basic constraints, + // this policy always rejects /***** * ICertAuthority certAuthority = (ICertAuthority) * ((GenericPolicyProcessor)owner).mAuthority; @@ -136,7 +136,7 @@ public class PolicyConstraintsExt extends APolicyRule if (mInhibitPolicyMapping < -1) mInhibitPolicyMapping = -1; - // create instance of policy constraings extension + // create instance of policy constraings extension try { mPolicyConstraintsExtension = new PolicyConstraintsExtension(mCritical, @@ -152,7 +152,7 @@ public class PolicyConstraintsExt extends APolicyRule "Could not init Policy Constraints Extension. Error: " + e)); } - // form instance params + // form instance params mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical); mInstanceParams.addElement( PROP_REQ_EXPLICIT_POLICY + "=" + mReqExplicitPolicy); @@ -162,15 +162,15 @@ public class PolicyConstraintsExt extends APolicyRule /** * Adds Policy Constraints Extension to a (CA) certificate. - * + * * If a Policy constraints Extension is already there, accept it if * it's been approved by agent, else replace it. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ public PolicyResult apply(IRequest req) { - // if extension hasn't been properly configured reject requests until + // if extension hasn't been properly configured reject requests until // it has been resolved (or disabled). if (mPolicyConstraintsExtension == null) { return PolicyResult.ACCEPTED; @@ -210,7 +210,7 @@ public class PolicyConstraintsExt extends APolicyRule extensions.get(PolicyConstraintsExtension.NAME); } } catch (IOException e) { - // extension isn't there. + // extension isn't there. } if (policyConstraintsExt != null) { @@ -247,7 +247,7 @@ public class PolicyConstraintsExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -256,7 +256,7 @@ public class PolicyConstraintsExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java b/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java index 7623f455f..0af8b86ca 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java @@ -47,12 +47,12 @@ import com.netscape.cms.policy.APolicyRule; * Adds the Policy Mappings extension to a (CA) certificate. * Filtering of CA certificates is done through predicates. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -84,21 +84,21 @@ public class PolicyMappingsExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.predicate=certType==ca ca.Policy.rule.<ruleName>.implName= * ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) throws EBaseException { mConfig = config; - // XXX should do do this ? - // if CA does not allow subordinate CAs by way of basic constraints, - // this policy always rejects + // XXX should do do this ? + // if CA does not allow subordinate CAs by way of basic constraints, + // this policy always rejects /***** * ICertAuthority certAuthority = (ICertAuthority) * ((IPolicyProcessor)owner).getAuthority(); @@ -129,7 +129,7 @@ public class PolicyMappingsExt extends APolicyRule "value must be greater than or equal to 1")); } - // init Policy Mappings, check values if enabled. + // init Policy Mappings, check values if enabled. mPolicyMaps = new PolicyMap[mNumPolicyMappings]; for (int i = 0; i < mNumPolicyMappings; i++) { String subtreeName = PROP_POLICYMAP + i; @@ -161,7 +161,7 @@ public class PolicyMappingsExt extends APolicyRule } } - // form instance params + // form instance params mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical); mInstanceParams.addElement( PROP_NUM_POLICYMAPPINGS + "=" + mNumPolicyMappings); @@ -172,15 +172,15 @@ public class PolicyMappingsExt extends APolicyRule /** * Adds policy mappings Extension to a (CA) certificate. - * + * * If a policy mappings Extension is already there, accept it if * it's been approved by agent, else replace it. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ public PolicyResult apply(IRequest req) { - // if extension hasn't been properly configured reject requests until + // if extension hasn't been properly configured reject requests until // it has been resolved (or disabled). if (mPolicyMappingsExtension == null) { //setError(req, PolicyResources.EXTENSION_NOT_INITED_1, NAME); @@ -221,7 +221,7 @@ public class PolicyMappingsExt extends APolicyRule extensions.get(PolicyMappingsExtension.NAME); } } catch (IOException e) { - // extension isn't there. + // extension isn't there. } if (policyMappingsExt != null) { @@ -258,7 +258,7 @@ public class PolicyMappingsExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -286,7 +286,7 @@ public class PolicyMappingsExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { @@ -338,7 +338,7 @@ class PolicyMap { /** * forms policy map parameters. - * + * * @param name name of this policy map, for example policyMap0 * @param config parent's config from where we find this configuration. * @param enabled whether policy was enabled. diff --git a/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java b/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java index e13a7a84c..b586c8bdf 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java @@ -31,12 +31,12 @@ import com.netscape.cms.policy.APolicyRule; /** * Checks extension presence. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -148,7 +148,7 @@ public class PresenceExt extends APolicyRule { /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java b/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java index 3b80246a9..fd52e9bb1 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java @@ -44,12 +44,12 @@ import com.netscape.cms.policy.APolicyRule; /** * PrivateKeyUsagePeriod Identifier Extension policy. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -124,7 +124,7 @@ public class PrivateKeyUsagePeriodExt extends APolicyRule * ra.Policy.rule.<ruleName>.notAfter=180 * ra.Policy.rule.<ruleName>.critical=false * ra.Policy.rule.<ruleName>.predicate=ou==Sales - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -151,7 +151,7 @@ public class PrivateKeyUsagePeriodExt extends APolicyRule /** * Adds a private key usage extension if none exists. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -222,7 +222,7 @@ public class PrivateKeyUsagePeriodExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return Empty Vector since this policy has no configuration parameters. * for this policy instance. */ @@ -237,7 +237,7 @@ public class PrivateKeyUsagePeriodExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return Empty Vector since this policy implementation has no * configuration parameters. */ diff --git a/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java index 2a5af4240..b5d6d8eec 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java @@ -40,12 +40,12 @@ import com.netscape.cms.policy.APolicyRule; * Remove Basic Constraints policy. * Adds the Basic constraints extension. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -109,7 +109,7 @@ public class RemoveBasicConstraintsExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -120,7 +120,7 @@ public class RemoveBasicConstraintsExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java index 63bd8804c..e1ae7d074 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java @@ -42,50 +42,50 @@ import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; /** - * + * * THIS POLICY HAS BEEN DEPRECATED SINCE CMS 4.2. * New Policy is com.netscape.certsrv.policy.SubjectAltNameExt. * <p> - * + * * Subject Alternative Name extension policy in CMS 4.1. - * + * * Adds the subject alternative name extension depending on the certificate type requested. - * + * * Two forms are supported. 1) For S/MIME certificates, email addresses are copied from data stored in the request by * the authentication component. Both 'e' and 'altEmail' are supported so that both the primary address and alternative * forms may be certified. Only the primary goes in the subjectName position (which should be phased out). - * + * * e mailAlternateAddress * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ public class SubjAltNameExt extends APolicyRule implements IEnrollmentPolicy, IExtendedPluginInfo { - // for future use. currently always allow. + // for future use. currently always allow. protected static final String PROP_AGENT_OVERR = "allowAgentOverride"; protected static final String PROP_EE_OVERR = "AllowEEOverride"; protected static final String PROP_ENABLE_MANUAL_VALUES = "enableManualValues"; - // for future use. currently always non-critical - // (standard says SHOULD be marked critical if included.) + // for future use. currently always non-critical + // (standard says SHOULD be marked critical if included.) protected static final String PROP_CRITICAL = "critical"; - // for future use to allow overrides from forms. + // for future use to allow overrides from forms. // request must be agent approved or authenticated. protected boolean mAllowAgentOverride = false; protected boolean mAllowEEOverride = false; protected boolean mEnableManualValues = false; - // for future use. currently always critical - // (standard says SHOULD be marked critical if included.) + // for future use. currently always critical + // (standard says SHOULD be marked critical if included.) protected boolean mCritical = false; public SubjAltNameExt() { @@ -116,11 +116,11 @@ public class SubjAltNameExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ra.Policy.rule.<ruleName>.implName=SubjAltNameExt ra.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -134,9 +134,9 @@ public class SubjAltNameExt extends APolicyRule /** * Adds the subject alternative names extension if not set already. - * + * * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -303,7 +303,7 @@ public class SubjAltNameExt extends APolicyRule /** * Create a new SET of extensions in the certificate info * object. - * + * * This should be a method in the X509CertInfo object */ protected CertificateExtensions @@ -323,7 +323,7 @@ public class SubjAltNameExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -339,7 +339,7 @@ public class SubjAltNameExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java index 62f0b21da..0d89d8876 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java @@ -46,31 +46,31 @@ import com.netscape.cms.policy.APolicyRule; /** * Subject Alternative Name extension policy. - * + * * Adds the subject alternative name extension as configured. - * + * * Two forms are supported. 1) For S/MIME certificates, email * addresses are copied from data stored in the request by the * authentication component. Both 'e' and 'altEmail' are supported * so that both the primary address and alternative forms may be * certified. Only the primary goes in the subjectName position (which * should be phased out). - * + * * e * mailAlternateAddress * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ public class SubjectAltNameExt extends APolicyRule implements IEnrollmentPolicy, IExtendedPluginInfo { - // (standard says SHOULD be marked critical if included.) + // (standard says SHOULD be marked critical if included.) protected static final String PROP_CRITICAL = "critical"; protected static final boolean DEF_CRITICAL = false; @@ -106,11 +106,11 @@ public class SubjectAltNameExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ra.Policy.rule.<ruleName>.implName=SubjectAltNameExt ra.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -150,9 +150,9 @@ public class SubjectAltNameExt extends APolicyRule /** * Adds the subject alternative names extension if not set already. - * + * * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -187,7 +187,7 @@ public class SubjectAltNameExt extends APolicyRule certInfo.get(X509CertInfo.EXTENSIONS); // Remove any previously computed version of the extension - // unless it is from RA. If from RA, accept what RA put in + // unless it is from RA. If from RA, accept what RA put in // request and don't add our own. if (extensions != null) { String sourceId = req.getSourceId(); @@ -232,7 +232,7 @@ public class SubjectAltNameExt extends APolicyRule curCritical = true; } - // make the extension + // make the extension SubjectAlternativeNameExtension sa = new SubjectAlternativeNameExtension(curCritical, gns); // add it to certInfo. @@ -265,7 +265,7 @@ public class SubjectAltNameExt extends APolicyRule /** * Create a new SET of extensions in the certificate info * object. - * + * * This should be a method in the X509CertInfo object */ protected CertificateExtensions @@ -285,7 +285,7 @@ public class SubjectAltNameExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -294,7 +294,7 @@ public class SubjectAltNameExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java index 6b4e7ead9..bcd9c9885 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java @@ -47,12 +47,12 @@ import com.netscape.cms.policy.APolicyRule; /** * Policy to add the subject directory attributes extension. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java index 32d254c40..16fc73347 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java @@ -49,12 +49,12 @@ import com.netscape.cms.policy.APolicyRule; * Subject Public Key Extension Policy * Adds the subject public key id extension to certificates. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -101,11 +101,11 @@ public class SubjectKeyIdentifierExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.predicate= ca.Policy.rule.<ruleName>.implName= ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -145,7 +145,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule KEYID_TYPE_SPKISHA1)); } - // form instance params + // form instance params mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical); mInstanceParams.addElement(PROP_KEYID_TYPE + "=" + mKeyIdType); @@ -157,7 +157,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule /** * Adds Subject Key identifier Extension to a certificate. * If the extension is already there, accept it. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -194,7 +194,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule extensions.get(SubjectKeyIdentifierExtension.NAME); } } catch (IOException e) { - // extension isn't there. + // extension isn't there. } if (subjectKeyIdExt != null) { if (agentApproved(req)) { @@ -253,7 +253,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule /** * Form the Key Identifier in the Subject Key Identifier extension. * <p> - * + * * @param certInfo Certificate Info * @param req request * @return A Key Identifier. @@ -284,7 +284,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule * the least significate 60 bits of the sha-1 hash of the subject * public key BIT STRING in accordance with RFC 2459. * <p> - * + * * @param certInfo - certificate info * @return A Key Identifier with value formulatd as described. */ @@ -339,7 +339,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -348,7 +348,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/profile/common/BasicProfile.java b/base/common/src/com/netscape/cms/profile/common/BasicProfile.java index 696d0cd13..0c60f081c 100644 --- a/base/common/src/com/netscape/cms/profile/common/BasicProfile.java +++ b/base/common/src/com/netscape/cms/profile/common/BasicProfile.java @@ -50,7 +50,7 @@ import com.netscape.certsrv.request.RequestStatus; /** * This class implements a basic profile. - * + * * @version $Revision$, $Date$ */ public abstract class BasicProfile implements IProfile { @@ -206,7 +206,7 @@ public abstract class BasicProfile implements IProfile { // policy.p1.constraint.params.x1=x1 // policy.p1.constraint.params.x2=x2 - // handle profile authentication plugins + // handle profile authentication plugins try { mAuthInstanceId = config.getString("auth." + PROP_INSTANCE_ID, null); mAuthzAcl = config.getString("authz.acl", ""); @@ -742,7 +742,7 @@ public abstract class BasicProfile implements IProfile { throws EProfileException { // String setId ex: policyset.set1 - // String id Id of policy : examples: p1,p2,p3 + // String id Id of policy : examples: p1,p2,p3 // String defaultClassId : id of the default plugin ex: validityDefaultImpl // String constraintClassId : if of the constraint plugin ex: basicConstraintsExtConstraintImpl // boolean createConfig : true : being called from the console. false: being called from server startup code @@ -847,7 +847,7 @@ public abstract class BasicProfile implements IProfile { // noDefaultImpl, genericExtDefaultImpl if ((curDefaultClassId.equals(defaultClassId) && - !curDefaultClassId.equals(PROP_NO_DEFAULT) && + !curDefaultClassId.equals(PROP_NO_DEFAULT) && !curDefaultClassId.equals(PROP_GENERIC_EXT_DEFAULT))) { matches++; @@ -1110,11 +1110,11 @@ public abstract class BasicProfile implements IProfile { /** * Signed Audit Log - * + * * This method is inherited by all extended "BasicProfile"s, * and is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ protected void audit(String msg) { @@ -1134,12 +1134,12 @@ public abstract class BasicProfile implements IProfile { /** * Signed Audit Log Subject ID - * + * * This method is inherited by all extended "BasicProfile"s, * and is called to obtain the "SubjectID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message SubjectID */ protected String auditSubjectID() { diff --git a/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java index b95b22339..1ae2f0853 100644 --- a/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java +++ b/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.profile.IProfilePolicy; /** * This class implements a Certificate Manager enrollment * profile for CA Certificates. - * + * * @version $Revision$, $Date$ */ public class CACertCAEnrollProfile extends CAEnrollProfile @@ -44,7 +44,7 @@ public class CACertCAEnrollProfile extends CAEnrollProfile NameValuePairs inputParams2 = new NameValuePairs(); createProfileInput("i2", "submitterInfoInputImpl", inputParams2); - // create outputs + // create outputs NameValuePairs outputParams1 = new NameValuePairs(); createProfileOutput("o1", "certOutputImpl", outputParams1); diff --git a/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java index c03f90a4b..46bc1a787 100644 --- a/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java +++ b/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.request.RequestStatus; /** * This class implements a Certificate Manager enrollment * profile. - * + * * @version $Revision$, $Date$ */ public class CAEnrollProfile extends EnrollProfile { @@ -181,7 +181,7 @@ public class CAEnrollProfile extends EnrollProfile { X509CertInfo info = request.getExtDataInCertInfo(REQUEST_CERTINFO); X509CertImpl theCert = null; - // #615460 - added audit log (transaction) + // #615460 - added audit log (transaction) SessionContext sc = SessionContext.getExistingContext(); sc.put("profileId", getId()); String setId = request.getExtDataInString("profileSetId"); diff --git a/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java b/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java index 3610520fd..444024b94 100644 --- a/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java +++ b/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.profile.IProfileContext; /** * This class implements an enrollment profile context * that carries information for request creation. - * + * * @version $Revision$, $Date$ */ public class EnrollProfileContext extends ProfileContext diff --git a/base/common/src/com/netscape/cms/profile/common/ProfileContext.java b/base/common/src/com/netscape/cms/profile/common/ProfileContext.java index 7d0686378..d07cdfc27 100644 --- a/base/common/src/com/netscape/cms/profile/common/ProfileContext.java +++ b/base/common/src/com/netscape/cms/profile/common/ProfileContext.java @@ -23,7 +23,7 @@ import com.netscape.certsrv.profile.IProfileContext; /** * This class implements the profile context. - * + * * @version $Revision$, $Date$ */ public class ProfileContext implements IProfileContext { diff --git a/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java b/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java index a8a90aef9..157914927 100644 --- a/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java +++ b/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java @@ -25,7 +25,7 @@ import com.netscape.certsrv.profile.IProfilePolicy; * This class implements a profile policy that * contains a default policy and a constraint * policy. - * + * * @version $Revision$, $Date$ */ public class ProfilePolicy implements IProfilePolicy { diff --git a/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java index 36bac1fa7..8bcb59c86 100644 --- a/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java +++ b/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.RequestStatus; /** * This class implements a Registration Manager * enrollment profile. - * + * * @version $Revision$, $Date$ */ public class RAEnrollProfile extends EnrollProfile { diff --git a/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java index 9be1e43c4..a1a83a49f 100644 --- a/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java +++ b/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.profile.IProfilePolicy; /** * This class implements a Certificate Manager enrollment * profile for Server Certificates. - * + * * @version $Revision$, $Date$ */ public class ServerCertCAEnrollProfile extends CAEnrollProfile diff --git a/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java index 3f1cdfb21..710a4616d 100644 --- a/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java +++ b/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.profile.IProfilePolicy; /** * This class implements a Certificate Manager enrollment * profile for User Certificates. - * + * * @version $Revision$, $Date$ */ public class UserCertCAEnrollProfile extends CAEnrollProfile diff --git a/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java index f924c587f..ca2668f7d 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java @@ -42,7 +42,7 @@ import com.netscape.cms.profile.def.UserExtensionDefault; * This class implements the basic constraints extension constraint. * It checks if the basic constraint in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class BasicConstraintsExtConstraint extends EnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java index e118fa215..a7a159de3 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java @@ -41,7 +41,7 @@ import com.netscape.cms.profile.def.ValidityDefault; * This class implements the validity constraint. * It checks if the validity in the certificate * template is within the CA's validity. - * + * * @version $Revision$, $Date$ */ public class CAValidityConstraint extends CAEnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java index 40c2153a8..eb3eb14f6 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java @@ -40,7 +40,7 @@ import com.netscape.cms.profile.common.EnrollProfile; /** * This class implements the generic enrollment constraint. - * + * * @version $Revision$, $Date$ */ public abstract class EnrollConstraint implements IPolicyConstraint { @@ -114,7 +114,7 @@ public abstract class EnrollConstraint implements IPolicyConstraint { /** * Validates the request. The request is not modified * during the validation. - * + * * @param request enrollment request * @param info certificate template * @exception ERejectException request is rejected due @@ -126,11 +126,11 @@ public abstract class EnrollConstraint implements IPolicyConstraint { /** * Validates the request. The request is not modified * during the validation. - * + * * The current implementation of this method calls * into the subclass's validate(request, info) * method for validation checking. - * + * * @param request request * @exception ERejectException request is rejected due * to violation of constraint diff --git a/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java index 3c737e8a5..7821964b9 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java @@ -43,7 +43,7 @@ import com.netscape.cms.profile.def.UserExtensionDefault; * This class implements the extended key usage extension constraint. * It checks if the extended key usage extension in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class ExtendedKeyUsageExtConstraint extends EnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java index 1562fddb8..97dc358e3 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java @@ -40,7 +40,7 @@ import com.netscape.cms.profile.def.UserExtensionDefault; * This class implements the general extension constraint. * It checks if the extension in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class ExtensionConstraint extends EnrollConstraint { @@ -110,7 +110,7 @@ public class ExtensionConstraint extends EnrollConstraint { getConfig(CONFIG_OID))); } - // check criticality + // check criticality String value = getConfig(CONFIG_CRITICAL); if (!isOptional(value)) { diff --git a/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java index e6f5019a0..2d1f44751 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java @@ -46,7 +46,7 @@ import com.netscape.cms.profile.def.UserKeyDefault; /** * This constraint is to check the key type and * key length. - * + * * @version $Revision$, $Date$ */ @SuppressWarnings("serial") @@ -454,7 +454,7 @@ public class KeyConstraint extends EnrollConstraint { CMS.debug("algId: " + algid); - //Get raw string representation of alg parameters, will give + //Get raw string representation of alg parameters, will give //us the curve OID. String params = null; @@ -582,7 +582,7 @@ public class KeyConstraint extends EnrollConstraint { if (keyType.equals("")) return; } - // All the params we need for validation have been collected, + // All the params we need for validation have been collected, // we don't know which order they will show up if (keyType.length() > 0 && keyParams.length() > 0) { String[] params = keyParams.split(","); diff --git a/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java index 927c64ec2..f7ec42215 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java @@ -40,7 +40,7 @@ import com.netscape.cms.profile.def.UserExtensionDefault; * This class implements the key usage extension constraint. * It checks if the key usage constraint in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class KeyUsageExtConstraint extends EnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java index 843360542..066553275 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java @@ -39,7 +39,7 @@ import com.netscape.cms.profile.def.UserExtensionDefault; * This class implements the Netscape certificate type extension constraint. * It checks if the Netscape certificate type extension in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class NSCertTypeExtConstraint extends EnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java index 459e9f219..17f6e0b37 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements no constraint. - * + * * @version $Revision$, $Date$ */ public class NoConstraint implements IPolicyConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java index fb01d7d14..d1403962e 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java @@ -38,13 +38,13 @@ import com.netscape.cms.profile.def.NoDefault; /** * This class supports renewal grace period, which has two * parameters: graceBefore and graceAfter - * + * * @author Christina Fu * @version $Revision$, $Date$ */ public class RenewGracePeriodConstraint extends EnrollConstraint { - // for renewal: # of days before the orig cert expiration date + // for renewal: # of days before the orig cert expiration date public static final String CONFIG_RENEW_GRACE_BEFORE = "renewal.graceBefore"; // for renewal: # of days after the orig cert expiration date public static final String CONFIG_RENEW_GRACE_AFTER = "renewal.graceAfter"; diff --git a/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java index 4dbe329b3..4ccb9ad8f 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java @@ -43,7 +43,7 @@ import com.netscape.cms.profile.def.UserSigningAlgDefault; * This class implements the signing algorithm constraint. * It checks if the signing algorithm in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class SigningAlgConstraint extends EnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java index 477e99b98..6ecac885b 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java @@ -41,7 +41,7 @@ import com.netscape.cms.profile.def.UserSubjectNameDefault; * This class implements the subject name constraint. * It checks if the subject name in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class SubjectNameConstraint extends EnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java index f10130aa6..8d7a67a77 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java @@ -46,13 +46,13 @@ import com.netscape.cms.profile.def.NoDefault; * The config param "allowSameKeyRenewal" enables the * situation where if the publickey is not unique, and if * the subject DN is the same, that is a "renewal". - * + * * Another "feature" that is quoted out of this code is the * "revokeDupKeyCert" option, which enables the revocation * of certs that bear the same publickey as the enrolling * request. Since this can potentially be abused, it is taken * out and preserved in comments to allow future refinement. - * + * * @version $Revision$, $Date$ */ public class UniqueKeyConstraint extends EnrollConstraint { @@ -166,7 +166,7 @@ public class UniqueKeyConstraint extends EnrollConstraint { BigInteger serialNum = cert.getSerialNumber(); ICAService service = (ICAService) mCA.getCAService(); - RevokedCertImpl crlEntry = + RevokedCertImpl crlEntry = formCRLEntry(serialNum, RevocationReason.KEY_COMPROMISE); service.revokeCert(crlEntry); CMS.debug("UniqueKeyConstraint: certificate with duplicate publickey revoked successfully"); @@ -234,28 +234,28 @@ public class UniqueKeyConstraint extends EnrollConstraint { /** * make a CRL entry from a serial number and revocation reason. - * + * * @return a RevokedCertImpl that can be entered in a CRL. - * + * * protected RevokedCertImpl formCRLEntry( * BigInteger serialNo, RevocationReason reason) * throws EBaseException { * CRLReasonExtension reasonExt = new CRLReasonExtension(reason); * CRLExtensions crlentryexts = new CRLExtensions(); - * + * * try { * crlentryexts.set(CRLReasonExtension.NAME, reasonExt); * } catch (IOException e) { * CMS.debug("CMSGW_ERR_CRL_REASON "+e.toString()); - * + * * // throw new ECMSGWException( * // CMS.getLogMessage("CMSGW_ERROR_SETTING_CRLREASON")); - * + * * } * RevokedCertImpl crlentry = * new RevokedCertImpl(serialNo, CMS.getCurrentDate(), * crlentryexts); - * + * * return crlentry; * } */ diff --git a/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java index 7a985b631..6545b81fd 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java @@ -55,7 +55,7 @@ import com.netscape.cms.profile.def.UserSubjectNameDefault; * It checks if the subject name in the certificate is * unique in the internal database, ie, no two certificates * have the same subject name. - * + * * @version $Revision$, $Date$ */ public class UniqueSubjectNameConstraint extends EnrollConstraint { @@ -143,7 +143,7 @@ public class UniqueSubjectNameConstraint extends EnrollConstraint { /** * Validates the request. The request is not modified * during the validation. - * + * * Rules are as follows: * If the subject name is not unique, then the request will be rejected unless: * 1. the certificate is expired or expired_revoked diff --git a/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java index 98a7b4f96..b7588aa4d 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java @@ -43,7 +43,7 @@ import com.netscape.cms.profile.def.ValidityDefault; * This class implements the validity constraint. * It checks if the validity in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class ValidityConstraint extends EnrollConstraint { @@ -154,11 +154,11 @@ public class ValidityConstraint extends EnrollConstraint { Integer.toString(days))); } - // 613828 - // The validity field shall specify a notBefore value - // that does not precede the current time and a notAfter - // value that does not precede the value specified in - // notBefore (test can be automated; try entering violating + // 613828 + // The validity field shall specify a notBefore value + // that does not precede the current time and a notAfter + // value that does not precede the value specified in + // notBefore (test can be automated; try entering violating // time values and check result). String notBeforeCheckStr = getConfig(CONFIG_CHECK_NOT_BEFORE); boolean notBeforeCheck; diff --git a/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java b/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java index 4e4f951f7..36818a907 100644 --- a/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java @@ -42,7 +42,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements an enrollment default policy * that populates Authuority Info Access extension. - * + * * @version $Revision$, $Date$ */ public class AuthInfoAccessExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java index 6c0f6e9fc..e789625e4 100644 --- a/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy that * populates subject name based on the attribute values * in the authentication token (AuthToken) object. - * + * * @version $Revision$, $Date$ */ public class AuthTokenSubjectNameDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java b/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java index 6ec75990c..77fd0a5fd 100644 --- a/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates Authority Key Identifier extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class AuthorityKeyIdentifierExtDefault extends CAEnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java b/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java index 043cf029b..f685a4f59 100644 --- a/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java @@ -33,7 +33,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements an enrollment default policy * that automatically assign request to agent. - * + * * @version $Revision$, $Date$ */ public class AutoAssignDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java index c442bf576..a827b7eaf 100644 --- a/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates Basic Constraint extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class BasicConstraintsExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java b/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java index 872e32960..1d1d05ed5 100644 --- a/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.ca.ICertificateAuthority; * This class implements an abstract CA specific * Enrollment default. This policy can only be * used with CA subsystem. - * + * * @version $Revision$, $Date$ */ public abstract class CAEnrollDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java index d1def3d5d..4bbd215a2 100644 --- a/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java @@ -48,7 +48,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a CRL Distribution points extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class CRLDistributionPointsExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java b/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java index 8d4ae2288..e68ffca07 100644 --- a/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java @@ -50,7 +50,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a policy mappings extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class CertificatePoliciesExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java b/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java index d30f971dd..752d99cbb 100644 --- a/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a Netscape comment extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class CertificateVersionDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java b/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java index 67ebadbe4..162d1647c 100644 --- a/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java @@ -62,7 +62,7 @@ import com.netscape.cms.profile.common.EnrollProfile; /** * This class implements an enrollment default policy. - * + * * @version $Revision$, $Date$ */ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDefault { @@ -125,7 +125,7 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe /** * Retrieves the localizable description of this policy. - * + * * @param locale locale of the end user * @return localized description of this default policy */ @@ -145,7 +145,7 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe /** * Populates attributes into the certificate template. - * + * * @param request enrollment request * @param info certificate template * @exception EProfileException failed to populate attributes @@ -156,7 +156,7 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe /** * Sets values from the approval page into certificate template. - * + * * @param name name of the attribute * @param locale user locale * @param info certificate template @@ -171,7 +171,7 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe /** * Retrieves certificate template values and returns them to * the approval page. - * + * * @param name name of the attribute * @param locale user locale * @param info certificate template @@ -184,10 +184,10 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe /** * Populates the request with this policy default. - * + * * The current implementation extracts enrollment specific attributes * and calls the populate() method of the subclass. - * + * * @param request request to be populated * @exception EProfileException failed to populate */ @@ -220,10 +220,10 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe /** * Sets the value of the given value property by name. - * + * * The current implementation extracts enrollment specific attributes * and calls the setValue() method of the subclass. - * + * * @param name name of property * @param locale locale of the end user * @param request request @@ -244,10 +244,10 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe /** * Retrieves the value of the given value * property by name. - * + * * The current implementation extracts enrollment specific attributes * and calls the getValue() method of the subclass. - * + * * @param name name of property * @param locale locale of the end user * @param request request @@ -604,7 +604,7 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe /** * Check if a object identifier in string form is valid, * that is a string in the form n.n.n.n and der encode and decode-able. - * + * * @param oid object identifier string. * @return true if the oid is valid */ diff --git a/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java b/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java index 24f79cdec..da395871b 100644 --- a/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java @@ -21,7 +21,7 @@ package com.netscape.cms.profile.def; * This class implements an enrollment extension * default policy that extension into the certificate * template. - * + * * @version $Revision$, $Date$ */ public abstract class EnrollExtDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java b/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java index f1d63a348..22f00eb94 100644 --- a/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates Extended Key Usage extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class ExtendedKeyUsageExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java b/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java index acbbd1089..b78f0e6cf 100644 --- a/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates Freshest CRL extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class FreshestCRLExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java b/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java index 1797091b7..d5d88c29e 100644 --- a/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a Netscape comment extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class GenericExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/ImageDefault.java b/base/common/src/com/netscape/cms/profile/def/ImageDefault.java index 16a7ac402..c1e69c9f4 100644 --- a/base/common/src/com/netscape/cms/profile/def/ImageDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/ImageDefault.java @@ -33,7 +33,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements an enrollment default policy * that shows an image in the approval page. - * + * * @version $Revision$, $Date$ */ public class ImageDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java b/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java index 97cfb3ff4..cba06023f 100644 --- a/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements an inhibit Any-Policy extension - * + * * @version $Revision$, $Date$ */ public class InhibitAnyPolicyExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java b/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java index 251d8a3e7..3feddd628 100644 --- a/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java @@ -42,7 +42,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a issuer alternative name extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class IssuerAltNameExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java b/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java index 1bfda9ad9..bbc4f5227 100644 --- a/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a Key Usage extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class KeyUsageExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java b/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java index cc96f3e90..f6da8aede 100644 --- a/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a Netscape comment extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class NSCCommentExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java b/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java index 0677ef69f..1ad86ea5f 100644 --- a/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java @@ -36,7 +36,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a Netscape Certificate Type extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class NSCertTypeExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java index e57d04067..929878de3 100644 --- a/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a name constraint extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class NameConstraintsExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/NoDefault.java b/base/common/src/com/netscape/cms/profile/def/NoDefault.java index 4678f4487..2e80aee2f 100644 --- a/base/common/src/com/netscape/cms/profile/def/NoDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/NoDefault.java @@ -33,7 +33,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements no default policy. - * + * * @version $Revision$, $Date$ */ public class NoDefault implements IPolicyDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java b/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java index 382f3cec3..ab5b8c62b 100644 --- a/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates an OCSP No Check extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class OCSPNoCheckExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java index db9b95a04..ced6096a3 100644 --- a/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a policy constraints extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class PolicyConstraintsExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java index 712641c0d..55a9e420e 100644 --- a/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a policy mappings extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class PolicyMappingsExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java b/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java index 20285567e..6532a13f0 100644 --- a/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java @@ -40,7 +40,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a Private Key Usage Period extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class PrivateKeyUsagePeriodExtDefault extends EnrollExtDefault { @@ -290,7 +290,7 @@ public class PrivateKeyUsagePeriodExtDefault extends EnrollExtDefault { try { boolean critical = getConfigBoolean(CONFIG_CRITICAL); - // always + 60 seconds + // always + 60 seconds String startTimeStr = getConfig(CONFIG_START_TIME); if (startTimeStr == null || startTimeStr.equals("")) { diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java index d3838577e..0aa92937f 100644 --- a/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java @@ -45,7 +45,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a subject alternative name extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class SubjectAltNameExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java index cca5ab234..813e92a28 100644 --- a/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java @@ -46,7 +46,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a subject directory attributes extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class SubjectDirAttributesExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java index 8ea7533cc..d850147a4 100644 --- a/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java @@ -42,7 +42,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements an enrollment default policy * that populates Subject Info Access extension. - * + * * @version $Revision$, $Date$ */ public class SubjectInfoAccessExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java index 9476e45f6..a8f6a7415 100644 --- a/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java @@ -42,7 +42,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a subject key identifier extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class SubjectKeyIdentifierExtDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java index 479219b84..31aee6dd6 100644 --- a/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates server-side configurable subject name * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class SubjectNameDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java b/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java index 46a78c731..a78992a74 100644 --- a/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a user-supplied extension * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class UserExtensionDefault extends EnrollExtDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java b/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java index b1dc9d116..f6bc488b2 100644 --- a/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a user supplied key * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class UserKeyDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java b/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java index 4aeed6ba3..7625f9a34 100644 --- a/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a user-supplied signing algorithm * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class UserSigningAlgDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java index 65456e256..77d743334 100644 --- a/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a user-supplied subject name * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class UserSubjectNameDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java b/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java index 3fadb81fd..8d5ca7d55 100644 --- a/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java @@ -38,7 +38,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a user-supplied validity * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class UserValidityDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java b/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java index ad06400f3..0c31fb0a8 100644 --- a/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java @@ -39,7 +39,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates a server-side configurable validity * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class ValidityDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java index 6b5ab6bc0..bd935fb53 100644 --- a/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates server-side configurable subject name * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class nsHKeySubjectNameDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java index cc1a8de81..c90b76c5d 100644 --- a/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java @@ -45,7 +45,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates server-side configurable subject name * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class nsNKeySubjectNameDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java index 77fa417f6..9dfda47b5 100644 --- a/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates server-side configurable subject name * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class nsTokenDeviceKeySubjectNameDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java index 65adabfad..dff36748c 100644 --- a/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java @@ -45,7 +45,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements an enrollment default policy * that populates server-side configurable subject name * into the certificate template. - * + * * @version $Revision$, $Date$ */ public class nsTokenUserKeySubjectNameDefault extends EnrollDefault { diff --git a/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java b/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java index 77d4b1ce0..901cf5c71 100644 --- a/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java +++ b/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java @@ -39,9 +39,9 @@ import com.netscape.cms.profile.common.EnrollProfile; * This input populates 2 main fields to the enrollment page: * 1/ Certificate Request Type, 2/ Certificate Request * <p> - * + * * This input usually is used by an enrollment profile for certificate requests. - * + * * @version $Revision$, $Date$ */ public class CMCCertReqInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/CertReqInput.java b/base/common/src/com/netscape/cms/profile/input/CertReqInput.java index 0b7e9f071..50fac5a41 100644 --- a/base/common/src/com/netscape/cms/profile/input/CertReqInput.java +++ b/base/common/src/com/netscape/cms/profile/input/CertReqInput.java @@ -42,9 +42,9 @@ import com.netscape.cms.profile.common.EnrollProfile; * This input populates 2 main fields to the enrollment page: * 1/ Certificate Request Type, 2/ Certificate Request * <p> - * + * * This input usually is used by an enrollment profile for certificate requests. - * + * * @version $Revision$, $Date$ */ public class CertReqInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java b/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java index 18b9ecf52..3205fca0a 100644 --- a/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java +++ b/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java @@ -42,10 +42,10 @@ import com.netscape.cms.profile.common.EnrollProfile; * pages so that a CRMF request containing 2 certificate * requests will be generated. * <p> - * + * * This input can only be used with Netscape 7.x or later clients. * <p> - * + * * @version $Revision$, $Date$ */ public class DualKeyGenInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java b/base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java index d59629f78..63c18483c 100644 --- a/base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java +++ b/base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java @@ -42,10 +42,10 @@ import com.netscape.cms.profile.common.EnrollProfile; * populates parameters to the enrollment page for * key generation. * <p> - * + * * This input normally is used with user-based or non certificate request profile. * <p> - * + * * @version $Revision$, $Date$ */ public class EncryptionKeyGenInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/EnrollInput.java b/base/common/src/com/netscape/cms/profile/input/EnrollInput.java index c4269ba7d..b4ed31223 100644 --- a/base/common/src/com/netscape/cms/profile/input/EnrollInput.java +++ b/base/common/src/com/netscape/cms/profile/input/EnrollInput.java @@ -42,7 +42,7 @@ import com.netscape.cms.profile.common.EnrollProfile; /** * This class implements the base enrollment input. - * + * * @version $Revision$, $Date$ */ public abstract class EnrollInput implements IProfileInput { @@ -72,7 +72,7 @@ public abstract class EnrollInput implements IProfileInput { /** * Populates the request with this policy default. - * + * * @param ctx profile context * @param request request * @exception EProfileException failed to populate @@ -82,7 +82,7 @@ public abstract class EnrollInput implements IProfileInput { /** * Retrieves the localizable name of this policy. - * + * * @param locale user locale * @return localized input name */ @@ -90,7 +90,7 @@ public abstract class EnrollInput implements IProfileInput { /** * Retrieves the localizable description of this policy. - * + * * @param locale user locale * @return localized input description */ @@ -99,7 +99,7 @@ public abstract class EnrollInput implements IProfileInput { /** * Retrieves the descriptor of the given value * property by name. - * + * * @param locale user locale * @param name property name * @return descriptor of the property @@ -242,11 +242,11 @@ public abstract class EnrollInput implements IProfileInput { /** * Signed Audit Log - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ protected void audit(String msg) { @@ -266,12 +266,12 @@ public abstract class EnrollInput implements IProfileInput { /** * Signed Audit Log Subject ID - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to obtain the "SubjectID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message SubjectID */ protected String auditSubjectID() { diff --git a/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java b/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java index 357488186..f62a5964c 100644 --- a/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java +++ b/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements the image * input that collects a picture. * <p> - * + * * @version $Revision$, $Date$ */ public class FileSigningInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/GenericInput.java b/base/common/src/com/netscape/cms/profile/input/GenericInput.java index e8edfaa6d..e92fbe93e 100644 --- a/base/common/src/com/netscape/cms/profile/input/GenericInput.java +++ b/base/common/src/com/netscape/cms/profile/input/GenericInput.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements a generic input. * <p> - * + * * @version $Revision$, $Date$ */ public class GenericInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/ImageInput.java b/base/common/src/com/netscape/cms/profile/input/ImageInput.java index 30570b56c..5874cc07f 100644 --- a/base/common/src/com/netscape/cms/profile/input/ImageInput.java +++ b/base/common/src/com/netscape/cms/profile/input/ImageInput.java @@ -33,7 +33,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements the image * input that collects a picture. * <p> - * + * * @version $Revision$, $Date$ */ public class ImageInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java b/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java index c2b3cf0d5..8be954024 100644 --- a/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java +++ b/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java @@ -42,10 +42,10 @@ import com.netscape.cms.profile.common.EnrollProfile; * populates parameters to the enrollment page for * key generation. * <p> - * + * * This input normally is used with user-based or non certificate request profile. * <p> - * + * * @version $Revision$, $Date$ */ public class KeyGenInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java b/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java index 542a2c940..c2566139a 100644 --- a/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java +++ b/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java @@ -33,7 +33,7 @@ import com.netscape.certsrv.request.IRequest; * This class implements the serial number input * for renewal * <p> - * + * * @author Christina Fu */ public class SerialNumRenewInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java b/base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java index aa471d4f6..d60ed551f 100644 --- a/base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java +++ b/base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java @@ -42,10 +42,10 @@ import com.netscape.cms.profile.common.EnrollProfile; * populates parameters to the enrollment page for * key generation. * <p> - * + * * This input normally is used with user-based or non certificate request profile. * <p> - * + * * @version $Revision$, $Date$ */ public class SigningKeyGenInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java b/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java index db70da666..2c0de4486 100644 --- a/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java +++ b/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java @@ -44,7 +44,7 @@ import com.netscape.cms.profile.common.EnrollProfile; * <p> * The collected parameters could be used for fomulating the subject name in the certificate. * <p> - * + * * @version $Revision$, $Date$ */ public class SubjectNameInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java b/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java index 984706f42..e15e13e91 100644 --- a/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java +++ b/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.request.IRequest; * input that collects certificate requestor's * information such as name, email and phone. * <p> - * + * * @version $Revision$, $Date$ */ public class SubmitterInfoInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java b/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java index 3c6067891..15f296a9e 100644 --- a/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java +++ b/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java @@ -37,9 +37,9 @@ import com.netscape.cms.profile.common.EnrollProfile; * This input populates 2 main fields to the enrollment "page": * 1/ token cuid, 2/ publickey * <p> - * + * * This input usually is used by an enrollment profile for certificate requests coming from TPS. - * + * * @version $Revision$, $Date$ */ public class nsHKeyCertReqInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java b/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java index 196798683..f14df1a80 100644 --- a/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java +++ b/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java @@ -37,9 +37,9 @@ import com.netscape.cms.profile.common.EnrollProfile; * This input populates 2 main fields to the enrollment "page": * 1/ id, 2/ publickey * <p> - * + * * This input usually is used by an enrollment profile for certificate requests coming from TPS. - * + * * @version $Revision$, $Date$ */ public class nsNKeyCertReqInput extends EnrollInput implements IProfileInput { diff --git a/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java b/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java index 2253460b1..9c04e6962 100644 --- a/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java +++ b/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java @@ -47,7 +47,7 @@ import com.netscape.cms.profile.common.EnrollProfile; /** * This class implements the output plugin that outputs * CMMF response for the issued certificate. - * + * * @version $Revision$, $Date$ */ public class CMMFOutput extends EnrollOutput implements IProfileOutput { diff --git a/base/common/src/com/netscape/cms/profile/output/CertOutput.java b/base/common/src/com/netscape/cms/profile/output/CertOutput.java index 1293c055c..a556d4a44 100644 --- a/base/common/src/com/netscape/cms/profile/output/CertOutput.java +++ b/base/common/src/com/netscape/cms/profile/output/CertOutput.java @@ -36,7 +36,7 @@ import com.netscape.cms.profile.common.EnrollProfile; /** * This class implements the pretty print certificate output * that displays the issued certificate in a pretty print format. - * + * * @version $Revision$, $Date$ */ public class CertOutput extends EnrollOutput implements IProfileOutput { diff --git a/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java b/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java index 25a4b4908..06c940e8c 100644 --- a/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java +++ b/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements the basic enrollment output. - * + * * @version $Revision$, $Date$ */ public abstract class EnrollOutput implements IProfileOutput { @@ -58,7 +58,7 @@ public abstract class EnrollOutput implements IProfileOutput { /** * Populates the request with this policy default. - * + * * @param ctx profile context * @param request request * @exception EProfileException failed to populate @@ -69,7 +69,7 @@ public abstract class EnrollOutput implements IProfileOutput { /** * Retrieves the descriptor of the given value * parameter by name. - * + * * @param locale user locale * @param name property name * @return property descriptor @@ -78,7 +78,7 @@ public abstract class EnrollOutput implements IProfileOutput { /** * Retrieves the localizable name of this policy. - * + * * @param locale user locale * @return output policy name */ @@ -86,7 +86,7 @@ public abstract class EnrollOutput implements IProfileOutput { /** * Retrieves the localizable description of this policy. - * + * * @param locale user locale * @return output policy description */ diff --git a/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java b/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java index 0e01e15dd..c412eb2fd 100644 --- a/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java +++ b/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java @@ -44,7 +44,7 @@ import com.netscape.cms.profile.common.EnrollProfile; /** * This class implements the output plugin that outputs * PKCS7 for the issued certificate. - * + * * @version $Revision$, $Date$ */ public class PKCS7Output extends EnrollOutput implements IProfileOutput { diff --git a/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java b/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java index 6bf03f436..571022ad8 100644 --- a/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java +++ b/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java @@ -35,7 +35,7 @@ import com.netscape.cms.profile.common.EnrollProfile; /** * This class implements the output plugin that outputs * DER for the issued certificate for token keys - * + * * @version $Revision$, $Date$ */ public class nsNKeyOutput extends EnrollOutput implements IProfileOutput { diff --git a/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java b/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java index 52c87113d..cfe35df39 100644 --- a/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java +++ b/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java @@ -45,7 +45,7 @@ import com.netscape.cms.profile.common.EnrollProfile; /** * This updater class will create the new user to the subsystem group and * then add the subsystem certificate to the user. - * + * * @version $Revision$, $Date$ */ public class SubsystemGroupUpdater implements IProfileUpdater { diff --git a/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java b/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java index 7f70722d0..acac975cb 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java +++ b/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java @@ -57,16 +57,16 @@ import com.netscape.certsrv.request.IRequest; * attribute formulated from the certificate * subject name, extension or request attributes. * <p> - * + * * The syntax is - * + * * <pre> - * avaPattern := constant-value | - * "$subj" "." attrName [ "." attrNumber ] | - * "$req" "." [ prefix .] attrName [ "." attrNumber ] | + * avaPattern := constant-value | + * "$subj" "." attrName [ "." attrNumber ] | + * "$req" "." [ prefix .] attrName [ "." attrNumber ] | * "$ext" "." extName [ "." nameType ] [ "." attrNumber ] * </pre> - * + * * <pre> * Example: <i>$ext.SubjectAlternativeName.RFC822Name.1</i> * cert subjectAltName is rfc822Name: jjames@mcom.com @@ -77,9 +77,9 @@ import com.netscape.certsrv.request.IRequest; * The first rfc822name value in the subjAltName extension. <br> * <p> * </pre> - * + * * If a request attribute or subject DN component does not exist, the attribute is skipped. - * + * * @version $Revision$, $Date$ */ class AVAPattern { @@ -117,12 +117,12 @@ class AVAPattern { /* value type */ protected String mType = null; - /* value - could be name of a request attribute or + /* value - could be name of a request attribute or * cert subject attribute or extension name. */ protected String mValue = null; - /* value type - general name type of an + /* value type - general name type of an * extension attribute if any. */ protected String mGNType = null; @@ -174,7 +174,7 @@ class AVAPattern { } if (c == '$') { - // check for $subj $ext or $req + // check for $subj $ext or $req try { c = in.read(); } catch (IOException e) { @@ -252,7 +252,7 @@ class AVAPattern { } if (c == '+' || c == ',') { // either ',' or '+' - in.unread(c); // pushback last , or + + in.unread(c); // pushback last , or + } } catch (IOException e) { throw new ELdapException( @@ -350,7 +350,7 @@ class AVAPattern { // value is constant. treat as regular ava. mType = TYPE_CONSTANT; - // parse ava value. + // parse ava value. StringBuffer valueBuf = new StringBuffer(); valueBuf.append((char) c); @@ -362,7 +362,7 @@ class AVAPattern { } if (c == '+' || c == ',') { // either ',' or '+' - in.unread(c); // pushback last , or + + in.unread(c); // pushback last , or + } } catch (IOException e) { throw new ELdapException( @@ -371,9 +371,9 @@ class AVAPattern { mValue = valueBuf.toString().trim(); - /* try { + /* try { * AVA ava = mLdapDNStrConverter.parseAVA( - * valueBuf.toString()); + * valueBuf.toString()); * mValue = ava.toLdapDNString(); * //System.out.println("----- mValue "+mValue); * } catch (IOException e) { diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java index bbf641540..a1a65a342 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java @@ -54,7 +54,7 @@ import com.netscape.certsrv.request.IRequest; * in the directory to publish the cert or crl. * The restriction of this mapper is that the ldap dn components must * be part of certificate subject name or request attributes or constant. - * + * * @version $Revision$, $Date$ */ public class LdapCaSimpleMap implements ILdapMapper, IExtendedPluginInfo { @@ -82,7 +82,7 @@ public class LdapCaSimpleMap implements ILdapMapper, IExtendedPluginInfo { /** * Constructor. - * + * * @param dnPattern The base DN. */ public LdapCaSimpleMap(String dnPattern) { @@ -157,7 +157,7 @@ public class LdapCaSimpleMap implements ILdapMapper, IExtendedPluginInfo { /** * Maps a X500 subject name to LDAP entry. * Uses DN pattern to form a DN for a LDAP base search. - * + * * @param conn the LDAP connection. * @param obj the object to map. * @exception ELdapException if any LDAP exceptions occured. @@ -170,7 +170,7 @@ public class LdapCaSimpleMap implements ILdapMapper, IExtendedPluginInfo { /** * Maps a X500 subject name to LDAP entry. * Uses DN pattern to form a DN for a LDAP base search. - * + * * @param conn the LDAP connection. * @param req the request to map. * @param obj the object to map. @@ -277,7 +277,7 @@ public class LdapCaSimpleMap implements ILdapMapper, IExtendedPluginInfo { /** * form a dn from component in the request and cert subject name - * + * * @param req The request * @param obj The certificate or crl */ diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java index 2373e3c66..d1a734b82 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.request.IRequest; * If the baseDN is null and none of the DN comps matched, it is an error. * If none of the DN comps and filter comps matched, it is an error. * If just the filter comps is null, a base search is performed. - * + * * @version $Revision$, $Date$ */ public class LdapCertCompsMap @@ -57,14 +57,14 @@ public class LdapCertCompsMap /** * Constructor. - * + * * The DN comps are used to form a LDAP entry to begin a subtree search. * The filter comps are used to form a search filter for the subtree. * If none of the DN comps matched, baseDN is used for the subtree. * If the baseDN is null and none of the DN comps matched, it is an error. * If none of the DN comps and filter comps matched, it is an error. * If just the filter comps is null, a base search is performed. - * + * * @param baseDN The base DN. * @param dnComps Components to form the LDAP base dn for search. * @param filterComps Components to form the LDAP search filter. @@ -116,7 +116,7 @@ public class LdapCertCompsMap * If the formed DN is null and baseDN is null an error is thrown. * If the filter is null a base search is performed. * If both are null an error is thrown. - * + * * @param conn - the LDAP connection. * @param obj - the X509Certificate. */ diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java index 11b53a797..5c085481d 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.request.IRequest; /** * Maps a X509 certificate to a LDAP entry by using the subject name * of the certificate as the LDAP entry DN. - * + * * @version $Revision$, $Date$ */ public class LdapCertExactMap implements ILdapMapper, IExtendedPluginInfo { @@ -103,7 +103,7 @@ public class LdapCertExactMap implements ILdapMapper, IExtendedPluginInfo { /** * Finds the entry for the certificate by looking for the cert * subject name in the subject name attribute. - * + * * @param conn - the LDAP connection. * @param obj - the X509Certificate. */ @@ -172,13 +172,13 @@ public class LdapCertExactMap implements ILdapMapper, IExtendedPluginInfo { /* catch (IOException e) { - log(ILogger.LL_FAILURE, + log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_CANT_GET_SUBJECT", e.toString())); throw new ELdapException( LdapResources.GET_CERT_SUBJECT_DN_FAILED, e); } catch (CertificateEncodingException e) { - log(ILogger.LL_FAILURE, + log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_CANT_DECODE_CERT", e.toString())); throw new ELdapException( LdapResources.GET_DER_ENCODED_CERT_FAILED, e); diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java index 4d5ff38c8..61ffef947 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.request.IRequest; /** * Maps a X509 certificate to a LDAP entry by finding an LDAP entry * which has an attribute whose contents are equal to the cert subject name. - * + * * @version $Revision$, $Date$ */ public class LdapCertSubjMap implements ILdapMapper, IExtendedPluginInfo { @@ -62,7 +62,7 @@ public class LdapCertSubjMap implements ILdapMapper, IExtendedPluginInfo { /** * constructs a certificate subject name mapper with search base. - * + * * @param searchBase the dn to start searching for the certificate * subject name. */ @@ -76,7 +76,7 @@ public class LdapCertSubjMap implements ILdapMapper, IExtendedPluginInfo { /** * Constructor using non-ES cert map attribute name. - * + * * @param searchBase entry to start search. * @param certSubjNameAttr attribute for certificate subject names. * @param certAttr attribute to find certificate. @@ -172,7 +172,7 @@ public class LdapCertSubjMap implements ILdapMapper, IExtendedPluginInfo { /** * Finds the entry for the certificate by looking for the cert * subject name in the subject name attribute. - * + * * @param conn - the LDAP connection. * @param obj - the X509Certificate. */ @@ -242,13 +242,13 @@ public class LdapCertSubjMap implements ILdapMapper, IExtendedPluginInfo { /* catch (IOException e) { - log(ILogger.LL_FAILURE, + log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_CANT_GET_SUBJECT", e.toString())); throw new ELdapException( LdapResources.GET_CERT_SUBJECT_DN_FAILED, e); } catch (CertificateEncodingException e) { - log(ILogger.LL_FAILURE, + log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_CANT_DECODE_CERT", e.toString())); throw new ELdapException( LdapResources.GET_DER_ENCODED_CERT_FAILED, e); diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java index 654de5d30..7c4c3c4b0 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.request.IRequest; * Default crl mapper. * maps the crl to a ldap entry by using components in the issuer name * to find the CA's entry. - * + * * @version $Revision$, $Date$ */ public class LdapCrlIssuerCompsMap @@ -49,14 +49,14 @@ public class LdapCrlIssuerCompsMap /** * Constructor. - * + * * The DN comps are used to form a LDAP entry to begin a subtree search. * The filter comps are used to form a search filter for the subtree. * If none of the DN comps matched, baseDN is used for the subtree. * If the baseDN is null and none of the DN comps matched, it is an error. * If none of the DN comps and filter comps matched, it is an error. * If just the filter comps is null, a base search is performed. - * + * * @param baseDN The base DN. * @param dnComps Components to form the LDAP base dn for search. * @param filterComps Components to form the LDAP search filter. @@ -110,7 +110,7 @@ public class LdapCrlIssuerCompsMap * If the formed DN is null and baseDN is null an error is thrown. * If the filter is null a base search is performed. * If both are null an error is thrown. - * + * * @param conn - the LDAP connection. * @param obj - the X509Certificate. * @return the result. LdapCertMapResult is also used for CRL. diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java index 73549f1b5..1f7f06f69 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java @@ -55,7 +55,7 @@ import com.netscape.certsrv.publish.ILdapPlugin; * If the baseDN is null and none of the DN comps matched, it is an error. * If none of the DN comps and filter comps matched, it is an error. * If just the filter comps is null, a base search is performed. - * + * * @version $Revision$, $Date$ */ public class LdapDNCompsMap @@ -71,14 +71,14 @@ public class LdapDNCompsMap /** * Constructor. - * + * * The DN comps are used to form a LDAP entry to begin a subtree search. * The filter comps are used to form a search filter for the subtree. * If none of the DN comps matched, baseDN is used for the subtree. * If the baseDN is null and none of the DN comps matched, it is an error. * If none of the DN comps and filter comps matched, it is an error. * If just the filter comps is null, a base search is performed. - * + * * @param baseDN The base DN. * @param dnComps Components to form the LDAP base dn for search. * @param filterComps Components to form the LDAP search filter. @@ -209,7 +209,7 @@ public class LdapDNCompsMap * If the formed DN is null and baseDN is null an error is thrown. * If the filter is null a base search is performed. * If both are null an error is thrown. - * + * * @param conn the LDAP connection. * @param x500name the dn to map. * @param obj the object @@ -234,8 +234,8 @@ public class LdapDNCompsMap // if (filter == null) { // log(ILogger.LL_FAILURE, "No dn and filter formed"); // throw new ELdapException( - // LdapResources.NO_DN_AND_FILTER_COMPS, - // x500name.toString()); + // LdapResources.NO_DN_AND_FILTER_COMPS, + // x500name.toString()); // } if (mBaseDN == null) { log(ILogger.LL_FAILURE, @@ -302,7 +302,7 @@ public class LdapDNCompsMap /** * form a dn and filter from component in the cert subject name - * + * * @param subjName subject name */ public String[] formDNandFilter(X500Name subjName) @@ -359,7 +359,7 @@ public class LdapDNCompsMap } } - // XXX should be an error when string is null? + // XXX should be an error when string is null? // return to caller to decide. if (dnRdns.size() != 0) { dnStr = new X500Name(dnRdns).toLdapDNString(); @@ -417,7 +417,7 @@ public class LdapDNCompsMap * arrays of objectidentifiers. * The string is expected to be comma separated AVA attribute names. * For example, "uid,cn,o,ou". Attribute names are case insensitive. - * + * * @param val the string specifying the comps * @exception ELdapException if any error occurs. */ diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java index c9a7f867c..d94032071 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java @@ -72,7 +72,7 @@ import com.netscape.certsrv.request.IRequest; * entry is not found, it has the option to create * the ldap entry given the dn and attributes * formulated. - * + * * @version $Revision$, $Date$ */ public class LdapEnhancedMap @@ -105,7 +105,7 @@ public class LdapEnhancedMap /* mapper plug-in fields */ protected static final String PROP_DNPATTERN = "dnPattern"; protected static final String PROP_CREATE = "createEntry"; - // the object class of the entry to be created. xxxx not done yet + // the object class of the entry to be created. xxxx not done yet protected static final String PROP_OBJCLASS = "objectClass"; // req/cert/ext attribute --> directory attribute table protected static final String PROP_ATTRNUM = "attrNum"; @@ -206,7 +206,7 @@ public class LdapEnhancedMap /** * form a dn from component in the request and cert subject name - * + * * @param req The request * @param obj The certificate or crl */ @@ -332,7 +332,7 @@ public class LdapEnhancedMap /** * for initializing from config store. - * + * * implementation for extended * ILdapPlugin interface method */ @@ -439,7 +439,7 @@ public class LdapEnhancedMap /** * Maps an X500 subject name to an LDAP entry. * Uses DN pattern to form a DN for an LDAP base search. - * + * * @param conn the LDAP connection. * @param obj the object to map. * @exception ELdapException if any LDAP exceptions occurred. @@ -452,7 +452,7 @@ public class LdapEnhancedMap /** * Maps an X500 subject name to an LDAP entry. * Uses DN pattern to form a DN for an LDAP base search. - * + * * @param conn the LDAP connection. * @param req the request to map. * @param obj the object to map. diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java index 642729673..67d98f4cc 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java @@ -51,7 +51,7 @@ import com.netscape.certsrv.request.IRequest; * in the directory to publish the cert or crl. * The restriction of this mapper is that the ldap dn components must * be part of certificate subject name or request attributes or constant. - * + * * @version $Revision$, $Date$ */ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo { @@ -77,7 +77,7 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo { /** * Constructor. - * + * * @param dnPattern The base DN. */ public LdapSimpleMap(String dnPattern) { @@ -151,7 +151,7 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo { /** * Maps a X500 subject name to LDAP entry. * Uses DN pattern to form a DN for a LDAP base search. - * + * * @param conn the LDAP connection. * @param obj the object to map. * @exception ELdapException if any LDAP exceptions occured. @@ -164,7 +164,7 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo { /** * Maps a X500 subject name to LDAP entry. * Uses DN pattern to form a DN for a LDAP base search. - * + * * @param conn the LDAP connection. * @param req the request to map. * @param obj the object to map. @@ -201,7 +201,7 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo { LDAPEntry entry = results.next(); if (results.hasMoreElements()) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_MORE_THAN_ONE_ENTRY", dn, ((req == null) ? "" : + log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_MORE_THAN_ONE_ENTRY", dn, ((req == null) ? "" : req.getRequestId().toString()))); throw new ELdapException(CMS.getUserMessage("CMS_LDAP_MORE_THAN_ONE_ENTRY", ((req == null) ? "" : req.getRequestId().toString()))); @@ -237,7 +237,7 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo { /** * form a dn from component in the request and cert subject name - * + * * @param req The request * @param obj The certificate or crl */ diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java index 7aeb672d0..ef7fa9d13 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java +++ b/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java @@ -45,41 +45,41 @@ import com.netscape.certsrv.request.IRequest; * class for parsing a DN pattern used to construct a ldap dn from * request attributes and cert subject name. * <p> - * + * * dnpattern is a string representing a ldap dn pattern to formulate from the certificate subject name attributes and * request attributes . If empty or not set, the certificate subject name will be used as the ldap dn. * <p> - * + * * The syntax is - * + * * <pre> * dnPattern := rdnPattern *[ "," rdnPattern ] * rdnPattern := avaPattern *[ "+" avaPattern ] - * avaPattern := name "=" value | - * name "=" "$subj" "." attrName [ "." attrNumber ] | - * name "=" "$ext" "." extName [ "." nameType ] [ "." attrNumber ] - * name "=" "$req" "." attrName [ "." attrNumber ] | + * avaPattern := name "=" value | + * name "=" "$subj" "." attrName [ "." attrNumber ] | + * name "=" "$ext" "." extName [ "." nameType ] [ "." attrNumber ] + * name "=" "$req" "." attrName [ "." attrNumber ] | * "$rdn" "." number * </pre> - * + * * <pre> * Example1: <i>cn=Certificate Manager,ou=people,o=mcom.com</i> * cert subject name: dn: CN=Certificate Manager, OU=people, O=mcom.com - * request attributes: uid: cmanager + * request attributes: uid: cmanager * <p> * The dn formulated will be : <br> * CN=Certificate Manager, OU=people, O=mcom.com * <p> * note: Subordinate ca enrollment will use ca mapper. Use predicate * to distinguish the ca itself and the subordinates. - * + * * Example2: <i>UID=$req.HTTP_PARAMS.uid, OU=$subj.ou, OU=people, , O=mcom.com</i> * cert subject name: dn: UID=jjames, OU=IS, OU=people, , O=mcom.com - * request attributes: uid: cmanager + * request attributes: uid: cmanager * <p> * The dn formulated will be : <br> * UID=jjames, OU=IS, OU=people, O=mcom.com - * <p> + * <p> * UID = the 'uid' attribute value in the request. <br> * OU = the 'ou' value in the cert subject name. <br> * O = the string mcom.com. <br> @@ -87,20 +87,20 @@ import com.netscape.certsrv.request.IRequest; * Example3: <i>UID=$req.HTTP_PARAMS.uid, E=$ext.SubjectAlternativeName.RFC822Name.1, O=mcom.com</i> * cert subject name: dn: UID=jjames, OU=IS, OU=people, O=mcom.com * cert subjectAltName is rfc822Name: jjames@mcom.com - * request attributes: uid: cmanager + * request attributes: uid: cmanager * <p> * The dn formulated will be : <br> * UID=jjames, E=jjames@mcom.com, O=mcom.com - * <p> + * <p> * UID = the 'uid' attribute value in the request. <br> * E = The first rfc822name value in the subjAltName extension. <br> * O = the string mcom.com. <br> * <p> * </pre> - * + * * If an request attribute or subject DN component does not exist, the attribute is skipped. There is potential risk * that a wrong dn will be mapped into. - * + * * @version $Revision$, $Date$ */ class MapAVAPattern { @@ -138,7 +138,7 @@ class MapAVAPattern { /* the attribute in the AVA pair */ protected String mAttr = null; - /* value - could be name of a request attribute or + /* value - could be name of a request attribute or * cert subject dn attribute. */ protected String mValue = null; @@ -185,7 +185,7 @@ class MapAVAPattern { if (c == -1) throw new ECompSyntaxErr(CMS.getUserMessage("CMS_AUTHENTICATION_COMPONENT_SYNTAX", "All blank")); - // $rdn "." number syntax. + // $rdn "." number syntax. if (c == '$') { //System.out.println("$rdn syntax"); @@ -230,9 +230,9 @@ class MapAVAPattern { return; } - // name "=" ... syntax. + // name "=" ... syntax. - // read name + // read name //System.out.println("reading name"); StringBuffer attrBuf = new StringBuffer(); @@ -253,10 +253,10 @@ class MapAVAPattern { throw new ECompSyntaxErr(CMS.getUserMessage("CMS_AUTHENTICATION_COMPONENT_SYNTAX", "Missing \"=\" in ava pattern")); - // read value + // read value //System.out.println("reading value"); - // skip spaces + // skip spaces //System.out.println("skip spaces for value"); try { while ((c = in.read()) == ' ' || c == '\t') {//System.out.println("spaces2 read "+(char)c); @@ -271,7 +271,7 @@ class MapAVAPattern { "no value after = in ava pattern")); if (c == '$') { - // check for $subj $ext or $req + // check for $subj $ext or $req try { c = in.read(); //System.out.println("check $dn or $attr read "+(char)c); @@ -327,7 +327,7 @@ class MapAVAPattern { "unknown keyword. expecting $subj $ext or $req.")); } - // get request attr name of subject dn pattern from above. + // get request attr name of subject dn pattern from above. String attrName = attrBuf.toString().trim(); //System.out.println("----- attrName "+attrName); @@ -337,10 +337,10 @@ class MapAVAPattern { mAttr = attrName; /* - try { - ObjectIdentifier attrOid = - mLdapDNStrConverter.parseAVAKeyword(attrName); - mAttr = mLdapDNStrConverter.encodeOID(attrOid); + try { + ObjectIdentifier attrOid = + mLdapDNStrConverter.parseAVAKeyword(attrName); + mAttr = mLdapDNStrConverter.encodeOID(attrOid); //System.out.println("----- mAttr "+mAttr); } catch (IOException e) { @@ -359,7 +359,7 @@ class MapAVAPattern { valueBuf.append((char) c); } if (c == '+' || c == ',') // either ',' or '+' - in.unread(c); // pushback last , or + + in.unread(c); // pushback last , or + } catch (IOException e) { throw new ELdapException( CMS.getUserMessage("CMS_LDAP_INTERNAL_ERROR", e.toString())); @@ -439,7 +439,7 @@ class MapAVAPattern { // value is constant. treat as regular ava. mType = TYPE_CONSTANT; //System.out.println("----- mType constant"); - // parse ava value. + // parse ava value. StringBuffer valueBuf = new StringBuffer(); valueBuf.append((char) c); @@ -450,7 +450,7 @@ class MapAVAPattern { valueBuf.append((char) c); } if (c == '+' || c == ',') { // either ',' or '+' - in.unread(c); // pushback last , or + + in.unread(c); // pushback last , or + } } catch (IOException e) { throw new ELdapException( diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java index 7a9025b1d..dc446a7b7 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java +++ b/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java @@ -34,49 +34,49 @@ import com.netscape.certsrv.request.IRequest; * class for parsing a DN pattern used to construct a ldap dn from * request attributes and cert subject name. * <p> - * + * * dnpattern is a string representing a ldap dn pattern to formulate from the certificate subject name attributes and * request attributes . If empty or not set, the certificate subject name will be used as the ldap dn. * <p> - * + * * The syntax is - * + * * <pre> * dnPattern := rdnPattern *[ "," rdnPattern ] * rdnPattern := avaPattern *[ "+" avaPattern ] - * avaPattern := name "=" value | - * name "=" "$subj" "." attrName [ "." attrNumber ] | - * name "=" "$req" "." attrName [ "." attrNumber ] | + * avaPattern := name "=" value | + * name "=" "$subj" "." attrName [ "." attrNumber ] | + * name "=" "$req" "." attrName [ "." attrNumber ] | * "$rdn" "." number * </pre> - * + * * <pre> * Example1: <i>cn=Certificate Manager,ou=people,o=mcom.com</i> * cert subject name: dn: CN=Certificate Manager, OU=people, O=mcom.com - * request attributes: uid: cmanager + * request attributes: uid: cmanager * <p> * The dn formulated will be : <br> * CN=Certificate Manager, OU=people, O=mcom.com * <p> * note: Subordinate ca enrollment will use ca mapper. Use predicate * to distinguish the ca itself and the subordinates. - * + * * Example2: <i>UID=$req.HTTP_PARAMS.uid, OU=$subj.ou, O=people, , O=mcom.com</i> * cert subject name: dn: UID=jjames, OU=IS, O=people, , O=mcom.com - * request attributes: uid: cmanager + * request attributes: uid: cmanager * <p> * The dn formulated will be : <br> * UID=jjames, OU=IS, OU=people, O=mcom.com - * <p> + * <p> * UID = the 'uid' attribute value in the request. <br> * OU = the 'ou' value in the cert subject name. <br> * O = the string people, mcom.com. <br> * <p> * </pre> - * + * * If an request attribute or subject DN component does not exist, the attribute is skipped. There is potential risk * that a wrong dn will be mapped into. - * + * * @version $Revision$, $Date$ */ public class MapDNPattern { @@ -97,7 +97,7 @@ public class MapDNPattern { /** * Construct a DN pattern by parsing a pattern string. - * + * * @param pattern the DN pattern * @exception EBaseException If parsing error occurs. */ @@ -166,7 +166,7 @@ public class MapDNPattern { /** * Form a Ldap v3 DN string from a request and a cert subject name. - * + * * @param req the request for (un)publish * @param subject the subjectDN of the certificate * @return Ldap v3 DN string to use for base ldap search. diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java index c1688345b..61da1d7d2 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java +++ b/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java @@ -33,49 +33,49 @@ import com.netscape.certsrv.request.IRequest; * class for parsing a DN pattern used to construct a ldap dn from * request attributes and cert subject name. * <p> - * + * * dnpattern is a string representing a ldap dn pattern to formulate from the certificate subject name attributes and * request attributes . If empty or not set, the certificate subject name will be used as the ldap dn. * <p> - * + * * The syntax is - * + * * <pre> * dnPattern := rdnPattern *[ "," rdnPattern ] * rdnPattern := avaPattern *[ "+" avaPattern ] - * avaPattern := name "=" value | - * name "=" "$subj" "." attrName [ "." attrNumber ] | - * name "=" "$req" "." attrName [ "." attrNumber ] | + * avaPattern := name "=" value | + * name "=" "$subj" "." attrName [ "." attrNumber ] | + * name "=" "$req" "." attrName [ "." attrNumber ] | * "$rdn" "." number * </pre> - * + * * <pre> * Example1: <i>cn=Certificate Manager,ou=people,o=mcom.com</i> * cert subject name: dn: CN=Certificate Manager, OU=people, O=mcom.com - * request attributes: uid: cmanager + * request attributes: uid: cmanager * <p> * The dn formulated will be : <br> * CN=Certificate Manager, OU=people, O=mcom.com * <p> * note: Subordinate ca enrollment will use ca mapper. Use predicate * to distinguish the ca itself and the subordinates. - * + * * Example2: <i>UID=$req.HTTP_PARAMS.uid, OU=$subj.ou, O=people, , O=mcom.com</i> * cert subject name: dn: UID=jjames, OU=IS, O=people, , O=mcom.com - * request attributes: uid: cmanager + * request attributes: uid: cmanager * <p> * The dn formulated will be : <br> * UID=jjames, OU=IS, OU=people, O=mcom.com - * <p> + * <p> * UID = the 'uid' attribute value in the request. <br> * OU = the 'ou' value in the cert subject name. <br> * O = the string people, mcom.com. <br> * <p> * </pre> - * + * * If an request attribute or subject DN component does not exist, the attribute is skipped.There is potential risk that * a wrong dn will be mapped into. - * + * * @version $Revision$, $Date$ */ class MapRDNPattern { @@ -96,7 +96,7 @@ class MapRDNPattern { /** * Construct a DN pattern by parsing a pattern string. - * + * * @param pattenr the DN pattern * @exception ELdapException If parsing error occurs. */ @@ -146,7 +146,7 @@ class MapRDNPattern { if (lastChar != -1) { try { - in.unread(lastChar); // pushback last , + in.unread(lastChar); // pushback last , } catch (IOException e) { throw new ELdapException( CMS.getUserMessage("CMS_LDAP_INTERNAL_ERROR", e.toString())); @@ -183,7 +183,7 @@ class MapRDNPattern { /** * Form a Ldap v3 DN string from a request and a cert subject name. - * + * * @param req the request for (un)publish * @param subject the subjectDN of the certificate * @return Ldap v3 DN string to use for base ldap search. diff --git a/base/common/src/com/netscape/cms/publish/mappers/NoMap.java b/base/common/src/com/netscape/cms/publish/mappers/NoMap.java index 155c54ce0..cc12714e2 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/NoMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/NoMap.java @@ -31,7 +31,7 @@ import com.netscape.certsrv.request.IRequest; /** * No Map - * + * * @version $Revision$, $Date$ */ public class NoMap implements ILdapMapper, IExtendedPluginInfo { @@ -68,7 +68,7 @@ public class NoMap implements ILdapMapper, IExtendedPluginInfo { /** * Maps a X500 subject name to LDAP entry. * Uses DN pattern to form a DN for a LDAP base search. - * + * * @param conn the LDAP connection. * @param obj the object to map. * @exception ELdapException if any LDAP exceptions occured. diff --git a/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java index cb13b2452..c41025b54 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java @@ -50,7 +50,7 @@ import com.netscape.cmsutil.util.Utils; /** * This publisher writes certificate and CRL into * a directory. - * + * * @version $Revision$, $Date$ */ public class FileBasedPublisher implements ILdapPublisher, IExtendedPluginInfo { @@ -257,7 +257,7 @@ public class FileBasedPublisher implements ILdapPublisher, IExtendedPluginInfo { oldLink.delete(); } File link = new File(linkName); - if (link.exists()) { // current link becomes an old link + if (link.exists()) { // current link becomes an old link link.renameTo(new File(linkName + ".old")); } File newLink = new File(linkName + ".new"); @@ -275,7 +275,7 @@ public class FileBasedPublisher implements ILdapPublisher, IExtendedPluginInfo { /** * Publishs a object to the ldap directory. - * + * * @param conn a Ldap connection * (null if LDAP publishing is not enabled) * @param dn dn of the ldap entry to publish cert @@ -391,7 +391,7 @@ public class FileBasedPublisher implements ILdapPublisher, IExtendedPluginInfo { /** * Unpublishs a object to the ldap directory. - * + * * @param conn the Ldap connection * (null if LDAP publishing is not enabled) * @param dn dn of the ldap entry to unpublish cert diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java index e47318b76..cbc77560f 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.publish.ILdapPublisher; /** * Interface for publishing a CA certificate to - * + * * @version $Revision$, $Date$ */ public class LdapCaCertPublisher @@ -152,7 +152,7 @@ public class LdapCaCertPublisher * Adds the cert to the multi-valued certificate attribute as a * DER encoded binary blob. Does not check if cert already exists. * Converts the class to certificateAuthority. - * + * * @param conn the LDAP connection * @param dn dn of the entry to publish the certificate * @param certObj the certificate object. diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java index 9000f6834..ac2b64973 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java @@ -47,7 +47,7 @@ import com.netscape.certsrv.publish.ILdapPublisher; * Interface for mapping a X509 certificate to a LDAP entry * Publishes a certificate as binary and its subject name. * there is one subject name value for each certificate. - * + * * @version $Revision$, $Date$ */ public class LdapCertSubjPublisher implements ILdapPublisher { @@ -136,7 +136,7 @@ public class LdapCertSubjPublisher implements ILdapPublisher { * Adds the cert to the multi-valued certificate attribute as a * DER encoded binary blob. Does not check if cert already exists. * Then adds the subject name of the cert to the subject name attribute. - * + * * @param conn the LDAP connection * @param dn dn of the entry to publish the certificate * @param certObj the certificate object. @@ -298,7 +298,7 @@ public class LdapCertSubjPublisher implements ILdapPublisher { return; } - // delete cert if there. + // delete cert if there. LDAPModificationSet modSet = new LDAPModificationSet(); if (hasCert) { diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java index c65ff79d5..014cc0e5e 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java @@ -41,7 +41,7 @@ import com.netscape.certsrv.publish.ILdapPublisher; /** * module for publishing a cross certificate pair to ldap * crossCertificatePair attribute - * + * * @version $Revision$, $Date$ */ public class LdapCertificatePairPublisher @@ -153,7 +153,7 @@ public class LdapCertificatePairPublisher /** * publish a certificatePair * -should not be called from listeners. - * + * * @param conn the LDAP connection * @param dn dn of the entry to publish the XcertificatePair * @param pair the Xcertificate bytes object. @@ -166,7 +166,7 @@ public class LdapCertificatePairPublisher /** * publish a certificatePair * -should not be called from listeners. - * + * * @param conn the LDAP connection * @param dn dn of the entry to publish the XcertificatePair * @param pair the cross cert bytes diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java index 6826cc801..51bebe236 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.publish.ILdapPublisher; /** * For publishing master or global CRL. * Publishes (replaces) the CRL in the CA's LDAP entry. - * + * * @version $Revision$, $Date$ */ public class LdapCrlPublisher implements ILdapPublisher, IExtendedPluginInfo { diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java index d2c488620..8dada61fb 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java @@ -52,7 +52,7 @@ import com.netscape.certsrv.publish.ILdapPublisher; /** * Interface for mapping a X509 certificate to a LDAP entry - * + * * @version $Revision$, $Date$ */ public class LdapEncryptCertPublisher implements ILdapPublisher, IExtendedPluginInfo { @@ -125,7 +125,7 @@ public class LdapEncryptCertPublisher implements ILdapPublisher, IExtendedPlugin * publish a user certificate * Adds the cert to the multi-valued certificate attribute as a * DER encoded binary blob. Does not check if cert already exists. - * + * * @param conn the LDAP connection * @param dn dn of the entry to publish the certificate * @param certObj the certificate object. @@ -155,7 +155,7 @@ public class LdapEncryptCertPublisher implements ILdapPublisher, IExtendedPlugin return; } - // publish + // publish LDAPModification mod = new LDAPModification(LDAPModification.REPLACE, attr); conn.modify(dn, mod); diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java index e31ce674c..020c25552 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.publish.ILdapPublisher; /** * Interface for mapping a X509 certificate to a LDAP entry - * + * * @version $Revision$, $Date$ */ public class LdapUserCertPublisher implements ILdapPublisher, IExtendedPluginInfo { @@ -114,7 +114,7 @@ public class LdapUserCertPublisher implements ILdapPublisher, IExtendedPluginInf * publish a user certificate * Adds the cert to the multi-valued certificate attribute as a * DER encoded binary blob. Does not check if cert already exists. - * + * * @param conn the LDAP connection * @param dn dn of the entry to publish the certificate * @param certObj the certificate object. @@ -176,7 +176,7 @@ public class LdapUserCertPublisher implements ILdapPublisher, IExtendedPluginInf return; } - // publish + // publish LDAPModification mod = null; if (deleteCert) { mod = new LDAPModification(LDAPModification.REPLACE, diff --git a/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java b/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java index af8d283dd..280a0ce97 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java +++ b/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java @@ -30,7 +30,7 @@ import java.util.Vector; /** * Publisher utility class. - * + * * @version $Revision$, $Date$ */ public class PublisherUtils { @@ -105,7 +105,7 @@ public class PublisherUtils { /** * strips out double quotes around String parameter - * + * * @param s the string potentially bracketed with double quotes * @return string stripped of surrounding double quotes */ diff --git a/base/common/src/com/netscape/cms/request/RequestScheduler.java b/base/common/src/com/netscape/cms/request/RequestScheduler.java index e0ebaefc4..073bdcce4 100644 --- a/base/common/src/com/netscape/cms/request/RequestScheduler.java +++ b/base/common/src/com/netscape/cms/request/RequestScheduler.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.request.IRequestScheduler; * the threads based on the request processing order. * The request that enters the request queue first should * be processed first. - * + * * @version $Revision$, $Date$ */ public class RequestScheduler implements IRequestScheduler { @@ -35,7 +35,7 @@ public class RequestScheduler implements IRequestScheduler { /** * Request entered the request queue processing. - * + * * @param r request */ public synchronized void requestIn(IRequest r) { @@ -49,7 +49,7 @@ public class RequestScheduler implements IRequestScheduler { /** * Request exited the request queue processing. - * + * * @param r request */ public synchronized void requestOut(IRequest r) { diff --git a/base/common/src/com/netscape/cms/selftests/ASelfTest.java b/base/common/src/com/netscape/cms/selftests/ASelfTest.java index cdd86ccaf..6857f3c46 100644 --- a/base/common/src/com/netscape/cms/selftests/ASelfTest.java +++ b/base/common/src/com/netscape/cms/selftests/ASelfTest.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.selftests.ISelfTestSubsystem; /** * This class implements an individual self test. * <P> - * + * * @author mharmsen * @author thomask * @version $Revision$, $Date$ @@ -79,7 +79,7 @@ public abstract class ASelfTest * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -136,7 +136,7 @@ public abstract class ASelfTest /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public abstract void startupSelfTest() @@ -153,7 +153,7 @@ public abstract class ASelfTest * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -164,7 +164,7 @@ public abstract class ASelfTest * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore() { @@ -175,7 +175,7 @@ public abstract class ASelfTest * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -184,7 +184,7 @@ public abstract class ASelfTest /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java b/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java index c9c12bb42..83caa0099 100644 --- a/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java +++ b/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java @@ -49,7 +49,7 @@ import com.netscape.cms.selftests.ASelfTest; /** * This class implements a self test to check for CA presence. * <P> - * + * * @author mharmsen * @author thomask * @version $Revision$, $Date$ @@ -80,7 +80,7 @@ public class CAPresence * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -134,7 +134,7 @@ public class CAPresence /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public void startupSelfTest() @@ -155,7 +155,7 @@ public class CAPresence * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -166,7 +166,7 @@ public class CAPresence * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore() { @@ -177,7 +177,7 @@ public class CAPresence * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -189,7 +189,7 @@ public class CAPresence /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java b/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java index 9325208f9..b1751ecb4 100644 --- a/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java +++ b/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java @@ -49,7 +49,7 @@ import com.netscape.cms.selftests.ASelfTest; /** * This class implements a self test to check the validity of the CA. * <P> - * + * * @author mharmsen * @author thomask * @version $Revision$, $Date$ @@ -80,7 +80,7 @@ public class CAValidity * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -134,7 +134,7 @@ public class CAValidity /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public void startupSelfTest() @@ -155,7 +155,7 @@ public class CAValidity * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -166,7 +166,7 @@ public class CAValidity * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore() { @@ -177,7 +177,7 @@ public class CAValidity * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -189,7 +189,7 @@ public class CAValidity /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java b/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java index 57afffdf2..f5b0939f1 100644 --- a/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java +++ b/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java @@ -45,7 +45,7 @@ import com.netscape.cms.selftests.ASelfTest; * This class implements a self test to check the system certs * of the subsystem * <P> - * + * * @version $Revision: $, $Date: $ */ public class SystemCertsVerification @@ -74,7 +74,7 @@ public class SystemCertsVerification * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -128,7 +128,7 @@ public class SystemCertsVerification /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public void startupSelfTest() @@ -149,7 +149,7 @@ public class SystemCertsVerification * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -160,7 +160,7 @@ public class SystemCertsVerification * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore() { @@ -171,7 +171,7 @@ public class SystemCertsVerification * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -183,7 +183,7 @@ public class SystemCertsVerification /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java b/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java index 01f5609bf..7183db613 100644 --- a/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java +++ b/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java @@ -46,7 +46,7 @@ import com.netscape.cms.selftests.ASelfTest; /** * This class implements a self test to check for KRA presence. * <P> - * + * * @author mharmsen * @author thomask * @version $Revision$, $Date$ @@ -77,7 +77,7 @@ public class KRAPresence * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -131,7 +131,7 @@ public class KRAPresence /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public void startupSelfTest() @@ -152,7 +152,7 @@ public class KRAPresence * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -163,7 +163,7 @@ public class KRAPresence * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore() { @@ -174,7 +174,7 @@ public class KRAPresence * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -186,7 +186,7 @@ public class KRAPresence /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java b/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java index c862362a2..a3d9e3ad3 100644 --- a/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java +++ b/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java @@ -50,7 +50,7 @@ import com.netscape.cms.selftests.ASelfTest; /** * This class implements a self test to check for OCSP presence. * <P> - * + * * @author mharmsen * @author thomask * @version $Revision$, $Date$ @@ -81,7 +81,7 @@ public class OCSPPresence * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -135,7 +135,7 @@ public class OCSPPresence /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public void startupSelfTest() @@ -156,7 +156,7 @@ public class OCSPPresence * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -167,7 +167,7 @@ public class OCSPPresence * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore() { @@ -178,7 +178,7 @@ public class OCSPPresence * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -190,7 +190,7 @@ public class OCSPPresence /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java b/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java index 478746827..383779d22 100644 --- a/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java +++ b/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java @@ -50,7 +50,7 @@ import com.netscape.cms.selftests.ASelfTest; /** * This class implements a self test to check the validity of the OCSP. * <P> - * + * * @author mharmsen * @author thomask * @version $Revision$, $Date$ @@ -81,7 +81,7 @@ public class OCSPValidity * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -135,7 +135,7 @@ public class OCSPValidity /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public void startupSelfTest() @@ -156,7 +156,7 @@ public class OCSPValidity * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -167,7 +167,7 @@ public class OCSPValidity * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore() { @@ -178,7 +178,7 @@ public class OCSPValidity * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -190,7 +190,7 @@ public class OCSPValidity /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java b/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java index 9790bf619..e279cf608 100644 --- a/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java +++ b/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java @@ -46,7 +46,7 @@ import com.netscape.cms.selftests.ASelfTest; /** * This class implements a self test to check for RA presence. * <P> - * + * * <PRE> * NOTE: This self-test is for Registration Authorities prior to * Netscape Certificate Management System 7.0. It does NOT @@ -55,7 +55,7 @@ import com.netscape.cms.selftests.ASelfTest; * ALL versions of Dogtag Certificate System). * </PRE> * <P> - * + * * @deprecated * @author mharmsen * @author thomask @@ -87,7 +87,7 @@ public class RAPresence * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -141,7 +141,7 @@ public class RAPresence /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public void startupSelfTest() @@ -162,7 +162,7 @@ public class RAPresence * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -173,7 +173,7 @@ public class RAPresence * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore() { @@ -184,7 +184,7 @@ public class RAPresence * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -196,7 +196,7 @@ public class RAPresence /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java b/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java index 69edeb24f..bee89a59c 100644 --- a/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java +++ b/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java @@ -47,7 +47,7 @@ import com.netscape.symkey.SessionKey; /** * This class implements a self test to check for TKS known session key. * <P> - * + * * @author mharmsen * @author thomask * @author awnuk @@ -72,7 +72,7 @@ public class TKSKnownSessionKey * Initializes this subsystem with the configuration store * associated with this instance name. * <P> - * + * * @param subsystem the associated subsystem * @param instanceName the name of this self test instance * @param parameters configuration store (self test parameters) @@ -216,7 +216,7 @@ public class TKSKnownSessionKey /** * Notifies this subsystem if it is in execution mode. * <P> - * + * * @exception ESelfTestException failed to start */ public void startupSelfTest() @@ -237,7 +237,7 @@ public class TKSKnownSessionKey * Returns the name associated with this self test. This method may * return null if the self test has not been intialized. * <P> - * + * * @return instanceName of this self test */ public String getSelfTestName() { @@ -248,7 +248,7 @@ public class TKSKnownSessionKey * Returns the root configuration storage (self test parameters) * associated with this subsystem. * <P> - * + * * @return configuration store (self test parameters) of this subsystem */ public IConfigStore getSelfTestConfigStore() { @@ -259,7 +259,7 @@ public class TKSKnownSessionKey * Retrieves description associated with an individual self test. * This method may return null. * <P> - * + * * @param locale locale of the client that requests the description * @return description of self test */ @@ -270,7 +270,7 @@ public class TKSKnownSessionKey /** * Execute an individual self test. * <P> - * + * * @param logger specifies logging subsystem * @exception ESelfTestException self test exception */ diff --git a/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java index 12575675c..7a08ce966 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.usrgrp.IUGSubsystem; /** * Manage Access Control List configuration - * + * * @version $Revision$, $Date$ */ public class ACLAdminServlet extends AdminServlet { @@ -80,7 +80,7 @@ public class ACLAdminServlet extends AdminServlet { * <LI>"evaluatorTypes" ACL evaluators. * </ul> * </ul> - * + * * @param config servlet configuration, read from the web.xml file */ public void init(ServletConfig config) throws ServletException { @@ -97,7 +97,7 @@ public class ACLAdminServlet extends AdminServlet { /** * Process the HTTP request. - * + * * @param req the object holding the request information * @param resp the object holding the response information */ @@ -320,11 +320,11 @@ public class ACLAdminServlet extends AdminServlet { /** * modify acls information for a resource * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ACL used when configuring Access Control List (ACL) information * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -484,11 +484,11 @@ public class ACLAdminServlet extends AdminServlet { /** * add access evaluators * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ACL used when configuring Access Control List (ACL) information * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this ACL evaluator's @@ -721,11 +721,11 @@ public class ACLAdminServlet extends AdminServlet { /** * remove access evaluators * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ACL used when configuring Access Control List (ACL) information * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this ACL evaluator's @@ -876,7 +876,7 @@ public class ACLAdminServlet extends AdminServlet { */ /* - private void getACLs(HttpServletRequest req, + private void getACLs(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException, EBaseException { NameValuePairs params = new NameValuePairs(); diff --git a/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java b/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java index a36c859d9..19b537854 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java +++ b/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java @@ -21,7 +21,7 @@ import java.util.ListResourceBundle; /** * A class represents a resource bundle for the remote admin. - * + * * @version $Revision$, $Date$ * @see java.util.ListResourceBundle */ diff --git a/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java index ce4c966ad..5e6e7889f 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java @@ -62,27 +62,27 @@ import com.netscape.cmsutil.util.Utils; * A class represents an administration servlet that * is responsible to serve administrative * operation such as configuration parameter updates. - * + * * Since each administration servlet needs to perform * authentication information parsing and response * formulation, it makes sense to encapsulate the * commonalities into this class. - * + * * By extending this serlvet, the subclass does not * need to re-implement the request parsing code * (i.e. authentication information parsing). - * + * * If a subsystem needs to expose configuration * parameters management, it should create an * administration servlet (i.e. CAAdminServlet) * and register it to RemoteAdmin subsystem. - * + * * <code> * public class CAAdminServlet extends AdminServlet { * ... * } * </code> - * + * * @version $Revision$, $Date$ */ public class AdminServlet extends HttpServlet { @@ -214,7 +214,7 @@ public class AdminServlet extends HttpServlet { while (paramNames.hasMoreElements()) { String pn = paramNames.nextElement(); // added this facility so that password can be hidden, - // all sensitive parameters should be prefixed with + // all sensitive parameters should be prefixed with // __ (double underscores); however, in the event that // a security parameter slips through, we perform multiple // additional checks to insure that it is NOT displayed @@ -280,13 +280,13 @@ public class AdminServlet extends HttpServlet { * Authenticates to the identity scope with the given * userid and password via identity manager. * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_AUTH_FAIL used when authentication fails (in case of SSL-client auth, only * webserver env can pick up the SSL violation; CMS authMgr can pick up cert mis-match, so this event is used) * <li>signed.audit LOGGING_SIGNED_AUDIT_AUTH_SUCCESS used when authentication succeeded * </ul> - * + * * @exception IOException an input/output error has occurred */ protected void authenticate(HttpServletRequest req) throws @@ -611,14 +611,14 @@ public class AdminServlet extends HttpServlet { /** * Authorize must occur after Authenticate * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_AUTHZ_FAIL used when authorization has failed * <li>signed.audit LOGGING_SIGNED_AUDIT_AUTHZ_SUCCESS used when authorization is successful * <li>signed.audit LOGGING_SIGNED_AUDIT_ROLE_ASSUME used when user assumes a role (in current CMS that's when one * accesses a role port) * </ul> - * + * * @param req HTTP servlet request * @return the authorization token */ @@ -773,7 +773,7 @@ public class AdminServlet extends HttpServlet { /** * Sends response. - * + * * @param returnCode return code * @param errorMsg localized error message * @param params result parameters @@ -1007,11 +1007,11 @@ public class AdminServlet extends HttpServlet { /** * FileConfigStore functionality - * + * * The original config file is moved to <filename>.<date>. * Commits the current properties to the configuration file. * <P> - * + * * @param createBackup true if a backup file should be created */ protected void commit(boolean createBackup) throws EBaseException { @@ -1027,11 +1027,11 @@ public class AdminServlet extends HttpServlet { /** * Signed Audit Log - * + * * This method is inherited by all extended admin servlets * and is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ protected void audit(String msg) { @@ -1051,12 +1051,12 @@ public class AdminServlet extends HttpServlet { /** * Signed Audit Log Subject ID - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to obtain the "SubjectID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message SubjectID */ protected String auditSubjectID() { @@ -1088,13 +1088,13 @@ public class AdminServlet extends HttpServlet { /** * Signed Audit Parameters - * + * * This method is inherited by all extended admin servlets and * is called to extract parameters from the HttpServletRequest * and return a string of name;;value pairs separated by a '+' * if more than one name;;value pair exists. * <P> - * + * * @param req HTTP servlet request * @return a delimited string of one or more delimited name/value pairs */ @@ -1213,11 +1213,11 @@ public class AdminServlet extends HttpServlet { /** * Signed Audit Groups - * + * * This method is called to extract all "groups" associated * with the "auditSubjectID()". * <P> - * + * * @param SubjectID string containing the signed audit log message SubjectID * @return a delimited string of groups associated * with the "auditSubjectID()" diff --git a/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java index cacd0b5d0..6ccfcdca9 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java @@ -49,8 +49,8 @@ import com.netscape.certsrv.logging.ILogger; * A class representing an administration servlet for the * Authentication Management subsystem. This servlet is responsible * to serve configuration requests for the Auths Management subsystem. - * - * + * + * * @version $Revision$, $Date$ */ public class AuthAdminServlet extends AdminServlet { @@ -198,7 +198,7 @@ public class AuthAdminServlet extends AdminServlet { null, resp); return; } - // for the rest + // for the rest try { super.authenticate(req); if (op.equals(OpDef.OP_AUTH)) { // for admin authentication only @@ -354,11 +354,11 @@ public class AuthAdminServlet extends AdminServlet { /** * Add authentication manager plug-in * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_AUTH used when configuring authentication * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this authentication @@ -611,11 +611,11 @@ public class AuthAdminServlet extends AdminServlet { /** * Add authentication manager instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_AUTH used when configuring authentication * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this authentication @@ -960,11 +960,11 @@ public class AuthAdminServlet extends AdminServlet { /** * Delete authentication manager plug-in * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_AUTH used when configuring authentication * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this authentication @@ -1132,11 +1132,11 @@ public class AuthAdminServlet extends AdminServlet { /** * Delete authentication manager instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_AUTH used when configuring authentication * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this authentication @@ -1203,7 +1203,7 @@ public class AuthAdminServlet extends AdminServlet { // only remove from memory // cannot shutdown because we don't keep track of whether it's - // being used. + // being used. mAuths.getInstances().remove(id); // remove the configuration. @@ -1382,11 +1382,11 @@ public class AuthAdminServlet extends AdminServlet { * The old instance is left running, so this is very expensive. * Restart of server recommended. * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_AUTH used when configuring authentication * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of this authentication @@ -1469,7 +1469,7 @@ public class AuthAdminServlet extends AdminServlet { return; } - // get plugin for implementation + // get plugin for implementation AuthMgrPlugin plugin = (AuthMgrPlugin) mAuths.getPlugins().get(implname); @@ -1491,7 +1491,7 @@ public class AuthAdminServlet extends AdminServlet { return; } - // save old instance substore params in case new one fails. + // save old instance substore params in case new one fails. IAuthManager oldinst = (IAuthManager) mAuths.get(id); diff --git a/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java b/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java index 69cfd9aaf..42c8da175 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java +++ b/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.base.IArgBlock; /** * Authentication Credentials as input to the authMgr * <P> - * + * * @version $Revision$, $Date$ */ public class AuthCredentials implements IAuthCredentials { @@ -36,7 +36,7 @@ public class AuthCredentials implements IAuthCredentials { */ private static final long serialVersionUID = -6938644716486895814L; private Hashtable<String, Object> authCreds = null; - // Inserted by bskim + // Inserted by bskim private IArgBlock argblk = null; // Insert end @@ -47,7 +47,7 @@ public class AuthCredentials implements IAuthCredentials { /** * sets a credential with credential name and the credential - * + * * @param name credential name * @param cred credential * @exception com.netscape.certsrv.base.EBaseException NullPointerException @@ -63,7 +63,7 @@ public class AuthCredentials implements IAuthCredentials { /** * returns the credential to which the specified name is mapped in this * credential set - * + * * @param name credential name * @return the named authentication credential */ @@ -75,7 +75,7 @@ public class AuthCredentials implements IAuthCredentials { * removes the name and its corresponding credential from this * credential set. This method does nothing if the named * credential is not in the credential set. - * + * * @param name credential name */ public void delete(String name) { @@ -86,7 +86,7 @@ public class AuthCredentials implements IAuthCredentials { * returns an enumeration of the credential names in this credential * set. Use the Enumeration methods on the returned object to * fetch the elements sequentially. - * + * * @return an enumeration of the names in this credential set * @see java.util.Enumeration */ diff --git a/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java index e7b32e844..27cd91c30 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java @@ -48,7 +48,7 @@ import com.netscape.cmsutil.util.Utils; * Authority. This servlet is responsible to serve CA * administrative operations such as configuration parameter * updates. - * + * * @version $Revision$, $Date$ */ public class CAAdminServlet extends AdminServlet { @@ -514,12 +514,12 @@ public class CAAdminServlet extends AdminServlet { /** * Add CRL issuing points configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE used when configuring CRL profile (extensions, * frequency, CRL format) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -670,12 +670,12 @@ public class CAAdminServlet extends AdminServlet { /** * Set CRL issuing points configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE used when configuring CRL profile (extensions, * frequency, CRL format) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -831,12 +831,12 @@ public class CAAdminServlet extends AdminServlet { /** * Delete CRL issuing points configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE used when configuring CRL profile (extensions, * frequency, CRL format) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -974,12 +974,12 @@ public class CAAdminServlet extends AdminServlet { /** * Delete CRL extensions configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE used when configuring CRL profile (extensions, * frequency, CRL format) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1193,12 +1193,12 @@ public class CAAdminServlet extends AdminServlet { /** * Set CRL configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE used when configuring CRL profile (extensions, * frequency, CRL format) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1472,11 +1472,11 @@ public class CAAdminServlet extends AdminServlet { String value = "false"; /* - ISubsystem eeGateway = + ISubsystem eeGateway = SubsystemRegistry.getInstance().get("eeGateway"); if (eeGateway != null) { IConfigStore eeConfig = eeGateway.getConfigStore(); - if (eeConfig != null) + if (eeConfig != null) value = eeConfig.getString("enabled", "true"); String ocspValue = "true"; ocspValue = eeConfig.getString("enableOCSP", "true"); @@ -1529,7 +1529,7 @@ public class CAAdminServlet extends AdminServlet { IOException, EBaseException { /* - ISubsystem eeGateway = + ISubsystem eeGateway = SubsystemRegistry.getInstance().get("eeGateway"); */ @@ -1547,7 +1547,7 @@ public class CAAdminServlet extends AdminServlet { /* if (eeConfig != null) { if (((EEGateway)eeGateway).isEnabled() && - value.equals("false") || + value.equals("false") || !((EEGateway)eeGateway).isEnabled() && value.equals("true")) { restart=true;; diff --git a/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java index 3a2ae0a11..5aa422730 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java @@ -85,7 +85,7 @@ import com.netscape.symkey.SessionKey; * servlet is responsible to serve Certificate Server * level administrative operations such as configuration * parameter updates. - * + * * @version $Revision$, $Date$ */ public final class CMSAdminServlet extends AdminServlet { @@ -505,12 +505,12 @@ public final class CMSAdminServlet extends AdminServlet { /** * Modify encryption configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION used when configuring encryption (cert settings and SSL * cipher preferences) * </ul> - * + * * @exception ServletException a servlet error has occurred * @exception IOException an input/output error has occurred * @exception EBaseException failed to modify encryption configuration @@ -935,7 +935,7 @@ public final class CMSAdminServlet extends AdminServlet { } } } - // String symKeys = new String("key1,key2"); + // String symKeys = new String("key1,key2"); String symKeys = SessionKey.ListSymmetricKeys(selectedToken); params.put(Constants.PR_TOKEN_LIST, symKeys); @@ -1072,11 +1072,11 @@ public final class CMSAdminServlet extends AdminServlet { /** * Retrieve a certificate request * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_KEY_GEN_ASYMMETRIC used when asymmetric keys are generated * </ul> - * + * * @exception ServletException a servlet error has occurred * @exception IOException an input/output error has occurred * @exception EBaseException failed to retrieve certificate request @@ -1444,12 +1444,12 @@ public final class CMSAdminServlet extends AdminServlet { /** * Issue import certificate * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY used when "Certificate Setup Wizard" is used to * import CA certs into the certificate database * </ul> - * + * * @exception ServletException a servlet error has occurred * @exception IOException an input/output error has occurred * @exception EBaseException failed to issue an import certificate @@ -1860,12 +1860,12 @@ public final class CMSAdminServlet extends AdminServlet { /** * Install certificates * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY used when "Certificate Setup Wizard" is used to * import CA certs into the certificate database * </ul> - * + * * @exception ServletException a servlet error has occurred * @exception IOException an input/output error has occurred * @exception EBaseException failed to install a certificate @@ -2018,15 +2018,15 @@ public final class CMSAdminServlet extends AdminServlet { // 600124 - renewal of SSL crash the server // we now do not delete previously installed certificates. - // Same Subject | Same Nickname | Same Key | Legal - // ----------------------------------------------------------- - // 1. Yes Yes No Yes - // 2. Yes Yes Yes Yes - // 3. No No Yes Yes - // 4. No No No Yes - // 5. No Yes Yes No - // 6. No Yes No No - // 7. Yes No Yes No + // Same Subject | Same Nickname | Same Key | Legal + // ----------------------------------------------------------- + // 1. Yes Yes No Yes + // 2. Yes Yes Yes Yes + // 3. No No Yes Yes + // 4. No No No Yes + // 5. No Yes Yes No + // 6. No Yes No No + // 7. Yes No Yes No // 8. Yes No No No // Based on above table, the following cases are permitted: @@ -2280,12 +2280,12 @@ public final class CMSAdminServlet extends AdminServlet { * For "importing" cross-signed cert into internal db for further * cross pair matching and publishing * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY used when "Certificate Setup Wizard" is used to * import a CA cross-signed certificate into the database * </ul> - * + * * @exception ServletException a servlet error has occurred * @exception IOException an input/output error has occurred * @exception EBaseException failed to import a cross-certificate pair @@ -2809,7 +2809,7 @@ public final class CMSAdminServlet extends AdminServlet { nickname = value.substring(0, index); date = value.substring(index + 1); - // cant use this one now since jss doesnt have the interface to + // cant use this one now since jss doesnt have the interface to // do it. jssSubSystem.deleteCert(nickname, date); // jssSubsystem.deleteCACert(nickname, date); @@ -2997,12 +2997,12 @@ public final class CMSAdminServlet extends AdminServlet { /** * Establish trust of a CA certificate * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY used when "Manage Certificate" is used to edit * the trustness of certs and deletion of certs * </ul> - * + * * @exception ServletException a servlet error has occurred * @exception IOException an input/output error has occurred * @exception EBaseException failed to establish CA certificate trust @@ -3092,11 +3092,11 @@ public final class CMSAdminServlet extends AdminServlet { /** * Execute all self tests specified to be run on demand. * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION used when self tests are run on demand * </ul> - * + * * @exception EMissingSelfTestException a self test plugin instance * property name was missing * @exception ESelfTestException a self test is missing a required @@ -3394,11 +3394,11 @@ public final class CMSAdminServlet extends AdminServlet { /** * Signed Audit Log Public Key - * + * * This method is called to obtain the public key from the passed in * "KeyPair" object for a signed audit log message. * <P> - * + * * @param object a Key Pair Object * @return key string containing the public key */ diff --git a/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java index 42ff32ebe..a89933c69 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.logging.ILogger; /** * A class representing an administration servlet for the * Jobs Scheduler and it's scheduled jobs. - * + * * @version $Revision$, $Date$ */ public class JobsAdminServlet extends AdminServlet { @@ -639,7 +639,7 @@ public class JobsAdminServlet extends AdminServlet { // only remove from memory // cannot shutdown because we don't keep track of whether it's - // being used. + // being used. mJobsSched.getInstances().remove(id); // remove the configuration. @@ -791,7 +791,7 @@ public class JobsAdminServlet extends AdminServlet { return; } - // get plugin for implementation + // get plugin for implementation JobPlugin plugin = (JobPlugin) mJobsSched.getPlugins().get(implname); @@ -803,7 +803,7 @@ public class JobsAdminServlet extends AdminServlet { return; } - // save old instance substore params in case new one fails. + // save old instance substore params in case new one fails. IJob oldinst = (IJob) mJobsSched.getInstances().get((Object) id); diff --git a/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java index eaa5a95c4..c6e6f9e1c 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java @@ -39,7 +39,7 @@ import com.netscape.certsrv.logging.ILogger; * Recovery Authority. This servlet is responsible to serve * KRA administrative operation such as configuration * parameter updates. - * + * * @version $Revision$, $Date$ */ public class KRAAdminServlet extends AdminServlet { @@ -71,7 +71,7 @@ public class KRAAdminServlet extends AdminServlet { /** * Returns serlvet information. - * + * * @return name of this servlet */ public String getServletInfo() { @@ -80,7 +80,7 @@ public class KRAAdminServlet extends AdminServlet { /** * Serves HTTP admin request. - * + * * @param req HTTP request * @param resp HTTP response */ @@ -153,7 +153,7 @@ public class KRAAdminServlet extends AdminServlet { } else if (scope.equals(ScopeDef.SC_NOTIFICATION_RIQ)) { setNotificationRIQConfig(req, resp); return; - } else + } else */ if (scope.equals(ScopeDef.SC_GENERAL)) { setGeneralConfig(req, resp); diff --git a/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java index 1b32018bc..fb73cec98 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java @@ -49,7 +49,7 @@ import com.netscape.certsrv.logging.LogPlugin; * subsystem. This servlet is responsible to serve * logging administrative operation such as configuration * parameter updates and log retriever. - * + * * @version $Revision$, $Date$ */ public class LogAdminServlet extends AdminServlet { @@ -407,11 +407,11 @@ public class LogAdminServlet extends AdminServlet { /** * Add log plug-in * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT used when configuring signedAudit * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of the log's substore @@ -680,11 +680,11 @@ public class LogAdminServlet extends AdminServlet { /** * Add log instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT used when configuring signedAudit * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of the log's substore @@ -1072,11 +1072,11 @@ public class LogAdminServlet extends AdminServlet { /** * Delete log instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT used when configuring signedAudit * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of the log's substore @@ -1146,7 +1146,7 @@ public class LogAdminServlet extends AdminServlet { // only remove from memory // cannot shutdown because we don't keep track of whether it's - // being used. + // being used. mSys.getLogInsts().remove(id); // remove the configuration. @@ -1234,11 +1234,11 @@ public class LogAdminServlet extends AdminServlet { /** * Delete log plug-in * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT used when configuring signedAudit * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of the log's substore @@ -1415,7 +1415,7 @@ public class LogAdminServlet extends AdminServlet { /** * Modify log instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT used when configuring signedAudit * <li>signed.audit LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE used when log file name (including any path changes) for @@ -1424,7 +1424,7 @@ public class LogAdminServlet extends AdminServlet { * <li>signed.audit LOGGING_SIGNED_AUDIT_LOG_EXPIRATION_CHANGE used when log expiration time change is attempted * (authorization should not allow, but make sure it's written after the attempt) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @param scope string used to obtain the contents of the log's substore @@ -1716,7 +1716,7 @@ public class LogAdminServlet extends AdminServlet { newExpirationTime = val; if (!val.equals(origVal.trim())) { if (id.equals(SIGNED_AUDIT_LOG_TYPE)) { - AUTHZ_RES_NAME = + AUTHZ_RES_NAME = "certServer.log.configuration.signedAudit.expirationTime"; } mOp = "modify"; @@ -2284,10 +2284,10 @@ public class LogAdminServlet extends AdminServlet { /** * Signed Audit Check Log Path - * + * * This method is called to extract the log file path. * <P> - * + * * @param req http servlet request * @return a string containing the log file path */ diff --git a/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java index 0e6784413..4149fae94 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.ocsp.IOCSPStore; * Authority. This servlet is responsible to serve OCSP * administrative operations such as configuration parameter * updates. - * + * * @version $Revision$, $Date$ */ public class OCSPAdminServlet extends AdminServlet { @@ -227,12 +227,12 @@ public class OCSPAdminServlet extends AdminServlet { /** * Set default OCSP store * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE used when configuring OCSP profile (everything under * Online Certificate Status Manager) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -317,12 +317,12 @@ public class OCSPAdminServlet extends AdminServlet { /** * Set OCSP store configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE used when configuring OCSP profile (everything under * Online Certificate Status Manager) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -467,12 +467,12 @@ public class OCSPAdminServlet extends AdminServlet { /** * Set general OCSP configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE used when configuring OCSP profile (everything under * Online Certificate Status Manager) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred diff --git a/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java index 0bcb962ea..c1da868c8 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java @@ -45,11 +45,11 @@ import com.netscape.certsrv.ra.IRegistrationAuthority; /** * This class is an administration servlet for policy management. - * + * * Each service (CA, KRA, RA) should be responsible * for registering an instance of this with the remote * administration subsystem. - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -114,14 +114,14 @@ public class PolicyAdminServlet extends AdminServlet { // NOTE: The "Certificate Policies" framework ONLY applied to // to CA, KRA, and legacy RA (pre-CMS 7.0) subsystems. // - // Further, the "PolicyAdminServlet.java" servlet is ONLY used + // Further, the "PolicyAdminServlet.java" servlet is ONLY used // by the CA Console for the following: // // SERVLET-NAME URL-PATTERN // ==================================================== // capolicy ca/capolicy // - // Finally, the "PolicyAdminServlet.java" servlet is ONLY used + // Finally, the "PolicyAdminServlet.java" servlet is ONLY used // by the KRA Console for the following: // // SERVLET-NAME URL-PATTERN @@ -480,12 +480,12 @@ public class PolicyAdminServlet extends AdminServlet { /** * Delete policy implementation * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when configuring cert policy constraints and * extensions * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -602,12 +602,12 @@ public class PolicyAdminServlet extends AdminServlet { /** * Add policy implementation * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when configuring cert policy constraints and * extensions * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -709,12 +709,12 @@ public class PolicyAdminServlet extends AdminServlet { /** * Delete policy instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when configuring cert policy constraints and * extensions * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -849,12 +849,12 @@ public class PolicyAdminServlet extends AdminServlet { /** * Add policy instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when configuring cert policy constraints and * extensions * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1006,12 +1006,12 @@ public class PolicyAdminServlet extends AdminServlet { /** * Change ordering of policy instances * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when configuring cert policy constraints and * extensions * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1097,12 +1097,12 @@ public class PolicyAdminServlet extends AdminServlet { /** * Modify policy instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY used when configuring cert policy constraints and * extensions * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1182,7 +1182,7 @@ public class PolicyAdminServlet extends AdminServlet { sendResponse(ERROR, INVALID_POLICY_IMPL_ID, null, resp); return; } - // XXX + // XXX for (@SuppressWarnings("unchecked") Enumeration<String> n = req.getParameterNames(); n.hasMoreElements();) { String p = n.nextElement(); diff --git a/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java index 94235f532..3ca222135 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java @@ -54,11 +54,11 @@ import com.netscape.cms.profile.common.ProfilePolicy; /** * This class is an administration servlet for policy management. - * + * * Each service (CA, KRA, RA) should be responsible * for registering an instance of this with the remote * administration subsystem. - * + * * @version $Revision$, $Date$ */ public class ProfileAdminServlet extends AdminServlet { @@ -396,12 +396,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Add policy profile * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -539,12 +539,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Add profile input * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -665,12 +665,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Add profile output * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -792,12 +792,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Delete policy profile * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -913,12 +913,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Delete profile input * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1031,12 +1031,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Delete profile output * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1149,12 +1149,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Add default policy profile configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1286,12 +1286,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Add policy constraints profile configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1425,12 +1425,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Modify default policy profile configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1557,12 +1557,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Modify profile input configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1677,12 +1677,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Modify profile output configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1798,12 +1798,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Modify policy constraints profile configuration * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -2272,12 +2272,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Delete profile instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -2410,12 +2410,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Add profile instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -2573,12 +2573,12 @@ public class ProfileAdminServlet extends AdminServlet { /** * Modify profile instance * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE used when configuring cert profile (general settings * and cert profile; obsoletes extensions and constraints policies) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred diff --git a/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java index 483ac42ef..8daadbce0 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java @@ -71,7 +71,7 @@ import com.netscape.cmsutil.password.IPasswordStore; * A class representing an publishing servlet for the * Publishing subsystem. This servlet is responsible * to serve configuration requests for the Publishing subsystem. - * + * * @version $Revision$, $Date$ */ public class PublisherAdminServlet extends AdminServlet { @@ -138,7 +138,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - // for the rest + // for the rest try { super.authenticate(req); @@ -571,7 +571,7 @@ public class PublisherAdminServlet extends AdminServlet { commit(true); - /* Do a "PUT" of the new pw to the watchdog" + /* Do a "PUT" of the new pw to the watchdog" ** do not remove - cfu if (pwd != null) CMS.putPasswordCache(PW_TAG_CA_LDAP_PUBLISHING, pwd); @@ -921,7 +921,7 @@ public class PublisherAdminServlet extends AdminServlet { CMS.debug("PublisherAdminServlet: testSetLDAPDest(): authInfo null"); */ } - //params.add(Constants.PR_SAVE_OK, + //params.add(Constants.PR_SAVE_OK, // "\n \nConfiguration changes are now committed."); mProcessor.shutdown(); @@ -1322,7 +1322,7 @@ public class PublisherAdminServlet extends AdminServlet { // only remove from memory // cannot shutdown because we don't keep track of whether it's - // being used. + // being used. mProcessor.getMapperInsts().remove(id); // remove the configuration. @@ -2014,7 +2014,7 @@ public class PublisherAdminServlet extends AdminServlet { // only remove from memory // cannot shutdown because we don't keep track of whether it's - // being used. + // being used. mProcessor.getRuleInsts().remove(id); // remove the configuration. @@ -2140,7 +2140,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - // get plugin for implementation + // get plugin for implementation RulePlugin plugin = (RulePlugin) mProcessor.getRulePlugins().get(implname); @@ -2152,7 +2152,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - // save old instance substore params in case new one fails. + // save old instance substore params in case new one fails. ILdapRule oldinst = (ILdapRule) mProcessor.getRuleInsts().get((Object) id); @@ -2666,7 +2666,7 @@ public class PublisherAdminServlet extends AdminServlet { // only remove from memory // cannot shutdown because we don't keep track of whether it's - // being used. + // being used. mProcessor.getPublisherInsts().remove(id); // remove the configuration. @@ -2818,7 +2818,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - // get plugin for implementation + // get plugin for implementation PublisherPlugin plugin = (PublisherPlugin) mProcessor.getPublisherPlugins().get(implname); @@ -2831,7 +2831,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - // save old instance substore params in case new one fails. + // save old instance substore params in case new one fails. ILdapPublisher oldinst = mProcessor.getPublisherInstance(id); Vector<String> oldConfigParms = oldinst.getInstanceParams(); diff --git a/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java index 5bdb14177..b2e271236 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java @@ -40,7 +40,7 @@ import com.netscape.certsrv.request.IRequestListener; * Authority. This servlet is responsible to serve RA * administrative operations such as configuration parameter * updates. - * + * * @version $Revision$, $Date$ */ public class RAAdminServlet extends AdminServlet { @@ -571,10 +571,10 @@ public class RAAdminServlet extends AdminServlet { while (enum.hasMoreElements()) { String key = (String)enum.nextElement(); if (key.equals(Constants.PR_EE_ENABLED)) { - if (eeConfig != null) + if (eeConfig != null) eeConfig.putString("enabled", req.getParameter(Constants.PR_EE_ENABLED)); - } + } } */ diff --git a/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java index 4bebe85d3..4f5afbb20 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java @@ -40,7 +40,7 @@ import com.netscape.certsrv.registry.IPluginRegistry; /** * This implements the administration servlet for registry subsystem. - * + * * @version $Revision$, $Date$ */ public class RegistryAdminServlet extends AdminServlet { diff --git a/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java b/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java index 4dccb141f..72106a903 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java @@ -31,9 +31,9 @@ import com.netscape.cms.servlet.cert.model.CertificateData; /** * This is the class used to list, retrieve and modify system certificates for all Java subsystems. - * + * * @author alee - * + * */ public class SystemCertificateResourceService extends CMSResourceService implements SystemCertificateResource { diff --git a/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java index e5a6dd3c4..90dc92221 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java @@ -63,10 +63,10 @@ import com.netscape.cmsutil.util.Utils; * User/Group Manager. It communicates with client * SDK to allow remote administration of User/Group * manager. - * + * * This servlet will be registered to remote * administration subsystem by usrgrp manager. - * + * * @version $Revision$, $Date$ */ public class UsrGrpAdminServlet extends AdminServlet { @@ -167,11 +167,11 @@ public class UsrGrpAdminServlet extends AdminServlet { log(ILogger.LL_FAILURE, CMS.getLogMessage("ADMIN_SRVLT_FAIL_AUTHS")); - sendResponse(ERROR, + sendResponse(ERROR, MessageFormatter.getLocalizedString( getLocale(req), AdminResources.class.getName(), - AdminResources.SRVLT_FAIL_AUTHS), + AdminResources.SRVLT_FAIL_AUTHS), null, resp); return; } @@ -333,7 +333,7 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Searches for users in LDAP directory. List uids only - * + * * Request/Response Syntax: * http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin @@ -381,7 +381,7 @@ public class UsrGrpAdminServlet extends AdminServlet { * List user information. Certificates covered in a separate * protocol for findUserCerts(). List of group memberships are * also provided. - * + * * Request/Response Syntax: * http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin @@ -462,7 +462,7 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * List user certificate(s) - * + * * Request/Response Syntax: * http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin @@ -542,7 +542,7 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Searchess for groups in LDAP server - * + * * Request/Response Syntax: * http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#group @@ -648,16 +648,16 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Adds a new user to LDAP server * <P> - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -973,16 +973,16 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Adds a certificate to a user * <P> - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1327,19 +1327,19 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Removes a certificate for a user * <P> - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin * <P> - * + * * In this method, "certDN" is actually a combination of version, serialNumber, issuerDN, and SubjectDN. * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1473,16 +1473,16 @@ public class UsrGrpAdminServlet extends AdminServlet { * any group he/she belongs to before trying to remove the user * itself. * <P> - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1643,16 +1643,16 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Adds a new group in local scope. * <P> - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#group * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1783,16 +1783,16 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * removes a group * <P> - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#group * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -1886,18 +1886,18 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * modifies a group * <P> - * + * * last person of the super power group "Certificate Server Administrators" can never be removed. * <P> - * + * * http://warp.mcom.com/server/certificate/columbo/design/ ui/admin-protocol-definition.html#group * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred @@ -2126,16 +2126,16 @@ public class UsrGrpAdminServlet extends AdminServlet { /** * Modifies an existing user in local scope. * <P> - * + * * Request/Response Syntax: http://warp.mcom.com/server/certificate/columbo/design/ * ui/admin-protocol-definition.html#user-admin * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CONFIG_ROLE used when configuring role information (anything under * users/groups) * </ul> - * + * * @param req HTTP servlet request * @param resp HTTP servlet response * @exception ServletException a servlet error has occurred diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java b/base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java index 24c3cd74d..36f33b6f8 100644 --- a/base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java @@ -32,9 +32,9 @@ import com.netscape.cms.servlet.cert.model.CertificateData; /** * Base class for CMS RESTful resources - * + * * @author alee - * + * */ public class CMSResourceService { diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java b/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java index c0931ee2f..f1de3ce4a 100644 --- a/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java @@ -101,7 +101,7 @@ import com.netscape.cmsutil.xml.XMLObject; /** * This is the base class of all CS servlet. - * + * * @version $Revision$, $Date$ */ public abstract class CMSServlet extends HttpServlet { @@ -132,7 +132,7 @@ public abstract class CMSServlet extends HttpServlet { private final static String FAILED = "1"; private final static String HDR_LANG = "accept-language"; - // final error message - if error and exception templates don't work + // final error message - if error and exception templates don't work // send out this text string directly to output. public final static String PROP_FINAL_ERROR_MSG = "finalErrorMsg"; @@ -206,7 +206,7 @@ public abstract class CMSServlet extends HttpServlet { public static final String CERT_ATTR = "javax.servlet.request.X509Certificate"; - // members. + // members. protected boolean mRenderResult = true; protected String mFinalErrorMsg = FINAL_ERROR_MSG; @@ -222,7 +222,7 @@ public abstract class CMSServlet extends HttpServlet { protected String mId = null; protected IConfigStore mConfig = null; - // the authority, RA, CA, KRA this servlet is serving. + // the authority, RA, CA, KRA this servlet is serving. protected IAuthority mAuthority = null; protected IRequestQueue mRequestQueue = null; @@ -317,7 +317,7 @@ public abstract class CMSServlet extends HttpServlet { } try { - // get final error message. + // get final error message. // used when templates can't even be loaded. String eMsg = sc.getInitParameter(PROP_FINAL_ERROR_MSG); @@ -350,12 +350,12 @@ public abstract class CMSServlet extends HttpServlet { } } - // get http params NOT to store in a IRequest and - // get http headers TO store in a IRequest. + // get http params NOT to store in a IRequest and + // get http headers TO store in a IRequest. getDontSaveHttpParams(sc); getSaveHttpHeaders(sc); } catch (Exception e) { - // should never occur since we provide defaults above. + // should never occur since we provide defaults above. log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_CONF_TEMP_PARAMS", e.toString())); @@ -393,7 +393,7 @@ public abstract class CMSServlet extends HttpServlet { while (paramNames.hasMoreElements()) { String pn = (String) paramNames.nextElement(); // added this facility so that password can be hidden, - // all sensitive parameters should be prefixed with + // all sensitive parameters should be prefixed with // __ (double underscores); however, in the event that // a security parameter slips through, we perform multiple // additional checks to insure that it is NOT displayed @@ -447,10 +447,10 @@ public abstract class CMSServlet extends HttpServlet { } CMS.debug("CMSServlet: " + mId + " start to service."); - // get a cms request + // get a cms request CMSRequest cmsRequest = newCMSRequest(); - // set argblock + // set argblock cmsRequest.setHttpParams(CMS.createArgBlock("http-request-params", toHashtable(httpReq))); // set http request @@ -522,7 +522,7 @@ public abstract class CMSServlet extends HttpServlet { /** * Create a new CMSRequest object. This should be overriden by servlets * implementing different types of request - * + * * @return a new CMSRequest object */ protected CMSRequest newCMSRequest() { @@ -532,7 +532,7 @@ public abstract class CMSServlet extends HttpServlet { /** * process an HTTP request. Servlets must override this with their * own implementation - * + * * @throws EBaseException if the servlet was unable to satisfactorily * process the request */ @@ -544,7 +544,7 @@ public abstract class CMSServlet extends HttpServlet { * Output a template. * If an error occurs while outputing the template the exception template * is used to display the error. - * + * * @param cmsReq the CS request */ protected void renderResult(CMSRequest cmsReq) @@ -688,7 +688,7 @@ public abstract class CMSServlet extends HttpServlet { * In others if an exception occurs while rendering the template the * exception template (this) is called. * <p> - * + * * @param cmsReq the CS request to pass to template filler if any. * @param e the unexpected exception */ @@ -705,8 +705,8 @@ public abstract class CMSServlet extends HttpServlet { // When an exception occurs the exit is non-local which probably // will leave the requestStatus value set to something other - // than CMSRequest.EXCEPTION, so force the requestStatus to - // EXCEPTION since it must be that if we're here. + // than CMSRequest.EXCEPTION, so force the requestStatus to + // EXCEPTION since it must be that if we're here. cmsReq.setStatus(CMSRequest.EXCEPTION); if (filler != null) { @@ -743,14 +743,14 @@ public abstract class CMSServlet extends HttpServlet { public void renderFinalError(CMSRequest cmsReq, Exception ex) throws IOException { - // this template is the last resort for all other unexpected - // errors in other templates so we can only output text. + // this template is the last resort for all other unexpected + // errors in other templates so we can only output text. HttpServletResponse httpResp = cmsReq.getHttpResp(); httpResp.setContentType("text/html"); ServletOutputStream out = httpResp.getOutputStream(); - // replace $ERRORMSG with exception message if included. + // replace $ERRORMSG with exception message if included. String finalErrMsg = mFinalErrorMsg; int tokenIdx = mFinalErrorMsg.indexOf(ERROR_MSG_TOKEN); @@ -772,10 +772,10 @@ public abstract class CMSServlet extends HttpServlet { /* try { - s = (SSLSocket) ((HTTPRequest) httpReq).getConnection().getSocket(); + s = (SSLSocket) ((HTTPRequest) httpReq).getConnection().getSocket(); } catch (ClassCastException e) { CMS.getLogger().log( - ILogger.EV_SYSTEM, ILogger.S_OTHER, ILogger.LL_WARN, + ILogger.EV_SYSTEM, ILogger.S_OTHER, ILogger.LL_WARN, CMS.getLogMessage("CMSGW_SSL_NO_INVALIDATE")); // ignore. return; @@ -831,7 +831,7 @@ public abstract class CMSServlet extends HttpServlet { mLogger.log(ILogger.EV_SYSTEM, ILogger.S_OTHER, ILogger.LL_INFO, CMS.getLogMessage("CMSGW_GETTING_SSL_CLIENT_CERT")); - // iws60 support Java Servlet Spec V2.2, attribute + // iws60 support Java Servlet Spec V2.2, attribute // javax.servlet.request.X509Certificate now contains array // of X509Certificates instead of one X509Certificate object X509Certificate[] allCerts = (X509Certificate[]) httpReq.getAttribute(CERT_ATTR); @@ -1125,7 +1125,7 @@ public abstract class CMSServlet extends HttpServlet { /** * instantiate a new filler from a class name, - * + * * @return null if can't be instantiated, new instance otherwise. */ protected ICMSTemplateFiller newFillerObject(String fillerClass) { @@ -1153,12 +1153,12 @@ public abstract class CMSServlet extends HttpServlet { */ protected void setDefaultTemplates(ServletConfig sc) { // Subclasses should override these for diff templates and params in - // their constructors. - // Set a template name to null to not use these standard ones. - // When template name is set to null nothing will be displayed. + // their constructors. + // Set a template name to null to not use these standard ones. + // When template name is set to null nothing will be displayed. // Servlet is assumed to have rendered its own output. - // The only exception is the unexpected error template where the - // default one will always be used if template name is null. + // The only exception is the unexpected error template where the + // default one will always be used if template name is null. String successTemplate = null; String errorTemplate = null; String unauthorizedTemplate = null; @@ -1237,7 +1237,7 @@ public abstract class CMSServlet extends HttpServlet { unexpectedErrorTemplate = "/" + gateway + unexpectedErrorTemplate; } } catch (Exception e) { - // this should never happen. + // this should never happen. log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_IMP_INIT_SERV_ERR", e.toString(), mId)); @@ -1319,7 +1319,7 @@ public abstract class CMSServlet extends HttpServlet { private static final String IMPORT_CERT = "importCert"; private static final String IMPORT_CHAIN = "importCAChain"; private static final String IMPORT_CERT_MIME_TYPE = "importCertMimeType"; - // default mime type + // default mime type private static final String NS_X509_USER_CERT = "application/x-x509-user-cert"; private static final String NS_X509_EMAIL_CERT = "application/x-x509-email-cert"; @@ -1391,7 +1391,7 @@ public abstract class CMSServlet extends HttpServlet { caChain = ((ICertAuthority) mAuthority).getCACertChain(); caCerts = caChain.getChain(); - // set user + CA cert chain in pkcs7 + // set user + CA cert chain in pkcs7 X509CertImpl[] userChain = new X509CertImpl[caCerts.length + 1]; @@ -1511,7 +1511,7 @@ public abstract class CMSServlet extends HttpServlet { /** * make a CRL entry from a serial number and revocation reason. - * + * * @return a RevokedCertImpl that can be entered in a CRL. */ protected RevokedCertImpl formCRLEntry( @@ -1536,7 +1536,7 @@ public abstract class CMSServlet extends HttpServlet { /** * check if a certificate (serial number) is revoked on a CA. - * + * * @return true if cert is marked revoked in the CA's database. * @return false if cert is not marked revoked. */ @@ -1676,13 +1676,13 @@ public abstract class CMSServlet extends HttpServlet { /** * Authentication * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_AUTH_FAIL used when authentication fails (in case of SSL-client auth, only * webserver env can pick up the SSL violation; CS authMgr can pick up cert mis-match, so this event is used) * <li>signed.audit LOGGING_SIGNED_AUDIT_AUTH_SUCCESS used when authentication succeeded * </ul> - * + * * @exception EBaseException an error has occurred */ public IAuthToken authenticate(HttpServletRequest httpReq, String authMgrName) @@ -1724,7 +1724,7 @@ public abstract class CMSServlet extends HttpServlet { // // check authentication by auth manager if any. - // + // if (authMgrName == null) { // Fixed Blackflag Bug #613900: Since this code block does @@ -1873,14 +1873,14 @@ public abstract class CMSServlet extends HttpServlet { /** * Authorize must occur after Authenticate * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_AUTHZ_FAIL used when authorization has failed * <li>signed.audit LOGGING_SIGNED_AUDIT_AUTHZ_SUCCESS used when authorization is successful * <li>signed.audit LOGGING_SIGNED_AUDIT_ROLE_ASSUME used when user assumes a role (in current CS that's when one * accesses a role port) * </ul> - * + * * @param authzMgrName string representing the name of the authorization * manager * @param authToken the authentication token @@ -2033,11 +2033,11 @@ public abstract class CMSServlet extends HttpServlet { /** * Signed Audit Log - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ protected void audit(String msg) { @@ -2057,12 +2057,12 @@ public abstract class CMSServlet extends HttpServlet { /** * Signed Audit Log Subject ID - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to obtain the "SubjectID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message SubjectID */ protected String auditSubjectID() { @@ -2097,12 +2097,12 @@ public abstract class CMSServlet extends HttpServlet { /** * Signed Audit Log Group ID - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to obtain the "gid" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message SubjectID */ protected String auditGroupID() { @@ -2137,11 +2137,11 @@ public abstract class CMSServlet extends HttpServlet { /** * Signed Audit Groups - * + * * This method is called to extract all "groups" associated * with the "auditSubjectID()". * <P> - * + * * @param SubjectID string containing the signed audit log message SubjectID * @return a delimited string of groups associated * with the "auditSubjectID()" diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java b/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java index 4bfc74607..6f9f43d3a 100644 --- a/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java @@ -34,7 +34,7 @@ import com.netscape.cmsutil.util.Utils; /** * This servlet is started by the web server at startup, and * it starts the CMS framework. - * + * * @version $Revision$, $Date$ */ public class CMSStartServlet extends HttpServlet { diff --git a/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java b/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java index 54e453f30..a6cb97908 100644 --- a/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java @@ -33,7 +33,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * This is the servlet that displays the html page for the corresponding input id. - * + * * @version $Revision$, $Date$ */ public class DisplayHtmlServlet extends CMSServlet { diff --git a/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java b/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java index 0bf726879..ceba2fc72 100644 --- a/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.base.IConfigStore; * <p> * This allows the requestor (browser) to make decisions about what to present in the UI, depending on how CMS is * configured - * + * * @version $Revision$, $Date$ */ public class DynamicVariablesServlet extends CMSServlet { @@ -137,7 +137,7 @@ public class DynamicVariablesServlet extends CMSServlet { * <li>clacrlurl() - the URL to get the CRL from, in the case of a Clone CA. This is defined in the CMS * configuration parameter 'cloning.cloneMasterCrlUrl' * </ul> - * + * * @see javax.servlet.Servlet#init(ServletConfig) */ diff --git a/base/common/src/com/netscape/cms/servlet/base/GetStats.java b/base/common/src/com/netscape/cms/servlet/base/GetStats.java index c21b56835..8c32e78c3 100644 --- a/base/common/src/com/netscape/cms/servlet/base/GetStats.java +++ b/base/common/src/com/netscape/cms/servlet/base/GetStats.java @@ -44,7 +44,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve information. - * + * * @version $Revision$, $Date$ */ public class GetStats extends CMSServlet { @@ -62,7 +62,7 @@ public class GetStats extends CMSServlet { /** * initialize the servlet. This servlet uses the template * file "getOCSPInfo.template" to render the result page. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -79,7 +79,7 @@ public class GetStats extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java b/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java index 95dbf2abf..b5f94bd19 100644 --- a/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java @@ -34,7 +34,7 @@ import com.netscape.cms.servlet.common.IndexTemplateFiller; /** * This is the servlet that builds the index page in * various ports. - * + * * @version $Revision$, $Date$ */ public class IndexServlet extends CMSServlet { diff --git a/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java b/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java index fced583a2..a0587229a 100644 --- a/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java @@ -33,7 +33,7 @@ import com.netscape.cmsutil.xml.XMLObject; /** * This servlet returns port information. - * + * * @version $Revision$, $Date$ */ public class PortsServlet extends CMSServlet { @@ -49,7 +49,7 @@ public class PortsServlet extends CMSServlet { public void init(ServletConfig sc) throws ServletException { super.init(sc); - // override these to output directly ourselves. + // override these to output directly ourselves. mTemplates.remove(CMSRequest.SUCCESS); mTemplates.remove(CMSRequest.ERROR); } diff --git a/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java b/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java index 41666ab31..4d7ff24f5 100644 --- a/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java @@ -22,31 +22,31 @@ import com.netscape.certsrv.apps.CMS; /** * This is a servlet that proxies request to another servlet. - * + * * SERVLET REDIRECTION * Specify the URL of a servlet to forward the request to * destServlet: /ee/ca/newservlet - * + * * PARAMETER MAPPING * In the servlet configuration (as an init-param in web.xml) you * can optionally specify a value for the parameter 'parameterMap' * which contains a list of HTTP parameters which should be * translated to new names. - * + * * parameterMap: name1->newname1,name2->newname2 - * + * * Optionally, names can be set to static values: - * + * * parameterMap: name1->name2=value - * + * * Examples: * Consider the following HTTP input parameters: * vehicle:car make:ford model:explorer - * + * * The following config strings will have this effect: * parameterMap: make->manufacturer,model->name=expedition,->suv=true * output: vehicle:car manufactuer:ford model:expedition suv:true - * + * * @version $Revision$, $Date$ */ public class ProxyServlet extends HttpServlet { @@ -222,7 +222,7 @@ class ProxyWrapper extends HttpServletRequestWrapper { } } } - // Now, deal with static values set in the config + // Now, deal with static values set in the config // which weren't set in the HTTP request Set<Map.Entry<String, String[]>> s2 = mValueMap.entrySet(); Iterator<Map.Entry<String, String[]>> i2 = s2.iterator(); diff --git a/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java b/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java index f883fd373..24210f377 100644 --- a/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.apps.CMS; * thread. * <p> * Also allows user to trigger a new garbage collection - * + * * @version $Revision$, $Date$ */ public class SystemInfoServlet extends HttpServlet { @@ -62,7 +62,7 @@ public class SystemInfoServlet extends HttpServlet { * <li>op = general - display information about memory, and other JVM informatino * <li>op = thread - display details about each thread. * </UL> - * + * * @see javax.servlet.http.HttpServlet#service(HttpServletRequest, HttpServletResponse) */ public void service(HttpServletRequest request, diff --git a/base/common/src/com/netscape/cms/servlet/base/UserInfo.java b/base/common/src/com/netscape/cms/servlet/base/UserInfo.java index dd8f69613..b509409da 100644 --- a/base/common/src/com/netscape/cms/servlet/base/UserInfo.java +++ b/base/common/src/com/netscape/cms/servlet/base/UserInfo.java @@ -20,7 +20,7 @@ package com.netscape.cms.servlet.base; /** * This class represents information about the client e.g. version, * langauge, vendor. - * + * * @version $Revision$, $Date$ */ public class UserInfo { @@ -35,7 +35,7 @@ public class UserInfo { /** * Returns the user language. - * + * * @param s user language info from the browser * @return user language */ @@ -52,7 +52,7 @@ public class UserInfo { /** * Returns the user country. - * + * * @param s user language info from the browser * @return user country */ @@ -69,7 +69,7 @@ public class UserInfo { /** * Returns the users agent. - * + * * @param s user language info from the browser * @return user agent */ diff --git a/base/common/src/com/netscape/cms/servlet/base/model/Link.java b/base/common/src/com/netscape/cms/servlet/base/model/Link.java index 7fd850a22..336092abe 100644 --- a/base/common/src/com/netscape/cms/servlet/base/model/Link.java +++ b/base/common/src/com/netscape/cms/servlet/base/model/Link.java @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlRootElement; /** * @author alee - * + * */ @XmlRootElement(name = "Link") public class Link { diff --git a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java index 5af09ad0d..fc9a97be2 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java @@ -69,7 +69,7 @@ import com.netscape.cmsutil.util.Utils; /** * Revoke a certificate with a CMC-formatted revocation request - * + * * @version $Revision$, $Date$ */ public class CMCRevReqServlet extends CMSServlet { @@ -96,7 +96,7 @@ public class CMCRevReqServlet extends CMSServlet { private final static String LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED = "LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED_7"; - // http params + // http params public static final String SERIAL_NO = TOKEN_CERT_SERIAL; public static final String REASON_CODE = "reasonCode"; public static final String CHALLENGE_PHRASE = "challengePhrase"; @@ -110,7 +110,7 @@ public class CMCRevReqServlet extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -136,11 +136,11 @@ public class CMCRevReqServlet extends CMSServlet { /** * Process the HTTP request. - * + * * <ul> * <li>http.param cmcRequest the base-64 encoded CMC request * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { @@ -315,20 +315,20 @@ public class CMCRevReqServlet extends CMSServlet { * Process cert status change request using the Certificate Management * protocol using CMS (CMC) * <P> - * + * * (Certificate Request - an "EE" cert status change request) * <P> - * + * * (Certificate Request Processed - an "EE" cert status change request) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST used when a cert status change request (e. g. - * "revocation") is made (before approval process) * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED used when a certificate status is * changed (revoked, expired, on-hold, off-hold) * </ul> - * + * * @param argSet CMS template parameters * @param header argument block * @param reason revocation reason (0 - Unspecified, 1 - Key compromised, @@ -965,11 +965,11 @@ public class CMCRevReqServlet extends CMSServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return id string containing the signed audit log message RequesterID */ @@ -995,11 +995,11 @@ public class CMCRevReqServlet extends CMSServlet { /** * Signed Audit Log Serial Number - * + * * This method is called to obtain the serial number of the certificate * whose status is to be changed for a signed audit log message. * <P> - * + * * @param eeSerialNumber a string containing the un-normalized serialNumber * @return id string containing the signed audit log message RequesterID */ @@ -1028,11 +1028,11 @@ public class CMCRevReqServlet extends CMSServlet { /** * Signed Audit Log Request Type - * + * * This method is called to obtain the "Request Type" for * a signed audit log message. * <P> - * + * * @param reason an integer denoting the revocation reason * @return string containing REVOKE or ON_HOLD */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java b/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java index f056047cc..94c8f1207 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java +++ b/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java @@ -69,7 +69,7 @@ import com.netscape.cmsutil.util.Utils; /** * Takes the certificate info (serial number) and optional challenge phrase, creates a * revocation request and submits it to the authority subsystem for processing - * + * * @version $Revision$, $Date$ */ public class ChallengeRevocationServlet1 extends CMSServlet { @@ -88,7 +88,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { private IPublisherProcessor mPublisherProcessor = null; private String mRequestID = null; - // http params + // http params public static final String SERIAL_NO = TOKEN_CERT_SERIAL; public static final String REASON_CODE = "reasonCode"; public static final String CHALLENGE_PHRASE = "challengePhrase"; @@ -103,7 +103,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { /** * Initialize the servlet. This servlet uses the file * revocationResult.template for the response - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -130,7 +130,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { * <li>http.param REASON_CODE the revocation reason * <li>http.param b64eCertificate the base-64 encoded certificate to revoke * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) @@ -370,7 +370,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { Vector<String> serialNumbers = new Vector<String>(); if (revokeAll != null && revokeAll.length() > 0) { - for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; + for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; i = revokeAll.indexOf('=', i)) { if (i > -1) { i++; diff --git a/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java b/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java index d17fd959b..aa7abc92e 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java +++ b/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java @@ -42,7 +42,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; * Redirect a request to the Master. This servlet is used in * a clone when a requested service (such as CRL) is not available. * It redirects the user to the master. - * + * * @version $Revision$, $Date$ */ public class CloneRedirect extends CMSServlet { @@ -69,7 +69,7 @@ public class CloneRedirect extends CMSServlet { /** * Initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java b/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java index ced92ba85..aa48a7ca9 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java @@ -46,7 +46,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * 'Face-to-face' certificate enrollment. - * + * * @version $Revision$, $Date$ */ public class DirAuthServlet extends CMSServlet { @@ -64,7 +64,7 @@ public class DirAuthServlet extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -83,7 +83,7 @@ public class DirAuthServlet extends CMSServlet { /** * Process the HTTP request. This servlet reads configuration information * from the hashDirEnrollment configuration substore - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java b/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java index a5cdc98e8..46863c098 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java @@ -46,7 +46,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * For Face-to-face enrollment, disable EE enrollment feature - * + * * @version $Revision$, $Date$ * @see com.netscape.cms.servlet.cert.EnableEnrollResult */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java index 5a1e4ed65..105fc66a1 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java @@ -69,10 +69,10 @@ import com.netscape.cmsutil.util.Utils; /** * Display detailed information about a certificate - * + * * The template 'displayBySerial.template' is used to * render the response for this servlet. - * + * * @version $Revision$, $Date$ */ public class DisplayBySerial extends CMSServlet { @@ -98,7 +98,7 @@ public class DisplayBySerial extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -118,7 +118,7 @@ public class DisplayBySerial extends CMSServlet { if (mOutputTemplatePath != null) mForm1Path = mOutputTemplatePath; - // override success and error templates to null - + // override success and error templates to null - // handle templates locally. mTemplates.remove(CMSRequest.SUCCESS); } @@ -353,11 +353,11 @@ public class DisplayBySerial extends CMSServlet { /* String scheme = req.getScheme(); - if (scheme.equals("http") && connectionIsSSL(req)) + if (scheme.equals("http") && connectionIsSSL(req)) scheme = "https"; String requestURI = req.getRequestURI(); int i = requestURI.indexOf('?'); - String newRequestURI = + String newRequestURI = (i > -1)? requestURI.substring(0, i): requestURI; header.addStringValue("serviceURL", scheme +"://"+ req.getServerName() + ":"+ @@ -384,7 +384,7 @@ public class DisplayBySerial extends CMSServlet { /* String userAgent = req.getHeader("user-agent"); - String agent = + String agent = (userAgent != null)? UserInfo.getUserAgent(userAgent): ""; */ // Now formulate a PKCS#7 blob @@ -428,7 +428,7 @@ public class DisplayBySerial extends CMSServlet { p7Str = Utils.base64encode(p7Bytes); header.addStringValue("pkcs7ChainBase64", p7Str); } catch (Exception e) { - //p7Str = "PKCS#7 B64 Encoding error - " + e.toString() + //p7Str = "PKCS#7 B64 Encoding error - " + e.toString() //+ "; Please contact your administrator"; log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERROR_FORMING_PKCS7_1", e.toString())); diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java index ad503272a..61a606cae 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java @@ -52,7 +52,7 @@ import com.netscape.cmsutil.util.Utils; /** * Decode the CRL and display it to the requester. - * + * * @version $Revision$, $Date$ */ public class DisplayCRL extends CMSServlet { @@ -79,7 +79,7 @@ public class DisplayCRL extends CMSServlet { /** * Initialize the servlet. This servlet uses the 'displayCRL.template' file to * to render the response to the client. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -103,7 +103,7 @@ public class DisplayCRL extends CMSServlet { * <li>http.param pageStart which page to start displaying from * <li>http.param pageSize number of entries to show per page * </ul> - * + * * @param cmsReq the Request to service. */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java index 99082d4c5..e65082f4d 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Servlet to report the status, ie, the agent-initiated user * enrollment is enabled or disabled. - * + * * @version $Revision$, $Date$ */ public class DisplayHashUserEnroll extends CMSServlet { diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java index 1594c5323..afd958abf 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java @@ -73,7 +73,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Revoke a Certificate - * + * * @version $Revision$, $Date$ */ public class DoRevoke extends CMSServlet { @@ -109,7 +109,7 @@ public class DoRevoke extends CMSServlet { /** * initialize the servlet. This servlet uses the template * file "revocationResult.template" to render the result - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -144,18 +144,18 @@ public class DoRevoke extends CMSServlet { /** * Serves HTTP request. The http parameters used by this request are as follows: - * + * * <pre> * serialNumber Serial number of certificate to revoke (in HEX) * revocationReason Revocation reason (Described below) * totalRecordCount [number] * verifiedRecordCount [number] * invalidityDate [number of seconds in Jan 1,1970] - * + * * </pre> - * + * * revocationReason can be one of these values: - * + * * <pre> * 0 = Unspecified (default) * 1 = Key compromised @@ -375,21 +375,21 @@ public class DoRevoke extends CMSServlet { /** * Process cert status change request * <P> - * + * * (Certificate Request - either an "agent" cert status change request, or an "EE" cert status change request) * <P> - * + * * (Certificate Request Processed - either an "agent" cert status change request, or an "EE" cert status change * request) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST used when a cert status change request (e. g. - * "revocation") is made (before approval process) * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED used when a certificate status is * changed (revoked, expired, on-hold, off-hold) * </ul> - * + * * @param argSet CMS template parameters * @param header argument block * @param reason revocation reason (0 - Unspecified, 1 - Key compromised, @@ -535,7 +535,7 @@ public class DoRevoke extends CMSServlet { Vector<String> serialNumbers = new Vector<String>(); if (revokeAll != null && revokeAll.length() > 0) { - for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; + for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; i = revokeAll.indexOf('=', i)) { if (i > -1) { i++; @@ -564,7 +564,7 @@ public class DoRevoke extends CMSServlet { boolean addToList = false; for (int j = 0; j < serialNumbers.size(); j++) { - //xxxxx serial number in decimal? + //xxxxx serial number in decimal? if (certs[i].getSerialNumber().toString().equals((String) serialNumbers.elementAt(j)) && eeSubjectDN != null && eeSubjectDN.equals(certs[i].getSubjectDN().toString())) { addToList = true; @@ -707,7 +707,7 @@ public class DoRevoke extends CMSServlet { // the request is complete if ((stat == RequestStatus.COMPLETE) || ((type.equals(IRequest.CLA_CERT4CRL_REQUEST)) && (stat == RequestStatus.SVC_PENDING))) { - // audit log the error + // audit log the error Integer result = revReq.getExtDataInInteger(IRequest.RESULT); if (result.equals(IRequest.RES_ERROR)) { @@ -832,7 +832,7 @@ public class DoRevoke extends CMSServlet { } if (mAuthority instanceof ICertificateAuthority) { - // let known update and publish status of all crls. + // let known update and publish status of all crls. Enumeration<ICRLIssuingPoint> otherCRLs = ((ICertificateAuthority) mAuthority).getCRLIssuingPoints(); @@ -906,7 +906,7 @@ public class DoRevoke extends CMSServlet { header.addIntegerValue("certsUpdated", certsUpdated); header.addIntegerValue("certsToUpdate", certsToUpdate); - // add crl publishing status. + // add crl publishing status. String publError = revReq.getExtDataInString(IRequest.CRL_PUBLISH_ERROR); @@ -1110,11 +1110,11 @@ public class DoRevoke extends CMSServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return id string containing the signed audit log message RequesterID */ @@ -1140,11 +1140,11 @@ public class DoRevoke extends CMSServlet { /** * Signed Audit Log Serial Number - * + * * This method is called to obtain the serial number of the certificate * whose status is to be changed for a signed audit log message. * <P> - * + * * @param eeSerialNumber a string containing the un-normalized serialNumber * @return id string containing the signed audit log message RequesterID */ @@ -1164,7 +1164,7 @@ public class DoRevoke extends CMSServlet { BigInteger value = BigInteger.ONE.negate(); - //try int + //try int try { value = new BigInteger(serialNumber, 10); } catch (NumberFormatException e) { @@ -1193,11 +1193,11 @@ public class DoRevoke extends CMSServlet { /** * Signed Audit Log Request Type - * + * * This method is called to obtain the "Request Type" for * a signed audit log message. * <P> - * + * * @param reason an integer denoting the revocation reason * @return string containing REVOKE or ON_HOLD */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java index c4603dd51..83cefa6f6 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java @@ -64,7 +64,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Revoke a Certificate - * + * * @version $Revision$, $Date$ */ public class DoRevokeTPS extends CMSServlet { @@ -99,7 +99,7 @@ public class DoRevokeTPS extends CMSServlet { /** * initialize the servlet. This servlet uses the template * file "revocationResult.template" to render the result - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -129,18 +129,18 @@ public class DoRevokeTPS extends CMSServlet { /** * Serves HTTP request. The http parameters used by this request are as follows: - * + * * <pre> * serialNumber Serial number of certificate to revoke (in HEX) * revocationReason Revocation reason (Described below) * totalRecordCount [number] * verifiedRecordCount [number] * invalidityDate [number of seconds in Jan 1,1970] - * + * * </pre> - * + * * revocationReason can be one of these values: - * + * * <pre> * 0 = Unspecified (default) * 1 = Key compromised @@ -278,21 +278,21 @@ public class DoRevokeTPS extends CMSServlet { /** * Process cert status change request * <P> - * + * * (Certificate Request - either an "agent" cert status change request, or an "EE" cert status change request) * <P> - * + * * (Certificate Request Processed - either an "agent" cert status change request, or an "EE" cert status change * request) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST used when a cert status change request (e. g. - * "revocation") is made (before approval process) * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED used when a certificate status is * changed (revoked, expired, on-hold, off-hold) * </ul> - * + * * @param argSet CMS template parameters * @param header argument block * @param reason revocation reason (0 - Unspecified, 1 - Key compromised, @@ -510,7 +510,7 @@ public class DoRevokeTPS extends CMSServlet { // the request is complete if ((stat == RequestStatus.COMPLETE) || ((type.equals(IRequest.CLA_CERT4CRL_REQUEST)) && (stat == RequestStatus.SVC_PENDING))) { - // audit log the error + // audit log the error Integer result = revReq.getExtDataInInteger(IRequest.RESULT); if (result.equals(IRequest.RES_ERROR)) { @@ -629,7 +629,7 @@ public class DoRevokeTPS extends CMSServlet { } if (mAuthority instanceof ICertificateAuthority) { - // let known update and publish status of all crls. + // let known update and publish status of all crls. Enumeration<ICRLIssuingPoint> otherCRLs = ((ICertificateAuthority) mAuthority).getCRLIssuingPoints(); @@ -682,7 +682,7 @@ public class DoRevokeTPS extends CMSServlet { if (mPublisherProcessor != null && mPublisherProcessor.ldapEnabled()) { header.addStringValue("dirEnabled", "yes"); - // add crl publishing status. + // add crl publishing status. String publError = revReq.getExtDataInString(IRequest.CRL_PUBLISH_ERROR); @@ -851,11 +851,11 @@ public class DoRevokeTPS extends CMSServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return id string containing the signed audit log message RequesterID */ @@ -881,11 +881,11 @@ public class DoRevokeTPS extends CMSServlet { /** * Signed Audit Log Serial Number - * + * * This method is called to obtain the serial number of the certificate * whose status is to be changed for a signed audit log message. * <P> - * + * * @param eeSerialNumber a string containing the un-normalized serialNumber * @return id string containing the signed audit log message RequesterID */ @@ -912,11 +912,11 @@ public class DoRevokeTPS extends CMSServlet { /** * Signed Audit Log Request Type - * + * * This method is called to obtain the "Request Type" for * a signed audit log message. * <P> - * + * * @param reason an integer denoting the revocation reason * @return string containing REVOKE or ON_HOLD */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java index c6b6065b4..cd9a0196b 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java @@ -58,7 +58,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * 'Unrevoke' a certificate. (For certificates that are on-hold only, * take them off-hold) - * + * * @version $Revision$, $Date$ */ public class DoUnrevoke extends CMSServlet { @@ -89,7 +89,7 @@ public class DoUnrevoke extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -115,7 +115,7 @@ public class DoUnrevoke extends CMSServlet { * with a revovcation reason 'on hold' for this operation to succeed. The serial number may be expressed as a hex * number by prefixing '0x' to the serialNumber string * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -214,20 +214,20 @@ public class DoUnrevoke extends CMSServlet { /** * Process X509 cert status change request * <P> - * + * * (Certificate Request - an "agent" cert status change request to take a certificate off-hold) * <P> - * + * * (Certificate Request Processed - an "agent" cert status change request to take a certificate off-hold) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST used when a cert status change request (e. g. - * "revocation") is made (before approval process) * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED used when a certificate status is * changed (taken off-hold) * </ul> - * + * * @param argSet CMS template parameters * @param header argument block * @param serialNumbers the serial number of the certificate @@ -409,7 +409,7 @@ public class DoUnrevoke extends CMSServlet { } } - // let known update and publish status of all crls. + // let known update and publish status of all crls. Enumeration<ICRLIssuingPoint> otherCRLs = ((ICertificateAuthority) mAuthority).getCRLIssuingPoints(); @@ -610,11 +610,11 @@ public class DoUnrevoke extends CMSServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return id string containing the signed audit log message RequesterID */ @@ -640,11 +640,11 @@ public class DoUnrevoke extends CMSServlet { /** * Signed Audit Log Serial Number - * + * * This method is called to obtain the serial number of the certificate * whose status is to be changed for a signed audit log message. * <P> - * + * * @param eeSerialNumber a string containing the un-normalized serialNumber * @return id string containing the signed audit log message RequesterID */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java index 5d096aff3..e56eece2c 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java @@ -55,7 +55,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * 'Unrevoke' a certificate. (For certificates that are on-hold only, * take them off-hold) - * + * * @version $Revision$, $Date$ */ public class DoUnrevokeTPS extends CMSServlet { @@ -88,7 +88,7 @@ public class DoUnrevokeTPS extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -113,7 +113,7 @@ public class DoUnrevokeTPS extends CMSServlet { * with a revovcation reason 'on hold' for this operation to succeed. The serial number may be expressed as a hex * number by prefixing '0x' to the serialNumber string * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -129,7 +129,7 @@ public class DoUnrevokeTPS extends CMSServlet { try { form = getTemplate(mFormPath, req, locale); } catch (IOException e) { - log(ILogger.LL_FAILURE, + log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_GET_TEMPLATE", e.toString())); throw new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR")); @@ -217,20 +217,20 @@ public class DoUnrevokeTPS extends CMSServlet { /** * Process X509 cert status change request * <P> - * + * * (Certificate Request - an "agent" cert status change request to take a certificate off-hold) * <P> - * + * * (Certificate Request Processed - an "agent" cert status change request to take a certificate off-hold) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST used when a cert status change request (e. g. - * "revocation") is made (before approval process) * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_PROCESSED used when a certificate status is * changed (taken off-hold) * </ul> - * + * * @param serialNumbers the serial number of the certificate * @param req HTTP servlet request * @param resp HTTP servlet response @@ -365,7 +365,7 @@ public class DoUnrevokeTPS extends CMSServlet { } } - // let known update and publish status of all crls. + // let known update and publish status of all crls. Enumeration<ICRLIssuingPoint> otherCRLs = ((ICertificateAuthority) mAuthority).getCRLIssuingPoints(); @@ -557,11 +557,11 @@ public class DoUnrevokeTPS extends CMSServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return id string containing the signed audit log message RequesterID */ @@ -587,11 +587,11 @@ public class DoUnrevokeTPS extends CMSServlet { /** * Signed Audit Log Serial Number - * + * * This method is called to obtain the serial number of the certificate * whose status is to be changed for a signed audit log message. * <P> - * + * * @param eeSerialNumber a string containing the un-normalized serialNumber * @return id string containing the signed audit log message RequesterID */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java b/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java index 2a143b668..cbb233251 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java +++ b/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * For Face-to-face enrollment, enable EE enrollment feature - * + * * @version $Revision$, $Date$ * @see com.netscape.cms.servlet.cert.DisableEnrollResult */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java index a73a8146c..50eaaa94b 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java @@ -77,7 +77,7 @@ import com.netscape.cmsutil.util.Utils; /** * Submit a Certificate Enrollment request - * + * * @version $Revision$, $Date$ */ public class EnrollServlet extends CMSServlet { @@ -91,7 +91,7 @@ public class EnrollServlet extends CMSServlet { // enrollment templates. public static final String ENROLL_SUCCESS_TEMPLATE = "EnrollSuccess.template"; - // http params + // http params public static final String OLD_CERT_TYPE = "csrCertType"; public static final String CERT_TYPE = "certType"; // same as in ConfigConstant.java @@ -171,7 +171,7 @@ public class EnrollServlet extends CMSServlet { * <ul> * <li>CMSServlet.PROP_ID - ID for signed audit log messages * <li>CMSServlet.PROP_SUCCESS_TEMPLATE - success template file - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -288,7 +288,7 @@ public class EnrollServlet extends CMSServlet { init_testbed_hack(mConfig); } catch (Exception e) { - // this should never happen. + // this should never happen. log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_IMP_INIT_SERV_ERR", e.toString(), mId)); @@ -304,7 +304,7 @@ public class EnrollServlet extends CMSServlet { * Getter method to see if Proof of Posession checking is enabled. * this value is set in the CMS.cfg filem with the parameter * "enrollment.enforcePop". It defaults to false - * + * * @return true if user is required to Prove that they possess the * private key corresponding to the public key in the certificate * request they are submitting @@ -323,7 +323,7 @@ public class EnrollServlet extends CMSServlet { * <LI>The request is preprocessed, then processed further in one of the cert request processor classes: * KeyGenProcessor, PKCS10Processor, CMCProcessor, CRMFProcessor * </UL> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) @@ -693,23 +693,23 @@ public class EnrollServlet extends CMSServlet { /** * Process X509 certificate enrollment request * <P> - * + * * (Certificate Request - either an "admin" cert request for an admin certificate, an "agent" cert request for * "bulk enrollment", or an "EE" standard cert request) * <P> - * + * * (Certificate Request Processed - either an automated "admin" non-profile based CA admin cert acceptance, an * automated "admin" non-profile based CA admin cert rejection, an automated "EE" non-profile based cert acceptance, * or an automated "EE" non-profile based cert rejection) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_NON_PROFILE_CERT_REQUEST used when a non-profile cert request is made * (before approval process) * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED used when a certificate request has just been * through the approval process * </ul> - * + * * @param cmsReq a certificate enrollment request * @exception EBaseException an error has occurred */ @@ -806,7 +806,7 @@ public class EnrollServlet extends CMSServlet { * === certAuth based enroll === * "certAuthEnroll" is on. * "certauthEnrollType can be one of the three: - * single - it's for single cert enrollment + * single - it's for single cert enrollment * dual - it's for dual certs enrollment * encryption - getting the encryption cert only via * authentication of the signing cert @@ -938,8 +938,8 @@ public class EnrollServlet extends CMSServlet { if (authToken != null) { authMgr = authToken.getInString(AuthToken.TOKEN_AUTHMGR_INST_NAME); - // don't store agent token in request. - // agent currently used for bulk issuance. + // don't store agent token in request. + // agent currently used for bulk issuance. // if (!authMgr.equals(AuthSubsystem.CERTUSERDB_AUTHMGR_ID)) { log(ILogger.LL_INFO, "Enrollment request was authenticated by " + @@ -1355,9 +1355,9 @@ public class EnrollServlet extends CMSServlet { // ensure that any low-level exceptions are reported // to the signed audit log and stored as failures try { - // send request to request queue. + // send request to request queue. mRequestQueue.processRequest(req); - // process result. + // process result. // render OLD_CERT_TYPE's response differently, we // do not want any javascript in HTML, and need to @@ -1693,11 +1693,11 @@ public class EnrollServlet extends CMSServlet { out.println("</HTML>"); } - // XXX ALERT !! - // Remove the following and calls to them when we bundle a cartman - // later than alpha1. - // These are here to cover up problem in cartman where the - // key usage extension always ends up being digital signature only + // XXX ALERT !! + // Remove the following and calls to them when we bundle a cartman + // later than alpha1. + // These are here to cover up problem in cartman where the + // key usage extension always ends up being digital signature only // and for rsa-ex ends up having no bits set. private boolean mIsTestBed = false; @@ -1709,11 +1709,11 @@ public class EnrollServlet extends CMSServlet { /** * Signed Audit Log Info Certificate Value - * + * * This method is called to obtain the certificate from the passed in * "X509CertImpl" for a signed audit log message. * <P> - * + * * @param x509cert an X509CertImpl * @return cert string containing the certificate */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java index 663397f54..bf985c93e 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java @@ -59,7 +59,7 @@ import com.netscape.cmsutil.crypto.CryptoUtil; /** * Retrieve certificate by serial number. - * + * * @version $Revision$, $Date$ */ public class GetBySerial extends CMSServlet { @@ -85,7 +85,7 @@ public class GetBySerial extends CMSServlet { * Initialize the servlet. This servlet uses the template file * "ImportCert.template" to import the cert to the users browser, * if that is what the user requested - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -101,7 +101,7 @@ public class GetBySerial extends CMSServlet { } mImportTemplateFiller = new ImportCertsTemplateFiller(); - // override success and error templates to null - + // override success and error templates to null - // handle templates locally. mTemplates.remove(CMSRequest.SUCCESS); @@ -118,7 +118,7 @@ public class GetBySerial extends CMSServlet { * <ul> * <li>http.param serialNumber serial number of certificate in HEX * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -279,7 +279,7 @@ public class GetBySerial extends CMSServlet { cmsReq.setStatus(CMSRequest.SUCCESS); // XXX follow request in cert record to set certtype, which will - // import cert only if it's client. For now assume "client" if + // import cert only if it's client. For now assume "client" if // someone clicked to import this cert. cmsReq.getHttpParams().set("certType", "client"); diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java b/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java index fe55f335b..da4959268 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java @@ -50,7 +50,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve the Certificates comprising the CA Chain for this CA. - * + * * @version $Revision$, $Date$ */ public class GetCAChain extends CMSServlet { @@ -67,7 +67,7 @@ public class GetCAChain extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -85,7 +85,7 @@ public class GetCAChain extends CMSServlet { * <li>http.param op 'downloadBIN' - return the binary certificate chain * <li>http.param op 'displayIND' - display pretty-print of certificate chain components * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java b/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java index 4c8661359..e9e3c809a 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java @@ -50,7 +50,7 @@ import com.netscape.cmsutil.util.Utils; /** * Retrieve CRL for a Certificate Authority - * + * * @version $Revision$, $Date$ */ public class GetCRL extends CMSServlet { @@ -67,7 +67,7 @@ public class GetCRL extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -81,7 +81,7 @@ public class GetCRL extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information * @see DisplayCRL#process */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java b/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java index 71b0004cd..ce60fabc1 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java @@ -54,7 +54,7 @@ import com.netscape.cms.servlet.common.ICMSTemplateFiller; /** * Gets a issued certificate from a request id. - * + * * @version $Revision$, $Date$ */ public class GetCertFromRequest extends CMSServlet { @@ -82,7 +82,7 @@ public class GetCertFromRequest extends CMSServlet { /** * initialize the servlet. This servlet uses the template files * "displayCertFromRequest.template" and "ImportCert.template" - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -134,7 +134,7 @@ public class GetCertFromRequest extends CMSServlet { * <ul> * <li>http.param requestId The request ID to search on * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) @@ -206,7 +206,7 @@ public class GetCertFromRequest extends CMSServlet { } } - if (!((r.getRequestType().equals(IRequest.ENROLLMENT_REQUEST)) || + if (!((r.getRequestType().equals(IRequest.ENROLLMENT_REQUEST)) || (r.getRequestType().equals(IRequest.RENEWAL_REQUEST)))) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_REQUEST_NOT_ENROLLMENT_1", requestId)); diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java b/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java index d0dfb8f9a..99bdf2486 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java @@ -46,7 +46,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Servlet to get the enrollment status, enable or disable. - * + * * @version $Revision$, $Date$ */ public class GetEnableStatus extends CMSServlet { @@ -63,7 +63,7 @@ public class GetEnableStatus extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -83,7 +83,7 @@ public class GetEnableStatus extends CMSServlet { * <ul> * <li>http.param * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java b/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java index 6af5c0c39..30f0b0c40 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java @@ -50,7 +50,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Get detailed information about CA CRL processing - * + * * @version $Revision$, $Date$ */ public class GetInfo extends CMSServlet { @@ -74,7 +74,7 @@ public class GetInfo extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -93,7 +93,7 @@ public class GetInfo extends CMSServlet { * <ul> * <li>http.param template filename of template to use to render the result * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java index 5e6207e1a..0d4b52672 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java @@ -85,7 +85,7 @@ import com.netscape.cms.servlet.common.ICMSTemplateFiller; /** * performs face-to-face enrollment. - * + * * @version $Revision$, $Date$ */ public class HashEnrollServlet extends CMSServlet { @@ -99,7 +99,7 @@ public class HashEnrollServlet extends CMSServlet { // enrollment templates. public static final String ENROLL_SUCCESS_TEMPLATE = "/ra/HashEnrollSuccess.template"; - // http params + // http params public static final String OLD_CERT_TYPE = "csrCertType"; public static final String CERT_TYPE = "certType"; // same as in ConfigConstant.java @@ -130,7 +130,7 @@ public class HashEnrollServlet extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -157,7 +157,7 @@ public class HashEnrollServlet extends CMSServlet { init_testbed_hack(mConfig); } catch (Exception e) { - // this should never happen. + // this should never happen. log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_IMP_INIT_SERV_ERR", e.toString(), mId)); } @@ -165,7 +165,7 @@ public class HashEnrollServlet extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) @@ -281,7 +281,7 @@ public class HashEnrollServlet extends CMSServlet { * === certAuth based enroll === * "certAuthEnroll" is on. * "certauthEnrollType can be one of the three: - * single - it's for single cert enrollment + * single - it's for single cert enrollment * dual - it's for dual certs enrollment * encryption - getting the encryption cert only via * authentication of the signing cert @@ -349,8 +349,8 @@ public class HashEnrollServlet extends CMSServlet { String certBasedOldSubjectDN = null; BigInteger certBasedOldSerialNum = null; - // check if request was authenticated, if so set authtoken & certInfo. - // also if authenticated, take certInfo from authToken. + // check if request was authenticated, if so set authtoken & certInfo. + // also if authenticated, take certInfo from authToken. X509CertInfo certInfo = null; if (certAuthEnroll == true) { @@ -399,14 +399,14 @@ public class HashEnrollServlet extends CMSServlet { } else { authMgr = authToken.getInString(AuthToken.TOKEN_AUTHMGR_INST_NAME); - // don't store agent token in request. - // agent currently used for bulk issuance. + // don't store agent token in request. + // agent currently used for bulk issuance. // if (!authMgr.equals(IAuthSubsystem.CERTUSERDB_AUTHMGR_ID)) { log(ILogger.LL_INFO, "Enrollment request was authenticated by " + authToken.getInString(AuthToken.TOKEN_AUTHMGR_INST_NAME)); fillCertInfoFromAuthToken(certInfo, authToken); - // save authtoken attrs to request directly (for policy use) + // save authtoken attrs to request directly (for policy use) saveAuthToken(authToken, req); // req.set(IRequest.AUTH_TOKEN, authToken); // } @@ -606,9 +606,9 @@ public class HashEnrollServlet extends CMSServlet { req.setExtData(CHALLENGE_PASSWORD, pwd); } - // send request to request queue. + // send request to request queue. mRequestQueue.processRequest(req); - // process result. + // process result. // render OLD_CERT_TYPE's response differently, we // dont want any javascript in HTML, and need to @@ -628,7 +628,7 @@ public class HashEnrollServlet extends CMSServlet { String agentID = null; if (!authMgr.equals(IAuthSubsystem.CERTUSERDB_AUTHMGR_ID)) { - // request is from eegateway, so fromUser. + // request is from eegateway, so fromUser. initiative = AuditFormat.FROMUSER; } else { agentID = authToken.getInString("userid"); @@ -640,7 +640,7 @@ public class HashEnrollServlet extends CMSServlet { if (status != RequestStatus.COMPLETE) { cmsReq.setIRequestStatus(); // set status acc. to IRequest status. - // audit log the status + // audit log the status try { if (status == RequestStatus.REJECTED) { Vector<String> messages = req.getExtDataInStringVector(IRequest.ERRORS); @@ -680,7 +680,7 @@ public class HashEnrollServlet extends CMSServlet { certInfo.get(X509CertInfo.SUBJECT), "" } ); } - } else { // other imcomplete status + } else { // other imcomplete status mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, @@ -802,7 +802,7 @@ public class HashEnrollServlet extends CMSServlet { throws EBaseException { // override subject, validity and extensions from auth token // CA determines algorithm, version and issuer. - // take key from keygen, cmc, pkcs10 or crmf. + // take key from keygen, cmc, pkcs10 or crmf. // subject name. try { @@ -953,14 +953,14 @@ public class HashEnrollServlet extends CMSServlet { new CertificateSubjectName(subject)); } else if (authToken == null || authToken.getInString(AuthToken.TOKEN_CERT_SUBJECT) == null) { - // No subject name - error! + // No subject name - error! log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_MISSING_SUBJECT_NAME_FROM_AUTHTOKEN")); throw new ECMSGWException( CMS.getUserMessage("CMS_GW_MISSING_SUBJECT_NAME_FROM_AUTHTOKEN")); } - // get extensions + // get extensions CertificateExtensions extensions = null; try { @@ -972,8 +972,8 @@ public class HashEnrollServlet extends CMSServlet { extensions = null; } if (certTemplate.hasExtensions()) { - // put each extension from CRMF into CertInfo. - // index by extension name, consistent with + // put each extension from CRMF into CertInfo. + // index by extension name, consistent with // CertificateExtensions.parseExtension() method. if (extensions == null) extensions = new CertificateExtensions(); @@ -1013,7 +1013,7 @@ public class HashEnrollServlet extends CMSServlet { } - // Added a new configuration parameter + // Added a new configuration parameter // eeGateway.Enrollment.authTokenOverride=[true|false] // By default, it is set to true. In most // of the case, administrator would want @@ -1022,7 +1022,7 @@ public class HashEnrollServlet extends CMSServlet { // -- CRMFfillCert if (authToken != null && authToken.getInString(AuthToken.TOKEN_CERT_SUBJECT) != null) { - // if authenticated override subect name, validity and + // if authenticated override subect name, validity and // extensions if any from authtoken. fillCertInfoFromAuthToken(certInfo, authToken); } @@ -1161,11 +1161,11 @@ public class HashEnrollServlet extends CMSServlet { out.println("</HTML>"); } - // XXX ALERT !! - // Remove the following and calls to them when we bundle a cartman - // later than alpha1. - // These are here to cover up problem in cartman where the - // key usage extension always ends up being digital signature only + // XXX ALERT !! + // Remove the following and calls to them when we bundle a cartman + // later than alpha1. + // These are here to cover up problem in cartman where the + // key usage extension always ends up being digital signature only // and for rsa-ex ends up having no bits set. private boolean mIsTestBed = false; @@ -1196,7 +1196,7 @@ public class HashEnrollServlet extends CMSServlet { exts.get(KeyUsageExtension.NAME); if (ext == null) - // should not happen + // should not happen continue; byte[] value = ext.getExtensionValue(); @@ -1207,7 +1207,7 @@ public class HashEnrollServlet extends CMSServlet { newvalue[1] = 0x03; newvalue[2] = 0x07; newvalue[3] = value[3]; - // force encryption certs to have digitial signature + // force encryption certs to have digitial signature // set too so smime can find the cert for encryption. if (value[3] == 0x20) { @@ -1229,10 +1229,10 @@ public class HashEnrollServlet extends CMSServlet { exts.set(KeyUsageExtension.NAME, newext); } } catch (IOException e) { - // should never happen + // should never happen continue; } catch (CertificateException e) { - // should never happen + // should never happen continue; } } diff --git a/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java index 2f551d3f5..016d5a124 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java @@ -60,24 +60,24 @@ import com.netscape.cmsutil.util.Utils; /** * Set up HTTP response to import certificate into browsers - * + * * The result must have been populate with the set of certificates * to return. - * + * * <pre> * inputs: certtype. - * outputs: + * outputs: * - cert type from http input (if any) - * - CA chain + * - CA chain * - authority name (RM, CM, DRM) * - scheme:host:port of server. - * array of one or more + * array of one or more * - cert serial number * - cert pretty print * - cert in base 64 encoding. * - cmmf blob to import * </pre> - * + * * @version $Revision$, $Date$ */ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { @@ -118,7 +118,7 @@ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { IArgBlock fixed = CMS.createArgBlock(); CMSTemplateParams params = new CMSTemplateParams(header, fixed); - // set host name and port. + // set host name and port. HttpServletRequest httpReq = cmsReq.getHttpReq(); String host = httpReq.getServerName(); int port = httpReq.getServerPort(); @@ -169,14 +169,14 @@ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { if (replyTo != null) fixed.set("replyTo", replyTo); - // set user + CA cert chain and pkcs7 for MSIE. + // set user + CA cert chain and pkcs7 for MSIE. X509CertImpl[] userChain = new X509CertImpl[cacerts.length + 1]; int m = 1, n = 0; for (; n < cacerts.length; m++, n++) userChain[m] = (X509CertImpl) cacerts[n]; - // certs. + // certs. X509CertImpl[] certs = (X509CertImpl[]) cmsReq.getResult(); // expose CRMF request id @@ -190,7 +190,7 @@ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { fixed.set(CRMF_REQID, crmfReqId); } - // set CA certs in cmmf, initialize CertRepContent + // set CA certs in cmmf, initialize CertRepContent // note cartman can't trust ca certs yet but it'll import them. // also set cert nickname for cartman. CertRepContent certRepContent = null; @@ -212,7 +212,7 @@ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { fixed.set(CERT_NICKNAME, certnickname); } - // make pkcs7 for MSIE + // make pkcs7 for MSIE if (CMSServlet.clientIsMSIE(cmsReq.getHttpReq()) && (certType == null || certType.equals("client"))) { userChain[0] = certs[0]; @@ -308,7 +308,7 @@ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { p7Str = CMS.BtoA(p7Bytes); repeat.addStringValue("pkcs7ChainBase64", p7Str); } catch (Exception ex) { - //p7Str = "PKCS#7 B64 Encoding error - " + ex.toString() + //p7Str = "PKCS#7 B64 Encoding error - " + ex.toString() //+ "; Please contact your administrator"; throw new ECMSGWException( CMS.getUserMessage("CMS_GW_FORMING_PKCS7_ERROR")); diff --git a/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java b/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java index b93a82fb8..4185113f4 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java +++ b/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java @@ -58,7 +58,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve a paged list of certs matching the specified query - * + * * @version $Revision$, $Date$ */ public class ListCerts extends CMSServlet { @@ -93,7 +93,7 @@ public class ListCerts extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "queryCert.template" to render the response - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -400,7 +400,7 @@ public class ListCerts extends CMSServlet { int toCurIndex = 0; if (!serialToVal.equals(MINUS_ONE)) { - // if user specify a range, we need to + // if user specify a range, we need to // calculate the totalRecordCount tolist = (ICertRecordList) mCertDB.findCertRecordsInList( filter, @@ -456,7 +456,7 @@ public class ListCerts extends CMSServlet { } // DS has a problem where last record will be returned - // even though the filter is not matched. + // even though the filter is not matched. /*cfu - is this necessary? it breaks when paging up if (curSerial.compareTo(sentinel) == -1) { com.netscape.certsrv.apps.CMS.debug("curSerial compare sentinel -1 break..."); diff --git a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java index ac531caca..7f626a83f 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java +++ b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java @@ -52,7 +52,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Provide statistical queries of request and certificate records. - * + * * @version $Revision$, $Date$ */ public class Monitor extends CMSServlet { @@ -82,7 +82,7 @@ public class Monitor extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * 'monitor.template' to render the response. - * + * * @param sc servlet configuration, read from the web.xml file */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java b/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java index 0f21e1921..5b9cd7741 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java +++ b/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java @@ -49,7 +49,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Specify the RevocationReason when revoking a certificate - * + * * @version $Revision$, $Date$ */ public class ReasonToRevoke extends CMSServlet { @@ -75,7 +75,7 @@ public class ReasonToRevoke extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * 'reasonToRevoke.template' to render the response - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -112,7 +112,7 @@ public class ReasonToRevoke extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java b/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java index 478df161d..2783656ae 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java @@ -53,7 +53,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Allow agent to turn on/off authentication managers - * + * * @version $Revision$, $Date$ */ public class RemoteAuthConfig extends CMSServlet { @@ -85,7 +85,7 @@ public class RemoteAuthConfig extends CMSServlet { /** * Initializes the servlet. - * + * * Presence of "auths.enableRemoteConfiguration=true" in CMS.cfg * enables remote configuration for authentication plugins. * List of remotely set instances can be found in CMS.cfg diff --git a/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java b/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java index 223121577..3b2a8c3e9 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java @@ -58,7 +58,7 @@ import com.netscape.cms.servlet.common.ICMSTemplateFiller; /** * Certificate Renewal - * + * * @version $Revision$, $Date$ */ public class RenewalServlet extends CMSServlet { @@ -70,12 +70,12 @@ public class RenewalServlet extends CMSServlet { // renewal templates. public static final String RENEWAL_SUCCESS_TEMPLATE = "RenewalSuccess.template"; - // http params + // http params public static final String CERT_TYPE = "certType"; public static final String SERIAL_NO = "serialNo"; - // XXX can't do pkcs10 cause it's got no serial no. + // XXX can't do pkcs10 cause it's got no serial no. // (unless put serial no in pki attributes) - // public static final String PKCS10 = "pkcs10"; + // public static final String PKCS10 = "pkcs10"; public static final String IMPORT_CERT = "importCert"; private String mRenewalSuccessTemplate = RENEWAL_SUCCESS_TEMPLATE; @@ -89,7 +89,7 @@ public class RenewalServlet extends CMSServlet { * initialize the servlet. This servlet makes use of the * template file "RenewalSuccess.template" to render the * response - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -111,7 +111,7 @@ public class RenewalServlet extends CMSServlet { mRenewalSuccessFiller = filler; } } catch (Exception e) { - // this should never happen. + // this should never happen. log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_IMP_INIT_SERV_ERR", e.toString(), mId)); @@ -121,7 +121,7 @@ public class RenewalServlet extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) @@ -130,12 +130,12 @@ public class RenewalServlet extends CMSServlet { IArgBlock httpParams = cmsReq.getHttpParams(); HttpServletRequest httpReq = cmsReq.getHttpReq(); - // renewal requires either: - // - coming from ee: - // - old cert from ssl client auth + // renewal requires either: + // - coming from ee: + // - old cert from ssl client auth // - old certs from auth manager - // - coming from agent or trusted RA: - // - serial no of cert to be renewed. + // - coming from agent or trusted RA: + // - serial no of cert to be renewed. BigInteger old_serial_no = null; X509CertImpl old_cert = null; @@ -171,7 +171,7 @@ public class RenewalServlet extends CMSServlet { authToken.getInString(AuthToken.TOKEN_AUTHMGR_INST_NAME); } - // coming from agent + // coming from agent if (mAuthMgr != null && mAuthMgr.equals(IAuthSubsystem.CERTUSERDB_AUTHMGR_ID)) { X509Certificate[] cert = new X509Certificate[1]; @@ -196,7 +196,7 @@ public class RenewalServlet extends CMSServlet { } } // coming from client else { - // from auth manager + // from auth manager X509CertImpl[] cert = new X509CertImpl[1]; old_serial_no = getCertFromAuthMgr(authToken, cert); @@ -215,15 +215,15 @@ public class RenewalServlet extends CMSServlet { req.setExtData(IRequest.OLD_CERTS, new X509CertImpl[] { old_cert } ); - // create new certinfo from old_cert contents. + // create new certinfo from old_cert contents. X509CertInfo old_certInfo = (X509CertInfo) ((X509CertImpl) old_cert).get( X509CertImpl.NAME + "." + X509CertImpl.INFO); new_certInfo = new X509CertInfo(old_certInfo.getEncodedInfo()); } else { - // if no old cert (came from RA agent) create new cert info - // (serializable) to pass through policies. And set the old + // if no old cert (came from RA agent) create new cert info + // (serializable) to pass through policies. And set the old // serial number to pick up. new_certInfo = new CertInfo(); new_certInfo.set(X509CertInfo.SERIAL_NUMBER, @@ -256,7 +256,7 @@ public class RenewalServlet extends CMSServlet { saveAuthToken(authToken, req); cmsReq.setIRequest(req); - // send request to request queue. + // send request to request queue. mRequestQueue.processRequest(req); // for audit log @@ -271,7 +271,7 @@ public class RenewalServlet extends CMSServlet { initiative = AuditFormat.FROMUSER; } - // check resulting status + // check resulting status RequestStatus status = req.getRequestStatus(); if (status != RequestStatus.COMPLETE) { @@ -320,7 +320,7 @@ public class RenewalServlet extends CMSServlet { "" } ); } - } else { // other imcomplete status + } else { // other imcomplete status mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, @@ -338,7 +338,7 @@ public class RenewalServlet extends CMSServlet { return; } - // service error + // service error Integer result = req.getExtDataInInteger(IRequest.RESULT); CMS.debug( @@ -413,8 +413,8 @@ public class RenewalServlet extends CMSServlet { ); cmsReq.setStatus(CMSRequest.SUCCESS); - // check if cert should be imported. - // browser must have input type set to nav or cartman since + // check if cert should be imported. + // browser must have input type set to nav or cartman since // there's no other way to tell IArgBlock httpParams = cmsReq.getHttpParams(); diff --git a/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java b/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java index 22aa29eda..2c1709145 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java @@ -59,7 +59,7 @@ import com.netscape.cmsutil.util.Utils; /** * Perform the first step in revoking a certificate - * + * * @version $Revision$, $Date$ */ public class RevocationServlet extends CMSServlet { @@ -71,11 +71,11 @@ public class RevocationServlet extends CMSServlet { // revocation templates. private final static String TPL_FILE = "reasonToRevoke.template"; - // http params + // http params public static final String SERIAL_NO = "serialNo"; - // XXX can't do pkcs10 cause it's got no serial no. + // XXX can't do pkcs10 cause it's got no serial no. // (unless put serial no in pki attributes) - // public static final String PKCS10 = "pkcs10"; + // public static final String PKCS10 = "pkcs10"; public static final String REASON_CODE = "reasonCode"; private String mFormPath = null; @@ -92,7 +92,7 @@ public class RevocationServlet extends CMSServlet { * initialize the servlet. This servlet uses * the template file "reasonToRevoke.template" to render the * result. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -131,7 +131,7 @@ public class RevocationServlet extends CMSServlet { * actually perform the certificate revocation. This is the first * step in the multi-step revocation process. (the next step is * in the ReasonToRevoke servlet. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) @@ -140,12 +140,12 @@ public class RevocationServlet extends CMSServlet { HttpServletRequest httpReq = cmsReq.getHttpReq(); HttpServletResponse httpResp = cmsReq.getHttpResp(); - // revocation requires either: - // - coming from ee: - // - old cert from ssl client auth + // revocation requires either: + // - coming from ee: + // - old cert from ssl client auth // - old certs from auth manager - // - coming from agent or trusted RA: - // - serial no of cert to be revoked. + // - coming from agent or trusted RA: + // - serial no of cert to be revoked. BigInteger old_serial_no = null; X509CertImpl old_cert = null; @@ -186,7 +186,7 @@ public class RevocationServlet extends CMSServlet { return; } - // coming from agent + // coming from agent if (mAuthMgr != null && mAuthMgr.equals(IAuthSubsystem.CERTUSERDB_AUTHMGR_ID)) { X509Certificate[] cert = new X509Certificate[1]; @@ -194,7 +194,7 @@ public class RevocationServlet extends CMSServlet { old_cert = (X509CertImpl) cert[0]; } // coming from client else { - // from auth manager + // from auth manager X509CertImpl[] cert = new X509CertImpl[1]; old_serial_no = getCertFromAuthMgr(authToken, cert); diff --git a/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java index cfc562d71..00941776c 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java @@ -44,7 +44,7 @@ import com.netscape.cms.servlet.common.ICMSTemplateFiller; * - cert pretty print * - cert in base 64 encoding. * - cmmf blob to import - * + * * @version $Revision$, $Date$ */ class RevocationSuccessTemplateFiller implements ICMSTemplateFiller { @@ -65,7 +65,7 @@ class RevocationSuccessTemplateFiller implements ICMSTemplateFiller { IArgBlock fixed = CMS.createArgBlock(); CMSTemplateParams params = new CMSTemplateParams(null, fixed); - // set host name and port. + // set host name and port. HttpServletRequest httpReq = cmsReq.getHttpReq(); String host = httpReq.getServerName(); int port = httpReq.getServerPort(); @@ -84,7 +84,7 @@ class RevocationSuccessTemplateFiller implements ICMSTemplateFiller { RevokedCertImpl[] revoked = (RevokedCertImpl[]) cmsReq.getResult(); - // revoked certs. + // revoked certs. for (int i = 0; i < revoked.length; i++) { IArgBlock repeat = CMS.createArgBlock(); diff --git a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java index 3602515c9..375265331 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java +++ b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java @@ -62,7 +62,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Search for certificates matching complex query filter - * + * * @version $Revision$, $Date$ */ public class SrchCerts extends CMSServlet { @@ -96,7 +96,7 @@ public class SrchCerts extends CMSServlet { /** * initialize the servlet. This servlet uses srchCert.template * to render the response - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java b/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java index c0298d1e7..6be6d506c 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java +++ b/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java @@ -61,7 +61,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Force the CRL to be updated now. - * + * * @version $Revision$, $Date$ */ public class UpdateCRL extends CMSServlet { @@ -109,7 +109,7 @@ public class UpdateCRL extends CMSServlet { * <li>http.param clearCRLCache true/false - should the CRL cache cleared before the CRL is generated? * <li>http.param crlIssuingPoint the CRL Issuing Point to Update * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java index 707e7ff5f..df0277b54 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java +++ b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java @@ -59,7 +59,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Update the configured LDAP server with specified objects - * + * * @version $Revision$, $Date$ */ public class UpdateDir extends CMSServlet { @@ -128,7 +128,7 @@ public class UpdateDir extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java b/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java index 14c537098..30623ce61 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java +++ b/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java @@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlElement; /** * @author alee - * + * */ @XmlRootElement(name = "CertificateData") @XmlAccessorType(XmlAccessType.FIELD) diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java index 90a48cb4e..421381441 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java +++ b/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java @@ -126,12 +126,12 @@ import com.netscape.cmsutil.util.Utils; * This servlet deals with PKCS#10-based certificate requests from * CRS, now called SCEP, and defined at: * http://search.ietf.org/internet-drafts/draft-nourse-scep-02.txt - * + * * The router is hardcoded to look for the http://host:80/cgi-bin/pkiclient.exe - * + * * The HTTP parameters are 'operation' and 'message' * operation can be either 'GetCACert' or 'PKIOperation' - * + * * @version $Revision$, $Date$ */ public class CRSEnrollment extends HttpServlet { @@ -319,13 +319,13 @@ public class CRSEnrollment extends HttpServlet { } /** - * + * * Service a CRS Request. It all starts here. This is where the message from the * router is processed - * + * * @param httpReq The HttpServletRequest. * @param httpResp The HttpServletResponse. - * + * */ public void service(HttpServletRequest httpReq, HttpServletResponse httpResp) @@ -500,7 +500,7 @@ public class CRSEnrollment extends HttpServlet { * ANY cert = new ANY(chain[i].getEncoded()); * certs.addElement(cert); * } - * + * * SignedData crsd = new SignedData( * new SET(), // empty set of digestAlgorithmID's * new ContentInfo( @@ -510,14 +510,14 @@ public class CRSEnrollment extends HttpServlet { * null, // no CRL's * new SET() // empty SignerInfos * ); - * + * * ContentInfo wrap = new ContentInfo(ContentInfo.SIGNED_DATA, crsd); - * + * * ByteArrayOutputStream baos = new ByteArrayOutputStream(); * wrap.encode(baos); - * + * * bytes = baos.toByteArray(); - * + * * httpResp.setContentType("application/x-x509-ca-ra-cert"); *****/ @@ -902,17 +902,17 @@ public class CRSEnrollment extends HttpServlet { CMS.debug("Processing PKCSReq"); try { // Check if there is an existing request. If this returns non-null, - // then the request is 'active' (either pending or completed) in + // then the request is 'active' (either pending or completed) in // which case, we compare the hash of the new request to the hash of the - // one in the queue - if they are the same, I return the state of the + // one in the queue - if they are the same, I return the state of the // original request - as if it was 'getCertInitial' message. // If the hashes are different, then the user attempted to enroll - // for a new request with the same txid, which is not allowed - + // for a new request with the same txid, which is not allowed - // so we return 'failure'. IRequest cmsRequest = findRequestByTransactionID(req.getTransactionID(), true); - // If there was no request (with a cert) with this transaction ID, + // If there was no request (with a cert) with this transaction ID, // process it as a new request cert = handlePKCSReq(httpReq, cmsRequest, req, crsResp, cx); @@ -1006,15 +1006,15 @@ public class CRSEnrollment extends HttpServlet { * Called if the router is requesting us to send it its certificate * Examine request queue for a request matching the transaction ID. * Ignore any rejected or cancelled requests. - * + * * If a request is found in the pending state, the response should be * 'pending' - * + * * If a request is found in the completed state, the response should be * to return the certificate - * + * * If no request is found, the response should be to return null - * + * */ public X509CertImpl handleGetCertInitial(CRSPKIMessage req, CRSPKIMessage resp) { @@ -1053,7 +1053,7 @@ public class CRSEnrollment extends HttpServlet { /** * Create an entry for this user in the publishing directory - * + * */ private boolean createEntry(String dn) { @@ -1096,7 +1096,7 @@ public class CRSEnrollment extends HttpServlet { /** * Here we decrypt the PKCS10 message from the client - * + * */ public void unwrapPKCS10(CRSPKIMessage req, CryptoContext cx) @@ -1316,7 +1316,7 @@ public class CRSEnrollment extends HttpServlet { req.put(SUBJECTNAME, subject); if (key == null || subject == null) { - // log + // log //throw new ERegistrationException(RegistrationResources.ERROR_MALFORMED_P10); } @@ -1536,7 +1536,7 @@ public class CRSEnrollment extends HttpServlet { return null; } - ////// post the request + ////// post the request /* needed: @@ -1604,7 +1604,7 @@ public class CRSEnrollment extends HttpServlet { credentials.set("PWD", p10Password); if (authenticator == null) { - // XXX - to help caRouterCert to work, we need to + // XXX - to help caRouterCert to work, we need to // add authentication to caRouterCert authToken = new AuthToken(null); } else { @@ -1867,7 +1867,7 @@ public class CRSEnrollment extends HttpServlet { byte[] ed = crsResp.makeEnvelopedData(0); - // 7. Make Digest of SignedData Content + // 7. Make Digest of SignedData Content MessageDigest md = MessageDigest.getInstance(mHashAlgorithm); msgdigest = md.digest(ed); @@ -1898,7 +1898,7 @@ public class CRSEnrollment extends HttpServlet { // recipientNonce and SenderNonce have already been set crsResp.makeAuthenticatedAttributes(); - // crsResp.makeAuthenticatedAttributes_old(); + // crsResp.makeAuthenticatedAttributes_old(); // now package up the rest of the SignerInfo { diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java b/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java index ff55dc9ce..5c7ac856f 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java +++ b/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java @@ -42,7 +42,7 @@ public class ChallengePassword implements CertAttrSet { /** * Get the password marshalled in this object - * + * * @return the challenge password */ public String toString() { @@ -51,7 +51,7 @@ public class ChallengePassword implements CertAttrSet { /** * Create a ChallengePassword object - * + * * @param stuff (must be of type byte[]) a DER-encoded by array following * The ASN.1 template for ChallenegePassword specified in the SCEP * documentation @@ -103,7 +103,7 @@ public class ChallengePassword implements CertAttrSet { /** * Get an attribute of this object. - * + * * @param name the name of the attribute of this object to get. The only * supported attribute is "password" */ diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java b/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java index 85f3938b8..3cb88f3f8 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java +++ b/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java @@ -94,7 +94,7 @@ public class ExtensionsRequested implements CertAttrSet { /** * construct - expects this in the inputstream (from the router): - * + * * 211 30 31: SEQUENCE { * 213 06 10: OBJECT IDENTIFIER '2 16 840 1 113733 1 9 8' * 225 31 17: SET { @@ -107,9 +107,9 @@ public class ExtensionsRequested implements CertAttrSet { * : } * : } * : } - * + * * or this (from IRE client): - * + * * 262 30 51: SEQUENCE { * 264 06 9: OBJECT IDENTIFIER extensionReq (1 2 840 113549 1 9 14) * 275 31 38: SET { diff --git a/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java b/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java index 88369ace3..f01d75c98 100644 --- a/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java +++ b/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.base.IArgBlock; /** * Authentication Credentials as input to the authMgr * <P> - * + * * @version $Revision$, $Date$ */ public class AuthCredentials implements IAuthCredentials { @@ -36,7 +36,7 @@ public class AuthCredentials implements IAuthCredentials { */ private static final long serialVersionUID = -5995164231849154265L; private Hashtable<String, Object> authCreds = null; - // Inserted by bskim + // Inserted by bskim private IArgBlock argblk = null; // Insert end @@ -47,7 +47,7 @@ public class AuthCredentials implements IAuthCredentials { /** * sets a credential with credential name and the credential - * + * * @param name credential name * @param cred credential * @exception com.netscape.certsrv.base.EBaseException NullPointerException @@ -63,7 +63,7 @@ public class AuthCredentials implements IAuthCredentials { /** * returns the credential to which the specified name is mapped in this * credential set - * + * * @param name credential name * @return the named authentication credential */ @@ -75,7 +75,7 @@ public class AuthCredentials implements IAuthCredentials { * removes the name and its corresponding credential from this * credential set. This method does nothing if the named * credential is not in the credential set. - * + * * @param name credential name */ public void delete(String name) { @@ -86,7 +86,7 @@ public class AuthCredentials implements IAuthCredentials { * returns an enumeration of the credential names in this credential * set. Use the Enumeration methods on the returned object to * fetch the elements sequentially. - * + * * @return an enumeration of the names in this credential set * @see java.util.Enumeration */ diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSFile.java b/base/common/src/com/netscape/cms/servlet/common/CMSFile.java index 4d7c4cdd6..7f73ce8d3 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSFile.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSFile.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.logging.ILogger; /** * CMSFile represents a file from the filesystem cached in memory - * + * * @version $Revision$, $Date$ */ public class CMSFile { diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java b/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java index 808bdda78..a8d753e7c 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java @@ -27,7 +27,7 @@ import com.netscape.certsrv.base.IConfigStore; /** * CMSFileLoader - file cache. - * + * * @version $Revision$, $Date$ */ @@ -43,10 +43,10 @@ public class CMSFileLoader { // property to cache templates only public final String PROP_CACHE_TEMPLATES_ONLY = "cacheTemplatesOnly"; - // hash of files to their content. + // hash of files to their content. private Hashtable<String, CMSFile> mLoadedFiles = new Hashtable<String, CMSFile>(); - // max number of files + // max number of files private int mMaxSize = MAX_SIZE; // number of files to clear when max is reached. @@ -84,14 +84,14 @@ public class CMSFileLoader { public byte[] get(File file, String enc) throws EBaseException, IOException { CMSFile cmsFile = getCMSFile(file, enc); - // Change end + // Change end return cmsFile.getContent(); } // Changed by bskim //public CMSFile getCMSFile(File file) throws EBaseException, IOException { public CMSFile getCMSFile(File file, String enc) throws EBaseException, IOException { - // Change end + // Change end String absPath = file.getAbsolutePath(); long modified = file.lastModified(); CMSFile cmsFile = (CMSFile) mLoadedFiles.get(absPath); @@ -100,7 +100,7 @@ public class CMSFileLoader { // new file. if (cmsFile == null || modified != lastModified) { // Changed by bskim - //cmsFile = updateFile(absPath, file); + //cmsFile = updateFile(absPath, file); cmsFile = updateFile(absPath, file, enc); // Change end } @@ -109,7 +109,7 @@ public class CMSFileLoader { } // Changed by bskim - //private CMSFile updateFile(String absPath, File file) + //private CMSFile updateFile(String absPath, File file) private CMSFile updateFile(String absPath, File file, String enc) // Change end throws EBaseException, IOException { diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java b/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java index 7ae242ae7..32264c01e 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java @@ -22,7 +22,7 @@ import java.util.ListResourceBundle; /** * A class represents a resource bundle for cms gateway. * <P> - * + * * @version $Revision$, $Date$ * @see java.util.ListResourceBundle */ diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java b/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java index 20743022a..157d5e3d1 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java @@ -42,7 +42,7 @@ import com.netscape.certsrv.logging.ILogger; /** * This class is to hold some general method for servlets. - * + * * @version $Revision$, $Date$ */ public class CMSGateway { @@ -345,7 +345,7 @@ public class CMSGateway { * epoch value passed in. If there is no header, or there is a problem * parsing the value, or if the file has been modified this will return * true, indicating the file has changed. - * + * * @param lastModified The time value in milliseconds past the epoch to * compare the If-Modified-Since header to. */ diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java b/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java index 62276df14..4e3d3c0bc 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java @@ -19,7 +19,7 @@ package com.netscape.cms.servlet.common; /** * handy class containing cms templates to load & fill. - * + * * @version $Revision$, $Date$ */ public class CMSLoadTemplate { diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java b/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java index 256c01010..d7a32d340 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.request.RequestStatus; /** * This represents a user request. - * + * * @version $Revision$, $Date$ */ public class CMSRequest { @@ -58,7 +58,7 @@ public class CMSRequest { // http headers & other info. private HttpServletRequest mHttpReq = null; - // http response. + // http response. private HttpServletResponse mHttpResp = null; // http servlet config. @@ -67,7 +67,7 @@ public class CMSRequest { // http servlet context. private ServletContext mServletContext = null; - // permanent request in request queue. + // permanent request in request queue. private IRequest mRequest = null; // whether request processed successfully @@ -90,7 +90,7 @@ public class CMSRequest { public CMSRequest() { } - // set methods use by servlets. + // set methods use by servlets. /** * set the HTTP parameters @@ -132,7 +132,7 @@ public class CMSRequest { mServletConfig = servletConfig; } - /* + /* * set the servlet context. the servletcontext has detail * about the currently running request */ @@ -142,7 +142,7 @@ public class CMSRequest { /** * Set request status. - * + * * @param status request status. Allowed values are * UNAUTHORIZED, SUCCESS, REJECTED, PENDING, ERROR, SVC_PENDING * @throws IllegalArgumentException if status is not one of the above values @@ -235,7 +235,7 @@ public class CMSRequest { return reason; } - // handy routines for IRequest. + // handy routines for IRequest. public void setExtData(String type, String value) { if (mRequest != null) { @@ -251,7 +251,7 @@ public class CMSRequest { } } - // policy errors; set on rejection or possibly deferral. + // policy errors; set on rejection or possibly deferral. public Vector<String> getPolicyMessages() { if (mRequest != null) { return mRequest.getExtDataInStringVector(IRequest.ERRORS); @@ -277,11 +277,11 @@ public class CMSRequest { mStatus = CMSRequest.SUCCESS; return; } - // unexpected resulting request status. + // unexpected resulting request status. if (status == RequestStatus.REJECTED) { mStatus = CMSRequest.REJECTED; return; - } // pending or service pending. + } // pending or service pending. else if (status == RequestStatus.PENDING) { mStatus = CMSRequest.PENDING; return; diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java b/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java index 317bddbcd..055a025b2 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java @@ -44,7 +44,7 @@ import com.netscape.certsrv.logging.ILogger; * <CMS_TEMPLATE> and replace the tag with * a series of javascript variable definitions * (depending on the servlet) - * + * * @version $Revision$, $Date$ */ public class CMSTemplate extends CMSFile { @@ -76,7 +76,7 @@ public class CMSTemplate extends CMSFile { /** * Constructor - * + * * @param file template file to load * @param charset character set * @throws IOException if the there was an error opening the file @@ -146,7 +146,7 @@ public class CMSTemplate extends CMSFile { /** * Write a javascript representation of 'input' * surrounded by SCRIPT tags to the outputstream - * + * * @param rout the outputstream to write to * @param input the parameters to write */ @@ -176,7 +176,7 @@ public class CMSTemplate extends CMSFile { out.println("var recordSet = new Array;"); out.println("var result = new Object();"); - // hack + // hack out.println("var httpParamsCount = 0;"); out.println("var httpHeadersCount = 0;"); out.println("var authTokenCount = 0;"); @@ -253,7 +253,7 @@ public class CMSTemplate extends CMSFile { /** * Ouput the pre-amble HTML Header including * the pre-output buffer. - * + * * @param out output stream specified * @return success or error */ @@ -275,7 +275,7 @@ public class CMSTemplate extends CMSFile { /** * Output the post HTML tags and post-output * buffer. - * + * * @param out output stream specified * @return success or error */ @@ -294,7 +294,7 @@ public class CMSTemplate extends CMSFile { return mAbsPath; } - // inherit getabspath, getContent, get last access and set last access + // inherit getabspath, getContent, get last access and set last access /*========================================================== * private methods diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java b/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java index ce2c26c3c..50c5e824f 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.base.IArgBlock; /** * Holds template parameters - * + * * @version $Revision$, $Date$ */ public class CMSTemplateParams { diff --git a/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java b/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java index e8b848f7d..2c24c112a 100644 --- a/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java +++ b/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.base.EBaseException; /** * A class represents a CMS gateway exception. * <P> - * + * * @version $Revision$, $Date$ */ public class ECMSGWException extends EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java index 40edb3bda..29e106ae9 100644 --- a/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.base.IArgBlock; /** * Default error template filler - * + * * @version $Revision$, $Date$ */ public class GenErrorTemplateFiller implements ICMSTemplateFiller { @@ -37,7 +37,7 @@ public class GenErrorTemplateFiller implements ICMSTemplateFiller { /** * fill error details and description if any. - * + * * @param cmsReq the CMS Request. * @param authority the authority * @param locale the locale of template. @@ -60,11 +60,11 @@ public class GenErrorTemplateFiller implements ICMSTemplateFiller { return null; } - // error + // error String ex = cmsReq.getError(); // Changed by beomsuk - /*if (ex == null) + /*if (ex == null) ex = new EBaseException(CMS.getLogMessage("BASE_UNKNOWN_ERROR")); fixed.set(ICMSTemplateFiller.ERROR, ex.toString(locale)); */ diff --git a/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java index 1d479fef3..60b79a81e 100644 --- a/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java @@ -60,7 +60,7 @@ import com.netscape.certsrv.request.RequestId; /** * default Pending template filler - * + * * @version $Revision$, $Date$ */ public class GenPendingTemplateFiller implements ICMSTemplateFiller { @@ -71,7 +71,7 @@ public class GenPendingTemplateFiller implements ICMSTemplateFiller { /** * fill error details and description if any. - * + * * @param cmsReq CMS Request * @param authority this authority * @param locale locale of template. @@ -92,7 +92,7 @@ public class GenPendingTemplateFiller implements ICMSTemplateFiller { if (sts != null) fixed.set(ICMSTemplateFiller.REQUEST_STATUS, sts.toString()); - // request id + // request id IRequest req = cmsReq.getIRequest(); if (req != null) { diff --git a/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java index 9e75cc799..95631ba5e 100644 --- a/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.request.IRequest; /** * default Service Pending template filler - * + * * @version $Revision$, $Date$ */ public class GenRejectedTemplateFiller implements ICMSTemplateFiller { @@ -60,7 +60,7 @@ public class GenRejectedTemplateFiller implements ICMSTemplateFiller { return null; } - // request id + // request id IRequest req = cmsReq.getIRequest(); if (req != null) { diff --git a/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java index f6de38412..bf164977d 100644 --- a/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java @@ -25,7 +25,7 @@ import com.netscape.certsrv.base.IArgBlock; /** * default Success template filler - * + * * @version $Revision$, $Date$ */ public class GenSuccessTemplateFiller implements ICMSTemplateFiller { @@ -35,7 +35,7 @@ public class GenSuccessTemplateFiller implements ICMSTemplateFiller { /** * fill error details and description if any. - * + * * @param cmsReq CMS Request * @param authority this authority * @param locale locale of template. @@ -54,7 +54,7 @@ public class GenSuccessTemplateFiller implements ICMSTemplateFiller { fixed.set(ICMSTemplateFiller.REQUEST_STATUS, sts.toString()); } - // this authority + // this authority if (authority != null) fixed.set(ICMSTemplateFiller.AUTHORITY, authority.getOfficialName()); diff --git a/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java index ec1b97779..275980cf1 100644 --- a/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.request.IRequest; /** * default Service Pending template filler - * + * * @version $Revision$, $Date$ */ public class GenSvcPendingTemplateFiller implements ICMSTemplateFiller { @@ -37,7 +37,7 @@ public class GenSvcPendingTemplateFiller implements ICMSTemplateFiller { /** * fill error details and description if any. - * + * * @param cmsReq CMS Request * @param authority this authority * @param locale locale of template. diff --git a/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java index cab1b36e6..48a4a54ea 100644 --- a/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java @@ -25,7 +25,7 @@ import com.netscape.certsrv.base.IArgBlock; /** * default Unauthorized template filler - * + * * @version $Revision$, $Date$ */ public class GenUnauthorizedTemplateFiller implements ICMSTemplateFiller { @@ -35,7 +35,7 @@ public class GenUnauthorizedTemplateFiller implements ICMSTemplateFiller { /** * fill error details and description if any. - * + * * @param cmsReq CMS Request * @param authority this authority * @param locale locale of template. @@ -58,7 +58,7 @@ public class GenUnauthorizedTemplateFiller implements ICMSTemplateFiller { fixed.set(ICMSTemplateFiller.ERROR, new ECMSGWException(CMS.getLogMessage("CMSGW_UNAUTHORIZED"))); - // this authority + // this authority if (authority != null) fixed.set(ICMSTemplateFiller.AUTHORITY, authority.getOfficialName()); diff --git a/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java index 8b560d7bc..1d768a88f 100644 --- a/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.base.IArgBlock; /** * default unexpected error template filler - * + * * @version $Revision$, $Date$ */ public class GenUnexpectedErrorTemplateFiller implements ICMSTemplateFiller { @@ -36,7 +36,7 @@ public class GenUnexpectedErrorTemplateFiller implements ICMSTemplateFiller { /** * fill error details and description if any. - * + * * @param cmsReq CMS Request * @param authority this authority * @param locale locale of template. @@ -49,8 +49,8 @@ public class GenUnexpectedErrorTemplateFiller implements ICMSTemplateFiller { // When an exception occurs the exit is non-local which probably // will leave the requestStatus value set to something other - // than CMSRequest.EXCEPTION, so force the requestStatus to - // EXCEPTION since it must be that if we're here. + // than CMSRequest.EXCEPTION, so force the requestStatus to + // EXCEPTION since it must be that if we're here. Integer sts = CMSRequest.EXCEPTION; if (cmsReq != null) cmsReq.setStatus(sts); diff --git a/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java index 2d046f0ee..27bcf308d 100644 --- a/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java @@ -23,11 +23,11 @@ import com.netscape.certsrv.authority.IAuthority; /** * This interface represents a template filler. - * + * * @version $Revision$, $Date$ */ public interface ICMSTemplateFiller { - // common template variables. + // common template variables. public final static String ERROR = "errorDetails"; public final static String ERROR_DESCR = "errorDescription"; public final static String EXCEPTION = "unexpectedError"; diff --git a/base/common/src/com/netscape/cms/servlet/common/IRawJS.java b/base/common/src/com/netscape/cms/servlet/common/IRawJS.java index 827f24f1d..e5714f727 100644 --- a/base/common/src/com/netscape/cms/servlet/common/IRawJS.java +++ b/base/common/src/com/netscape/cms/servlet/common/IRawJS.java @@ -19,7 +19,7 @@ package com.netscape.cms.servlet.common; /** * This represents raw JS parameters. - * + * * @version $Revision$, $Date$ */ public interface IRawJS { diff --git a/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java index 59c4a0fe4..ced916541 100644 --- a/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.base.ISubsystem; * subsystems can be loaded into this kernel by specifying * parameters in the configuration store. * <P> - * + * * @version $Revision$, $Date$ */ public class IndexTemplateFiller implements ICMSTemplateFiller { @@ -101,7 +101,7 @@ public class IndexTemplateFiller implements ICMSTemplateFiller { count++; } // information about what is selected is provided - // from the caller. This parameter (selected) is used + // from the caller. This parameter (selected) is used // by header servlet try { header.addStringValue("selected", diff --git a/base/common/src/com/netscape/cms/servlet/common/RawJS.java b/base/common/src/com/netscape/cms/servlet/common/RawJS.java index f936e0757..03a4e7e2b 100644 --- a/base/common/src/com/netscape/cms/servlet/common/RawJS.java +++ b/base/common/src/com/netscape/cms/servlet/common/RawJS.java @@ -19,7 +19,7 @@ package com.netscape.cms.servlet.common; /** * This represents raw JS parameters. - * + * * @version $Revision$, $Date$ */ public class RawJS implements IRawJS { diff --git a/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java b/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java index 5c16b8195..1d19a0b17 100644 --- a/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java +++ b/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java @@ -29,7 +29,7 @@ import com.netscape.certsrv.base.IConfigStore; /** * Utility class - * + * * @version $Revision$, $Date$ */ public class ServletUtils { diff --git a/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java b/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java index f9085a5bc..467cc1cf4 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java @@ -60,7 +60,7 @@ import com.netscape.cms.servlet.common.CMSRequest; * Clone servlet - part of the Clone Authority (CLA) * processes Revoked certs from its dependant clone CAs * service request and return status. - * + * * @version $Revision$, $Date$ */ public class CloneServlet extends CMSServlet { @@ -123,7 +123,7 @@ public class CloneServlet extends CMSServlet { IPKIMessage msg = null; IPKIMessage replymsg = null; - // NOTE must read all bufer before redoing handshake for + // NOTE must read all bufer before redoing handshake for // ssl client auth for client auth to work. // get request method @@ -152,8 +152,8 @@ public class CloneServlet extends CMSServlet { // force client auth handshake, validate clone CA (CCA) // and get CCA's Id. - // NOTE must do this after all contents are read for ssl - // redohandshake to work + // NOTE must do this after all contents are read for ssl + // redohandshake to work X509Certificate peerCert; @@ -231,7 +231,7 @@ public class CloneServlet extends CMSServlet { // decode request. CMS.debug("Cloneservlet: before decoding request, encodedreq= " + encodedreq); msg = (IPKIMessage) mReqEncoder.decode(encodedreq); - // process request + // process request CMS.debug("Cloneservlet: decoded request"); replymsg = processRequest(CCA_Id, CCAUserId, msg, token); } catch (IOException e) { @@ -247,7 +247,7 @@ public class CloneServlet extends CMSServlet { return; } - // encode reply + // encode reply String encodedrep = mReqEncoder.encode(replymsg); resp.setStatus(HttpServletResponse.SC_OK); @@ -269,9 +269,9 @@ public class CloneServlet extends CMSServlet { X509Certificate peerCert) throws EBaseException { try { - // XXX using agent authentication now since we're only - // verifying that the cert belongs to a user in the db. - // XXX change this to ACL in the future. + // XXX using agent authentication now since we're only + // verifying that the cert belongs to a user in the db. + // XXX change this to ACL in the future. // build JAVA X509Certificate from peerCert. X509CertImpl cert = new X509CertImpl(peerCert.getEncoded()); @@ -417,10 +417,10 @@ public class CloneServlet extends CMSServlet { // Get the certificate(s) from the request X509CertImpl issuedCerts[] = (X509CertImpl[])thisreq.get(IRequest.ISSUED_CERTS); - // return potentially more than one certificates. + // return potentially more than one certificates. if (issuedCerts != null) { for (int i = 0; i < issuedCerts.length; i++) { - mLogger.log(ILogger.EV_AUDIT, + mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, AuditFormat.FORMAT, @@ -436,7 +436,7 @@ public class CloneServlet extends CMSServlet { ); } } else { - mLogger.log(ILogger.EV_AUDIT, + mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, AuditFormat.NODNFORMAT, @@ -458,7 +458,7 @@ public class CloneServlet extends CMSServlet { AuditFormat.LEVEL, AuditFormat.RENEWALFORMAT, new Object[] { - thisreq.getRequestId(), + thisreq.getRequestId(), initiative , authMgr , "completed", @@ -468,7 +468,7 @@ public class CloneServlet extends CMSServlet { renewed_cert.getSerialNumber().toString(16)} ); } else { - mLogger.log(ILogger.EV_AUDIT, + mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, AuditFormat.NODNFORMAT, @@ -492,7 +492,7 @@ public class CloneServlet extends CMSServlet { Extension ext = (Extension) enum.nextElement(); if (ext instanceof CRLReasonExtension) { reason = ((CRLReasonExtension)ext).getReason().toInt - (); + (); break; } } @@ -502,7 +502,7 @@ public class CloneServlet extends CMSServlet { Integer result = (Integer)thisreq.get(IRequest.RESULT); if (result.equals(IRequest.RES_ERROR)) { EBaseException ex = (EBaseException)thisreq.get(IRequest.ERROR); - EBaseException[] svcErrors = + EBaseException[] svcErrors = (EBaseException[])thisreq.get(IRequest.SVCERRORS); if (svcErrors != null && svcErrors.length > 0) { for (int i = 0; i < svcErrors.length; i++) { @@ -515,7 +515,7 @@ public class CloneServlet extends CMSServlet { AuditFormat.LEVEL, AuditFormat.DOREVOKEFORMAT, new Object[] { - thisreq.getRequestId(), + thisreq.getRequestId(), initiative , "completed with error: " + err.toString() , @@ -536,7 +536,7 @@ public class CloneServlet extends CMSServlet { AuditFormat.LEVEL, AuditFormat.DOREVOKEFORMAT, new Object[] { - thisreq.getRequestId(), + thisreq.getRequestId(), initiative , "completed" , oldCerts[j].getSubjectDN() , @@ -547,7 +547,7 @@ public class CloneServlet extends CMSServlet { } } } else { - mLogger.log(ILogger.EV_AUDIT, + mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, AuditFormat.NODNFORMAT, diff --git a/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java b/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java index e8d4f898f..c566753b6 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java @@ -76,7 +76,7 @@ import com.netscape.cmsutil.util.Utils; * Connector servlet * process requests from remote authority - * service request or return status. - * + * * @version $Revision$, $Date$ */ public class ConnectorServlet extends CMSServlet { @@ -158,7 +158,7 @@ public class ConnectorServlet extends CMSServlet { IPKIMessage msg = null; IPKIMessage replymsg = null; - // NOTE must read all bufer before redoing handshake for + // NOTE must read all bufer before redoing handshake for // ssl client auth for client auth to work. // get request method @@ -186,8 +186,8 @@ public class ConnectorServlet extends CMSServlet { } // force client auth handshake, validate RA and get RA's Id. - // NOTE must do this after all contents are read for ssl - // redohandshake to work + // NOTE must do this after all contents are read for ssl + // redohandshake to work X509Certificate peerCert; @@ -206,7 +206,7 @@ public class ConnectorServlet extends CMSServlet { return; } - // authenticate RA + // authenticate RA String RA_Id = null; String raUserId = null; @@ -260,7 +260,7 @@ public class ConnectorServlet extends CMSServlet { try { // decode request. msg = (IPKIMessage) mReqEncoder.decode(encodedreq); - // process request + // process request replymsg = processRequest(RA_Id, raUserId, msg, token); } catch (IOException e) { CMS.debug("ConnectorServlet: service " + e.toString()); @@ -283,7 +283,7 @@ public class ConnectorServlet extends CMSServlet { CMS.debug("ConnectorServlet: done processRequest"); - // encode reply + // encode reply try { String encodedrep = mReqEncoder.encode(replymsg); @@ -373,7 +373,7 @@ public class ConnectorServlet extends CMSServlet { CMS.getSubsystem("profile"); IEnrollProfile profile = null; - // profile subsystem may not be available. In case of KRA for + // profile subsystem may not be available. In case of KRA for // example if (ps == null) { CMS.debug("ConnectorServlet: Profile Subsystem not found "); @@ -394,13 +394,13 @@ public class ConnectorServlet extends CMSServlet { /** * Process request * <P> - * + * * (Certificate Request - all "agent" profile cert requests made through a connector) * <P> - * + * * (Certificate Request Processed - all automated "agent" profile based cert acceptance made through a connector) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_PROFILE_CERT_REQUEST used when a profile cert request is made (before * approval process) @@ -409,7 +409,7 @@ public class ConnectorServlet extends CMSServlet { * <li>signed.audit LOGGING_SIGNED_AUDIT_INTER_BOUNDARY_SUCCESS used when inter-CIMC_Boundary data transfer is * successful (this is used when data does not need to be captured) * </ul> - * + * * @param source string containing source * @param sourceUserId string containing source user ID * @param msg PKI message @@ -753,7 +753,7 @@ public class ConnectorServlet extends CMSServlet { x509Certs = thisreq.getExtDataInCertArray(IRequest.ISSUED_CERTS); - // return potentially more than one certificates. + // return potentially more than one certificates. if (x509Certs != null) { for (int i = 0; i < x509Certs.length; i++) { mLogger.log(ILogger.EV_AUDIT, @@ -1003,11 +1003,11 @@ public class ConnectorServlet extends CMSServlet { /** * Signed Audit Log - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ protected void audit(String msg) { @@ -1027,12 +1027,12 @@ public class ConnectorServlet extends CMSServlet { /** * Signed Audit Log Profile ID - * + * * This method is inherited by all extended "EnrollProfile"s, * and is called to obtain the "ProfileID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message ProfileID */ protected String auditProfileID() { @@ -1054,11 +1054,11 @@ public class ConnectorServlet extends CMSServlet { /** * Signed Audit Log Info Certificate Value - * + * * This method is called to obtain the certificate from the passed in * "X509CertImpl" for a signed audit log message. * <P> - * + * * @param request a Request containing an X509CertImpl * @return cert string containing the certificate */ diff --git a/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java b/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java index bb787c7ad..597b50741 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java @@ -42,7 +42,7 @@ import com.netscape.cms.servlet.common.CMSRequest; * GenerateKeyPairServlet * handles "server-side key pair generation" requests from the * netkey RA. - * + * * @author Christina Fu (cfu) * @version $Revision$, $Date$ */ @@ -64,7 +64,7 @@ public class GenerateKeyPairServlet extends CMSServlet { /** * Constructs GenerateKeyPair servlet. - * + * */ public GenerateKeyPairServlet() { super(); @@ -84,7 +84,7 @@ public class GenerateKeyPairServlet extends CMSServlet { /** * Returns serlvet information. - * + * * @return name of this servlet */ public String getServletInfo() { @@ -94,7 +94,7 @@ public class GenerateKeyPairServlet extends CMSServlet { /* * processServerSideKeyGen - * handles netkey DRM serverside keygen. - * netkey operations: + * netkey operations: * 1. generate keypair (archive user priv key) * 2. unwrap des key with transport key, then url decode it * 3. wrap user priv key with des key @@ -219,8 +219,8 @@ public class GenerateKeyPairServlet extends CMSServlet { } } - /* - + /* + * For GenerateKeyPair: * * input: @@ -277,9 +277,9 @@ public class GenerateKeyPairServlet extends CMSServlet { /** * XXX remember tocheck peer SSL cert and get RA id later - * + * * Serves HTTP admin request. - * + * * @param req HTTP request * @param resp HTTP response */ diff --git a/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java b/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java index 337b24259..0f79d6394 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java @@ -42,7 +42,7 @@ import com.netscape.cms.servlet.common.CMSRequest; * TokenKeyRecoveryServlet * handles "key recovery service" requests from the * netkey TPS - * + * * @author Christina Fu (cfu) * @version $Revision$, $Date$ */ @@ -63,7 +63,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { /** * Constructs TokenKeyRecovery servlet. - * + * */ public TokenKeyRecoveryServlet() { super(); @@ -83,7 +83,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { /** * Returns serlvet information. - * + * * @return name of this servlet */ public String getServletInfo() { @@ -92,7 +92,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { /** * Process the HTTP request. - * + * * @param s The URL to decode */ protected String URLdecode(String s) { @@ -127,7 +127,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { * wrapped with DRM transport key * cert - the user cert corresponding to the key to be recovered * - * operations: + * operations: * 1. unwrap des key with transport key, then url decode it * 2. retrieve user private key * 3. wrap user priv key with des key @@ -269,7 +269,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { } } - /* + /* * For TokenKeyRecovery * * input: diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java index 1f5a3327c..a3d933993 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java @@ -578,7 +578,7 @@ public class AdminPanel extends WizardPanelBase { } // this request is from IE. The VBScript has problem of generating // certificate request if the subject name has E and UID components. - // For now, we always hardcoded the subject DN to be cn=NAME in + // For now, we always hardcoded the subject DN to be cn=NAME in // the IE browser. } else if (cert_request_type.equals("pkcs10")) { try { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java index 2e7682e08..e6b5f3c13 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java @@ -67,7 +67,7 @@ public class BaseServlet extends VelocityServlet { while (paramNames.hasMoreElements()) { String pn = paramNames.nextElement(); // added this facility so that password can be hidden, - // all sensitive parameters should be prefixed with + // all sensitive parameters should be prefixed with // __ (double underscores); however, in the event that // a security parameter slips through, we perform multiple // additional checks to insure that it is NOT displayed diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java index e956edebe..71703c888 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java @@ -490,10 +490,10 @@ public class CertUtil { } if (req != null) { - // update request with cert + // update request with cert req.setExtData(IEnrollProfile.REQUEST_ISSUED_CERT, cert); - // store request in db + // store request in db try { CMS.debug("certUtil: before updateRequest"); if (queue != null) { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java b/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java index 52a98d540..9a780cca8 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java @@ -50,7 +50,7 @@ public class CheckIdentity extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -61,7 +61,7 @@ public class CheckIdentity extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java index dbda788f6..41249fa97 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java @@ -63,7 +63,7 @@ public abstract class ConfigBaseServlet extends BaseServlet { while (paramNames.hasMoreElements()) { String pn = paramNames.nextElement(); // added this facility so that password can be hidden, - // all sensitive parameters should be prefixed with + // all sensitive parameters should be prefixed with // __ (double underscores); however, in the event that // a security parameter slips through, we perform multiple // additional checks to insure that it is NOT displayed diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java index 82c45d1cd..ed2e4a22c 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java @@ -977,7 +977,7 @@ public class DatabasePanel extends WizardPanelBase { String remove = HttpInput.getID(request, "removeData"); if (isPanelDone() && (remove == null || remove.equals(""))) { - /* if user submits the same data, they just want to skip + /* if user submits the same data, they just want to skip to the next panel, no database population is required. */ if (hostname1.equals(hostname2) && portStr1.equals(portStr2) && @@ -1055,7 +1055,7 @@ public class DatabasePanel extends WizardPanelBase { (secure.equals("on") ? "true" : "false")); importLDIFS("preop.internaldb.post_ldif", conn); - /* For vlvtask, we need to check if the task has + /* For vlvtask, we need to check if the task has been completed or not. Presence of nsTaskExitCode means task is complete */ String wait_dn = cs.getString("preop.internaldb.wait_dn", ""); @@ -1369,7 +1369,7 @@ public class DatabasePanel extends WizardPanelBase { conn.add(entry); } catch (LDAPException e) { if (e.getLDAPResultCode() == LDAPException.ENTRY_ALREADY_EXISTS) { - /* BZ 470918 -we cant just add the new dn. We need to do a replace instead + /* BZ 470918 -we cant just add the new dn. We need to do a replace instead * until the DS code is fixed */ CMS.debug("DatabasePanel enableReplication: " + replicadn + " has already been used"); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java index c6db8a8b7..19edff7ba 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java @@ -117,7 +117,7 @@ public class DisplayCertChainPanel extends WizardPanelBase { Context context) { CMS.debug("DisplayCertChainPanel: display"); - // update session id + // update session id String session_id = request.getParameter("session_id"); if (session_id != null) { CMS.debug("DisplayCertChainPanel setting session id."); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java index 6d0e92618..7729ea40e 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java @@ -167,7 +167,7 @@ public class DonePanel extends WizardPanelBase { Context context) { CMS.debug("DonePanel: display()"); - // update session id + // update session id String session_id = request.getParameter("session_id"); if (session_id != null) { CMS.debug("NamePanel setting session id."); @@ -326,7 +326,7 @@ public class DonePanel extends WizardPanelBase { } try { - // Add this host (only CA can create new domain) + // Add this host (only CA can create new domain) String cn = ownhost + ":" + ownadminsport; String dn = "cn=" + cn + ",cn=CAList,ou=Security Domain," + basedn; LDAPEntry entry = null; diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java b/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java index 094aa7166..808cfa523 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java @@ -50,7 +50,7 @@ public class DownloadPKCS12 extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java index 02fbd7643..c956e733a 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java @@ -54,7 +54,7 @@ public class GetCertChain extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -67,7 +67,7 @@ public class GetCertChain extends CMSServlet { * <li>http.param op 'downloadBIN' - return the binary certificate chain * <li>http.param op 'displayIND' - display pretty-print of certificate chain components * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java index 33d82e9b8..a9de5a54e 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java @@ -59,7 +59,7 @@ public class GetConfigEntries extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -73,7 +73,7 @@ public class GetConfigEntries extends CMSServlet { * <li>http.param op 'downloadBIN' - return the binary certificate chain * <li>http.param op 'displayIND' - display pretty-print of certificate chain components * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java index e6810ff42..e16f99f4f 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java @@ -67,7 +67,7 @@ public class GetCookie extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -84,7 +84,7 @@ public class GetCookie extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java index 999f13815..fc13382c9 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java @@ -61,7 +61,7 @@ public class GetDomainXML extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -76,7 +76,7 @@ public class GetDomainXML extends CMSServlet { * <li>http.param op 'downloadBIN' - return the binary certificate chain * <li>http.param op 'displayIND' - display pretty-print of certificate chain components * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { @@ -115,14 +115,14 @@ public class GetDomainXML extends CMSServlet { connFactory.init(ldapConfig); conn = connFactory.getConn(); - // get the security domain name + // get the security domain name String secdomain = (String) conn.read(dn).getAttribute("name").getStringValues().nextElement(); XMLObject xmlObj = new XMLObject(); Node domainInfo = xmlObj.createRoot("DomainInfo"); xmlObj.addItemToContainer(domainInfo, "Name", secdomain); - // this should return CAList, KRAList etc. + // this should return CAList, KRAList etc. LDAPSearchResults res = conn.search(dn, LDAPConnection.SCOPE_ONE, filter, attrs, true, cons); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java index 4dc6f0ff6..21baefcb0 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java @@ -50,7 +50,7 @@ public class GetStatus extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -59,7 +59,7 @@ public class GetStatus extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java index 288cfad60..85f274404 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java @@ -53,7 +53,7 @@ public class GetSubsystemCert extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java index f97d3e5e1..28c3b242d 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java @@ -51,7 +51,7 @@ public class GetTokenInfo extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -65,7 +65,7 @@ public class GetTokenInfo extends CMSServlet { * <li>http.param op 'downloadBIN' - return the binary certificate chain * <li>http.param op 'displayIND' - display pretty-print of certificate chain components * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java index 87a1788d6..847ca3486 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java @@ -61,7 +61,7 @@ public class GetTransportCert extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java index 9044dec04..b42bdb7de 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java @@ -56,7 +56,7 @@ public class HierarchyPanel extends WizardPanelBase { public boolean shouldSkip() { - // we dont need to ask the hierachy if we are + // we dont need to ask the hierachy if we are // setting up a clone try { IConfigStore c = CMS.getConfigStore(); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java index 93c26cdf3..a12bb164f 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java @@ -128,7 +128,7 @@ public class ImportAdminCertPanel extends WizardPanelBase { if (ca == null) { if (type.equals("otherca")) { try { - // this is a non-CA system that has elected to have its certificates + // this is a non-CA system that has elected to have its certificates // signed by a CA outside of the security domain. // in this case, we submitted the cert request for the admin cert to // to security domain host. diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java b/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java index 66ca8a8bf..dd648e8c5 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java @@ -60,7 +60,7 @@ public class ImportTransportCert extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java index 1c67654b4..7732a9a3c 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java @@ -39,7 +39,7 @@ public class ModuleServlet extends BaseServlet { * "preop.module=soft" * or * "preop.module=hard" - * + * * <ul> * <li>http.param selection "soft" or "hard" for software token or hardware token * </ul> diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java index 916ab199b..cb37ef76d 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java @@ -165,7 +165,7 @@ public class NamePanel extends WizardPanelBase { CMS.debug("NamePanel: display()"); context.put("title", "Subject Names"); - // update session id + // update session id String session_id = request.getParameter("session_id"); if (session_id != null) { CMS.debug("NamePanel setting session id."); @@ -337,7 +337,7 @@ public class NamePanel extends WizardPanelBase { } // while } - /* + /* * update some parameters for clones */ public void updateCloneConfig(IConfigStore config) @@ -868,7 +868,7 @@ public class NamePanel extends WizardPanelBase { System.err.println("Exception caught: " + e.toString()); } - } // while + } // while if (hasErr == false) { config.putBoolean("preop.NamePanel.done", true); config.commit(false); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java b/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java index 0042cdb5a..2f6238304 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java @@ -75,7 +75,7 @@ public class RegisterUser extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java index 54a5ed3f6..506abdd70 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java @@ -194,7 +194,7 @@ public class RestoreKeyCertPanel extends WizardPanelBase { if (!tokenname.equals("Internal Key Storage Token")) return; - // Path can be empty. If this case, we just want to + // Path can be empty. If this case, we just want to // get to the next panel. Customer has HSM. String s = HttpInput.getString(request, "path"); // if (s == null || s.equals("")) { @@ -450,7 +450,7 @@ public class RestoreKeyCertPanel extends WizardPanelBase { s1.append(","); s1.append("ca.connector.KRA"); } - + s1.append(",internaldb,internaldb.ldapauth,internaldb.ldapconn"); content = diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java index f3a4169e8..a36db6439 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java @@ -352,7 +352,7 @@ public class SecurityDomainPanel extends WizardPanelBase { config.putString("securitydomain.httpsadminport", CMS.getAdminPort()); - // make sure the subsystem certificate is issued by the security + // make sure the subsystem certificate is issued by the security // domain config.putString("preop.cert.subsystem.type", "local"); config.putString("preop.cert.subsystem.profile", "subsystemCert.profile"); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java index bd557fa7a..e1217a460 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java @@ -414,7 +414,7 @@ public class SizePanel extends WizardPanelBase { CMS.debug("SizePanel: update() Exception caught: " + e.toString()); } - // generate key pair + // generate key pair Enumeration<Cert> c = mCerts.elements(); while (c.hasMoreElements()) { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java b/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java index 2372b3094..4c6338751 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java @@ -51,7 +51,7 @@ public class TokenAuthenticate extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -60,7 +60,7 @@ public class TokenAuthenticate extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java index f3df51bd1..2698da7d9 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java @@ -60,7 +60,7 @@ public class UpdateConnector extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java index a2b6ebc72..5dd05b2cd 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java @@ -73,7 +73,7 @@ public class UpdateDomainXML extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -196,7 +196,7 @@ public class UpdateDomainXML extends CMSServlet { * <li>http.param op 'downloadBIN' - return the binary certificate chain * <li>http.param op 'displayIND' - display pretty-print of certificate chain components * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { @@ -455,7 +455,7 @@ public class UpdateDomainXML extends CMSServlet { parser.addItemToContainer(parent, "Clone", clone.toUpperCase()); count++; } - //update count + //update count String countS = ""; NodeList nlist = n.getChildNodes(); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java index 894afa5ff..ff3666f2a 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java @@ -62,7 +62,7 @@ public class UpdateNumberRange extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -77,7 +77,7 @@ public class UpdateNumberRange extends CMSServlet { * <li>http.param op 'downloadBIN' - return the binary certificate chain * <li>http.param op 'displayIND' - display pretty-print of certificate chain components * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { @@ -158,7 +158,7 @@ public class UpdateNumberRange extends CMSServlet { } // checkRanges for replicaID - we do this each time a replica is created. - // This needs to be done beforehand to ensure that we always have enough + // This needs to be done beforehand to ensure that we always have enough // replica numbers if (type.equals("replicaId")) { CMS.debug("Checking replica number ranges"); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java index 2d3e33f9a..30e0b0fce 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java @@ -56,7 +56,7 @@ public class UpdateOCSPConfig extends CMSServlet { /** * initialize the servlet. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java b/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java index 59b01f26a..aa51ec35f 100644 --- a/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java @@ -46,7 +46,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; * shows key information and presents a list of text boxes * so that recovery agents can type in their identifiers * and passwords. - * + * * @version $Revision$, $Date$ */ public class ConfirmRecoverBySerial extends CMSServlet { @@ -105,7 +105,7 @@ public class ConfirmRecoverBySerial extends CMSServlet { public void process(CMSRequest cmsReq) throws EBaseException { // Note that we should try to handle all the exceptions - // instead of passing it up back to the servlet + // instead of passing it up back to the servlet // framework. HttpServletRequest req = cmsReq.getHttpReq(); diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java index 8876d9350..e414dde9a 100644 --- a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java @@ -46,7 +46,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Display a specific Key Archival Request * <P> - * + * * @version $Revision$, $Date$ */ public class DisplayBySerial extends CMSServlet { @@ -76,7 +76,7 @@ public class DisplayBySerial extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "displayBySerial.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -101,7 +101,7 @@ public class DisplayBySerial extends CMSServlet { * <ul> * <li>http.param serialNumber serial number of the key archival request * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -141,7 +141,7 @@ public class DisplayBySerial extends CMSServlet { } // Note that we should try to handle all the exceptions - // instead of passing it up back to the servlet + // instead of passing it up back to the servlet // framework. IArgBlock header = CMS.createArgBlock(); diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java index 29cc2b3b3..9bc1c1b4f 100644 --- a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Display a Specific Key Archival Request, and initiate * key recovery process - * + * * @version $Revision$, $Date$ */ public class DisplayBySerialForRecovery extends CMSServlet { @@ -78,7 +78,7 @@ public class DisplayBySerialForRecovery extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "displayBySerialForRecovery.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -103,7 +103,7 @@ public class DisplayBySerialForRecovery extends CMSServlet { * <li>http.param serialNumber request ID of key archival request * <li>http.param publicKeyData * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -143,7 +143,7 @@ public class DisplayBySerialForRecovery extends CMSServlet { } // Note that we should try to handle all the exceptions - // instead of passing it up back to the servlet + // instead of passing it up back to the servlet // framework. IArgBlock header = CMS.createArgBlock(); diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java b/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java index dd224cc8a..5c0fc73e9 100644 --- a/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java +++ b/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java @@ -35,7 +35,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve Transport Certificate used to * wrap Private key Archival requests - * + * * @version $Revision$, $Date$ */ public class DisplayTransport extends CMSServlet { @@ -70,7 +70,7 @@ public class DisplayTransport extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java b/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java index cd440da08..630ef1b14 100644 --- a/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * View the Key Recovery Request - * + * * @version $Revision$, $Date$ */ public class ExamineRecovery extends CMSServlet { @@ -107,7 +107,7 @@ public class ExamineRecovery extends CMSServlet { * <ul> * <li>http.param recoveryID recovery request ID * </ul> - * + * * @param cmsReq the object holding the request and response information */ @@ -167,7 +167,7 @@ public class ExamineRecovery extends CMSServlet { /* catch (NumberFormatException e) { error = eBaseException( - + header.addStringValue(OUT_ERROR, MessageFormatter.getLocalizedString( locale[0], diff --git a/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java b/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java index 55d79b1ab..4989c1245 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java +++ b/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java @@ -46,7 +46,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Check to see if a Key Recovery Request has been approved - * + * * @version $Revision$, $Date$ */ public class GetApprovalStatus extends CMSServlet { @@ -79,7 +79,7 @@ public class GetApprovalStatus extends CMSServlet { * initialize the servlet. This servlet uses the template files * "getApprovalStatus.template" and "finishRecovery.template" * to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -102,7 +102,7 @@ public class GetApprovalStatus extends CMSServlet { * <ul> * <li>http.param recoveryID request ID to check * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -189,7 +189,7 @@ public class GetApprovalStatus extends CMSServlet { } */ } else if (((IKeyRecoveryAuthority) mService).getError(recoveryID) != null) { - // error in recovery process + // error in recovery process header.addStringValue(OUT_ERROR, ((IKeyRecoveryAuthority) mService).getError(recoveryID)); rComplete = 1; diff --git a/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java b/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java index 9d67cab8d..dfc7d4d3b 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java +++ b/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java @@ -44,7 +44,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Get the recovered key in PKCS#12 format * - for asynchronous key recovery only - * + * */ public class GetAsyncPk12 extends CMSServlet { @@ -83,7 +83,7 @@ public class GetAsyncPk12 extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "finishAsyncRecovery.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -108,7 +108,7 @@ public class GetAsyncPk12 extends CMSServlet { * <ul> * <li>http.param reqID request id for recovery * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -228,7 +228,7 @@ public class GetAsyncPk12 extends CMSServlet { CMS.getUserMessage(locale[0], "CMS_BASE_INTERNAL_ERROR", e.toString())); } } else if (((IKeyRecoveryAuthority) mService).getError(reqID) != null) { - // error in recovery process + // error in recovery process header.addStringValue(OUT_ERROR, ((IKeyRecoveryAuthority) mService).getError(reqID)); } else { diff --git a/base/common/src/com/netscape/cms/servlet/key/GetPk12.java b/base/common/src/com/netscape/cms/servlet/key/GetPk12.java index 96fe7c85d..fdcbf40bc 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GetPk12.java +++ b/base/common/src/com/netscape/cms/servlet/key/GetPk12.java @@ -44,7 +44,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Get the recovered key in PKCS#12 format - * + * * @version $Revision$, $Date$ */ public class GetPk12 extends CMSServlet { @@ -82,7 +82,7 @@ public class GetPk12 extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "finishRecovery.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -107,7 +107,7 @@ public class GetPk12 extends CMSServlet { * <ul> * <li>http.param recoveryID ID of request to recover * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java b/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java index 7c0c0cb1c..fee739f29 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java @@ -42,7 +42,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Approve an asynchronous key recovery request - * + * */ public class GrantAsyncRecovery extends CMSServlet { @@ -80,7 +80,7 @@ public class GrantAsyncRecovery extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * 'grantAsyncRecovery.template' to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -106,9 +106,9 @@ public class GrantAsyncRecovery extends CMSServlet { * <ul> * <li>http.param reqID request ID of the request to approve * <li>http.param agentID User ID of the agent approving the request - * + * * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -183,12 +183,12 @@ public class GrantAsyncRecovery extends CMSServlet { /** * Update agent approval list * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_KEY_RECOVERY_AGENT_LOGIN used whenever DRM agents login as recovery agents * to approve key recovery requests * </ul> - * + * * @param argSet CMS template parameters * @param header argument block * @param reqID string containing the recovery request ID diff --git a/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java b/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java index 02aacc31c..9c4ccc8be 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java @@ -43,7 +43,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Approve a key recovery request - * + * * @version $Revision$, $Date$ */ public class GrantRecovery extends CMSServlet { @@ -84,7 +84,7 @@ public class GrantRecovery extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * 'grantRecovery.template' to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -111,9 +111,9 @@ public class GrantRecovery extends CMSServlet { * <li>http.param recoveryID ID of the request to approve * <li>http.param agentID User ID of the agent approving the request * <li>http.param agentPWD Password of the agent approving the request - * + * * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -189,12 +189,12 @@ public class GrantRecovery extends CMSServlet { * Recovers a key. The p12 will be protected by the password * provided by the administrator. * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_KEY_RECOVERY_AGENT_LOGIN used whenever DRM agents login as recovery agents * to approve key recovery requests * </ul> - * + * * @param argSet CMS template parameters * @param header argument block * @param recoveryID string containing the recovery ID diff --git a/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java b/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java index ed770ea91..b599cc7f5 100644 --- a/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java +++ b/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.dbs.keydb.IKeyRecord; /** * Output a 'pretty print' of a Key Archival record - * + * * @version $Revision$, $Date$ */ public class KeyRecordParser { @@ -60,7 +60,7 @@ public class KeyRecordParser { rec.getSerialNumber(), 10); rarg.addStringValue(OUT_KEY_ALGORITHM, rec.getAlgorithm()); - // Possible Enhancement: sun's BASE64Encode is not + // Possible Enhancement: sun's BASE64Encode is not // fast. We may may to have our native implmenetation. IPrettyPrintFormat pp = CMS.getPrettyPrintFormat(":"); diff --git a/base/common/src/com/netscape/cms/servlet/key/KeyResource.java b/base/common/src/com/netscape/cms/servlet/key/KeyResource.java index a47c46d86..13960b23e 100644 --- a/base/common/src/com/netscape/cms/servlet/key/KeyResource.java +++ b/base/common/src/com/netscape/cms/servlet/key/KeyResource.java @@ -12,7 +12,7 @@ import com.netscape.cms.servlet.request.model.RecoveryRequestData; @Path("/key") public interface KeyResource { - + /** * Used to retrieve a key * @param data @@ -23,7 +23,7 @@ public interface KeyResource { @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public KeyData retrieveKey(RecoveryRequestData data); - + // retrieval - used to test integration with a browser @POST @Path("retrieve") diff --git a/base/common/src/com/netscape/cms/servlet/key/KeyResourceService.java b/base/common/src/com/netscape/cms/servlet/key/KeyResourceService.java index 88f2f8a82..0ec84b8f6 100644 --- a/base/common/src/com/netscape/cms/servlet/key/KeyResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/key/KeyResourceService.java @@ -37,10 +37,10 @@ import com.netscape.certsrv.dbs.keydb.KeyId; /** * @author alee - * + * */ public class KeyResourceService extends CMSResourceService implements KeyResource{ - + /** * Used to retrieve a key * @param data @@ -64,15 +64,15 @@ public class KeyResourceService extends CMSResourceService implements KeyResourc } return keyData; } - + // retrieval - used to test integration with a browser public KeyData retrieveKey(MultivaluedMap<String, String> form) { RecoveryRequestData data = new RecoveryRequestData(form); return retrieveKey(data); } - + private KeyId validateRequest(RecoveryRequestData data) { - + // confirm request exists RequestId reqId = data.getRequestId(); if (reqId == null) { @@ -100,24 +100,24 @@ public class KeyResourceService extends CMSResourceService implements KeyResourc // request not found throw new WebApplicationException(Response.Status.GONE); } - + //confirm request is of the right type String type = reqInfo.getRequestType(); if (!type.equals(IRequest.SECURITY_DATA_RECOVERY_REQUEST)) { // log error throw new WebApplicationException(Response.Status.BAD_REQUEST); } - - //confirm that agent is originator of request, else throw 401 + + //confirm that agent is originator of request, else throw 401 // TO-DO - + // confirm request is in approved state String status = reqInfo.getRequestStatus(); if (!status.equals(RequestStatus.APPROVED.toString())) { // log error throw new WebApplicationException(Response.Status.UNAUTHORIZED); } - + return reqInfo.getKeyId(); } diff --git a/base/common/src/com/netscape/cms/servlet/key/KeysResource.java b/base/common/src/com/netscape/cms/servlet/key/KeysResource.java index c93ffa4c9..67d29cc52 100644 --- a/base/common/src/com/netscape/cms/servlet/key/KeysResource.java +++ b/base/common/src/com/netscape/cms/servlet/key/KeysResource.java @@ -7,17 +7,17 @@ import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import com.netscape.cms.servlet.key.model.KeyDataInfos; - + @Path("/keys") public interface KeysResource { public static final int DEFAULT_MAXTIME = 10; public static final int DEFAULT_MAXRESULTS = 100; - + @GET @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) public KeyDataInfos listKeys(@QueryParam("clientID") String clientID, @QueryParam("status") String status, @DefaultValue(""+DEFAULT_MAXRESULTS) @QueryParam("maxResults") int maxResults, @DefaultValue(""+DEFAULT_MAXTIME) @QueryParam("maxTime") int maxTime); - + } diff --git a/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java b/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java index d525d5a77..080d4871b 100644 --- a/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java @@ -16,13 +16,13 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- /** - * + * */ package com.netscape.cms.servlet.key; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; - + import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.cms.servlet.base.CMSResourceService; @@ -32,20 +32,20 @@ import com.netscape.cmsutil.ldap.LDAPUtil; /** * @author alee - * + * */ public class KeysResourceService extends CMSResourceService implements KeysResource { /** * Used to generate list of key infos based on the search parameters */ - public KeyDataInfos listKeys(String clientID, String status, int maxResults, int maxTime) { + public KeyDataInfos listKeys(String clientID, String status, int maxResults, int maxTime) { // auth and authz - + // get ldap filter String filter = createSearchFilter(status, clientID); CMS.debug("listKeys: filter is " + filter); - + KeyDAO dao = new KeyDAO(); KeyDataInfos infos; try { @@ -56,30 +56,30 @@ public class KeysResourceService extends CMSResourceService implements KeysResou } return infos; } - + private String createSearchFilter(String status, String clientID) { String filter = ""; int matches = 0; - + if ((status == null) && (clientID == null)) { filter = "(serialno=*)"; return filter; } - + if (status != null) { filter += "(status=" + LDAPUtil.escape(status) + ")"; matches ++; } - + if (clientID != null) { filter += "(clientID=" + LDAPUtil.escape(clientID) + ")"; matches ++; } - + if (matches > 1) { filter = "(&" + filter + ")"; } - + return filter; } diff --git a/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java b/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java index 28ff30803..bedfa911d 100644 --- a/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java @@ -50,7 +50,7 @@ import com.netscape.cmsutil.util.Cert; /** * A class representing a recoverBySerial servlet. - * + * * @version $Revision$, $Date$ */ public class RecoverBySerial extends CMSServlet { diff --git a/base/common/src/com/netscape/cms/servlet/key/SrchKey.java b/base/common/src/com/netscape/cms/servlet/key/SrchKey.java index bff14e9f2..b249b663f 100644 --- a/base/common/src/com/netscape/cms/servlet/key/SrchKey.java +++ b/base/common/src/com/netscape/cms/servlet/key/SrchKey.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve archived keys matching search criteria - * + * * @version $Revision$, $Date$ */ public class SrchKey extends CMSServlet { @@ -92,7 +92,7 @@ public class SrchKey extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "srchKey.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -144,7 +144,7 @@ public class SrchKey extends CMSServlet { * <li>http.param querySentinel ID of first request to show * <li>http.param timeLimit number of seconds to limit ldap search to * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java b/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java index 95c777701..c3e6bba53 100644 --- a/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java @@ -47,8 +47,8 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve archived keys matching given public key material - * - * + * + * * @version $Revision$, $Date$ */ public class SrchKeyForRecovery extends CMSServlet { @@ -93,7 +93,7 @@ public class SrchKeyForRecovery extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "srchKeyForRecovery.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -143,7 +143,7 @@ public class SrchKeyForRecovery extends CMSServlet { * <li>http.param querySentinel ID of first request to show * <li>http.param timeLimit number of seconds to limit ldap search to * </ul> - * + * * @param cmsReq the object holding the request and response information */ @@ -295,7 +295,7 @@ public class SrchKeyForRecovery extends CMSServlet { IKeyRecord rec = e.nextElement(); // rec is null when we specify maxResults // DS will return an err=4, which triggers - // a LDAPException.SIZE_LIMIT_ExCEEDED + // a LDAPException.SIZE_LIMIT_ExCEEDED // in DSSearchResults.java if (rec != null) { IArgBlock rarg = CMS.createArgBlock(); diff --git a/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java b/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java index f479c6f0d..c34c1752f 100644 --- a/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java +++ b/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java @@ -48,7 +48,7 @@ public class KeyDAO { private IKeyRepository repo; private IKeyRecoveryAuthority kra; private IRequestQueue queue; - + public KeyDAO() { kra = ( IKeyRecoveryAuthority ) CMS.getSubsystem( "kra" ); repo = kra.getKeyRepository(); @@ -57,7 +57,7 @@ public class KeyDAO { /** * Returns list of keys meeting specified search filter. * Currently, vlv searches are not used for keys. - * + * * @param filter * @param maxResults * @param maxTime @@ -65,29 +65,29 @@ public class KeyDAO { * @return * @throws EBaseException */ - public KeyDataInfos listKeys(String filter, int maxResults, int maxTime, UriInfo uriInfo) + public KeyDataInfos listKeys(String filter, int maxResults, int maxTime, UriInfo uriInfo) throws EBaseException { List <KeyDataInfo> list = new ArrayList<KeyDataInfo>(); Enumeration<IKeyRecord> e = null; - - e = repo.searchKeys(filter, maxResults, maxTime); + + e = repo.searchKeys(filter, maxResults, maxTime); if (e == null) { throw new EBaseException("search results are null"); } - + while (e.hasMoreElements()) { IKeyRecord rec = e.nextElement(); if (rec != null) { list.add(createKeyDataInfo(rec, uriInfo)); } } - + KeyDataInfos ret = new KeyDataInfos(); ret.setKeyInfos(list); - + return ret; } - + public KeyData getKey(KeyId keyId, RecoveryRequestData data) throws EBaseException { KeyData keyData; @@ -105,7 +105,7 @@ public class KeyDAO { // get wrapped key IKeyRecord rec = repo.readKeyRecord(keyId.toBigInteger()); if (rec == null) { - return null; + return null; } Hashtable<String, Object> requestParams = kra.getVolatileRequest( @@ -182,10 +182,10 @@ public class KeyDAO { kra.destroyVolatileRequest(request.getRequestId()); queue.markAsServiced(request); - + return keyData; } - + public KeyDataInfo createKeyDataInfo(IKeyRecord rec, UriInfo uriInfo) throws EBaseException { KeyDataInfo ret = new KeyDataInfo(); @@ -198,5 +198,5 @@ public class KeyDAO { return ret; } - + } diff --git a/base/common/src/com/netscape/cms/servlet/key/model/KeyData.java b/base/common/src/com/netscape/cms/servlet/key/model/KeyData.java index 4f303e27d..2ff2b5d0c 100644 --- a/base/common/src/com/netscape/cms/servlet/key/model/KeyData.java +++ b/base/common/src/com/netscape/cms/servlet/key/model/KeyData.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- /** - * + * */ package com.netscape.cms.servlet.key.model; @@ -35,7 +35,7 @@ import javax.xml.bind.annotation.XmlElement; public class KeyData { @XmlElement String wrappedPrivateData; - + @XmlElement String nonceData; @@ -56,7 +56,7 @@ public class KeyData { public void setWrappedPrivateData(String wrappedPrivateData) { this.wrappedPrivateData = wrappedPrivateData; } - + /** * @return the nonceData */ diff --git a/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfo.java b/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfo.java index 88b31b4d1..6fd9649fb 100644 --- a/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfo.java +++ b/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfo.java @@ -16,11 +16,11 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- /** - * + * */ package com.netscape.cms.servlet.key.model; - + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -35,13 +35,13 @@ import com.netscape.certsrv.dbs.keydb.KeyId; @XmlRootElement(name="SecurityDataInfo") @XmlAccessorType(XmlAccessType.FIELD) public class KeyDataInfo { - + @XmlElement protected String keyURL; @XmlElement protected String clientID; - + public KeyDataInfo() { // required for JAXB (defaults) } diff --git a/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfos.java b/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfos.java index b01184708..79e5add95 100644 --- a/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfos.java +++ b/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfos.java @@ -28,10 +28,10 @@ import com.netscape.cms.servlet.base.model.Link; @XmlRootElement(name = "SecurityDataInfos") public class KeyDataInfos { - + protected Collection<KeyDataInfo> keyInfos; protected List<Link> links; - + /** * @return the keyInfos */ @@ -58,7 +58,7 @@ public class KeyDataInfos { public void setLinks(List<Link> links) { this.links = links; } - + @XmlTransient public String getNext() { if (links == null) { diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java index 1ef680853..fef1a2e5c 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java @@ -47,7 +47,7 @@ import com.netscape.cmsutil.util.Cert; /** * Configure the CA to respond to OCSP requests for a CA - * + * * @version $Revision$ $Date$ */ public class AddCAServlet extends CMSServlet { @@ -80,7 +80,7 @@ public class AddCAServlet extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "addCA.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -105,7 +105,7 @@ public class AddCAServlet extends CMSServlet { * <li>signed.audit LOGGING_SIGNED_AUDIT_OCSP_ADD_CA_REQUEST_PROCESSED used when an add CA request to the OCSP * Responder is processed * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java index 2dec0e1f5..ff2d76029 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java @@ -56,7 +56,7 @@ import com.netscape.cmsutil.util.Cert; /** * Update the OCSP responder with a new CRL - * + * * @version $Revision$ $Date$ */ public class AddCRLServlet extends CMSServlet { @@ -86,7 +86,7 @@ public class AddCRLServlet extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "addCRL.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -103,7 +103,7 @@ public class AddCRLServlet extends CMSServlet { /** * Process the HTTP request. * <P> - * + * * <ul> * <li>http.param crl certificate revocation list, base-64, DER encoded wrapped in -----BEGIN CERTIFICATE REVOCATION * LIST-----, -----END CERTIFICATE REVOCATION LIST----- strings @@ -113,7 +113,7 @@ public class AddCRLServlet extends CMSServlet { * <li>signed.audit LOGGING_SIGNED_AUDIT_CRL_VALIDATION used when CRL is retrieved and validation process occurs * ("agent" or "EE") * </ul> - * + * * @param cmsReq the object holding the request and response information * @exception EBaseException an error has occurred */ diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java index dfe796366..cbe9283d3 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java @@ -49,7 +49,7 @@ import com.netscape.cmsutil.util.Cert; /** * Check the status of a specific certificate - * + * * @version $Revision$ $Date$ */ public class CheckCertServlet extends CMSServlet { @@ -83,7 +83,7 @@ public class CheckCertServlet extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "checkCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -103,7 +103,7 @@ public class CheckCertServlet extends CMSServlet { * <li>http.param cert certificate to check. Base64, DER encoded, wrapped in -----BEGIN CERTIFICATE-----, -----END * CERTIFICATE----- strings * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java b/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java index 3dfc1d5f3..65c16d817 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java @@ -43,7 +43,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve information about the number of OCSP requests the OCSP * has serviced - * + * * @version $Revision$, $Date$ */ public class GetOCSPInfo extends CMSServlet { @@ -61,7 +61,7 @@ public class GetOCSPInfo extends CMSServlet { /** * initialize the servlet. This servlet uses the template * file "getOCSPInfo.template" to render the result page. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -79,7 +79,7 @@ public class GetOCSPInfo extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java index a93512ccd..b2365d009 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java @@ -46,7 +46,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Show the list of CA's that the OCSP responder can service - * + * * @version $Revision$ $Date$ */ public class ListCAServlet extends CMSServlet { @@ -71,7 +71,7 @@ public class ListCAServlet extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "listCAs.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -87,7 +87,7 @@ public class ListCAServlet extends CMSServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java index 3ab20141c..1e1b649e6 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java @@ -51,7 +51,7 @@ import com.netscape.cmsutil.util.Utils; /** * Process OCSP messages, According to RFC 2560 * See http://www.ietf.org/rfc/rfc2560.txt - * + * * @version $Revision$ $Date$ */ public class OCSPServlet extends CMSServlet { @@ -74,7 +74,7 @@ public class OCSPServlet extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "ImportCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -94,7 +94,7 @@ public class OCSPServlet extends CMSServlet { * This method is invoked when the OCSP service receives a OCSP * request. Based on RFC 2560, the request should have the OCSP * request in the HTTP body as binary blob. - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java index 4262940d0..a5b656cb4 100644 --- a/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java +++ b/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java @@ -42,7 +42,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Configure the CA to no longer respond to OCSP requests for a CA - * + * * @version $Revision: 1274 $ $Date: 2010-09-07 22:14:41 -0700 (Tue, 07 Sep 2010) $ */ public class RemoveCAServlet extends CMSServlet { @@ -70,7 +70,7 @@ public class RemoveCAServlet extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "addCA.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -95,7 +95,7 @@ public class RemoveCAServlet extends CMSServlet { * LOGGING_SIGNED_AUDIT_OCSP_REMOVE_CA_REQUEST_PROCESSED_FAILURE are used when a remove CA request to the OCSP * Responder is processed successfully or not. * </ul> - * + * * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) diff --git a/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java index 2d2f1430e..4d46e8a75 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java @@ -58,7 +58,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Process CRMF requests, according to RFC 2511 * See http://www.ietf.org/rfc/rfc2511.txt - * + * * @version $Revision$, $Date$ */ public class CRMFProcessor extends PKIProcessor { @@ -88,12 +88,12 @@ public class CRMFProcessor extends PKIProcessor { /** * Verify Proof of Possession (POP) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_PROOF_OF_POSSESSION used when proof of possession is checked during * certificate enrollment * </ul> - * + * * @param certReqMsg the certificate request message * @exception EBaseException an error has occurred */ diff --git a/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java index 9139f888c..395d30ea9 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java @@ -22,7 +22,7 @@ import com.netscape.cms.servlet.common.CMSRequest; /** * This represents the request parser. - * + * * @version $Revision$, $Date$ */ public interface IPKIProcessor { diff --git a/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java index cfe9754a8..bea447abe 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java @@ -39,7 +39,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * KeyGenProcess parses Certificate request matching the * KEYGEN tag format used by Netscape Communicator 4.x - * + * * @version $Revision$, $Date$ */ public class KeyGenProcessor extends PKIProcessor { diff --git a/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java b/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java index dad4b64ab..9ce331412 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java @@ -49,7 +49,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; * PKCS10Processor process Certificate Requests in * PKCS10 format, as defined here: * http://www.rsasecurity.com/rsalabs/pkcs/pkcs-10/index.html - * + * * @version $Revision$, $Date$ */ public class PKCS10Processor extends PKIProcessor { diff --git a/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java index 5b78bb42a..b3859ad2f 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java @@ -43,7 +43,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Process Certificate Requests - * + * * @version $Revision$, $Date$ */ public class PKIProcessor implements IPKIProcessor { @@ -295,11 +295,11 @@ public class PKIProcessor implements IPKIProcessor { /** * Signed Audit Log - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ protected void audit(String msg) { @@ -319,12 +319,12 @@ public class PKIProcessor implements IPKIProcessor { /** * Signed Audit Log Subject ID - * + * * This method is inherited by all extended "CMSServlet"s, * and is called to obtain the "SubjectID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message SubjectID */ protected String auditSubjectID() { diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java index 48848695f..7b5343000 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.CMSRequest; /** * Toggle the approval state of a profile - * + * * @version $Revision$, $Date$ */ public class ProfileApproveServlet extends ProfileServlet { @@ -71,7 +71,7 @@ public class ProfileApproveServlet extends ProfileServlet { /** * initialize the servlet. This servlet uses the template file * "ImportCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -82,13 +82,13 @@ public class ProfileApproveServlet extends ProfileServlet { /** * Process the HTTP request. * <P> - * + * * <ul> * <li>http.param profileId the id of the profile to change * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_PROFILE_APPROVAL used when an agent approves/disapproves a cert * profile set by the administrator for automatic approval * </ul> - * + * * @param cmsReq the object holding the request and response information * @exception EBaseException an error has occurred */ @@ -460,11 +460,11 @@ public class ProfileApproveServlet extends ProfileServlet { /** * Signed Audit Log Profile ID - * + * * This method is called to obtain the "ProfileID" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return id string containing the signed audit log message ProfileID */ @@ -490,11 +490,11 @@ public class ProfileApproveServlet extends ProfileServlet { /** * Signed Audit Log Profile Operation - * + * * This method is called to obtain the "Profile Operation" for * a signed audit log message. * <P> - * + * * @param req HTTP request * @return operation string containing either OP_APPROVE, OP_DISAPPROVE, * or SIGNED_AUDIT_EMPTY_VALUE diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java index 2ca5f0a5c..9556da8e3 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java @@ -39,7 +39,7 @@ import com.netscape.cms.servlet.common.CMSRequest; /** * List all enabled profiles. - * + * * @version $Revision$, $Date$ */ public class ProfileListServlet extends ProfileServlet { @@ -60,7 +60,7 @@ public class ProfileListServlet extends ProfileServlet { /** * initialize the servlet. This servlet uses the template file * "ImportCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -70,7 +70,7 @@ public class ProfileListServlet extends ProfileServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java index e482b67da..996b65d78 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java @@ -66,7 +66,7 @@ import com.netscape.cmsutil.util.Utils; /** * This servlet approves profile-based request. - * + * * @version $Revision$, $Date$ */ public class ProfileProcessServlet extends ProfileServlet { @@ -359,7 +359,7 @@ public class ProfileProcessServlet extends ProfileServlet { if (op.equals("assign")) { String owner = req.getRequestOwner(); - // assigned owner + // assigned owner if (owner != null && owner.length() > 0) { if (!grantPermission(req, authToken)) { CMS.debug("ProfileProcessServlet: Permission not granted to assign request."); @@ -548,15 +548,15 @@ public class ProfileProcessServlet extends ProfileServlet { /** * Cancel request * <P> - * + * * (Certificate Request Processed - a manual "agent" profile based cert cancellation) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED used when a certificate request has just been * through the approval process * </ul> - * + * * @param request the servlet request * @param args argument set * @param req the certificate request @@ -605,15 +605,15 @@ public class ProfileProcessServlet extends ProfileServlet { /** * Reject request * <P> - * + * * (Certificate Request Processed - a manual "agent" profile based cert rejection) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED used when a certificate request has just been * through the approval process * </ul> - * + * * @param request the servlet request * @param args argument set * @param req the certificate request @@ -662,15 +662,15 @@ public class ProfileProcessServlet extends ProfileServlet { /** * Approve request * <P> - * + * * (Certificate Request Processed - a manual "agent" profile based cert acceptance) * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED used when a certificate request has just been * through the approval process * </ul> - * + * * @param request the servlet request * @param args argument set * @param req the certificate request @@ -835,11 +835,11 @@ public class ProfileProcessServlet extends ProfileServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param request the actual request * @return id string containing the signed audit log message RequesterID */ @@ -865,11 +865,11 @@ public class ProfileProcessServlet extends ProfileServlet { /** * Signed Audit Log Info Value - * + * * This method is called to obtain the "reason" for * a signed audit log message. * <P> - * + * * @param request the actual request * @return reason string containing the signed audit log message reason */ @@ -901,11 +901,11 @@ public class ProfileProcessServlet extends ProfileServlet { /** * Signed Audit Log Info Certificate Value - * + * * This method is called to obtain the certificate from the passed in * "X509CertImpl" for a signed audit log message. * <P> - * + * * @param x509cert an X509CertImpl * @return cert string containing the certificate */ diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java index dd0ee7be7..61a04a630 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java @@ -55,7 +55,7 @@ import com.netscape.cms.servlet.common.CMSRequest; /** * This servlet allows reviewing of profile-based request. - * + * * @version $Revision$, $Date$ */ public class ProfileReviewServlet extends ProfileServlet { @@ -77,7 +77,7 @@ public class ProfileReviewServlet extends ProfileServlet { /** * initialize the servlet. This servlet uses the template file * "ImportCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -99,7 +99,7 @@ public class ProfileReviewServlet extends ProfileServlet { * <ul> * <li>http.param requestId the ID of the profile to review * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java index 5b07951f8..a4213e3a1 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java @@ -49,7 +49,7 @@ import com.netscape.cms.servlet.common.CMSRequest; /** * Retrieve detailed information of a particular profile. - * + * * @version $Revision$, $Date$ */ public class ProfileSelectServlet extends ProfileServlet { @@ -74,7 +74,7 @@ public class ProfileSelectServlet extends ProfileServlet { * <ul> * <li>http.param profileId the id of the profile to select * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java index 457b8422b..9eac8eebd 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.ServletUtils; /** * This servlet is the base class of all profile servlets. - * + * * @version $Revision$, $Date$ */ public class ProfileServlet extends CMSServlet { @@ -168,7 +168,7 @@ public class ProfileServlet extends CMSServlet { * initialize the servlet. Servlets implementing this method * must specify the template to use as a parameter called * "templatePath" in the servletConfig - * + * * @param sc servlet configuration, read from the web.xml file */ diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java index 16451f6dd..93e5b6a4b 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java @@ -66,7 +66,7 @@ import com.netscape.cmsutil.util.Utils; /** * This servlet submits end-user request into the profile framework. - * + * * @version $Revision$, $Date$ */ public class ProfileSubmitCMCServlet extends ProfileServlet { @@ -104,9 +104,9 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { * be set up to always issue certificates against a certain profile * by setting the 'profileId' configuration in the servletConfig * If not, the user must specify the profileID when submitting the request - * + * * "ImportCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -212,17 +212,17 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { /** * Process the HTTP request * <P> - * + * * (Certificate Request Processed - either an automated "EE" profile based cert acceptance, or an automated "EE" * profile based cert rejection) * <P> - * + * * <ul> * <li>http.param profileId ID of profile to use to process request * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED used when a certificate request has just been * through the approval process * </ul> - * + * * @param cmsReq the object holding the request and response information * @exception EBaseException an error has occurred */ @@ -267,7 +267,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { while (paramNames.hasMoreElements()) { String paramName = paramNames.nextElement(); // added this facility so that password can be hidden, - // all sensitive parameters should be prefixed with + // all sensitive parameters should be prefixed with // __ (double underscores); however, in the event that // a security parameter slips through, we perform multiple // additional checks to insure that it is NOT displayed @@ -526,7 +526,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { Integer nums = (Integer) (context.get("numOfControls")); CMCOutputTemplate template = new CMCOutputTemplate(); // if there is only one control GetCert, then simple response - // must be returned. + // must be returned. if (nums != null && nums.intValue() == 1) { TaggedAttribute attr1 = (TaggedAttribute) (context.get(OBJECT_IDENTIFIER.id_cmc_getCert)); if (attr1 != null) { @@ -623,7 +623,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { return; } catch (Throwable e) { CMS.debug("ProfileSubmitCMCServlet: populate " + e.toString()); - // throw new IOException("Profile " + profileId + + // throw new IOException("Profile " + profileId + // " cannot populate"); CMCOutputTemplate template = new CMCOutputTemplate(); SEQUENCE seq = new SEQUENCE(); @@ -704,7 +704,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { "CMS_PROFILE_DEFERRED", e.toString()); } catch (ERejectException e) { - // return error to the user + // return error to the user reqs[k].setRequestStatus(RequestStatus.REJECTED); CMS.debug("ProfileSubmitCMCServlet: submit " + e.toString()); errorCode = "3"; @@ -772,7 +772,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { } /////////////////////////////////////////////// - // output output list + // output output list /////////////////////////////////////////////// CMS.debug("ProfileSubmitCMCServlet: done serving"); @@ -812,11 +812,11 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param request the actual request * @return id string containing the signed audit log message RequesterID */ @@ -842,11 +842,11 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { /** * Signed Audit Log Info Certificate Value - * + * * This method is called to obtain the certificate from the passed in * "X509CertImpl" for a signed audit log message. * <P> - * + * * @param request request containing an X509CertImpl * @return cert string containing the certificate */ diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java index eb3b93eb8..64ab5f82d 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java @@ -73,7 +73,7 @@ import com.netscape.cmsutil.xml.XMLObject; /** * This servlet submits end-user request into the profile framework. - * + * * @author Christina Fu (renewal support) * @version $Revision$, $Date$ */ @@ -117,9 +117,9 @@ public class ProfileSubmitServlet extends ProfileServlet { * be set up to always issue certificates against a certain profile * by setting the 'profileId' configuration in the servletConfig * If not, the user must specify the profileID when submitting the request - * + * * "ImportCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -154,7 +154,7 @@ public class ProfileSubmitServlet extends ProfileServlet { } - /* + /* * fill input info from "request" to context. * This is expected to be used by renewal where the request * is retrieved from request record @@ -356,7 +356,7 @@ public class ProfileSubmitServlet extends ProfileServlet { } } - /* + /* * fill input info from orig request to the renew request. * This is expected to be used by renewal where the request * is retrieved from request record @@ -439,17 +439,17 @@ public class ProfileSubmitServlet extends ProfileServlet { /** * Process the HTTP request * <P> - * + * * (Certificate Request Processed - either an automated "EE" profile based cert acceptance, or an automated "EE" * profile based cert rejection) * <P> - * + * * <ul> * <li>http.param profileId ID of profile to use to process request * <li>signed.audit LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED used when a certificate request has just been * through the approval process * </ul> - * + * * @param cmsReq the object holding the request and response information * @exception EBaseException an error has occurred */ @@ -488,7 +488,7 @@ public class ProfileSubmitServlet extends ProfileServlet { while (paramNames.hasMoreElements()) { String paramName = paramNames.nextElement(); // added this facility so that password can be hidden, - // all sensitive parameters should be prefixed with + // all sensitive parameters should be prefixed with // __ (double underscores); however, in the event that // a security parameter slips through, we perform multiple // additional checks to insure that it is NOT displayed @@ -548,7 +548,7 @@ public class ProfileSubmitServlet extends ProfileServlet { * Framework. The authentication and authorization are taken from * the renewal profile, while the input (with requests) and grace * period constraint are taken from the original cert's request record. - * + * * Things to note: * * the renew request will contain the original profile instead * of the new @@ -614,7 +614,7 @@ public class ProfileSubmitServlet extends ProfileServlet { String serial = request.getParameter("serial_num"); BigInteger certSerial = null; // if serial number is sent with request, then the authentication - // method is not ssl client auth. In this case, an alternative + // method is not ssl client auth. In this case, an alternative // authentication method is used (default: ldap based) if (serial != null) { CMS.debug("ProfileSubmitServlet: renewal: found serial_num"); @@ -1199,7 +1199,7 @@ public class ProfileSubmitServlet extends ProfileServlet { // no profile set found CMS.debug("ProfileSubmitServlet: no profile policy set found"); if (xmlOutput) { - outputError(response, FAILED, CMS.getUserMessage("CMS_PROFILE_NO_POLICY_SET_FOUND"), + outputError(response, FAILED, CMS.getUserMessage("CMS_PROFILE_NO_POLICY_SET_FOUND"), reqs[k].getRequestId().toString()); } else { args.set(ARG_ERROR_CODE, "1"); @@ -1246,10 +1246,10 @@ public class ProfileSubmitServlet extends ProfileServlet { return; } catch (Throwable e) { CMS.debug("ProfileSubmitServlet: populate " + e.toString()); - // throw new IOException("Profile " + profileId + + // throw new IOException("Profile " + profileId + // " cannot populate"); if (xmlOutput) { - outputError(response, FAILED, CMS.getUserMessage(locale, "CMS_INTERNAL_ERROR"), + outputError(response, FAILED, CMS.getUserMessage(locale, "CMS_INTERNAL_ERROR"), reqs[k].getRequestId().toString()); } else { args.set(ARG_ERROR_CODE, "1"); @@ -1332,7 +1332,7 @@ public class ProfileSubmitServlet extends ProfileServlet { "CMS_PROFILE_DEFERRED", e.toString()); } catch (ERejectException e) { - // return error to the user + // return error to the user reqs[k].setRequestStatus(RequestStatus.REJECTED); CMS.debug("ProfileSubmitServlet: submit " + e.toString()); errorCode = "3"; @@ -1415,7 +1415,7 @@ public class ProfileSubmitServlet extends ProfileServlet { } /////////////////////////////////////////////// - // output output list + // output output list /////////////////////////////////////////////// if (xmlOutput) { xmlOutput(response, profile, locale, reqs); @@ -1538,11 +1538,11 @@ public class ProfileSubmitServlet extends ProfileServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @param request the actual request * @return id string containing the signed audit log message RequesterID */ @@ -1568,11 +1568,11 @@ public class ProfileSubmitServlet extends ProfileServlet { /** * Signed Audit Log Info Certificate Value - * + * * This method is called to obtain the certificate from the passed in * "X509CertImpl" for a signed audit log message. * <P> - * + * * @param request request containing an X509CertImpl * @return cert string containing the certificate */ diff --git a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java index d8fc68a69..b2043238b 100644 --- a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java +++ b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java @@ -62,7 +62,7 @@ import com.netscape.cms.servlet.common.RawJS; /** * Output a 'pretty print' of a certificate request - * + * * @version $Revision$, $Date$ */ public class CertReqParser extends ReqParser { @@ -82,7 +82,7 @@ public class CertReqParser extends ReqParser { /** * Constructs a certificate request parser. - * + * * @param details return detailed information (this can be time consuming) */ public CertReqParser(boolean details) { @@ -142,7 +142,7 @@ public class CertReqParser extends ReqParser { // show all http parameters stored in request. if (name.equalsIgnoreCase(IRequest.HTTP_PARAMS)) { Hashtable<String, String> http_params = req.getExtDataInHashtable(name); - // show certType specially + // show certType specially String certType = http_params.get(IRequest.CERT_TYPE); if (certType != null) { @@ -290,12 +290,12 @@ public class CertReqParser extends ReqParser { } if (name.equalsIgnoreCase(IRequest.CERT_INFO)) { - // Get the certificate info from the request + // Get the certificate info from the request X509CertInfo[] certInfo = req.getExtDataInCertInfoArray(IRequest.CERT_INFO); if (certInfo != null && certInfo[0] != null) { - // Get the subject name if any set. + // Get the subject name if any set. CertificateSubjectName subjectName = null; String signatureAlgorithm = null; String signatureAlgorithmName = null; @@ -410,7 +410,7 @@ public class CertReqParser extends ReqParser { } - // Get the public key + // Get the public key CertificateX509Key certKey = null; try { @@ -436,7 +436,7 @@ public class CertReqParser extends ReqParser { pp.toHexString(key.getKey(), 0, 16)); } - // Get the validity period + // Get the validity period CertificateValidity validity = null; try { @@ -444,7 +444,7 @@ public class CertReqParser extends ReqParser { (CertificateValidity) certInfo[0].get(X509CertInfo.VALIDITY); if (validity != null) { - long validityLength = (((Date) validity.get(CertificateValidity.NOT_AFTER)).getTime() - + long validityLength = (((Date) validity.get(CertificateValidity.NOT_AFTER)).getTime() - ((Date) validity.get(CertificateValidity.NOT_BEFORE)).getTime()) / 1000; arg.addLongValue("validityLength", validityLength); } @@ -694,7 +694,7 @@ public class CertReqParser extends ReqParser { // show all http parameters stored in request. if (name.equalsIgnoreCase(IRequest.HTTP_PARAMS)) { Hashtable<String, String> http_params = req.getExtDataInHashtable(name); - // show certType specially + // show certType specially String certType = http_params.get(IRequest.CERT_TYPE); if (certType != null) { @@ -818,7 +818,7 @@ public class CertReqParser extends ReqParser { } if (name.equalsIgnoreCase(IRequest.CERT_INFO)) { - // Get the certificate info from the request + // Get the certificate info from the request RevokedCertImpl revokedCert[] = req.getExtDataInRevokedCertArray(IRequest.CERT_INFO); if (mDetails && revokedCert != null) { diff --git a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java index b65c90fca..43b6d8901 100644 --- a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java +++ b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java @@ -83,7 +83,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Check the status of a certificate request - * + * * @version $Revision$, $Date$ */ public class CheckRequest extends CMSServlet { @@ -123,7 +123,7 @@ public class CheckRequest extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "requestStatus.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -143,7 +143,7 @@ public class CheckRequest extends CMSServlet { * the 'queryPending' parameter. * <li>http.param queryPending query formatted as a CMC request * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -329,7 +329,7 @@ public class CheckRequest extends CMSServlet { String type = r.getRequestType(); Integer result = r.getExtDataInInteger(IRequest.RESULT); - /* if (type.equals(IRequest.ENROLLMENT_REQUEST) && (r.get("profile") != null) && status.equals(RequestStatus.COMPLETE)) { + /* if (type.equals(IRequest.ENROLLMENT_REQUEST) && (r.get("profile") != null) && status.equals(RequestStatus.COMPLETE)) { X509CertImpl cert = (X509CertImpl) r.get(IEnrollProfile.REQUEST_ISSUED_CERT); IArgBlock rarg = CMS.createArgBlock(); diff --git a/base/common/src/com/netscape/cms/servlet/request/IReqParser.java b/base/common/src/com/netscape/cms/servlet/request/IReqParser.java index f90e97b70..7731efcb4 100644 --- a/base/common/src/com/netscape/cms/servlet/request/IReqParser.java +++ b/base/common/src/com/netscape/cms/servlet/request/IReqParser.java @@ -29,7 +29,7 @@ import com.netscape.cms.servlet.common.CMSTemplateParams; * converts Java request object into name value * pairs and vice versa. * <P> - * + * * @version $Revision$, $Date$ */ public interface IReqParser { diff --git a/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java b/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java index b7ddc16d4..6c863733f 100644 --- a/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java +++ b/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java @@ -30,7 +30,7 @@ import com.netscape.cms.servlet.key.KeyRecordParser; /** * Output a 'pretty print' of a Key Archival request - * + * * @version $Revision$, $Date$ */ public class KeyReqParser extends ReqParser { diff --git a/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResourceService.java b/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResourceService.java index 82b1efa07..0ea06f983 100644 --- a/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResourceService.java @@ -15,7 +15,7 @@ // (C) 2011 Red Hat, Inc. // All rights reserved. // --- END COPYRIGHT BLOCK --- - + package com.netscape.cms.servlet.request; import javax.ws.rs.WebApplicationException; @@ -41,16 +41,16 @@ public class KeyRequestsResourceService extends CMSResourceService implements Ke public KeyRequestInfos listRequests(String requestState, String requestType, String clientID, RequestId start, int pageSize, int maxResults, int maxTime) { // auth and authz - + // get ldap filter String filter = createSearchFilter(requestState, requestType, clientID); CMS.debug("listRequests: filter is " + filter); - + // get start marker if (start == null) { start = new RequestId(KeyRequestsResource.DEFAULT_START); } - + KeyRequestDAO reqDAO = new KeyRequestDAO(); KeyRequestInfos requests; try { @@ -66,31 +66,31 @@ public class KeyRequestsResourceService extends CMSResourceService implements Ke private String createSearchFilter(String requestState, String requestType, String clientID) { String filter = ""; int matches = 0; - + if ((requestState == null) && (requestType == null) && (clientID == null)) { filter = "(requeststate=*)"; return filter; } - + if (requestState != null) { filter += "(requeststate=" + LDAPUtil.escape(requestState) + ")"; matches ++; } - + if (requestType != null) { filter += "(requesttype=" + LDAPUtil.escape(requestType) + ")"; matches ++; } - + if (clientID != null) { filter += "(clientID=" + LDAPUtil.escape(clientID) + ")"; matches ++; } - + if (matches > 1) { filter = "(&" + filter + ")"; } - + return filter; } } diff --git a/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java b/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java index 9c173d832..bf8decd69 100644 --- a/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java +++ b/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java @@ -52,7 +52,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Display Generic Request detail to the user. - * + * * @version $Revision$, $Date$ */ public class ProcessReq extends CMSServlet { @@ -94,7 +94,7 @@ public class ProcessReq extends CMSServlet { * <LI><B>CertReqParser.DETAIL_PARSER</B> - Show certificate detail * <LI><B>KeyReqParser.PARSER</B> - Show key archival detail * </UL> - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -113,7 +113,7 @@ public class ProcessReq extends CMSServlet { mParser = KeyReqParser.PARSER; } - // override success and error templates to null - + // override success and error templates to null - // handle templates locally. mTemplates.remove(CMSRequest.SUCCESS); mTemplates.remove(CMSRequest.ERROR); @@ -127,7 +127,7 @@ public class ProcessReq extends CMSServlet { * <li>http.param seqNum * <li>http.param doAssign reassign request. Value can be reassignToMe reassignToNobody * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -261,7 +261,7 @@ public class ProcessReq extends CMSServlet { } } - // add authority names to know what privileges can be requested. + // add authority names to know what privileges can be requested. if (CMS.getSubsystem("kra") != null) header.addStringValue("localkra", "yes"); if (CMS.getSubsystem("ca") != null) @@ -272,8 +272,8 @@ public class ProcessReq extends CMSServlet { // DONT NEED TO DO THIS FOR DRM if (mAuthority instanceof ICertAuthority) { // Check/set signing algorithms dynamically. - // In RA mSigningAlgorithms could be null at startup if CA is not - // up and set later when CA comes back up. + // In RA mSigningAlgorithms could be null at startup if CA is not + // up and set later when CA comes back up. // Once it's set assumed that it won't change. String[] allAlgorithms = mSigningAlgorithms; diff --git a/base/common/src/com/netscape/cms/servlet/request/QueryReq.java b/base/common/src/com/netscape/cms/servlet/request/QueryReq.java index f6ae634f4..f18fabc6a 100644 --- a/base/common/src/com/netscape/cms/servlet/request/QueryReq.java +++ b/base/common/src/com/netscape/cms/servlet/request/QueryReq.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Show paged list of requests matching search criteria - * + * * @version $Revision$, $Date$ */ public class QueryReq extends CMSServlet { @@ -118,7 +118,7 @@ public class QueryReq extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "queryReq.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -143,7 +143,7 @@ public class QueryReq extends CMSServlet { mParser = KeyReqParser.PARSER; } - // override success and error templates to null - + // override success and error templates to null - // handle templates locally. mTemplates.remove(CMSRequest.SUCCESS); mTemplates.remove(CMSRequest.ERROR); @@ -222,7 +222,7 @@ public class QueryReq extends CMSServlet { * <li>http.param totalCount total number of records in set of pages * <li>http.param direction "up", "down", "begin", or "end" * </ul> - * + * * @param cmsReq the object holding the request and response information */ @@ -254,7 +254,7 @@ public class QueryReq extends CMSServlet { Locale[] locale = new Locale[1]; try { - // if get a EBaseException we just throw it. + // if get a EBaseException we just throw it. form = getTemplate(mFormPath, req, locale); } catch (IOException e) { log(ILogger.LL_FAILURE, @@ -265,9 +265,9 @@ public class QueryReq extends CMSServlet { /** * WARNING: - * + * * PLEASE DO NOT TOUCH THE FILTER HERE. ALL FILTERS ARE INDEXED. - * + * **/ String filter = null; String reqState = req.getParameter("reqState"); @@ -353,7 +353,7 @@ public class QueryReq extends CMSServlet { /** * Perform search based on direction button pressed - * + * * @param filter ldap filter indicating which VLV to search through. This can be * 'all requests', 'pending', etc * @param count the number of requests to show per page @@ -382,7 +382,7 @@ public class QueryReq extends CMSServlet { } /** - * + * * @param locale * @param filter the types of requests to return - this must match the VLV index * @param count maximum number of records to return @@ -411,7 +411,7 @@ public class QueryReq extends CMSServlet { boolean jumptoend = false; if (marker.toString().equals("-1")) { marker = BigInteger.ZERO; // I think this is inconsequential - jumptoend = true; // override to '99' during search + jumptoend = true; // override to '99' during search } RequestId id = new RequestId(marker); @@ -487,7 +487,7 @@ public class QueryReq extends CMSServlet { /** * If the vector contains the marker element at the end, remove it. - * + * * @param v The vector to trim * @param marker the marker to look for. */ @@ -502,7 +502,7 @@ public class QueryReq extends CMSServlet { /** * Sometimes the list comes back from LDAP in reverse order. This function makes * sure the results are in 'forward' order. - * + * * @param list * @return */ @@ -527,7 +527,7 @@ public class QueryReq extends CMSServlet { /** * If the requests are in backwards order, reverse the list - * + * * @param list * @return */ diff --git a/base/common/src/com/netscape/cms/servlet/request/ReqParser.java b/base/common/src/com/netscape/cms/servlet/request/ReqParser.java index 230ddb433..4a6a79072 100644 --- a/base/common/src/com/netscape/cms/servlet/request/ReqParser.java +++ b/base/common/src/com/netscape/cms/servlet/request/ReqParser.java @@ -29,7 +29,7 @@ import com.netscape.cms.servlet.common.CMSTemplateParams; /** * A class representing a request parser. * <P> - * + * * @version $Revision$, $Date$ */ public class ReqParser implements IReqParser { diff --git a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java index 08d5805b6..b9fa461fd 100644 --- a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java +++ b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java @@ -49,7 +49,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Search for certificates matching complex query filter - * + * * @version $Revision$, $Date$ */ public class SearchReqs extends CMSServlet { @@ -90,7 +90,7 @@ public class SearchReqs extends CMSServlet { /** * initialize the servlet. This servlet uses queryReq.template * to render the response - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/request/model/ArchivalRequestData.java b/base/common/src/com/netscape/cms/servlet/request/model/ArchivalRequestData.java index 8a25c6684..bcc51bf96 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/ArchivalRequestData.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/ArchivalRequestData.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- /** - * + * */ package com.netscape.cms.servlet.request.model; @@ -42,21 +42,21 @@ public class ArchivalRequestData { @XmlElement protected String clientId; - + @XmlElement protected String transWrappedSessionKey; - + @XmlElement protected String dataType; - + @XmlElement protected String wrappedPrivateData; - + public ArchivalRequestData() { // required for JAXB (defaults) } - - public ArchivalRequestData(MultivaluedMap<String, String> form) { + + public ArchivalRequestData(MultivaluedMap<String, String> form) { clientId = form.getFirst(CLIENT_ID); transWrappedSessionKey = form.getFirst(TRANS_WRAPPED_SESSION_KEY); dataType = form.getFirst(DATA_TYPE); @@ -118,6 +118,6 @@ public class ArchivalRequestData { public void setWrappedPrivateData(String wrappedPrivateData) { this.wrappedPrivateData = wrappedPrivateData; } - + } diff --git a/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java index d1f1a27bd..aaea45398 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java @@ -53,20 +53,20 @@ public class KeyRequestDAO { private IKeyRecoveryAuthority kra; private static String REQUEST_ARCHIVE_OPTIONS = IEnrollProfile.REQUEST_ARCHIVE_OPTIONS; - + private String[] vlvFilters = { "(requeststate=*)", "(requesttype=enrollment)", "(requesttype=recovery)", "(requeststate=canceled)", "(&(requeststate=canceled)(requesttype=enrollment))", - "(&(requeststate=canceled)(requesttype=recovery))", - "(requeststate=rejected)", + "(&(requeststate=canceled)(requesttype=recovery))", + "(requeststate=rejected)", "(&(requeststate=rejected)(requesttype=enrollment))", "(&(requeststate=rejected)(requesttype=recovery))", "(requeststate=complete)", "(&(requeststate=complete)(requesttype=enrollment))", "(&(requeststate=complete)(requesttype=recovery))" }; - + public static final String ATTR_SERIALNO = "serialNumber"; public KeyRequestDAO() { @@ -75,12 +75,12 @@ public class KeyRequestDAO { } /** - * Finds list of requests matching the specified search filter. - * - * If the filter corresponds to a VLV search, then that search is executed and the pageSize + * Finds list of requests matching the specified search filter. + * + * If the filter corresponds to a VLV search, then that search is executed and the pageSize * and start parameters are used. Otherwise, the maxResults and maxTime parameters are * used in the regularly indexed search. - * + * * @param filter - ldap search filter * @param start - start position for VLV search * @param pageSize - page size for VLV search @@ -96,16 +96,16 @@ public class KeyRequestDAO { List <Link> links = new ArrayList<Link>(); int totalSize = 0; int current = 0; - + if (isVLVSearch(filter)) { IRequestVirtualList vlvlist = queue.getPagedRequestsByFilter(start, false, filter, pageSize +1 , "requestId"); totalSize = vlvlist.getSize(); current = vlvlist.getCurrentIndex(); - + int numRecords = (totalSize > (current + pageSize)) ? pageSize : totalSize - current; - + for (int i=0; i < numRecords; i++) { IRequest request = vlvlist.getElementAt(i); list.add(createKeyRequestInfo(request, uriInfo)); @@ -127,7 +127,7 @@ public class KeyRequestDAO { } } } - + // builder for vlv links MultivaluedMap<String, String> params = uriInfo.getQueryParameters(); UriBuilder builder = uriInfo.getAbsolutePathBuilder(); @@ -139,7 +139,7 @@ public class KeyRequestDAO { } builder.queryParam("start", "{start}"); builder.queryParam("pageSize", "{pageSize}"); - + // next link if (totalSize > current + pageSize) { int next = current + pageSize + 1; @@ -147,7 +147,7 @@ public class KeyRequestDAO { Link nextLink = new Link("next", nextUri.toString(), "application/xml"); links.add(nextLink); } - + // previous link if (current >0) { int previous = current - pageSize; @@ -155,18 +155,18 @@ public class KeyRequestDAO { Link previousLink = new Link("previous", previousUri.toString(), "application/xml"); links.add(previousLink); } - + KeyRequestInfos ret = new KeyRequestInfos(); ret.setRequests(list); ret.setLinks(links); return ret; } - + /** * Gets info for a specific request * @param id * @return info for specific request - * @throws EBaseException + * @throws EBaseException */ public KeyRequestInfo getRequest(RequestId id, UriInfo uriInfo) throws EBaseException { IRequest request = queue.findRequest(id); @@ -180,7 +180,7 @@ public class KeyRequestDAO { * Submits an archival request and processes it. * @param data * @return info for the request submitted. - * @throws EBaseException + * @throws EBaseException */ public KeyRequestInfo submitRequest(ArchivalRequestData data, UriInfo uriInfo) throws EBaseException { String clientId = data.getClientId(); @@ -209,9 +209,9 @@ public class KeyRequestDAO { * Submits a key recovery request. * @param data * @return info on the recovery request created - * @throws EBaseException + * @throws EBaseException */ - public KeyRequestInfo submitRequest(RecoveryRequestData data, UriInfo uriInfo) throws EBaseException { + public KeyRequestInfo submitRequest(RecoveryRequestData data, UriInfo uriInfo) throws EBaseException { // set data using request.setExtData(field, data) @@ -256,42 +256,42 @@ public class KeyRequestDAO { request.setRequestStatus(RequestStatus.APPROVED); queue.updateRequest(request); } - + public void rejectRequest(RequestId id) throws EBaseException { IRequest request = queue.findRequest(id); request.setRequestStatus(RequestStatus.CANCELED); queue.updateRequest(request); } - + public void cancelRequest(RequestId id) throws EBaseException { IRequest request = queue.findRequest(id); request.setRequestStatus(RequestStatus.REJECTED); queue.updateRequest(request); } - + public KeyRequestInfo createKeyRequestInfo(IRequest request, UriInfo uriInfo) { KeyRequestInfo ret = new KeyRequestInfo(); - + ret.setRequestType(request.getRequestType()); ret.setRequestStatus(request.getRequestStatus().toString()); - + Path keyRequestPath = KeyRequestResource.class.getAnnotation(Path.class); RequestId rid = request.getRequestId(); UriBuilder reqBuilder = uriInfo.getBaseUriBuilder(); reqBuilder.path(keyRequestPath.value() + "/" + rid); ret.setRequestURL(reqBuilder.build().toString()); - + Path keyPath = KeyResource.class.getAnnotation(Path.class); String kid = request.getExtDataInString("keyrecord"); UriBuilder keyBuilder = uriInfo.getBaseUriBuilder(); keyBuilder.path(keyPath.value() + "/" + kid); ret.setKeyURL(keyBuilder.build().toString()); - + return ret; } - + private boolean isVLVSearch(String filter) { for (int i=0; i < vlvFilters.length; i++) { if (vlvFilters[i].equalsIgnoreCase(filter)) { diff --git a/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java index f07c302dd..fd3be8044 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java @@ -32,20 +32,20 @@ public class KeyRequestInfo { @XmlElement protected String requestType; - + @XmlElement protected String requestStatus; - + @XmlElement protected String requestURL; - + @XmlElement protected String keyURL; - + public KeyRequestInfo(){ // required to be here for JAXB (defaults) } - + /** * @return the requestType */ diff --git a/base/common/src/com/netscape/cms/servlet/request/model/RecoveryRequestData.java b/base/common/src/com/netscape/cms/servlet/request/model/RecoveryRequestData.java index 80ec6d127..335414792 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/RecoveryRequestData.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/RecoveryRequestData.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- /** - * + * */ package com.netscape.cms.servlet.request.model; @@ -40,7 +40,7 @@ import com.netscape.certsrv.request.RequestIdAdapter; @XmlRootElement(name="SecurityDataRecoveryRequest") @XmlAccessorType(XmlAccessType.FIELD) public class RecoveryRequestData { - + private static final String KEY_ID = "keyId"; private static final String REQUEST_ID = "requestId"; private static final String TRANS_WRAPPED_SESSION_KEY = "transWrappedSessionKey"; @@ -50,24 +50,24 @@ public class RecoveryRequestData { @XmlElement @XmlJavaTypeAdapter(KeyIdAdapter.class) protected KeyId keyId; - + @XmlElement @XmlJavaTypeAdapter(RequestIdAdapter.class) protected RequestId requestId; - + @XmlElement protected String transWrappedSessionKey; - + @XmlElement protected String sessionWrappedPassphrase; - + @XmlElement protected String nonceData; public RecoveryRequestData() { // required for JAXB (defaults) } - + public RecoveryRequestData(MultivaluedMap<String, String> form) { if (form.containsKey(KEY_ID)) { keyId = new KeyId(form.getFirst(KEY_ID)); diff --git a/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java b/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java index c96a30a85..d4801e794 100644 --- a/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java +++ b/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java @@ -54,7 +54,7 @@ import com.netscape.symkey.SessionKey; * Service Authority. This servlet is responsible to serve * tks administrative operation such as configuration * parameter updates. - * + * * @version $Revision$, $Date$ */ public class TokenServlet extends CMSServlet { @@ -134,7 +134,7 @@ public class TokenServlet extends CMSServlet { /** * Returns serlvet information. - * + * * @return name of this servlet */ public String getServletInfo() { @@ -143,7 +143,7 @@ public class TokenServlet extends CMSServlet { /** * Process the HTTP request. - * + * * @param s The URL to decode. */ protected String URLdecode(String s) { @@ -455,7 +455,7 @@ public class TokenServlet extends CMSServlet { // (1) generate DES key /* applet does not support DES3 - org.mozilla.jss.crypto.KeyGenerator kg = + org.mozilla.jss.crypto.KeyGenerator kg = internalToken.getKeyGenerator(KeyGenAlgorithm.DES3); desKey = kg.generate();*/ @@ -1148,19 +1148,19 @@ public class TokenServlet extends CMSServlet { audit(auditMessage); } - /* + /* * For EncryptData: * data=value1 * CUID=value2 // missing from RA * versionID=value3 // missing from RA * - * For ComputeSession: + * For ComputeSession: * card_challenge=value1 * host_challenge=value2 - + * For DiversifyKey: * new_master_key_index - * master_key_index + * master_key_index */ private void processComputeRandomData(HttpServletRequest req, @@ -1329,7 +1329,7 @@ public class TokenServlet extends CMSServlet { /** * Serves HTTP admin request. - * + * * @param req HTTP request * @param resp HTTP response */ diff --git a/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java b/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java index aee57858f..6c5211650 100644 --- a/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java +++ b/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java @@ -222,7 +222,7 @@ public class WizardServlet extends VelocityServlet { public int getPanelNo(HttpServletRequest request) { int p = 0; - // panel number can be identified by either + // panel number can be identified by either // panel no (p parameter) directly, or // panel name (panelname parameter). if (request.getParameter("panelname") != null) { @@ -424,7 +424,7 @@ public class WizardServlet extends VelocityServlet { while (paramNames.hasMoreElements()) { String pn = paramNames.nextElement(); // added this facility so that password can be hidden, - // all sensitive parameters should be prefixed with + // all sensitive parameters should be prefixed with // __ (double underscores); however, in the event that // a security parameter slips through, we perform multiple // additional checks to insure that it is NOT displayed diff --git a/base/common/src/com/netscape/cms/shares/OldJoinShares.java b/base/common/src/com/netscape/cms/shares/OldJoinShares.java index f01e1e1c3..cda8dddfe 100644 --- a/base/common/src/com/netscape/cms/shares/OldJoinShares.java +++ b/base/common/src/com/netscape/cms/shares/OldJoinShares.java @@ -25,7 +25,7 @@ import com.netscape.certsrv.kra.IJoinShares; /** * Use Java's reflection API to leverage CMS's * old Share and JoinShares implementations. - * + * * @deprecated * @version $Revision$ $Date$ */ diff --git a/base/common/src/com/netscape/cms/shares/OldShare.java b/base/common/src/com/netscape/cms/shares/OldShare.java index 4020e759e..2bf27f5ab 100644 --- a/base/common/src/com/netscape/cms/shares/OldShare.java +++ b/base/common/src/com/netscape/cms/shares/OldShare.java @@ -25,7 +25,7 @@ import com.netscape.certsrv.kra.IShare; /** * Use Java's reflection API to leverage CMS's * old Share and JoinShares implementations. - * + * * @deprecated * @version $Revision$ $Date$ */ 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 diff --git a/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java b/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java index c60e93d99..fab809bad 100644 --- a/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java +++ b/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java @@ -244,7 +244,7 @@ public class AuthTokenTest extends CMSBaseTestCase { /** * CMSMemoryStub - * + * * This class is used to help test methods that rely on setting and then * getting a value out. It assumes BtoA is always called first, stores * the value passed in, and then returns that value for BtoA. diff --git a/base/common/test/com/netscape/cmscore/dbs/DBVirtualListDefaultStub.java b/base/common/test/com/netscape/cmscore/dbs/DBVirtualListDefaultStub.java index d674bd6a6..4f4c2ddbb 100644 --- a/base/common/test/com/netscape/cmscore/dbs/DBVirtualListDefaultStub.java +++ b/base/common/test/com/netscape/cmscore/dbs/DBVirtualListDefaultStub.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.dbs.IElementProcessor; * This class helps test avoid the problem of test stubs having to * implement a new stub method every time the interface changes. * It also makes the tests clearer by not cluttered them with empty methods. - * + * * Do not put any behaviour in this class. */ public class DBVirtualListDefaultStub<T> implements IDBVirtualList<T> { diff --git a/base/common/test/com/netscape/cmscore/request/RequestTest.java b/base/common/test/com/netscape/cmscore/request/RequestTest.java index 5832f6af5..32c244033 100644 --- a/base/common/test/com/netscape/cmscore/request/RequestTest.java +++ b/base/common/test/com/netscape/cmscore/request/RequestTest.java @@ -592,7 +592,7 @@ public class RequestTest extends CMSBaseTestCase { /** * CMSMemoryStub - * + * * This class is used to help test methods that rely on setting and then * getting a value out. It assumes BtoA is always called first, stores * the value passed in, and then returns that value for BtoA. diff --git a/base/console/src/com/netscape/admin/certsrv/AttrCellRenderer.java b/base/console/src/com/netscape/admin/certsrv/AttrCellRenderer.java index 863e42197..1c5882b6f 100644 --- a/base/console/src/com/netscape/admin/certsrv/AttrCellRenderer.java +++ b/base/console/src/com/netscape/admin/certsrv/AttrCellRenderer.java @@ -48,7 +48,7 @@ public class AttrCellRenderer extends JLabel implements ListCellRenderer { setHorizontalAlignment(((JLabel)value).getHorizontalAlignment()); } else { if (value instanceof String) { - setText((String) value); + setText((String) value); } else { setText(value.toString()); } diff --git a/base/console/src/com/netscape/admin/certsrv/CMSAdmin.java b/base/console/src/com/netscape/admin/certsrv/CMSAdmin.java index 6e88cc276..94bb266d1 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSAdmin.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSAdmin.java @@ -83,7 +83,7 @@ public class CMSAdmin extends AbstractServerObject if (mActiveFrame == null) mActiveFrame = UtilConsoleGlobals.getActivatedFrame(); mResource = ResourceBundle.getBundle(CMSAdminResources.class.getName()); - // STATUS_UPDATE_INTERVAL = 1500000; + // STATUS_UPDATE_INTERVAL = 1500000; } /*========================================================== @@ -303,7 +303,7 @@ public class CMSAdmin extends AbstractServerObject } } - /** + /** * Enable/Disable start/stop action menu. */ private void enableStartStop(IPage viewInstance) { @@ -348,12 +348,12 @@ public class CMSAdmin extends AbstractServerObject // moved from WIIntroPage.java data.put(ConfigConstants.TASKID,TaskId.TASK_GET_DEFAULT_INFO); data.put(ConfigConstants.OPTYPE, OpDef.OP_READ); - data.put(ConfigConstants.PR_CERT_INSTANCE_NAME, + data.put(ConfigConstants.PR_CERT_INSTANCE_NAME, mConsoleInfo.get(ConfigConstants.PR_CERT_INSTANCE_NAME)); // #344791 - help server to make up the hostname - data.put(ConfigConstants.PR_HOST, - mConsoleInfo.get(ConfigConstants.PR_HOST)); - data.put(ConfigConstants.PR_SERVER_ROOT, + data.put(ConfigConstants.PR_HOST, + mConsoleInfo.get(ConfigConstants.PR_HOST)); + data.put(ConfigConstants.PR_SERVER_ROOT, mConsoleInfo.get(ConfigConstants.PR_SERVER_ROOT)); return data; } @@ -392,7 +392,7 @@ public class CMSAdmin extends AbstractServerObject data.clear(); data = null; boolean isInfoReady = false; - + if (success) { InstallWizardInfo wizardInfo = new InstallWizardInfo(mConsoleInfo); @@ -404,7 +404,7 @@ public class CMSAdmin extends AbstractServerObject data = createWizardInfo(); isInfoReady = configCertCgi.configCert(data); Debug.println("CMSAdmin: isInfoReady = "+isInfoReady); - + if (isInfoReady) { JFrame frame = new JFrame(); Cursor cursor = new Cursor(Cursor.HAND_CURSOR); @@ -529,7 +529,7 @@ public class CMSAdmin extends AbstractServerObject ex.getMessage(), CMSAdminUtil.ERROR_MESSAGE); return false; } - + //LOAD UI FRAMEWORK try { @@ -592,7 +592,7 @@ public class CMSAdmin extends AbstractServerObject Debug.println("Check server status"); if (getConsoleInfo().getCurrentDN() == null) { return STATUS_STARTED; - } else { + } else { if ( mPort == 0) { mServerStatus = STATUS_UNKNOWN; return STATUS_UNKNOWN; @@ -633,7 +633,7 @@ public class CMSAdmin extends AbstractServerObject * @return The Certificate Server status. */ public boolean getStatusFromAgentPort() { - + if (mPort == 0) { getInfo(getConsoleInfo().getCurrentDN()); if (mPort == 0) { @@ -641,7 +641,7 @@ public class CMSAdmin extends AbstractServerObject return false; } } - + //check if ssl port is functional try { if ((mServerInfo == null) || (mServerInfo.getPort() == 0)) { @@ -649,9 +649,9 @@ public class CMSAdmin extends AbstractServerObject mServerInfo = new CMSServerInfo(mHost, mPort, "", "", mServerID, mInstallationDate, mServerVersion, mServerRoot, path); } - + mServerInfo.ping(); - + } catch (EAdminException e) { Debug.println("CMSAdmin: getServerStatus() -"+e.toString()); if (e.getMessageString().equals(CMSAdminResources.SERVER_NORESPONSE) || @@ -666,7 +666,7 @@ public class CMSAdmin extends AbstractServerObject // mServerStatus = STATUS_UNKNOWN; return false; } - + Debug.println("CMSAdmin: getServerStatus() -OK"); // mServerStatus = STATUS_STARTED; return true; @@ -706,7 +706,7 @@ public class CMSAdmin extends AbstractServerObject boolean status = task.run( null ); Debug.println("remove run"); Debug.println("Remove server status: "+ status); - String instance = (String) mConsoleInfo.get("ServerInstance"); + String instance = (String) mConsoleInfo.get("ServerInstance"); if (null == instance) { instance = ""; } @@ -718,7 +718,7 @@ public class CMSAdmin extends AbstractServerObject String[] attrs = { "*", "numsubordinates" }; String sieDN = mConsoleInfo.getCurrentDN(); Debug.println("removeServer:sieDN:" + sieDN); - + LDAPEntry sieEntry = null; try { sieEntry = ldc.read( sieDN, attrs ); @@ -732,7 +732,7 @@ public class CMSAdmin extends AbstractServerObject args); _removed = false; // remove failed */ - return false; + return false; } if (sieEntry != null ) { try { @@ -762,7 +762,7 @@ public class CMSAdmin extends AbstractServerObject DSUtil.showInformationDialog(_info.getFrame(), "121", (String)null) ; } - + */ } // CMSAdminUtil.showMessageDialog(mConsoleInfo.getFrame(), mResource, PREFIX, @@ -772,9 +772,9 @@ public class CMSAdmin extends AbstractServerObject - private boolean delete_sieTree (LDAPEntry entry ) + private boolean delete_sieTree (LDAPEntry entry ) throws LDAPException { - + LDAPConnection ldc = mConsoleInfo.getLDAPConnection(); boolean ret = false; @@ -785,13 +785,13 @@ public class CMSAdmin extends AbstractServerObject search_results = ldc.search( dn, LDAPConnection.SCOPE_ONE, "(objectClass=*)", attrs, false ); - + while ( search_results.hasMoreElements() ) { /* Get the next child */ LDAPEntry child_entry = (LDAPEntry)search_results.nextElement(); ret = delete_sieTree( child_entry ); - + } } ldc.delete(dn); @@ -817,14 +817,14 @@ public class CMSAdmin extends AbstractServerObject private boolean remove_serverInstance (String sieDN ) { - + LDAPSearchResults search_results = null; String baseDN =(String) mConsoleInfo.get("BaseDN"); LDAPConnection ldc = mConsoleInfo.getLDAPConnection(); String[] attrs = { "*", "uniquemember" }; String filter = "(&(objectclass=groupOfUniquenames)(uniquemember=" + sieDN+"))"; - + try { search_results = ldc.search( baseDN, ldc.SCOPE_SUB, filter, attrs, false); @@ -836,7 +836,7 @@ public class CMSAdmin extends AbstractServerObject while ( search_results.hasMoreElements() ) { // need to remove the reference to the sieDN from // this entry. - + entry = (LDAPEntry)search_results.nextElement(); String eDN = (String) entry.getDN(); // Now we need to modify the entry to delete the @@ -845,7 +845,7 @@ public class CMSAdmin extends AbstractServerObject } return true; } - + private boolean remove_intstanceFromEntry ( LDAPConnection ldc, String eDN, String sieDN ) { @@ -853,7 +853,7 @@ public class CMSAdmin extends AbstractServerObject LDAPAttribute attUmember = new LDAPAttribute("uniquemember", sieDN); Debug.println("DSAdmin:remove_intstanceFromEntry: Modifying entry:" + eDN); - mods.add( LDAPModification.DELETE, attUmember ); + mods.add( LDAPModification.DELETE, attUmember ); try { ldc.modify(eDN, mods ); } catch ( LDAPException e ) { diff --git a/base/console/src/com/netscape/admin/certsrv/CMSAdminResources.java b/base/console/src/com/netscape/admin/certsrv/CMSAdminResources.java index af2ba4c91..7251a9df8 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSAdminResources.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSAdminResources.java @@ -86,7 +86,7 @@ public class CMSAdminResources extends ResourceBundle { public static final String IMAGE_ACLOBJECT = "aclobj.gif"; public static final String IMAGE_ACL = "acl.gif"; public static final String IMAGE_ACLPLUGIN = "aclplugin.gif"; - + //dialog icons public static final String IMAGE_INFO_ICON = "messagel.gif"; public static final String IMAGE_ERROR_ICON = "error.gif"; @@ -137,25 +137,25 @@ public class CMSAdminResources extends ResourceBundle { public final static String MENU_NEW_EXTENSION = "NEW_EXTENSION"; public final static String MENU_NEW_POLICY = "NEW_POLICY"; public final static String MENU_PERMISSION = "PERMISSION"; - public final static String MENU_CONFIGURE_SERVER = "Configure Server"; - public final static String MENU_CONFIGURE_SERVER_DESC = "Configure the Server"; - public final static String MENU_START_SERVER = "Start Server"; - public final static String MENU_START_SERVER_DESC = "Start the Server"; - public final static String MENU_REMOVE_SERVER = "Remove Server"; - public final static String MENU_REMOVE_SERVER_DESC = "Remove the Server"; + public final static String MENU_CONFIGURE_SERVER = "Configure Server"; + public final static String MENU_CONFIGURE_SERVER_DESC = "Configure the Server"; + public final static String MENU_START_SERVER = "Start Server"; + public final static String MENU_START_SERVER_DESC = "Start the Server"; + public final static String MENU_REMOVE_SERVER = "Remove Server"; + public final static String MENU_REMOVE_SERVER_DESC = "Remove the Server"; public final static String MENU_STOP_SERVER = "Stop Server"; public final static String MENU_STOP_SERVER_DESC = "Stop the Server"; public final static String MENU_RESTART_SERVER = "Restart Server"; public final static String MENU_RESTART_SERVER_DESC = "Restart the Server"; - public final static String PROP_FILE = + public final static String PROP_FILE = "CMSAdminRS"; public CMSAdminResources() { mResourceSet = new ThisResourceSet(PROP_FILE); - mResourceBundle = mResourceSet.getThisBundle(PROP_FILE, + mResourceBundle = mResourceSet.getThisBundle(PROP_FILE, Locale.getDefault()); } diff --git a/base/console/src/com/netscape/admin/certsrv/CMSAdminUtil.java b/base/console/src/com/netscape/admin/certsrv/CMSAdminUtil.java index 107de427b..1f03c0213 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSAdminUtil.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSAdminUtil.java @@ -45,30 +45,30 @@ public class CMSAdminUtil { /*========================================================== * variables *==========================================================*/ - public static final int DEFAULT_TEXTFIELD_WIDTH = 30; + public static final int DEFAULT_TEXTFIELD_WIDTH = 30; public static final int COMPONENT_SPACE = SuiLookAndFeel.COMPONENT_SPACE; - public static final int SEPARATED_COMPONENT_SPACE = + public static final int SEPARATED_COMPONENT_SPACE = SuiLookAndFeel.SEPARATED_COMPONENT_SPACE; - public static final int DIFFERENT_COMPONENT_SPACE = + public static final int DIFFERENT_COMPONENT_SPACE = SuiLookAndFeel.DIFFERENT_COMPONENT_SPACE; - public static final int HELP_BUTTON_OFFSET = 9; - + public static final int HELP_BUTTON_OFFSET = 9; + public static final int DEFAULT_BUTTON_SIZE = 72; - + final public static Dimension DEFAULT_PANEL_SIZE = new Dimension(350,440); final public static int DEFAULT_PADDING = SuiLookAndFeel.COMPONENT_SPACE; private static final int DEFAULT_WIDTH = 40; final public static Insets DEFAULT_EMPTY_INSETS = new Insets(0,0,0,0); public static final Insets DEAFULT_END_INSETS = new Insets(COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE,COMPONENT_SPACE); - + public static final int WARNING_MESSAGE = JOptionPane.WARNING_MESSAGE; public static final int ERROR_MESSAGE = JOptionPane.ERROR_MESSAGE; public static final int INFORMATION_MESSAGE = JOptionPane.INFORMATION_MESSAGE; public static final int OK_OPTION = JOptionPane.OK_OPTION; public static final int NO_OPTION = JOptionPane.NO_OPTION; public static final int CANCEL_OPTION = JOptionPane.CANCEL_OPTION; - + private static Hashtable mPackageImages = new Hashtable(); //image container private static final ResourceSet mHelpResource = new ResourceSet("com.netscape.admin.certsrv.certsrv-help"); @@ -81,7 +81,7 @@ public class CMSAdminUtil { /*========================================================== * Utilities methods *==========================================================*/ - + /** * Utility function to retrieve images from the package image * class path. @@ -139,7 +139,7 @@ public class CMSAdminUtil { component.repaint(1); } - public static void enableJTextField(JTextComponent component, + public static void enableJTextField(JTextComponent component, boolean enable, Color color) { component.setEnabled(enable); component.setEditable(enable); @@ -190,7 +190,7 @@ public class CMSAdminUtil { } public static void addComponents(JPanel panel, JComponent comp1, - JComponent comp2, JComponent comp3, JComponent comp4, + JComponent comp2, JComponent comp3, JComponent comp4, GridBagConstraints gbc) { double weighty = gbc.weighty; CMSAdminUtil.resetGBC(gbc); @@ -223,7 +223,7 @@ public class CMSAdminUtil { * Add a label and a textfield to a panel, assumed to be using * GridBagLayout. */ - public static void addEntryField(JPanel panel, JComponent label, + public static void addEntryField(JPanel panel, JComponent label, JComponent field, GridBagConstraints gbc) { gbc.fill = gbc.NONE; gbc.weightx = 0.0; @@ -247,7 +247,7 @@ public class CMSAdminUtil { * Add 3 components in the same row to a panel, assumed to be using * GridBagLayout. */ - public static void addEntryField(JPanel panel, JComponent field1, + public static void addEntryField(JPanel panel, JComponent field1, JComponent field2, JComponent field3, GridBagConstraints gbc) { gbc.fill = gbc.NONE; gbc.weightx = 0.0; @@ -274,12 +274,12 @@ public class CMSAdminUtil { 0,DIFFERENT_COMPONENT_SPACE); panel.add( field3, gbc ); } - + /** * Add 4 components in the same row to a panel, assumed to be using * GridBagLayout. */ - public static void addEntryField(JPanel panel, JComponent field1, + public static void addEntryField(JPanel panel, JComponent field1, JComponent field2, JComponent field3, JComponent field4, GridBagConstraints gbc) { gbc.fill = gbc.NONE; gbc.weightx = 0.0; @@ -304,7 +304,7 @@ public class CMSAdminUtil { gbc.anchor = gbc.EAST; gbc.insets = new Insets(COMPONENT_SPACE,DIFFERENT_COMPONENT_SPACE,0,0); panel.add( field3, gbc ); - + gbc.gridx++; gbc.anchor = gbc.WEST; gbc.fill = gbc.HORIZONTAL; @@ -460,7 +460,7 @@ public class CMSAdminUtil { } return ret; } - + public static String certRequestWrapText(String s, int width) { String ret = ""; StringTokenizer tokenizer = new StringTokenizer(s, "\n"); @@ -470,7 +470,7 @@ public class CMSAdminUtil { String endCert = ""; String content = ""; while(tokenizer.hasMoreTokens()) { - String sToken = (String)tokenizer.nextToken(); + String sToken = (String)tokenizer.nextToken(); if (index == 1) { beginCert = sToken; } else if (index == numTokens) { @@ -523,7 +523,7 @@ public class CMSAdminUtil { /** * Find out the table width to be used - * + * * @table JTable object */ public static int getTotalColumnWidth( JTable table ) { @@ -540,14 +540,14 @@ public class CMSAdminUtil { /*========================================================== * Component Factory *==========================================================*/ - + //==== BORDER CREATION ==================================== public static Border makeEtchedBorder() { Border margin = new EmptyBorder(0,0, SuiLookAndFeel.VERT_WINDOW_INSET,0); - return new CompoundBorder(BorderFactory.createEtchedBorder(), margin); + return new CompoundBorder(BorderFactory.createEtchedBorder(), margin); } - + public static Border makeTitledBorder(ResourceBundle resource, String panelName, String keyword) { @@ -559,31 +559,31 @@ public class CMSAdminUtil { } return new TitledBorder(title); } - - //==== DIALOG CREATION ==================================== - + + //==== DIALOG CREATION ==================================== + public static void showMessageDialog(ResourceBundle resource, String panelName, - String keyword, + String keyword, int messageType ) { - showMessageDialog(UtilConsoleGlobals.getActivatedFrame(), resource, panelName, keyword, messageType); + showMessageDialog(UtilConsoleGlobals.getActivatedFrame(), resource, panelName, keyword, messageType); } - + public static void showMessageDialog(JFrame frame, - String title, - String msg, + String title, + String msg, int messageType ) { Icon icon; if (messageType != ERROR_MESSAGE) - icon = getImage(CMSAdminResources.IMAGE_INFO_ICON); + icon = getImage(CMSAdminResources.IMAGE_INFO_ICON); else icon = getImage(CMSAdminResources.IMAGE_ERROR_ICON); - + JOptionPane.showMessageDialog( frame, CMSAdminUtil.wrapText(msg), - title, - messageType, + title, + messageType, icon); } @@ -593,7 +593,7 @@ public class CMSAdminUtil { public static void showMessageDialog(JFrame frame, ResourceBundle resource, String panelName, - String keyword, + String keyword, int messageType ) { String msg, title; try { @@ -606,32 +606,32 @@ public class CMSAdminUtil { } catch (MissingResourceException e) { title = "Missing Title"; } - + Icon icon; if (messageType != ERROR_MESSAGE) - icon = getImage(CMSAdminResources.IMAGE_INFO_ICON); + icon = getImage(CMSAdminResources.IMAGE_INFO_ICON); else icon = getImage(CMSAdminResources.IMAGE_ERROR_ICON); - + JOptionPane.showMessageDialog( frame, CMSAdminUtil.wrapText(msg), - title, - messageType, + title, + messageType, icon); } - - public static void showErrorDialog(ResourceBundle resource, + + public static void showErrorDialog(ResourceBundle resource, String message, - int messageType) { - showErrorDialog(new JFrame(), resource, message, messageType); + int messageType) { + showErrorDialog(new JFrame(), resource, message, messageType); } - + /** * Creating error dialog box for display */ public static void showErrorDialog(JFrame frame, - ResourceBundle resource, + ResourceBundle resource, String message, int messageType) { String title; @@ -643,19 +643,19 @@ public class CMSAdminUtil { JOptionPane.showMessageDialog( frame, CMSAdminUtil.wrapText(message), - title, - messageType, + title, + messageType, getImage(CMSAdminResources.IMAGE_ERROR_ICON)); } - + public static int showConfirmDialog( ResourceBundle resource, String panelName, - String keyword, - int messageType ) + String keyword, + int messageType ) { - return showConfirmDialog(new JFrame(), resource, panelName, keyword, messageType); + return showConfirmDialog(new JFrame(), resource, panelName, keyword, messageType); } - + public static int showConfirmDialog( ResourceBundle resource, String panelName, String keyword, String[] params, @@ -667,12 +667,12 @@ public class CMSAdminUtil { /** * Creating confirm dialog box for display - */ + */ public static int showConfirmDialog( JFrame frame, ResourceBundle resource, String panelName, - String keyword, - int messageType ) + String keyword, + int messageType ) { String msg, title; try { @@ -685,15 +685,15 @@ public class CMSAdminUtil { } catch (MissingResourceException e) { title = "Missing Title"; } - + return JOptionPane.showConfirmDialog( frame, CMSAdminUtil.wrapText(msg), title, JOptionPane.YES_NO_OPTION, messageType, getImage(CMSAdminResources.IMAGE_WARN_ICON)); - } - + } + public static int showConfirmDialog(JFrame frame, ResourceBundle resource, String panelName, String keyword, String[] params, int messageType ) { @@ -722,26 +722,26 @@ public class CMSAdminUtil { messageType, getImage(CMSAdminResources.IMAGE_WARN_ICON)); } - + //==== LABEL CREATION ================================ - + /** * Factory Method to create LABEL using specified params */ - public static JLabel makeJLabel(ResourceBundle resource, - String panelName, + public static JLabel makeJLabel(ResourceBundle resource, + String panelName, String keyword, Icon icon) { return makeJLabel(resource, panelName, keyword, icon, -1); } - - + + /** * Factory Method to create LABEL using specified params */ - public static JLabel makeJLabel(ResourceBundle resource, - String panelName, + public static JLabel makeJLabel(ResourceBundle resource, + String panelName, String keyword, Icon icon, int alignment) @@ -759,32 +759,32 @@ public class CMSAdminUtil { if (title != null) label.setText(title); if (alignment != -1) - label.setHorizontalAlignment(alignment); + label.setHorizontalAlignment(alignment); //setToolTip(resource, panelName, "LABEL_"+keyword, label); - + return label; - } - - + } + + //==== TEXTFIELD CREATION ================================ - + /** * Factory Method to create TextFiled using specified params */ - public static JTextField makeJTextField(Document d, - String s, + public static JTextField makeJTextField(Document d, + String s, int len, Object listener) { - - JTextField pf = new JTextField(DEFAULT_TEXTFIELD_WIDTH){ + + JTextField pf = new JTextField(DEFAULT_TEXTFIELD_WIDTH){ public void setEnabled( boolean enabled ) { super.setEnabled( enabled ); //super.setEditable(enabled); super.setBackground( enabled ? Color.white: SystemColor.window); - } - }; - pf.setEnabled( true ); - + } + }; + pf.setEnabled( true ); + if (d != null) pf.setDocument(d); if (s != null) @@ -794,17 +794,17 @@ public class CMSAdminUtil { pf.addActionListener((ActionListener)listener); //detect text changes - pf.getDocument().addDocumentListener((DocumentListener)listener); + pf.getDocument().addDocumentListener((DocumentListener)listener); return pf; - } - + } + //==== PASSWORD FIELD CREATION ================================ - + /** * Factory Method to create Password Filed using specified params */ - public static JPasswordField makeJPasswordField(Document d, - String s, + public static JPasswordField makeJPasswordField(Document d, + String s, int len, Object listener) { JPasswordField pf = new JPasswordField(DEFAULT_TEXTFIELD_WIDTH) { @@ -813,8 +813,8 @@ public class CMSAdminUtil { super.setEditable(enabled); setBackground( enabled ? Color.white: SystemColor.window); this.repaint(); - } - }; + } + }; pf.setEnabled( true ); if (d != null) pf.setDocument(d); @@ -825,13 +825,13 @@ public class CMSAdminUtil { pf.addActionListener((ActionListener)listener); //detect text changes - pf.getDocument().addDocumentListener((DocumentListener)listener); + pf.getDocument().addDocumentListener((DocumentListener)listener); return pf; - } - - + } + + //==== LIST CREATION ================================ - + /** * Factory Method to create a list box mode specified with specific * visible row count. Special cell renderer is used to display each cell. @@ -845,14 +845,14 @@ public class CMSAdminUtil { listbox.setSelectedIndex(0); return listbox; } - + //===== CHECKBOX CREATION ======================= - + /** * Factory Method to create CheckBox using specified params */ - public static JCheckBox makeJCheckBox(ResourceBundle resource, - String panelName, + public static JCheckBox makeJCheckBox(ResourceBundle resource, + String panelName, String keyword, Icon icon, boolean select, @@ -864,7 +864,7 @@ public class CMSAdminUtil { } catch (MissingResourceException e) { label = "Missing Label"; } - + JCheckBox button = new JCheckBox(); if (label != null) button.setText(label); @@ -873,17 +873,17 @@ public class CMSAdminUtil { button.setSelected(select); button.addActionListener(listener); //setToolTip(resource, panelName, "CHECKBOX_"+keyword, button); - + return button; - } - + } + //===== RADIO BUTTON CREATION ======================= - + /** * Factory Method to create Radio Button using specified params */ - public static JRadioButton makeJRadioButton(ResourceBundle resource, - String panelName, + public static JRadioButton makeJRadioButton(ResourceBundle resource, + String panelName, String keyword, Icon icon, boolean select, @@ -895,7 +895,7 @@ public class CMSAdminUtil { } catch (MissingResourceException e) { label = "Missing Label"; } - + JRadioButton button = new JRadioButton(); if (label != null) button.setText(label); @@ -904,17 +904,17 @@ public class CMSAdminUtil { button.setSelected(select); button.addActionListener(listener); //setToolTip(resource, panelName, "RADIOBUTTON_"+keyword, button); - + return button; - } - + } + //===== BUTTON CREATION ======================= - + /** * Factory Method to create Button using specified params */ - public static JButton makeJButton(ResourceBundle resource, - String panelName, + public static JButton makeJButton(ResourceBundle resource, + String panelName, String keyword, Icon icon, ActionListener listener) @@ -925,7 +925,7 @@ public class CMSAdminUtil { } catch (MissingResourceException e) { label = "Missing Label"; } - + JButton button = new JButton(); if (label != null) button.setText(label); @@ -933,10 +933,10 @@ public class CMSAdminUtil { button.setIcon(icon); button.addActionListener(listener); //setToolTip(resource, panelName, "BUTTON_"+keyword, button); - + return button; - } - + } + /** * Create a panel with horizontally arranged, equally sized buttons * The buttons are aligned to the right in the panel (if it is @@ -947,15 +947,15 @@ public class CMSAdminUtil { * @param isConfig don't pat button * @return A panel containing the buttons */ - + public static JPanel makeJButtonPanel( JButton[] buttons) { return makeJButtonPanel(buttons, false, false); } - + public static JPanel makeJButtonPanel( JButton[] buttons, boolean isHelp) { return makeJButtonPanel(buttons, isHelp, false); - } - + } + public static JPanel makeJButtonPanel( JButton[] buttons, boolean isHelp, boolean isConfig) { JButtonFactory.resize( buttons ); JPanel buttonPanel = new JPanel(); @@ -973,30 +973,30 @@ public class CMSAdminUtil { gbc.gridwidth = gbc.REMAINDER; if (isHelp) buttonPanel.add( Box.createHorizontalStrut(HELP_BUTTON_OFFSET)); - else + else buttonPanel.add( Box.createHorizontalStrut(SuiLookAndFeel.COMPONENT_SPACE) ); } buttonPanel.add( buttons[i], gbc ); - if ( i < buttons.length-2 ) + if ( i < buttons.length-2 ) buttonPanel.add( Box.createHorizontalStrut(SuiLookAndFeel.COMPONENT_SPACE) ); } - + JPanel p = new JPanel(); p.setLayout( new BorderLayout() ); p.add( "Center", buttonPanel ); - + if(!isConfig) { p.add( "South", - Box.createVerticalStrut(DIFFERENT_COMPONENT_SPACE) ); + Box.createVerticalStrut(DIFFERENT_COMPONENT_SPACE) ); p.add( "East", - Box.createHorizontalStrut(DIFFERENT_COMPONENT_SPACE) ); + Box.createHorizontalStrut(DIFFERENT_COMPONENT_SPACE) ); } else { p.add( "South", - Box.createVerticalStrut(DIFFERENT_COMPONENT_SPACE-COMPONENT_SPACE) ); + Box.createVerticalStrut(DIFFERENT_COMPONENT_SPACE-COMPONENT_SPACE) ); } p.add( "North", Box.createVerticalStrut(DIFFERENT_COMPONENT_SPACE) ); - + return p; } @@ -1018,25 +1018,25 @@ public class CMSAdminUtil { gbc.gridwidth = gbc.REMAINDER; gbc.weightx = 1.0; gbc.insets = new Insets(0, DIFFERENT_COMPONENT_SPACE, 0,0); - + for( int i = 0; i < buttons.length; i++ ) { if ( i == buttons.length-1 ) gbc.gridheight = gbc.REMAINDER; buttonPanel.add( buttons[i], gbc ); gbc.insets = new Insets(COMPONENT_SPACE, DIFFERENT_COMPONENT_SPACE, 0, 0); - } - + } + JPanel p = new JPanel(); p.setLayout( new BorderLayout() ); - p.add( "Center", buttonPanel ); - return p; + p.add( "Center", buttonPanel ); + return p; } - + //===== COMBOBOX CREATION ======================= - - public static JComboBox makeJComboBox(ResourceBundle resource, - String panelName, + + public static JComboBox makeJComboBox(ResourceBundle resource, + String panelName, String keyword) { String value = null; @@ -1056,33 +1056,33 @@ public class CMSAdminUtil { ++ii; } catch (MissingResourceException e) { val = null; - } + } } while (val != null); - + if (value != null) jcb.setSelectedItem(value); return jcb; } - - + + //===== TOOL TIP CREATION ======================= - + /** * Set tool tip on compoenent using resources passed in */ - public static void setToolTip(ResourceBundle resource, - String panelName, - String compKeyword, - JComponent w) + public static void setToolTip(ResourceBundle resource, + String panelName, + String compKeyword, + JComponent w) { try { String ttip = resource.getString(panelName+"_"+compKeyword+"_TTIP"); w.setToolTipText(ttip); } catch (MissingResourceException e) { //DON'T HAVE TOOT TIP - } + } } - + public static String[] randomize(String [] t) { String[] s = new String[t.length]; System.arraycopy(t,0,s,0,t.length); @@ -1117,7 +1117,7 @@ public class CMSAdminUtil { } } } - } + } public static void bubbleSort(String[] str, String[] data) { for (int i = 0; i < str.length-1; i++) { @@ -1166,21 +1166,21 @@ public class CMSAdminUtil { } //get localized string using the format - public static String getLocalizedString(ResourceBundle resource, - String keyword, + public static String getLocalizedString(ResourceBundle resource, + String keyword, Object param) { return MessageFormatter.getLocalizedString(resource.getClass().getName(), - keyword, param); - } - + keyword, param); + } + //get localized string using the format - public static String getLocalizedString(ResourceBundle resource, - String keyword, + public static String getLocalizedString(ResourceBundle resource, + String keyword, Object [] params) { return MessageFormatter.getLocalizedString(resource.getClass().getName(), - keyword, params); + keyword, params); } - + public static String getPureString(String data) { StringBuffer input = new StringBuffer(data); StringBuffer buff = new StringBuffer(); @@ -1203,7 +1203,7 @@ public class CMSAdminUtil { static RemoteImage getSystemImage( String imagePath ) { return new RemoteImage( imagePath ); } - + public static JTextArea createTextArea(String str, Color color) { JTextArea desc = new JTextArea(str); desc.setBackground(color); @@ -1211,7 +1211,7 @@ public class CMSAdminUtil { desc.setCaretColor(color); desc.setLineWrap(true); desc.setWrapStyleWord(true); - + return desc; } diff --git a/base/console/src/com/netscape/admin/certsrv/CMSBaseMenuInfo.java b/base/console/src/com/netscape/admin/certsrv/CMSBaseMenuInfo.java index cb1909f22..1a0670d69 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSBaseMenuInfo.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSBaseMenuInfo.java @@ -103,7 +103,7 @@ public class CMSBaseMenuInfo implements IMenuInfo { Vector items = (Vector) mCategoryIDMenuItems.elementAt(i); items.addElement(item); //XXX check exist already ?? } - + /** * Add menu item separator */ diff --git a/base/console/src/com/netscape/admin/certsrv/CMSBasePanel.java b/base/console/src/com/netscape/admin/certsrv/CMSBasePanel.java index 3430a74d9..b151893c7 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSBasePanel.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSBasePanel.java @@ -33,25 +33,25 @@ import java.awt.event.*; * @author Jack Pan-Chen * @version $Revision$, $Date$ */ -public class CMSBasePanel extends JPanel +public class CMSBasePanel extends JPanel implements ActionListener, DocumentListener, ItemListener, ListSelectionListener { /*========================================================== * variables *==========================================================*/ - public static Insets DEFAULT_CENTER_INSETS = new Insets(0,0,0,0); + public static Insets DEFAULT_CENTER_INSETS = new Insets(0,0,0,0); public static Insets EMPTY_INSETS = new Insets(0,0,0,0); public static final int COMPONENT_SPACE = SuiLookAndFeel.COMPONENT_SPACE; - public static final int SEPARATED_COMPONENT_SPACE = + public static final int SEPARATED_COMPONENT_SPACE = SuiLookAndFeel.SEPARATED_COMPONENT_SPACE; - public static final int DIFFERENT_COMPONENT_SPACE = + public static final int DIFFERENT_COMPONENT_SPACE = SuiLookAndFeel.DIFFERENT_COMPONENT_SPACE; - + protected static final int WARNING_MESSAGE = JOptionPane.WARNING_MESSAGE; protected static final int ERROR_MESSAGE = JOptionPane.ERROR_MESSAGE; protected static final int INFORMATION_MESSAGE = JOptionPane.INFORMATION_MESSAGE; - + protected String mPanelName; // panel name (UPPERCASE IDENTIFIER) protected ResourceBundle mResource; // resource boundle public static int mNonWaitCursor = -1; @@ -71,23 +71,23 @@ public class CMSBasePanel extends JPanel mPanelName = panelName; mResource = rb; } - + /*========================================================== * public methods *==========================================================*/ - + /** * Set Panel name * @param name panel name */ public void setPanelName(String name) { - mPanelName = name; + mPanelName = name; } - + /*========================================================== * EVNET HANDLER METHODS - *==========================================================*/ - + *==========================================================*/ + //=== ACTIONLISTENER ===================== public void actionPerformed(ActionEvent e) { } @@ -95,10 +95,10 @@ public class CMSBasePanel extends JPanel //== DocumentListener == public void insertUpdate(DocumentEvent e) { } - + public void removeUpdate(DocumentEvent e){ } - + public void changedUpdate(DocumentEvent e){ } @@ -109,48 +109,48 @@ public class CMSBasePanel extends JPanel //== ListSelectionListener == public void valueChanged(ListSelectionEvent e){ } - + /*========================================================== * protected methods *==========================================================*/ - + //create string using formated resource string //the string format protected String getLocalizedString(String keyword, Object param) { return CMSAdminUtil.getLocalizedString(mResource, keyword, param); } - + protected String getLocalizedString(String keyword, Object [] params) { return CMSAdminUtil.getLocalizedString(mResource, keyword, params); - } - - + } + + //=== DIALOG MESSAGE ===================== - + protected void showMessageDialog(String keyword, int messageType ) { CMSAdminUtil.showMessageDialog(mResource, mPanelName, keyword, messageType); } - + protected void showMessageDialog(String keyword) { showMessageDialog(keyword, ERROR_MESSAGE); } - + protected int showConfirmDialog(String keyword, int messageType ) { return CMSAdminUtil.showConfirmDialog(mResource, mPanelName, keyword, messageType); - } - + } + protected int showConfirmDialog(String keyword, String[] params, int messageType ) { return CMSAdminUtil.showConfirmDialog(mResource, mPanelName, keyword, params, messageType); - } - + } + protected int showConfirmDialog(String keyword) { return showConfirmDialog(keyword, WARNING_MESSAGE); } - + protected int showConfirmDialog(String keyword, String[] params) { return showConfirmDialog(keyword, params, WARNING_MESSAGE); } - + /** * Display Error Message dialog * @@ -159,7 +159,7 @@ public class CMSBasePanel extends JPanel protected void showErrorDialog(String message) { CMSAdminUtil.showErrorDialog(mResource, message, ERROR_MESSAGE); } - + //=== TITLED BORDER ====================== protected Border makeTitledBorder(String keyword) { String label; @@ -181,7 +181,7 @@ public class CMSBasePanel extends JPanel */ return new CompoundBorder(border, margin); } - + //=== LABEL CREATION ==================== protected JLabel makeJLabel(Icon i, String s, int a) { JLabel label = new JLabel(); @@ -201,7 +201,7 @@ public class CMSBasePanel extends JPanel protected JLabel makeJLabel(String keyword) { return makeJLabel(keyword, (Icon) null, -1); } - + protected JLabel makeJLabel(String keyword, Icon i, int a) { return CMSAdminUtil.makeJLabel(mResource, mPanelName, keyword, i, a); } @@ -210,7 +210,7 @@ public class CMSBasePanel extends JPanel protected JTextField makeJTextField(Document d, String s, int len) { return CMSAdminUtil.makeJTextField(d, s,len, this); } - + protected JTextField makeJTextField() { return makeJTextField(null, null, -1); } @@ -271,15 +271,15 @@ public class CMSBasePanel extends JPanel protected JButton makeJButton(String keyword) { return makeJButton(keyword, (Icon)null); } - + protected JButton makeJButton(String keyword, ActionListener listener) { return makeJButton(keyword, (Icon)null, listener); } - + protected JButton makeJButton(String keyword, Icon i) { return makeJButton(keyword, i, this); - } - + } + protected JButton makeJButton(String keyword, Icon i, ActionListener listener) { return CMSAdminUtil.makeJButton(mResource, mPanelName, keyword, i, listener); } @@ -312,7 +312,7 @@ public class CMSBasePanel extends JPanel protected JCheckBox makeJCheckBox(String keyword) { return makeJCheckBox(keyword, (Icon)null, false); } - + protected JCheckBox makeJCheckBox(String keyword, boolean b) { return makeJCheckBox(keyword, (Icon)null, b); } @@ -356,9 +356,9 @@ public class CMSBasePanel extends JPanel ++ii; } catch (MissingResourceException e) { val = null; - } + } } while (val != null); - + if (value != null) jcb.setSelectedItem(value); return jcb; @@ -366,11 +366,11 @@ public class CMSBasePanel extends JPanel //==== LIST CREATION ============================ - + protected JList makeJList(DefaultListModel listModel, int visibleCount) { return CMSAdminUtil.makeJList(listModel, visibleCount); } - + //===== RADIO BUTTON CREATION ======================= protected JRadioButton makeJRadioButton(Icon i, String s, boolean b) { JRadioButton rb = new JRadioButton(); @@ -407,7 +407,7 @@ public class CMSBasePanel extends JPanel protected JRadioButton makeJRadioButton(String keyword, Icon i, boolean b) { return CMSAdminUtil.makeJRadioButton(mResource, mPanelName, keyword, i, b, this); } - + /** * Create a panel with horizontally arranged, equally sized buttons * The buttons are aligned to the right in the panel (if it is @@ -420,7 +420,7 @@ public class CMSBasePanel extends JPanel public static JPanel makeJButtonPanel( JButton[] buttons ) { return CMSAdminUtil.makeJButtonPanel(buttons); } - + public static JPanel makeJButtonPanel( JButton[] buttons, boolean isHelp) { return CMSAdminUtil.makeJButtonPanel(buttons, isHelp); } @@ -428,7 +428,7 @@ public class CMSBasePanel extends JPanel public static JPanel makeJButtonPanel( JButton[] buttons, boolean isHelp, boolean isConfig) { return CMSAdminUtil.makeJButtonPanel(buttons, isHelp, isConfig); } - + protected void startProgressStatus() { if (mNonWaitCursor == -1) { mCursor = mParent.getCursor(); @@ -455,6 +455,6 @@ public class CMSBasePanel extends JPanel * private methods *==========================================================*/ private void setToolTip(String compKeyword, JComponent w) { - CMSAdminUtil.setToolTip(mResource, mPanelName, compKeyword, w); + CMSAdminUtil.setToolTip(mResource, mPanelName, compKeyword, w); } } diff --git a/base/console/src/com/netscape/admin/certsrv/CMSBaseResourceModel.java b/base/console/src/com/netscape/admin/certsrv/CMSBaseResourceModel.java index b7ec04e3a..2c8e65427 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSBaseResourceModel.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSBaseResourceModel.java @@ -49,7 +49,7 @@ public class CMSBaseResourceModel extends ResourceModel { *==========================================================*/ private CMSResourcePage mPage; // physical page representation - protected ConsoleInfo mConsoleInfo; // console info + protected ConsoleInfo mConsoleInfo; // console info protected CMSServerInfo mServerInfo; // server info protected IResourceObject[] mSelection; // selected objects protected Vector mSelectionListeners; // listener list @@ -85,9 +85,9 @@ public class CMSBaseResourceModel extends ResourceModel { * @param page CMSResourcePage instance */ public void setResourcePage(CMSResourcePage page) { - mPage = page; + mPage = page; } - + public CMSResourcePage getResourcePage() { return mPage; } @@ -215,24 +215,24 @@ public class CMSBaseResourceModel extends ResourceModel { * for setting up the subtrees. */ public void addSubSystemNode(CMSResourceObject node) { - ((CMSResourceObject)getRoot()).add(node); + ((CMSResourceObject)getRoot()).add(node); } - + /** * Register the nick name of the resource object, so other sub system * can look up and retrieve the corresponding resource object. */ public void registerNickName(String nickName, CMSResourceObject node) { - mNickNameRegistry.put(nickName, node); + mNickNameRegistry.put(nickName, node); } - + /** * Retrieve the resource obejct associated with this nickname */ public CMSResourceObject getByNickName(String nickName) { return (CMSResourceObject) mNickNameRegistry.get(nickName); } - + /** * Start the zipping status bar */ @@ -245,12 +245,12 @@ public class CMSBaseResourceModel extends ResourceModel { */ public void progressStop() { mPage.progressStop(); - } - + } + /*========================================================== * priotected methods *==========================================================*/ - + protected void init() { CMSResourceObject root = new CMSResourceObject(); root.setName(mResource.getString(CMSAdminResources.CERT_SERVER_NAME)+":" + mServerInfo.getPort()); diff --git a/base/console/src/com/netscape/admin/certsrv/CMSCAUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSCAUILoader.java index f967d28e0..8bd20e4e8 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSCAUILoader.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSCAUILoader.java @@ -57,29 +57,29 @@ public class CMSCAUILoader implements ISubSystemUILoader { public void register() { //register subsystem UI try { - + //task tab IPage task = mUIFramework.getPage(CMSPageFeeder.TASK_TAB_TYPE,""); - + //config tab CMSResourcePage page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"CONFIGURATION"); CMSBaseResourceModel model = (CMSBaseResourceModel) page.getModel(); model.setResourcePage(page); populateConfigContent(model); - + /*repos tab page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"CONTENT"); model = (CMSBaseResourceModel) page.getModel(); populateRepositoryContent(model); populateRepositoryMenu(page); */ - + /*acl tab page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"ACCESSCONTROLLIST"); model = (CMSBaseResourceModel) page.getModel(); populateACLContent(model); */ - + }catch(Exception e) { Debug.println("CMSCAUILoader: register() config - "+e.toString()); } @@ -113,7 +113,7 @@ public class CMSCAUILoader implements ISubSystemUILoader { jobsnode.setAllowsChildren(true); CMSResourceObject cnode = new CMSResourceObject("JOBS"); - + tabPane1 = new CMSUGTabPanel(model, cnode); tabPane1.addTab(new JobsInstanceTab(model)); tabPane1.addTab(new JobsImplTab(model)); @@ -134,7 +134,7 @@ public class CMSCAUILoader implements ISubSystemUILoader { list.setIcon( CMSAdminUtil.getImage(CMSAdminResources.IMAGE_FOLDER)); list.setAllowsChildren(true); list.setCustomPanel(tabPane); - + //policies sub node //CMSResourceObject node2; node = new CMSResourceObject("POLICIES"); @@ -176,7 +176,7 @@ public class CMSCAUILoader implements ISubSystemUILoader { notificationNode.setAllowsChildren(false); list.add(notificationNode); - + /* servlet sub node - XXX NOT FOR B1 Servlet Instance Tab code is under config/servlet. It has been 'cvs removed'. It needs porting to new UI. @@ -203,7 +203,7 @@ public class CMSCAUILoader implements ISubSystemUILoader { node.setAllowsChildren(false); list.add(node); */ - + /* crl extensions sub node node = new CMSResourceObject("CRLEXTENSIONS"); CMSUGTabPanel crlExtTabPane = new CMSUGTabPanel(model, node); @@ -269,7 +269,7 @@ public class CMSCAUILoader implements ISubSystemUILoader { node.setAllowsChildren(false); list.add(node); */ - + //ldap publishing node = new CMSResourceObject("PUBLISHING"); tabPane = new CMSTabPanel(model, node); @@ -286,9 +286,9 @@ public class CMSCAUILoader implements ISubSystemUILoader { // allow mappers node = new CMSResourceObject("MAPPERS"); CMSUGTabPanel ugtabPane = new CMSUGTabPanel(model, node); - ugtabPane.addTab(new MapperInstanceTab(model, + ugtabPane.addTab(new MapperInstanceTab(model, DestDef.DEST_CA_PUBLISHER_ADMIN)); - ugtabPane.addTab(new MapperImplTab(model, + ugtabPane.addTab(new MapperImplTab(model, DestDef.DEST_CA_PUBLISHER_ADMIN)); node.setCustomPanel(ugtabPane); node.setIcon(CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULEOBJECT)); @@ -298,9 +298,9 @@ public class CMSCAUILoader implements ISubSystemUILoader { // allow LDAP publisher and mapper plugins node = new CMSResourceObject("PUBLISHERS"); ugtabPane = new CMSUGTabPanel(model, node); - ugtabPane.addTab(new PublisherInstanceTab(model, + ugtabPane.addTab(new PublisherInstanceTab(model, DestDef.DEST_CA_PUBLISHER_ADMIN)); - ugtabPane.addTab(new PublisherImplTab(model, + ugtabPane.addTab(new PublisherImplTab(model, DestDef.DEST_CA_PUBLISHER_ADMIN)); node.setCustomPanel(ugtabPane); node.setIcon( CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULEOBJECT)); @@ -310,24 +310,24 @@ public class CMSCAUILoader implements ISubSystemUILoader { // allow rules node = new CMSResourceObject("RULES"); ugtabPane = new CMSUGTabPanel(model, node); - ugtabPane.addTab(new RuleInstanceTab(model, + ugtabPane.addTab(new RuleInstanceTab(model, DestDef.DEST_CA_PUBLISHER_ADMIN)); // XXX just support one publishing rule type - // ugtabPane.addTab(new RuleImplTab(model, + // ugtabPane.addTab(new RuleImplTab(model, // DestDef.DEST_CA_PUBLISHER_ADMIN)); node.setCustomPanel(ugtabPane); node.setIcon(CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULEOBJECT)); node.setAllowsChildren(false); publishingNode.add(node); - + model.addSubSystemNode(list); } - + /* protected void populateRepositoryContent(CMSBaseResourceModel model) { CMSResourceObject list, node; - + //ca repositories node list = new CMSResourceObject("CAREPOSITORIES"); list.setCustomPanel(new CMSBlankPanel(model)); @@ -347,15 +347,15 @@ public class CMSCAUILoader implements ISubSystemUILoader { } protected void populateRepositoryMenu(CMSResourcePage page) { - CMSBaseResourceModel model = (CMSBaseResourceModel) page.getModel(); + CMSBaseResourceModel model = (CMSBaseResourceModel) page.getModel(); CMSBaseMenuInfo menuInfo = (CMSBaseMenuInfo)page.getMenuInfo(); try { menuInfo.registerMenuItem(CMSBaseMenuInfo.MENU_FILE, CMSBaseMenuInfo.MENU_NEWCERT, - new CertRequestAction(model.getConsoleInfo(),model.getServerInfo())); + new CertRequestAction(model.getConsoleInfo(),model.getServerInfo())); } catch(Exception e) { - Debug.println("menuinfo register()"+e.toString()); - } + Debug.println("menuinfo register()"+e.toString()); + } } */ protected void populateACLContent(CMSBaseResourceModel model) { @@ -366,7 +366,7 @@ public class CMSCAUILoader implements ISubSystemUILoader { node.setCustomPanel(new CMSBlankPanel(model)); node.setIcon( CMSAdminUtil.getImage(CMSAdminResources.IMAGE_DOCUMENT)); node.setAllowsChildren(false); - list.add(node); + list.add(node); */ } diff --git a/base/console/src/com/netscape/admin/certsrv/CMSCCMUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSCCMUILoader.java index 785514ac2..4688e52af 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSCCMUILoader.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSCCMUILoader.java @@ -53,21 +53,21 @@ public class CMSCCMUILoader implements ISubSystemUILoader { public void register() { //register subsystem UI try { - + //task tab IPage task = mUIFramework.getPage(CMSPageFeeder.TASK_TAB_TYPE,""); - + //config tab CMSResourcePage page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"CONFIGURATION"); CMSBaseResourceModel model = (CMSBaseResourceModel) page.getModel(); populateConfigContent(model); - + /*acl tab page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"ACCESSCONTROLLIST"); model = (CMSBaseResourceModel) page.getModel(); populateACLContent(model); */ - + }catch(Exception e) { Debug.println("CMSCCMUILoader: register() config - "+e.toString()); } @@ -80,7 +80,7 @@ public class CMSCCMUILoader implements ISubSystemUILoader { protected void populateConfigContent(CMSBaseResourceModel model) { CMSResourceObject node; CMSTabPanel tabPane; - + //ccm node node = new CMSResourceObject("CCMCONFIG"); tabPane = new CMSTabPanel(model, node); @@ -89,7 +89,7 @@ public class CMSCCMUILoader implements ISubSystemUILoader { node.setCustomPanel(tabPane); node.setIcon( CMSAdminUtil.getImage(CMSAdminResources.IMAGE_FOLDER)); node.setAllowsChildren(true); - + model.addSubSystemNode(node); } @@ -101,7 +101,7 @@ public class CMSCCMUILoader implements ISubSystemUILoader { node.setCustomPanel(new CMSBlankPanel(model)); node.setIcon( CMSAdminUtil.getImage(CMSAdminResources.IMAGE_DOCUMENT)); node.setAllowsChildren(false); - list.add(node); + list.add(node); } */ } diff --git a/base/console/src/com/netscape/admin/certsrv/CMSContentTableModel.java b/base/console/src/com/netscape/admin/certsrv/CMSContentTableModel.java index 15bc29665..b83af283e 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSContentTableModel.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSContentTableModel.java @@ -48,14 +48,14 @@ public class CMSContentTableModel extends CMSTableModel { /*========================================================== * public methods *==========================================================*/ - + /** * Returns the number of rows in the table * @return number of rows */ public int getRowCount() { return mObjectContainer.size(); - } + } /** * Add data row and data object associated with this row @@ -66,13 +66,13 @@ public class CMSContentTableModel extends CMSTableModel { super.addRow(values); mObjectContainer.addElement(obj); } - + /** * Remove row at the specified index position * @param index row index to be removed */ - public void removeRow(int index) - throws ArrayIndexOutOfBoundsException + public void removeRow(int index) + throws ArrayIndexOutOfBoundsException { Debug.println("CMSContentDataModel: removeRow() - start"); mObjectContainer.removeElementAt(index); diff --git a/base/console/src/com/netscape/admin/certsrv/CMSEAUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSEAUILoader.java index 9c3ae6e01..4b2ddb95f 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSEAUILoader.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSEAUILoader.java @@ -54,27 +54,27 @@ public class CMSEAUILoader implements ISubSystemUILoader { public void register() { //register subsystem UI try { - + //task tab IPage task = mUIFramework.getPage(CMSPageFeeder.TASK_TAB_TYPE,""); - + //config tab CMSResourcePage page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"CONFIGURATION"); CMSBaseResourceModel model = (CMSBaseResourceModel) page.getModel(); populateConfigContent(model); - + /*repos tab page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"CONTENT"); model = (CMSBaseResourceModel) page.getModel(); populateRepositoryContent(model); */ - + /*acl tab page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"ACCESSCONTROLLIST"); model = (CMSBaseResourceModel) page.getModel(); populateACLContent(model); */ - + }catch(Exception e) { Debug.println("CMSEAUILoader: register() config - "+e.toString()); } @@ -98,11 +98,11 @@ public class CMSEAUILoader implements ISubSystemUILoader { model.addSubSystemNode(list); } - + /* protected void populateRepositoryContent(CMSBaseResourceModel model) { CMSResourceObject list, node; - + //ca repositories node list = new CMSResourceObject("EAREPOSITORIES"); list.setCustomPanel(new CMSBlankPanel(model)); @@ -129,7 +129,7 @@ public class CMSEAUILoader implements ISubSystemUILoader { node.setCustomPanel(new CMSBlankPanel(model)); node.setIcon( CMSAdminUtil.getImage(CMSAdminResources.IMAGE_DOCUMENT)); node.setAllowsChildren(false); - list.add(node); + list.add(node); } */ diff --git a/base/console/src/com/netscape/admin/certsrv/CMSKernelUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSKernelUILoader.java index cb232c527..49fbb5524 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSKernelUILoader.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSKernelUILoader.java @@ -42,42 +42,42 @@ import javax.swing.*; * @date 03/30/97 */ public class CMSKernelUILoader implements ISubSystemUILoader { - + protected static final int ERROR_MESSAGE = JOptionPane.ERROR_MESSAGE; /*========================================================== * variables *==========================================================*/ private CMSUIFramework mUIFramework; //parent framework - + /*========================================================== * constructors *==========================================================*/ public CMSKernelUILoader(CMSUIFramework framework) { mUIFramework = framework; } - + /*========================================================== * public methods *==========================================================*/ public void register() { - + //register subsystem UI try { //task tab - this holds icons such as start server, stop server, etc IPage task = mUIFramework.getPage(CMSPageFeeder.TASK_TAB_TYPE,""); }catch(Exception e) { Debug.println("CMSKernelUILoader: register() config tab - "+e.toString()); - } + } CMSResourcePage page; - CMSBaseResourceModel model; - - try { + CMSBaseResourceModel model; + + try { //configuration tab - (holds main UI tree) page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"CONFIGURATION"); model = (CMSBaseResourceModel) page.getModel(); populateConfigContent(model); populateConfigMenu(page); - + } catch(Exception e) { Debug.println("CMSKernelUILoader: register() config tab - "+e.toString()); } @@ -91,31 +91,31 @@ public class CMSKernelUILoader implements ISubSystemUILoader { Debug.println("CMSKernelUILoader: register() status - "+e.toString()); } } - + /*========================================================== * protected methods - *==========================================================*/ + *==========================================================*/ /** * This method creates the configuration tree */ - + protected void populateConfigContent(CMSBaseResourceModel model) { - + CMSResourceObject root = (CMSResourceObject) model.getRoot(); CMSTabPanel tabPane = new CMSTabPanel(model, root); tabPane.addTab(new CMSLDAPSettingPanel(tabPane)); tabPane.addTab(new CMSSMTPPanel(tabPane)); tabPane.addTab(new CMSSelfTestsPanel(tabPane)); - // The log panel would only really be useful if we were able to - // enable or disable debug without restarting. If we can do this, + // The log panel would only really be useful if we were able to + // enable or disable debug without restarting. If we can do this, // then we can enable this tab. // // tabPane.addTab(new GeneralLogPanel(tabPane)); root.setCustomPanel(tabPane); - + CMSResourceObject usernode = new CMSResourceObject("USERGROUPS"); CMSUGTabPanel tabPane1 = new CMSUGTabPanel(model, usernode); @@ -125,7 +125,7 @@ public class CMSKernelUILoader implements ISubSystemUILoader { usernode.setAllowsChildren(false); usernode.setIcon(CMSAdminUtil.getImage(CMSAdminResources.IMAGE_UGOBJECT)); model.addSubSystemNode(usernode); - + // This ACL configuration may be revived in a future version CMSResourceObject aclnode = new CMSResourceObject("ACL"); CMSUGTabPanel aclTabPane = new CMSUGTabPanel(model, aclnode); @@ -136,7 +136,7 @@ public class CMSKernelUILoader implements ISubSystemUILoader { CMSAdminResources.IMAGE_ACLOBJECT)); aclnode.setAllowsChildren(false); model.addSubSystemNode(aclnode); - + // Authentication subsystem /* CMSResourceObject authnode = new CMSResourceObject("AUTH"); @@ -160,7 +160,7 @@ public class CMSKernelUILoader implements ISubSystemUILoader { jobsnode.setAllowsChildren(true); CMSResourceObject cnode = new CMSResourceObject("JOBS"); - + tabPane1 = new CMSUGTabPanel(model, cnode); tabPane1.addTab(new JobsInstanceTab(model)); tabPane1.addTab(new JobsImplTab(model)); @@ -190,10 +190,10 @@ public class CMSKernelUILoader implements ISubSystemUILoader { tabPane3.addTab(new UserCertsTab(model, DestDef.DEST_SERVER_ADMIN)); NameValuePairs response; /* - try + try { AdminConnection connection = model.getServerInfo().getAdmin(); - + response = connection.search(DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_SUBSYSTEM, new NameValuePairs()); Debug.println(response.toString()); @@ -210,7 +210,7 @@ public class CMSKernelUILoader implements ISubSystemUILoader { encryptionnode.setAllowsChildren(false); model.addSubSystemNode(encryptionnode); } - + /** * Modifies the window menu (File, Edit, View, etc) to add some @@ -224,16 +224,16 @@ public class CMSKernelUILoader implements ISubSystemUILoader { // CMSBaseMenuInfo.MENU_PKCS11, // new PKCS11ManagementAction(model.getConsoleInfo())); // reference Bug 613851 Manage PKCS#11 shows a blank window. - menuInfo.addMenuItemSeparator(CMSBaseMenuInfo.MENU_FILE); + menuInfo.addMenuItemSeparator(CMSBaseMenuInfo.MENU_FILE); menuInfo.addMenuItemSeparator(CMSBaseMenuInfo.MENU_VIEW); menuInfo.registerMenuItem(CMSBaseMenuInfo.MENU_VIEW, CMSBaseMenuInfo.MENU_REFRESH, new RefreshTabPane(model)); } catch(Exception e) { - Debug.println("menuinfo register()"+e.toString()); + Debug.println("menuinfo register()"+e.toString()); } } - + /** * creates the tree view seen in the left panel when the user selects @@ -248,13 +248,13 @@ public class CMSKernelUILoader implements ISubSystemUILoader { protected void populateStatusContent(CMSResourcePage page) { CMSBaseResourceModel model = (CMSBaseResourceModel) page.getModel(); CMSResourceObject root = (CMSResourceObject) model.getRoot(); - + //set general stat panel root.setCustomPanel(new StatusPanel(model)); - + CMSResourceObject list, node; CMSTabPanel tabPane; - + //log content list = new CMSResourceObject("LOG"); list.setCustomPanel(new CMSBlankPanel(model)); @@ -266,7 +266,7 @@ public class CMSKernelUILoader implements ISubSystemUILoader { model.addSubSystemNode(list); } - + protected void populateStatusMenu(CMSResourcePage page) { CMSBaseResourceModel model = (CMSBaseResourceModel) page.getModel(); CMSBaseMenuInfo menuInfo = (CMSBaseMenuInfo)page.getMenuInfo(); @@ -279,7 +279,7 @@ public class CMSKernelUILoader implements ISubSystemUILoader { Debug.println("menuinfo register()"+e.toString()); } } - + /** * retrieve log instance listing from the server * side and populate the index @@ -297,7 +297,7 @@ public class CMSKernelUILoader implements ISubSystemUILoader { new NameValuePairs()); } catch (EAdminException e) { //display error dialog - CMSAdminUtil.showErrorDialog(model.getFrame(), + CMSAdminUtil.showErrorDialog(model.getFrame(), ResourceBundle.getBundle( CMSAdminResources.class.getName() ), e.getMessage(), ERROR_MESSAGE); diff --git a/base/console/src/com/netscape/admin/certsrv/CMSMessageBox.java b/base/console/src/com/netscape/admin/certsrv/CMSMessageBox.java index 2eef61cb2..33094d041 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSMessageBox.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSMessageBox.java @@ -35,7 +35,7 @@ public class CMSMessageBox extends JDialog setSize( width, 100 ); setResizable( false ); setLocationRelativeTo(parent); - + message = new Label( messageString, Label.CENTER ); getContentPane().add( message, BorderLayout.CENTER ); setVisible(true); @@ -45,12 +45,12 @@ public class CMSMessageBox extends JDialog super(parent, "Status", false); int width = 300; mResource = ResourceBundle.getBundle(CMSAdminResources.class.getName()); - String messageString = mResource.getString(panelName+"_DIALOG_PROGRESS_"+keyword); - + String messageString = mResource.getString(panelName+"_DIALOG_PROGRESS_"+keyword); + setSize( width, 100 ); setResizable( false ); setLocationRelativeTo(parent); - + message = new Label( messageString, Label.CENTER ); getContentPane().add( message, BorderLayout.CENTER ); setVisible(true); @@ -59,7 +59,7 @@ public class CMSMessageBox extends JDialog public CMSMessageBox(Frame parent) { super(parent); - + // This code is automatically generated by Visual Cafe when you add // components to the visual environment. It instantiates and initializes // the components. To modify the code, only use code syntax that matches diff --git a/base/console/src/com/netscape/admin/certsrv/CMSOCSPUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSOCSPUILoader.java index 3c8d5dba0..92a374285 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSOCSPUILoader.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSOCSPUILoader.java @@ -55,15 +55,15 @@ public class CMSOCSPUILoader implements ISubSystemUILoader { public void register() { //register subsystem UI try { - + //task tab IPage task = mUIFramework.getPage(CMSPageFeeder.TASK_TAB_TYPE,""); - + //config tab CMSResourcePage page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"CONFIGURATION"); CMSBaseResourceModel model = (CMSBaseResourceModel) page.getModel(); populateConfigContent(model); - + }catch(Exception e) { Debug.println("CMSCAUILoader: register() config - "+e.toString()); } @@ -75,7 +75,7 @@ public class CMSOCSPUILoader implements ISubSystemUILoader { protected void populateConfigContent(CMSBaseResourceModel model) { CMSResourceObject list, node; CMSTabPanel tabPane; - + //ca node list = new CMSResourceObject("OCSPCONFIG"); tabPane = new CMSTabPanel(model, list); @@ -93,8 +93,8 @@ public class CMSOCSPUILoader implements ISubSystemUILoader { ; node.setAllowsChildren(false); list.add(node); - + model.addSubSystemNode(list); } - + } diff --git a/base/console/src/com/netscape/admin/certsrv/CMSPageFeeder.java b/base/console/src/com/netscape/admin/certsrv/CMSPageFeeder.java index 0abd28f29..f01967a91 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSPageFeeder.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSPageFeeder.java @@ -40,7 +40,7 @@ public class CMSPageFeeder extends FrameworkInitializer { *==========================================================*/ public static String RESOURCE_TAB_TYPE = "RESOURCE_TAB_TYPE"; public static String TASK_TAB_TYPE = "TASK_TAB_TYPE"; - + private static String PREFIX = "CMSPAGEFEEDER_"; private ConsoleInfo mConsoleInfo; // global information @@ -51,7 +51,7 @@ public class CMSPageFeeder extends FrameworkInitializer { //private ResourcePage mResourcePage; // resource page //private ResourcePage mContentPage; // content page //private ResourcePage mUGPage; // identity and roles page - + private ResourceBundle mResource; // resource boundle /*========================================================== @@ -70,7 +70,7 @@ public class CMSPageFeeder extends FrameworkInitializer { mServerInfo = serverInfo; mResource = ResourceBundle.getBundle(CMSAdminResources.class.getName()); mPages = new Hashtable(); - + setFrameTitle(mResource.getString(PREFIX+"SERVERNAME")); setMinimizedImage(CMSAdminUtil.getImage(CMSAdminResources.IMAGE_CERTICON_MEDIUM).getImage()); setBannerImage(CMSAdminUtil.getThemeImage(CMSAdminResources.IMAGE_BRANDING).getImage()); @@ -99,13 +99,13 @@ public class CMSPageFeeder extends FrameworkInitializer { return task; */ } - + if (!type.trim().equals(RESOURCE_TAB_TYPE)) { throw new EAdminException(mResource.getString(PREFIX+"RESOURCE_TAB_NOT_FOUND"), true); } - + if (mPages.containsKey(name.trim())) { - return (IPage) mPages.get(name.trim()); + return (IPage) mPages.get(name.trim()); } else { CMSResourcePage page = new CMSResourcePage(new CMSBaseResourceModel(mConsoleInfo,mServerInfo)); String title; @@ -133,8 +133,8 @@ public class CMSPageFeeder extends FrameworkInitializer { ((CMSResourcePage)page).getTree().expandRow(0); } } - - + + /*========================================================== * private methods *==========================================================*/ diff --git a/base/console/src/com/netscape/admin/certsrv/CMSPassword.java b/base/console/src/com/netscape/admin/certsrv/CMSPassword.java index 4fbca9011..483efaf35 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSPassword.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSPassword.java @@ -218,7 +218,7 @@ public class CMSPassword extends JDialog } if (evt.getSource().equals(mHelp)) { CMSAdminUtil.help(HELPINDEX); - return; + return; } } @@ -259,7 +259,7 @@ public class CMSPassword extends JDialog null, this); mHelp = CMSAdminUtil.makeJButton(mResource, PREFIX, "HELP", null, this); - + //JButton[] buttons = { mOK, mCancel, mHelp}; JButton[] buttons = { mOK, mCancel}; JButtonFactory.resize( buttons ); @@ -276,7 +276,7 @@ public class CMSPassword extends JDialog getRootPane().setDefaultButton(mOK); } } - + /** * Inner class which handles key events for JTextField components. */ diff --git a/base/console/src/com/netscape/admin/certsrv/CMSRAUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSRAUILoader.java index b2103a34e..9ba836db4 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSRAUILoader.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSRAUILoader.java @@ -54,27 +54,27 @@ public class CMSRAUILoader implements ISubSystemUILoader { public void register() { //register subsystem UI try { - + //task tab IPage task = mUIFramework.getPage(CMSPageFeeder.TASK_TAB_TYPE,""); - + //config tab CMSResourcePage page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"CONFIGURATION"); CMSBaseResourceModel model = (CMSBaseResourceModel) page.getModel(); populateConfigContent(model); - + /*repos tab page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"CONTENT"); model = (CMSBaseResourceModel) page.getModel(); populateRepositoryContent(model); */ - + /*acl tab page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"ACCESSCONTROLLIST"); model = (CMSBaseResourceModel) page.getModel(); - populateACLContent(model); + populateACLContent(model); */ - + }catch(Exception e) { Debug.println("CMSRAUILoader: register() config - "+e.toString()); } @@ -128,7 +128,7 @@ public class CMSRAUILoader implements ISubSystemUILoader { list.setIcon( CMSAdminUtil.getImage(CMSAdminResources.IMAGE_FOLDER)); list.setAllowsChildren(true); list.setCustomPanel(tabPane); - + //policies sub node CMSResourceObject node2; node = new CMSResourceObject("POLICIES"); @@ -167,14 +167,14 @@ public class CMSRAUILoader implements ISubSystemUILoader { notificationNode.setAllowsChildren(false); list.add(notificationNode); - + /* servlet sub node - XXX NOT FOR B1 CMSResourceObject node3; node3 = new CMSResourceObject("SERVLET"); CMSUGTabPanel tabPane3 = new CMSUGTabPanel(model, node3); - tabPane3.addTab(new ServletInstanceTab(model, + tabPane3.addTab(new ServletInstanceTab(model, DestDef.DEST_RA_SERVLET_ADMIN)); - tabPane3.addTab(new ServletImplTab(model, + tabPane3.addTab(new ServletImplTab(model, DestDef.DEST_RA_SERVLET_ADMIN)); node3.setCustomPanel(tabPane3); node3.setIcon(CMSAdminUtil.getImage(CMSAdminResources.IMAGE_SERVLETOBJECT)); @@ -192,7 +192,7 @@ public class CMSRAUILoader implements ISubSystemUILoader { node.setAllowsChildren(false); list.add(node); */ - + /*backup restore sub node node = new CMSResourceObject("BACKUP"); tabPane = new CMSTabPanel(model, node); @@ -203,7 +203,7 @@ public class CMSRAUILoader implements ISubSystemUILoader { node.setAllowsChildren(false); list.add(node); */ - + //ldap publishing //node = new CMSResourceObject("PUBLISHING"); //tabPane = new CMSTabPanel(model, node); @@ -224,14 +224,14 @@ public class CMSRAUILoader implements ISubSystemUILoader { node.setAllowsChildren(false); list.add(node); */ - + model.addSubSystemNode(list); } - + /* protected void populateRepositoryContent(CMSBaseResourceModel model) { CMSResourceObject list, node; - + //ra repositories node list = new CMSResourceObject("RAREPOSITORIES"); list.setCustomPanel(new CMSBlankPanel(model)); @@ -259,7 +259,7 @@ public class CMSRAUILoader implements ISubSystemUILoader { node.setCustomPanel(new CMSBlankPanel(model)); node.setIcon( CMSAdminUtil.getImage(CMSAdminResources.IMAGE_DOCUMENT)); node.setAllowsChildren(false); - list.add(node); + list.add(node); } */ diff --git a/base/console/src/com/netscape/admin/certsrv/CMSResourceObject.java b/base/console/src/com/netscape/admin/certsrv/CMSResourceObject.java index f0f5d38b0..355664fbe 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSResourceObject.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSResourceObject.java @@ -40,7 +40,7 @@ public class CMSResourceObject extends ResourceObject { private JPanel mRightPane; private String mNickName; protected ResourceBundle mResource = ResourceBundle.getBundle(CMSAdminResources.class.getName()); - + /*========================================================== * constructors *==========================================================*/ @@ -89,9 +89,9 @@ public class CMSResourceObject extends ResourceObject { * Returns the internal nickname for this resource object */ public String getNickName() { - return mNickName; + return mNickName; } - + /** * Returns the AWT Component that is displayed in the right hand pane * of the resource page. @@ -110,7 +110,7 @@ public class CMSResourceObject extends ResourceObject { public void setCustomPanel(JPanel panel) { mRightPane = panel; } - + protected MenuItemText getMenuItemText(String keyword) { ResourceBundle mResource = ResourceBundle.getBundle( CMSAdminResources.class.getName()); @@ -121,6 +121,6 @@ public class CMSResourceObject extends ResourceObject { if (desc == null) desc = " "; return new MenuItemText( keyword, name, desc); - } + } } diff --git a/base/console/src/com/netscape/admin/certsrv/CMSResourcePage.java b/base/console/src/com/netscape/admin/certsrv/CMSResourcePage.java index 9ad03515d..3eb97bd1b 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSResourcePage.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSResourcePage.java @@ -36,11 +36,11 @@ public class CMSResourcePage extends ResourcePage implements Cloneable { * variables *==========================================================*/ protected IMenuInfo mMenuInfo; // menu information delegation - + /*========================================================== * constructors *==========================================================*/ - + /** * Return ResourcePage using the data model specified. */ @@ -55,7 +55,7 @@ public class CMSResourcePage extends ResourcePage implements Cloneable { /*========================================================== * public methods *==========================================================*/ - + /** * Need to overwrite this one to clone * DSResourcePage instead of ResourcePage @@ -76,7 +76,7 @@ public class CMSResourcePage extends ResourcePage implements Cloneable { public JTree getTree() { return (JTree)_tree; } - + /** * Implements TreeSelectionListener. Called when an object is selected * in the resource tree. Informs IResourceModelListeners of this event. @@ -89,12 +89,12 @@ public class CMSResourcePage extends ResourcePage implements Cloneable { setCustomPanel(_model.getCustomPanel(this, selection[0])); } _model.actionObjectSelected(this, selection, getPreviousSelection()); - + //the selected node not necessary the original selection //in case of not allow to change _previousSelection = getSelection(); } - + /** * Called internally when page is unselected */ @@ -102,7 +102,7 @@ public class CMSResourcePage extends ResourcePage implements Cloneable { super.pageUnselected(framework); //check if the data is not saved } - + /** * Initializes page. Called after construction or after clonePage(). * The reference to IFramework allows this page to set menu items, status @@ -111,11 +111,11 @@ public class CMSResourcePage extends ResourcePage implements Cloneable { */ public void initialize(IFramework framework) { //Debug.println("CMSResourcePage - initialize() "+mMenuInfo); - super.initialize(framework); + super.initialize(framework); if (mMenuInfo != null) addMenuItems(mMenuInfo , _menuInfoAction); } - + /** * Set and replace the existing menuInfo delegation object */ @@ -123,7 +123,7 @@ public class CMSResourcePage extends ResourcePage implements Cloneable { //Debug.println("CMSResourcePage - setMenuInfo() "+menuInfo); mMenuInfo = menuInfo; } - + /** * Retrieve IMenuInfo object */ @@ -133,7 +133,7 @@ public class CMSResourcePage extends ResourcePage implements Cloneable { } return mMenuInfo; } - + /** * Start the zipping status bar */ @@ -148,7 +148,7 @@ public class CMSResourcePage extends ResourcePage implements Cloneable { public void progressStop() { //XXX COMEBACK AFTER UPGRADE _statusItemProgress.stop(); - } - + } + } diff --git a/base/console/src/com/netscape/admin/certsrv/CMSServerInfo.java b/base/console/src/com/netscape/admin/certsrv/CMSServerInfo.java index d2d64b3fc..9c3a702a7 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSServerInfo.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSServerInfo.java @@ -34,10 +34,10 @@ import com.netscape.admin.certsrv.connection.*; * @version $Revision$, $Date$ */ public class CMSServerInfo implements IConnectionListener { - + /*========================================================== * variables - *==========================================================*/ + *==========================================================*/ private static final String PREFIX = "SERVER"; private AdminConnection mAdmin = null; // srever entry point private String mHost = null; // server host @@ -48,7 +48,7 @@ public class CMSServerInfo implements IConnectionListener { private String mUserid = null; // user id private String mInstallDate = null; // server install date private String mPassword = null; // user password - private String mPath = null; + private String mPath = null; private Vector mSubsystem = new Vector(); /*========================================================== @@ -56,8 +56,8 @@ public class CMSServerInfo implements IConnectionListener { *==========================================================*/ public CMSServerInfo(String host, int port, String userid, String password, String serverid, String installDate, String version, - String serverRoot, String path) - throws EAdminException + String serverRoot, String path) + throws EAdminException { mHost = host; @@ -69,20 +69,20 @@ public class CMSServerInfo implements IConnectionListener { mInstallDate = installDate; mServerRoot = serverRoot; mPath = path; - + Debug.println("CMSServerInfo: host "+mHost+" port "+mPort+ " userid "+mUserid+" serverRoot "+mServerRoot+" serverid "+mServerId); mAdmin = new AdminConnection( - new BasicAuthenticator(mUserid, mPassword), + new BasicAuthenticator(mUserid, mPassword), new SSLConnectionFactory(SSLConnectionFactory.JSS_CONNECTION), true /* KeepAlive */, mHost, mPort, mPath); - mAdmin.setConnectionListener(this); + mAdmin.setConnectionListener(this); } /*========================================================== * public methods *==========================================================*/ - + public void restartCallback() { JFrame frame = UtilConsoleGlobals.getActivatedFrame(); if (frame != null) { @@ -94,24 +94,24 @@ public class CMSServerInfo implements IConnectionListener { } public void ping() throws EAdminException { - + // Need to do authentication here NameValuePairs config = new NameValuePairs(); config.put(Constants.PR_PING, ""); - + NameValuePairs response; - + response = mAdmin.read(DestDef.DEST_AUTH_ADMIN, ScopeDef.SC_AUTH, Constants.RS_ID_CONFIG, config); - + if (!response.get(Constants.PR_PING).equalsIgnoreCase(Constants.TRUE)) { Debug.println("Ping failed -> Server off"); throw new EAdminException("PING_FAILED",false); } } - + public void authenticate() throws EAdminException { mAdmin.auth(DestDef.DEST_AUTH_ADMIN, ScopeDef.SC_AUTH); } @@ -131,27 +131,27 @@ public class CMSServerInfo implements IConnectionListener { public int getPort() { return mPort; } - + public String getUserId() { - return mUserid; + return mUserid; } - + public String getServerId() { - return mServerId; + return mServerId; } public String getServerRoot() { - return mServerRoot; + return mServerRoot; } public String getServerVersion() { return mServerVersion; } - + public String getInstallDate() { - return mInstallDate; + return mInstallDate; } - + public Object clone() { try { return new CMSServerInfo(mHost, mPort, mUserid, mPassword, @@ -160,13 +160,13 @@ public class CMSServerInfo implements IConnectionListener { return null; } } - + public Vector getInstalledSubsystems() { return mSubsystem; } - + public void setInstalledSubsystems(Vector subsystem) { mSubsystem = subsystem; } - + } diff --git a/base/console/src/com/netscape/admin/certsrv/CMSTaskModel.java b/base/console/src/com/netscape/admin/certsrv/CMSTaskModel.java index c3451609d..e4a55bc91 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSTaskModel.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSTaskModel.java @@ -45,12 +45,12 @@ public class CMSTaskModel extends TaskModel implements IMenuInfo { * variables *==========================================================*/ private static String PREFIX = "CMSTASKMODEL_NODE_"; - + private static final String PREFERENCES_TASK_TAB = "TaskTab"; private static final String PREFERENCES_TASK_LIST = "TaskList"; - + static public String MENU_KEYCERT = CMSAdminResources.MENU_KEYCERT; - static public String MENU_KEYCERT_MANAGEMENT = + static public String MENU_KEYCERT_MANAGEMENT = CMSAdminResources.MENU_KEYCERT_MANAGEMENT; static public String MENU_PKCS11 = CMSAdminResources.MENU_PKCS11; static public String REF_TASKMODEL = "CMSTASKMODEL"; @@ -63,7 +63,7 @@ public class CMSTaskModel extends TaskModel implements IMenuInfo { /*========================================================== * constructors *==========================================================*/ - + public CMSTaskModel(ConsoleInfo ci, CMSServerInfo serverInfo) { mServerInfo = serverInfo; mResource = ResourceBundle.getBundle(CMSAdminResources.class.getName()); @@ -74,14 +74,14 @@ public class CMSTaskModel extends TaskModel implements IMenuInfo { /*========================================================== * public methods *==========================================================*/ - + /** * getServerInfo() */ public CMSServerInfo getServerInfo() { return mServerInfo; } - + /** * Returns supported menu categories */ @@ -106,8 +106,8 @@ public class CMSTaskModel extends TaskModel implements IMenuInfo { return null; } - public void actionObjectSelected(IPage viewInstance, - ITaskObject selection, + public void actionObjectSelected(IPage viewInstance, + ITaskObject selection, ITaskObject previousSelection) { super.actionObjectSelected(viewInstance, selection, previousSelection); mSelection = selection; @@ -140,7 +140,7 @@ public class CMSTaskModel extends TaskModel implements IMenuInfo { desc = " "; return new MenuItemText( keyword, name, desc); } - + private void init() { TaskObject root = new TaskObject( "root", mConsoleInfo ); root.setAllowsChildren(true); @@ -244,8 +244,8 @@ public class CMSTaskModel extends TaskModel implements IMenuInfo { } catch ( LDAPException e ) { Debug.println( "CMSTaskModel.findTasks: " + e.toString() ); } - } - + } + //get task orders private String findTaskOrder( String base ) { String order = null; @@ -283,6 +283,6 @@ public class CMSTaskModel extends TaskModel implements IMenuInfo { ex ); } return order; - } + } } diff --git a/base/console/src/com/netscape/admin/certsrv/CMSTaskObject.java b/base/console/src/com/netscape/admin/certsrv/CMSTaskObject.java index 5999ab833..e808a7409 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSTaskObject.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSTaskObject.java @@ -50,7 +50,7 @@ public class CMSTaskObject extends TaskObject mResource = ResourceBundle.getBundle(CMSAdminResources.class.getName()); } - public CMSTaskObject(CMSServerInfo serverInfo, String name, + public CMSTaskObject(CMSServerInfo serverInfo, String name, ConsoleInfo info) { super(name, info); mServerInfo = serverInfo; @@ -67,5 +67,5 @@ public class CMSTaskObject extends TaskObject public CMSServerInfo getServerInfo() { return mServerInfo; } - + } diff --git a/base/console/src/com/netscape/admin/certsrv/CMSUIFramework.java b/base/console/src/com/netscape/admin/certsrv/CMSUIFramework.java index 13028b003..2a4eb11bc 100644 --- a/base/console/src/com/netscape/admin/certsrv/CMSUIFramework.java +++ b/base/console/src/com/netscape/admin/certsrv/CMSUIFramework.java @@ -49,7 +49,7 @@ public class CMSUIFramework { /*========================================================== * constructors *==========================================================*/ - public CMSUIFramework(ConsoleInfo info, CMSServerInfo serverInfo) + public CMSUIFramework(ConsoleInfo info, CMSServerInfo serverInfo) throws EAdminException { mConsoleInfo = info; @@ -70,22 +70,22 @@ public class CMSUIFramework { public void setSubSystemLocator(ISubSystemLocator locator) { mSubSystemLocator = locator; } - + public IPage getPage(String type, String name) throws EAdminException { return mPageFeeder.getPage(type, name); } - + public Framework getFramework() { - return mFramework; + return mFramework; } - + public boolean isNTEnv() throws EAdminException { Debug.println("CMSUIFramework - isNTEnv()"); NameValuePairs response; AdminConnection conn = mServerInfo.getAdmin(); response = conn.search(DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_PLATFORM, new NameValuePairs()); - if (response == null) + if (response == null) throw new EAdminException("PROTOCOL_ERROR",false); if (response.get(Constants.PR_NT).equals(Constants.TRUE)) return true; @@ -99,12 +99,12 @@ public class CMSUIFramework { //initialize the kernel UI CMSKernelUILoader kernelUI = new CMSKernelUILoader(this); kernelUI.register(); - + //load subsystem information. if no locator specified use default if (mSubSystemLocator == null) mSubSystemLocator = new DefaultSubSystemLocator(); SubSystemInfo[] subsystems = mSubSystemLocator.getInstalledSubSystem(); - + //delegate UI loading to each subsystem loader UILoaderRegistry registry = new UILoaderRegistry(this); Vector subsystemList = new Vector(); @@ -114,14 +114,14 @@ public class CMSUIFramework { ISubSystemUILoader loader = registry.getUILoader(subsystems[i].mType); loader.register(); } catch (Exception e) { - Debug.println("Error loading subsystem UI - "+e.toString()); + Debug.println("Error loading subsystem UI - "+e.toString()); } } - + //set subsystem setting mServerInfo.setInstalledSubsystems(subsystemList); } - + } //===================================================================== @@ -134,7 +134,7 @@ class UILoaderRegistry { private final String PREFIX = "UILOADERREGISTRY_"; private Hashtable mContent = new Hashtable(); private ResourceBundle mResource; // resource boundle - + public UILoaderRegistry(CMSUIFramework uiFramework) { mResource = ResourceBundle.getBundle(CMSAdminResources.class.getName()); mContent.put(Constants.PR_CA_INSTANCE,new CMSCAUILoader(uiFramework)); @@ -143,7 +143,7 @@ class UILoaderRegistry { mContent.put(Constants.PR_OCSP_INSTANCE,new CMSOCSPUILoader(uiFramework)); //mContent.put("ccm",new CMSCCMUILoader(uiFramework)); } - + public ISubSystemUILoader getUILoader(String type) throws EAdminException { if (!mContent.containsKey(type)) { Debug.println("Error Loading Subsystem UI Loader"); @@ -159,7 +159,7 @@ class UILoaderRegistry { * Info container for the sub system */ class SubSystemInfo { - String mType; + String mType; String mNickName; } @@ -173,7 +173,7 @@ interface ISubSystemLocator { //XXX DUMMY that just returned with all components //XXX installed on the srever side class DefaultSubSystemLocator implements ISubSystemLocator { - + public SubSystemInfo[] getInstalledSubSystem() throws EAdminException { SubSystemInfo[] subsystems = new SubSystemInfo[4]; for (int i=0; i< subsystems.length; i++) @@ -185,7 +185,7 @@ class DefaultSubSystemLocator implements ISubSystemLocator { //subsystems[3].mType="ccm"; if (true) return subsystems; - //this should never be called + //this should never be called throw new EAdminException("DefaultSubSystemLocator - error loading",true); } } @@ -196,11 +196,11 @@ class DefaultSubSystemLocator implements ISubSystemLocator { */ class HTTPSSubSystemLocator implements ISubSystemLocator { private AdminConnection mConnection; - + public HTTPSSubSystemLocator(AdminConnection conn) { mConnection = conn; } - + public SubSystemInfo[] getInstalledSubSystem() throws EAdminException { NameValuePairs input = getSubSystem(); Debug.println("getInstalledSubSystem() - "+input.toString()); @@ -216,7 +216,7 @@ class HTTPSSubSystemLocator implements ISubSystemLocator { } return subsystems; } - + private NameValuePairs getSubSystem() throws EAdminException { Debug.println("CMSUIFramework - getSubSystem() - started"); NameValuePairs response; @@ -224,12 +224,12 @@ class HTTPSSubSystemLocator implements ISubSystemLocator { ScopeDef.SC_SUBSYSTEM, new NameValuePairs()); if (response == null) { - throw new EAdminException("PROTOCOL_ERROR",false); + throw new EAdminException("PROTOCOL_ERROR",false); } Debug.println("CMSUIFramework - getSubSystem() - completed"); return response; } - + } /* diff --git a/base/console/src/com/netscape/admin/certsrv/Console.java b/base/console/src/com/netscape/admin/certsrv/Console.java index c9684583a..ca0bfcb2e 100644 --- a/base/console/src/com/netscape/admin/certsrv/Console.java +++ b/base/console/src/com/netscape/admin/certsrv/Console.java @@ -327,21 +327,21 @@ public class Console implements CommClient { * Called by createPerInstanceUI(). */ private String serverIDtoDN(String id) { - + LDAPConnection ldc = _info.getLDAPConnection(); Vector instances = new Vector(); - + try { LDAPSearchResults res = ldc.search( - "o=netscapeRoot", + "o=netscapeRoot", LDAPConnection.SCOPE_SUB, "(nsServerID=" + id + ")", new String[]{"dn"}, false); - + while (res.hasMoreElements()) { LDAPEntry hostEntry = res.next(); instances.addElement(hostEntry.getDN()); - } + } if (instances.size() == 0) { System.err.println("Server instance " + id + " does not exist."); @@ -351,11 +351,11 @@ public class Console implements CommClient { id = (String) instances.elementAt(0); } else { - + if (_splashScreen != null) { _splashScreen.setVisible(false); } - + int idx = -1; while (idx == -1) { System.out.println("\nThere are multiple instances of server \"" + id + "\":\n"); @@ -374,7 +374,7 @@ public class Console implements CommClient { } catch (Exception ignore) {} } - + if (idx >=1 && idx <= instances.size()) { idx = idx - 1; } @@ -398,11 +398,11 @@ public class Console implements CommClient { } protected void createPerInstanceUI(String host) { - + if (!DN.isDN(host)) { host = serverIDtoDN(host); } - + LDAPConnection ldc = _info.getLDAPConnection(); String configDN = "cn=configuration," + host; try { @@ -499,7 +499,7 @@ public class Console implements CommClient { common_init(language); String userid = uid; String password = passwd; - + if (userid == null) { userid = _preferences.getString(PREFERENCE_UID); } @@ -508,10 +508,10 @@ public class Console implements CommClient { if(lastUsedURL != null) { recentURLs.addElement(lastUsedURL); if(adminURL == null) { - adminURL = lastUsedURL; + adminURL = lastUsedURL; } } - + if(adminURL == null) { adminURL = localAdminURL; } @@ -621,7 +621,7 @@ public class Console implements CommClient { if (rememberUserid) { _preferences.set(PREFERENCE_UID, userid); _preferences.set(PREFERENCE_URL, adminURL); - + String recentlyUsedURL; int count = 1; Enumeration urlEnum = recentURLs.elements(); @@ -630,7 +630,7 @@ public class Console implements CommClient { if(!recentlyUsedURL.equals(adminURL)) _preferences.set(PREFERENCE_URL+Integer.toString(count++), recentlyUsedURL); } - + for(; count < MAX_RECENT_URLS; count++) { _preferences.remove(PREFERENCE_URL+Integer.toString(count)); } @@ -659,7 +659,7 @@ public class Console implements CommClient { _splashScreen.dispose(); com.netscape.management.client.console.SplashScreen.removeInstance(); _splashScreen = null; - + break; } } @@ -1531,7 +1531,7 @@ public class Console implements CommClient { static public void main(String argv[]) { GetOpt opt = new GetOpt("h:a:A:f:l:u:w:s:D:x:", argv); - + if (opt.hasOption('f')) { String outFile = opt.getOptionParam('f'); try { @@ -1573,7 +1573,7 @@ public class Console implements CommClient { Debug.println(0, "Management-Console/" + - _resource.getString("console","displayVersion") + + _resource.getString("console","displayVersion") + " B" + VersionInfo.getBuildNumber()); if (opt.hasOption('x')) { @@ -1614,7 +1614,7 @@ public class Console implements CommClient { System.exit(0); } - // bug 353403: -a option intended for end-user to + // bug 353403: -a option intended for end-user to // specify default admin url. This option overrides // -A option. String sAdminURL = null; @@ -1782,7 +1782,7 @@ class TeeStream extends PrintStream { /** * An internal class used to wrap the parameters of an * authentication request. - * + * * @author David Tompkins, 12/13/97 */ class Response { diff --git a/base/console/src/com/netscape/admin/certsrv/CustomComboBox.java b/base/console/src/com/netscape/admin/certsrv/CustomComboBox.java index c76c36006..b8014ce52 100644 --- a/base/console/src/com/netscape/admin/certsrv/CustomComboBox.java +++ b/base/console/src/com/netscape/admin/certsrv/CustomComboBox.java @@ -41,14 +41,14 @@ public class CustomComboBox extends JComboBox { } class CustomCellRenderer extends JLabel implements ListCellRenderer { - + final static Color selectedCellBackground = new Color(0,0,128); final static Color selectedCellForeground = Color.white; final static Color defaultCellBackground = Color.white; final static Color defaultCellForeground = Color.black; final static String SELECTION_TITLE = CustomComboBoxModel.SELECTION_TITLE; final static String SELECTION_ICON = CustomComboBoxModel.SELECTION_ICON; - + CustomComboBox combobox; public CustomCellRenderer(CustomComboBox x) { @@ -72,7 +72,7 @@ class CustomCellRenderer extends JLabel implements ListCellRenderer { setBackground(defaultCellBackground); setForeground(defaultCellForeground); } - + return this; } } diff --git a/base/console/src/com/netscape/admin/certsrv/CustomComboBoxModel.java b/base/console/src/com/netscape/admin/certsrv/CustomComboBoxModel.java index c97beeb5b..bcbc17feb 100644 --- a/base/console/src/com/netscape/admin/certsrv/CustomComboBoxModel.java +++ b/base/console/src/com/netscape/admin/certsrv/CustomComboBoxModel.java @@ -34,10 +34,10 @@ import javax.swing.event.*; * @see CustomComboBox */ class CustomComboBoxModel extends AbstractListModel implements ComboBoxModel { - + /*========================================================== * constructors - *==========================================================*/ + *==========================================================*/ public CustomComboBoxModel() { _cache = new Vector(); _index = new Vector(); @@ -46,7 +46,7 @@ class CustomComboBoxModel extends AbstractListModel implements ComboBoxModel { /*========================================================== * public methods *==========================================================*/ - + /** * set selected item * DO NOT USE!!! @@ -86,7 +86,7 @@ class CustomComboBoxModel extends AbstractListModel implements ComboBoxModel { return null; } } - + /** * set default icon * @param icon new icon to be used @@ -107,8 +107,8 @@ class CustomComboBoxModel extends AbstractListModel implements ComboBoxModel { newItem.put(SELECTION_DATA, data); _cache.addElement(newItem); _index.addElement(title.toUpperCase()); - } - + } + /** * Add new list entry into model * @param icon new icon associated @@ -121,7 +121,7 @@ class CustomComboBoxModel extends AbstractListModel implements ComboBoxModel { _cache.addElement(newItem); _index.addElement(title.toUpperCase()); } - + /** * Add new list entry into model. * Default icon used @@ -134,14 +134,14 @@ class CustomComboBoxModel extends AbstractListModel implements ComboBoxModel { _cache.addElement(newItem); _index.addElement(title.toUpperCase()); } - + /** * Remove all entries from the model */ public void removeAll() { _cache.removeAllElements(); } - + /** * Remove specific entry from the model * @param key key string associated with the entry @@ -153,15 +153,15 @@ class CustomComboBoxModel extends AbstractListModel implements ComboBoxModel { _index.removeElementAt(x); } } - + /*========================================================== * variables *==========================================================*/ - + public static final String SELECTION_TITLE = "title"; public static final String SELECTION_ICON = "icon"; public static final String SELECTION_DATA = "data"; - + private Object _currentValue; private Vector _cache; private Vector _index; diff --git a/base/console/src/com/netscape/admin/certsrv/EAdminException.java b/base/console/src/com/netscape/admin/certsrv/EAdminException.java index acb5ab6ce..558cc71bb 100644 --- a/base/console/src/com/netscape/admin/certsrv/EAdminException.java +++ b/base/console/src/com/netscape/admin/certsrv/EAdminException.java @@ -131,7 +131,7 @@ public class EAdminException extends Exception { return super.getMessage(); } } - + /** * Returns the message or message tag unconvrted */ diff --git a/base/console/src/com/netscape/admin/certsrv/GenericCellEditor.java b/base/console/src/com/netscape/admin/certsrv/GenericCellEditor.java index b26b9f9f9..2412c32ea 100644 --- a/base/console/src/com/netscape/admin/certsrv/GenericCellEditor.java +++ b/base/console/src/com/netscape/admin/certsrv/GenericCellEditor.java @@ -42,7 +42,7 @@ public class GenericCellEditor implements TableCellEditor, Serializable { protected JComponent editorComponent; protected JTextField mTextField = new JTextField(); protected JPasswordField mPasswordField = new JPasswordField(); - + protected EditorDelegate delegate = new EditorDelegate(); protected int clickCounts = 2; @@ -58,7 +58,7 @@ public class GenericCellEditor implements TableCellEditor, Serializable { Vector v = (Vector)(((CMSContentTableModel)model).getObjectValueAt(row)); delegate.setValue(value, v); - + return editorComponent; } diff --git a/base/console/src/com/netscape/admin/certsrv/GenericCellRenderer.java b/base/console/src/com/netscape/admin/certsrv/GenericCellRenderer.java index 34d69e37e..0045a31a7 100644 --- a/base/console/src/com/netscape/admin/certsrv/GenericCellRenderer.java +++ b/base/console/src/com/netscape/admin/certsrv/GenericCellRenderer.java @@ -49,7 +49,7 @@ public class GenericCellRenderer static Color HIGHLIGHTCOLOR = new Color(0, 0, 128); static Color WHITECOLOR = Color.white; static Color BLACKCOLOR = Color.black; - + /*========================================================== * constructors *==========================================================*/ @@ -78,11 +78,11 @@ public class GenericCellRenderer int row, int column) { TableModel model = table.getModel(); if(value == null) { - - value = model.getValueAt(row, column); + + value = model.getValueAt(row, column); } Vector v = (Vector)(((CMSContentTableModel)model).getObjectValueAt(row)); - this.value.setValue(value, v); + this.value.setValue(value, v); component.setBackground(isSelected ? HIGHLIGHTCOLOR : WHITECOLOR); component.setForeground(isSelected ? WHITECOLOR : BLACKCOLOR); return component; @@ -102,7 +102,7 @@ public class GenericCellRenderer mLabel.setFont(temp.getFont()); } component = mLabel; - + StringBuffer buf = new StringBuffer(); for(int i=0; i< ((String)x).length(); i++) buf.append("*"); @@ -129,7 +129,7 @@ public class GenericCellRenderer } else if (type.equals(Constants.COMBOTYPE)) { String[] items = (String[])v.elementAt(1); - if (mComboBox == null) + if (mComboBox == null) mComboBox = new JComboBox(items); else { mComboBox.removeAllItems(); @@ -146,7 +146,7 @@ public class GenericCellRenderer mComboBox.setSelectedItem(str); } } - + } } diff --git a/base/console/src/com/netscape/admin/certsrv/IDisplayPanel.java b/base/console/src/com/netscape/admin/certsrv/IDisplayPanel.java index 1a855ef22..e3ee2edf0 100644 --- a/base/console/src/com/netscape/admin/certsrv/IDisplayPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/IDisplayPanel.java @@ -33,11 +33,11 @@ public interface IDisplayPanel { /** * Set the data associated with this ui */ - public boolean setDisplayPanelContent(IAttributeContent content); - + public boolean setDisplayPanelContent(IAttributeContent content); + /** * Retrieve the error message to be displayed to the user */ - public String getErrorMessage(); + public String getErrorMessage(); }
\ No newline at end of file diff --git a/base/console/src/com/netscape/admin/certsrv/IRefreshTab.java b/base/console/src/com/netscape/admin/certsrv/IRefreshTab.java index c69bedc4c..649932482 100644 --- a/base/console/src/com/netscape/admin/certsrv/IRefreshTab.java +++ b/base/console/src/com/netscape/admin/certsrv/IRefreshTab.java @@ -19,7 +19,7 @@ package com.netscape.admin.certsrv; /** * The interface for refreshing the tab. - * + * * @author Christine Ho * @version $Revision$, $Date$ * @@ -28,7 +28,7 @@ package com.netscape.admin.certsrv; * @see com.netscape.admin.certsrv.CMSBaseResourceModel */ public interface IRefreshTab { - + /** * fresh the panel. The panel should IGNOR all * modification made, retrieve the old value @@ -36,6 +36,6 @@ public interface IRefreshTab { * components on this panel. */ public void refresh(); - + } diff --git a/base/console/src/com/netscape/admin/certsrv/IRefreshTabPanel.java b/base/console/src/com/netscape/admin/certsrv/IRefreshTabPanel.java index bc657b0db..6777e9fa0 100644 --- a/base/console/src/com/netscape/admin/certsrv/IRefreshTabPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/IRefreshTabPanel.java @@ -27,12 +27,12 @@ package com.netscape.admin.certsrv; * @see com.netscape.admin.certsrv.CMSBaseResourceModel */ public interface IRefreshTabPanel { - + /** - * Get Selected Tab from Tab panel + * Get Selected Tab from Tab panel */ public CMSBasePanel getSelectedTab(); - - + + } diff --git a/base/console/src/com/netscape/admin/certsrv/IUIMapper.java b/base/console/src/com/netscape/admin/certsrv/IUIMapper.java index e24e38664..adbf8ab31 100644 --- a/base/console/src/com/netscape/admin/certsrv/IUIMapper.java +++ b/base/console/src/com/netscape/admin/certsrv/IUIMapper.java @@ -53,37 +53,37 @@ public interface IUIMapper { * @return description or null if none */ public String getDesc(); - + /** * Is this UI provide edit panel */ - public boolean isEditable(); - + public boolean isEditable(); + /** * Is this UI Provide display panel */ - public boolean isDisplayable(); - + public boolean isDisplayable(); + /** * Is this UI provide search filter panel */ - public boolean isFilterable(); - + public boolean isFilterable(); + /** * retrieve Editor Panel * isEditable() will be called before this operation is * used. */ - public IEditorPanel getEditorPanel(); - + public IEditorPanel getEditorPanel(); + /** * retrieve Display Panel */ - public IDisplayPanel getDisplayPanel(); - + public IDisplayPanel getDisplayPanel(); + /** * Retrieve Filter Panel */ - public IFilterPanel getFilterPanel(); + public IFilterPanel getFilterPanel(); } diff --git a/base/console/src/com/netscape/admin/certsrv/LabelCellRenderer.java b/base/console/src/com/netscape/admin/certsrv/LabelCellRenderer.java index ea41f6b45..e3682c248 100644 --- a/base/console/src/com/netscape/admin/certsrv/LabelCellRenderer.java +++ b/base/console/src/com/netscape/admin/certsrv/LabelCellRenderer.java @@ -42,7 +42,7 @@ public class LabelCellRenderer public final static Color HIGHLIGHTCOLOR = new Color(0, 0, 128); public final static Color WHITECOLOR = Color.white; public final static Color BLACKCOLOR = Color.black; - + /*========================================================== * constructors *==========================================================*/ @@ -77,9 +77,9 @@ public class LabelCellRenderer int row, int column) { if(value == null) { - value = table.getModel().getValueAt(row, column); + value = table.getModel().getValueAt(row, column); } - this.value.setValue(value); + this.value.setValue(value); component.setBackground(isSelected ? HIGHLIGHTCOLOR : WHITECOLOR); component.setForeground(isSelected ? WHITECOLOR : BLACKCOLOR); return component; @@ -108,7 +108,7 @@ public class LabelCellRenderer ((JLabel)component).setToolTipText(((JLabel)x).getToolTipText()); } } - + } } diff --git a/base/console/src/com/netscape/admin/certsrv/UIMapperRegistry.java b/base/console/src/com/netscape/admin/certsrv/UIMapperRegistry.java index 531a0b5fc..368db2509 100644 --- a/base/console/src/com/netscape/admin/certsrv/UIMapperRegistry.java +++ b/base/console/src/com/netscape/admin/certsrv/UIMapperRegistry.java @@ -53,10 +53,10 @@ public class UIMapperRegistry { * @param mapperClassName fully qualified class name implementing UI */ /* XXX WE DON'T NEED THIS - public static void registerCertAttrUI(String className, String oid, - String attrName, String mapperClassName) + public static void registerCertAttrUI(String className, String oid, + String attrName, String mapperClassName) throws ClassNotFoundException, CertificateException - { + { Class extClass, mapClass; extClass = Class.forName(className); mapClass = Class.forName(mapperClassName); @@ -64,7 +64,7 @@ public class UIMapperRegistry { registerCertAttrUI(attrName,mapperClassName); } */ - + /** * internal register new cert attr * @@ -74,14 +74,14 @@ public class UIMapperRegistry { */ public static void registerCertAttrUI(String attrName, String mapperClassName) { mAttrContent.put(attrName, mapperClassName); - } - + } + /** * Retrieve all certificate attribute name */ public static Enumeration getCertAttrNames() { return mAttrContent.keys(); - } + } /** * Retrieve all extension UI Mappers @@ -95,7 +95,7 @@ public class UIMapperRegistry { * * @param certAttrClassName certificate attribute name */ - public static IUIMapper getCertAttrUI(String certAttrClassName) + public static IUIMapper getCertAttrUI(String certAttrClassName) throws InstantiationException, IllegalAccessException, ClassNotFoundException { String mapperClassName = (String) mAttrContent.get(certAttrClassName); @@ -116,6 +116,6 @@ public class UIMapperRegistry { registry.addExtensionMapping */ } - + } diff --git a/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java index e6085f820..c1a4a9807 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java @@ -110,7 +110,7 @@ public class ACIDialog extends JDialog CMSAdminUtil.showErrorDialog(mParentFrame, mResource, msg ,CMSAdminUtil.ERROR_MESSAGE); return; - } + } } else if (evt.getSource().equals(mHelp)) { CMSAdminUtil.help(mHelpToken); } @@ -168,7 +168,7 @@ public class ACIDialog extends JDialog mAllowBtn.setSelected(true); } else if (aci.startsWith("deny")) { mDenyBtn.setSelected(true); - } + } int startIndex = aci.indexOf("("); int endIndex = aci.indexOf(")"); if ((startIndex > 0) && (endIndex > 0)) { @@ -197,7 +197,7 @@ public class ACIDialog extends JDialog String result = ""; if (!mAllowBtn.isSelected() && !mDenyBtn.isSelected()) return ""; - if (mAllowBtn.isSelected()) + if (mAllowBtn.isSelected()) result = result+"allow"+" ("; else if (mDenyBtn.isSelected()) result = result+"deny"+" ("; @@ -259,7 +259,7 @@ public class ACIDialog extends JDialog } } } - + return false; } @@ -356,7 +356,7 @@ public class ACIDialog extends JDialog private JPanel makeListPane() { JPanel listPanel = new JPanel(); - + GridBagConstraints gbc = new GridBagConstraints(); GridBagLayout gb = new GridBagLayout(); listPanel.setLayout(gb); @@ -439,7 +439,7 @@ public class ACIDialog extends JDialog gb.setConstraints(opsLabel, gbc); mainPanel.add(opsLabel); opsLabel.addMouseListener(this); - opsLabel.setName("rights"); + opsLabel.setName("rights"); mList = CMSAdminUtil.makeJList(mDataModel, 3); mScrollPane = new JScrollPane(mList, @@ -474,7 +474,7 @@ public class ACIDialog extends JDialog */ CMSAdminUtil.resetGBC(gbc); - JLabel attrLabel = CMSAdminUtil.makeJLabel(mResource, PREFIX, + JLabel attrLabel = CMSAdminUtil.makeJLabel(mResource, PREFIX, "SYNTAX", null); gbc.anchor = gbc.NORTHWEST; gbc.gridwidth = gbc.REMAINDER; diff --git a/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java index b3bcb72e1..cf3ae7dcd 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java @@ -61,7 +61,7 @@ public class ACLEditDialog extends JDialog this(admin, parent, null, null); } - public ACLEditDialog(AdminConnection admin, JFrame parent, + public ACLEditDialog(AdminConnection admin, JFrame parent, String name, String desc) { super(parent,true); mParentFrame = parent; @@ -91,12 +91,12 @@ public class ACLEditDialog extends JDialog } else if (evt.getSource().equals(mDelete)) { int index = mList.getSelectedIndex(); if (index >= 0) { - int i = CMSAdminUtil.showConfirmDialog(mParentFrame, + int i = CMSAdminUtil.showConfirmDialog(mParentFrame, mResource, PREFIX, "DELETE", CMSAdminUtil.WARNING_MESSAGE); if (i == JOptionPane.YES_OPTION) { mDataModel.removeElementAt(index); Debug.println("Deleted"); - if (mDataModel.size() > 0) + if (mDataModel.size() > 0) mList.setSelectedIndex(0); } } @@ -106,12 +106,12 @@ public class ACLEditDialog extends JDialog if (mResourceName.equals("")) { String msg = mResource.getString( PREFIX+"_DIALOG_EMPTYRESOURCEID_MESSAGE"); - CMSAdminUtil.showErrorDialog(mParentFrame, - mResource, msg, CMSAdminUtil.ERROR_MESSAGE); + CMSAdminUtil.showErrorDialog(mParentFrame, + mResource, msg, CMSAdminUtil.ERROR_MESSAGE); return; } } - + String rights = mRightsText.getText().trim(); NameValuePairs pairs = new NameValuePairs(); @@ -160,11 +160,11 @@ public class ACLEditDialog extends JDialog } } else if (evt.getSource().equals(mAdd)) { String rights = mRightsText.getText().trim(); - if (rights.equals("")) { + if (rights.equals("")) { String msg = mResource.getString( PREFIX+"_DIALOG_EMPTYRIGHTS_MESSAGE"); - CMSAdminUtil.showErrorDialog(mParentFrame, - mResource, msg, CMSAdminUtil.ERROR_MESSAGE); + CMSAdminUtil.showErrorDialog(mParentFrame, + mResource, msg, CMSAdminUtil.ERROR_MESSAGE); return; } mOperations = rights; @@ -254,7 +254,7 @@ public class ACLEditDialog extends JDialog 0,CMSAdminUtil.DIFFERENT_COMPONENT_SPACE); gb.setConstraints(helpPanel, gbc); center.add(helpPanel); - + //action panel JPanel action = makeActionPane(); CMSAdminUtil.resetGBC(gbc); @@ -277,7 +277,7 @@ public class ACLEditDialog extends JDialog mDelete.setEnabled(true); mEdit.setEnabled(true); } - + return; } @@ -312,7 +312,7 @@ public class ACLEditDialog extends JDialog //up, down buttons required //actionlister to this object mAdd = CMSAdminUtil.makeJButton(mResource, PREFIX, "ADD", null, this); - mDelete = CMSAdminUtil.makeJButton(mResource, PREFIX, "DELETE", + mDelete = CMSAdminUtil.makeJButton(mResource, PREFIX, "DELETE", null, this); mEdit = CMSAdminUtil.makeJButton(mResource, PREFIX, "EDIT", null, this); JButton[] buttons = {mAdd, mDelete, mEdit}; @@ -344,7 +344,7 @@ public class ACLEditDialog extends JDialog mHelpArea.setWrapStyleWord(true); mHelpArea.setBackground(helpPanel.getBackground()); mHelpArea.setEditable(false); - + CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.gridwidth = gbc.REMAINDER; @@ -410,7 +410,7 @@ public class ACLEditDialog extends JDialog mainPanel.add(rightsLbl); rightsLbl.setName("rights"); rightsLbl.addMouseListener(this); - + CMSAdminUtil.resetGBC(gbc); mRightsText = new JTextField(30); gbc.anchor = gbc.WEST; @@ -493,7 +493,7 @@ public class ACLEditDialog extends JDialog return mainPanel; } - private void enableTextField(JTextField textFld, boolean enabled, + private void enableTextField(JTextField textFld, boolean enabled, Color color) { textFld.setEnabled(enabled); textFld.setEditable(enabled); diff --git a/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java index 4693224b1..71735f455 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java @@ -39,7 +39,7 @@ public class ACLImplTab extends CMSBaseUGTab { private AdminConnection mConnection; private JTable mTable; private JScrollPane mScrollPane; - protected ACLImplDataModel mDataModel; + protected ACLImplDataModel mDataModel; protected EvaluatorRegisterDialog mEditor=null; protected JButton mRefresh, mAdd, mDelete, mHelp; private static final String HELPINDEX = diff --git a/base/console/src/com/netscape/admin/certsrv/config/AutoRecoveryModel.java b/base/console/src/com/netscape/admin/certsrv/config/AutoRecoveryModel.java index 90b617cbd..a227a8d49 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/AutoRecoveryModel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/AutoRecoveryModel.java @@ -37,8 +37,8 @@ public class AutoRecoveryModel extends CMSTableModel *==========================================================*/ public static final String COL1 = "NUMBER"; public static final String COL2 = "UID"; - public static final String COL3 = "PASSWORD"; - + public static final String COL3 = "PASSWORD"; + private static String[] mColumns = {COL1, COL2, COL3}; /*========================================================== diff --git a/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java b/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java index 18590747a..4cbc2edbb 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java @@ -33,7 +33,7 @@ import com.netscape.admin.certsrv.keycert.*; /** * CA certs Tab * - * @author Christine Ho + * @author Christine Ho * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.config */ @@ -47,12 +47,12 @@ public class CACertsTab extends CMSBaseUGTab { private AdminConnection mConnection; private String mDestination; private ConsoleInfo mConsoleInfo; - + protected JScrollPane mScrollPane; protected JTable mTable; //table protected ListCertsModel mDataModel; //table model protected CertViewDialog mEditor=null; //keep single copy - + protected JButton mRefresh, mAdd, mDelete, mView, mEdit, mHelp; private final static String HELPINDEX = "configuration-log-plugin-help"; @@ -162,17 +162,17 @@ public class CACertsTab extends CMSBaseUGTab { String[] params = new String[2]; if (trust.equals("U")) { params[0] = "untrusted"; - params[1] = "trust"; + params[1] = "trust"; i = showConfirmDialog("TRUST", params); } else { params[0] = "trusted"; - params[1] = "untrust"; + params[1] = "untrust"; i = showConfirmDialog("TRUST", params); } if (i == JOptionPane.YES_OPTION) { nvps.put("trustbit", params[1]); - mConnection.modify(DestDef.DEST_SERVER_ADMIN, + mConnection.modify(DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_ROOTCERT_TRUSTBIT, Constants.RS_ID_CONFIG, nvps); } @@ -189,7 +189,7 @@ public class CACertsTab extends CMSBaseUGTab { } public void mouseReleased(MouseEvent e) { - setButtons(); + setButtons(); } /*========================================================== @@ -198,8 +198,8 @@ public class CACertsTab extends CMSBaseUGTab { public void refresh() { mDataModel.removeAllRows(); - update(); - + update(); + setButtons(); mTable.invalidate(); mTable.validate(); @@ -284,7 +284,7 @@ public class CACertsTab extends CMSBaseUGTab { //set buttons private void setButtons() { - + //enable and diable buttons accordingly //Debug.println("setButtons() - "+mTable.getSelectedRow()); //Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty()); @@ -293,28 +293,28 @@ public class CACertsTab extends CMSBaseUGTab { mView.setEnabled(false); return; } - + if(mDataModel.getRowCount()<=0) { mDelete.setEnabled(false); mView.setEnabled(false); return; } - + mDelete.setEnabled(true); - mView.setEnabled(true); - + mView.setEnabled(true); + } - + //============================================= // SEND REQUESTS TO THE SERVER SIDE //============================================= private void update() { //send request and parse data - + mModel.progressStart(); NameValuePairs response; try { - response = mConnection.search(mDestination, ScopeDef.SC_ROOTCERTSLIST, + response = mConnection.search(mDestination, ScopeDef.SC_ROOTCERTSLIST, new NameValuePairs()); } catch (EAdminException e) { //display error dialog diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java index 8f1fc1f20..377e6287d 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java @@ -25,7 +25,7 @@ import java.awt.event.*; /** * Access Log Setting Tab to be displayed at the right hand side - * + * * @author Christine Ho * @version $Revision$, $Date$ */ @@ -46,7 +46,7 @@ public class CMSAccessLogPanel extends CMSBaseLogPanel { mHelpToken = HELPINDEX; mIsNT = isNT; } - + /*========================================================== * public methods *==========================================================*/ @@ -88,7 +88,7 @@ public class CMSAccessLogPanel extends CMSBaseLogPanel { } catch (EAdminException e) { showErrorDialog(e.toString()); mModel.progressStop(); - } + } setValues(); mModel.progressStop(); clearDirtyFlag(); @@ -97,14 +97,14 @@ public class CMSAccessLogPanel extends CMSBaseLogPanel { private void parseVals(NameValuePairs nvp) { if (nvp.get(Constants.PR_LOG_ENABLED).equalsIgnoreCase( - Constants.TRUE)) + Constants.TRUE)) activateLog.setSelected(true); else activateLog.setSelected(false); mLevel = Integer.parseInt(nvp.get(Constants.PR_LOG_LEVEL)); mlogBufSizTextData = nvp.get(Constants.PR_LOG_BUFFERSIZE); mlogMaxSizTextData = nvp.get(Constants.PR_LOG_MAXFILESIZE); - int val = + int val = Integer.parseInt(nvp.get(Constants.PR_LOG_ROLLEROVER_INTERVAL)); mFrequency = getRollOverIndex(val); } @@ -148,7 +148,7 @@ public class CMSAccessLogPanel extends CMSBaseLogPanel { NameValuePairs nvp = new NameValuePairs(); mModel.progressStart(); - if (activateLog.isSelected()) + if (activateLog.isSelected()) nvp.put(Constants.PR_LOG_ENABLED, Constants.TRUE); else nvp.put(Constants.PR_LOG_ENABLED, Constants.FALSE); @@ -183,13 +183,13 @@ public class CMSAccessLogPanel extends CMSBaseLogPanel { showErrorDialog(e.toString()); mModel.progressStop(); return false; - } + } clearDirtyFlag(); mModel.progressStop(); return true; } - + /** * Implementation for reset values * @return true if save successful; otherwise, false. @@ -201,8 +201,8 @@ public class CMSAccessLogPanel extends CMSBaseLogPanel { /*========================================================== * EVENT HANDLER METHODS - *==========================================================*/ - + *==========================================================*/ + //=== ACTIONLISTENER ===================== public void actionPerformed(ActionEvent e) { super.actionPerformed(e); diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java index 067b954e8..384cbc6cc 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java @@ -46,7 +46,7 @@ public class CMSAuditLogPanel extends CMSBaseLogPanel { mHelpToken = HELPINDEX; mIsNT = isNT; } - + /*========================================================== * public methods *==========================================================*/ @@ -97,14 +97,14 @@ public class CMSAuditLogPanel extends CMSBaseLogPanel { private void parseVals(NameValuePairs nvp) { if (nvp.get(Constants.PR_LOG_ENABLED).equalsIgnoreCase( - Constants.TRUE)) + Constants.TRUE)) activateLog.setSelected(true); else activateLog.setSelected(false); mLevel = Integer.parseInt(nvp.get(Constants.PR_LOG_LEVEL)); mlogBufSizTextData = nvp.get(Constants.PR_LOG_BUFFERSIZE); mlogMaxSizTextData = nvp.get(Constants.PR_LOG_MAXFILESIZE); - int val = + int val = Integer.parseInt(nvp.get(Constants.PR_LOG_ROLLEROVER_INTERVAL)); mFrequency = getRollOverIndex(val); } @@ -184,12 +184,12 @@ public class CMSAuditLogPanel extends CMSBaseLogPanel { mModel.progressStop(); return false; } - + mModel.progressStop(); clearDirtyFlag(); return true; } - + /** * Implementation for reset values * @return true if save successful; otherwise, false. @@ -201,8 +201,8 @@ public class CMSAuditLogPanel extends CMSBaseLogPanel { /*========================================================== * EVENT HANDLER METHODS - *==========================================================*/ - + *==========================================================*/ + //=== ACTIONLISTENER ===================== public void actionPerformed(ActionEvent e) { super.actionPerformed(e); diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java b/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java index ef55470c6..b29a579b4 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java @@ -74,7 +74,7 @@ public class CMSAutoRecovery extends JDialog implements ActionListener, int col = mTable.getEditingColumn(); int row = mTable.getEditingRow(); if ((col>-1)&&(row>-1)) { - String str = ((JTextComponent)component).getText(); + String str = ((JTextComponent)component).getText(); mTable.setValueAt(str, row, col); } } @@ -86,11 +86,11 @@ public class CMSAutoRecovery extends JDialog implements ActionListener, CMSAdminUtil.showMessageDialog(mParentFrame, mResource, PREFIX, "EMPTYFIELD", CMSAdminUtil.ERROR_MESSAGE); return; - } else { + } else { NameValuePairs nvps = new NameValuePairs(); nvps.put(Constants.PR_RECOVERY_AGENT, val); nvps.put(Constants.PR_AUTO_RECOVERY_ON, Constants.TRUE); - + try { mAdmin.modify(DestDef.DEST_KRA_ADMIN, ScopeDef.SC_AUTO_RECOVERY, Constants.RS_ID_CONFIG, nvps); @@ -98,7 +98,7 @@ public class CMSAutoRecovery extends JDialog implements ActionListener, CMSAdminUtil.showErrorDialog(mParentFrame, mResource, ex.getMessage(), CMSAdminUtil.ERROR_MESSAGE); } - } + } mEnable.setText(mDisableLabel); mEnable.setToolTipText(mDisableTip); mEnable.repaint(); @@ -108,7 +108,7 @@ public class CMSAutoRecovery extends JDialog implements ActionListener, cleanup(); this.dispose(); } - + } //Set the first column's cellrender as label cell @@ -151,7 +151,7 @@ public class CMSAutoRecovery extends JDialog implements ActionListener, GridBagLayout gbm = new GridBagLayout(); getContentPane().setLayout(gbm); GridBagConstraints gbc = new GridBagConstraints(); - + CMSAdminUtil.resetGBC(gbc); JLabel heading = CMSAdminUtil.makeJLabel(mResource, PREFIX, "HEADING", null); @@ -214,7 +214,7 @@ public class CMSAutoRecovery extends JDialog implements ActionListener, } private void createTable() { - + NameValuePairs nvps = new NameValuePairs(); nvps.put(Constants.PR_RECOVERY_M, ""); @@ -227,7 +227,7 @@ public class CMSAutoRecovery extends JDialog implements ActionListener, } catch (EAdminException e) { //showErrorDialog(e.toString()); } - + mDataModel = new AutoRecoveryModel(); Vector[] data = new Vector[numUsers]; for (int i=0; i<data.length; i++) { diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java index 87562829b..37d10879c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java @@ -76,7 +76,7 @@ public class CMSBaseConfigDialog extends JDialog /* true if creating a new instance * false if editing an old one */ - protected boolean mNewInstance=false; // + protected boolean mNewInstance=false; // private ExtendedPluginInfoSet mEPIs = null; protected CMSBaseResourceModel mModel = null; @@ -140,7 +140,7 @@ public class CMSBaseConfigDialog extends JDialog /** * retrieve the extended plugin information for this plugin - * from the server. The servlet must implement the scope + * from the server. The servlet must implement the scope * 'extendedPluginInfo' and the plugin must implement the * IExtendedPluginInfo interface, or else the display * will revert back to simple name-value pairs. @@ -148,12 +148,12 @@ public class CMSBaseConfigDialog extends JDialog ExtendedPluginInfoSet getExtendedPluginInfo(String implname, NameValuePairs oldstyle) { - + NameValuePairs data = new NameValuePairs(); String query = mImplType+":"+implname;//implName:pluginName NameValuePairs response=null; - if (mImplType.equals("policy") && + if (mImplType.equals("policy") && (mRuleName != null) && !mRuleName.trim().equals("")) { query = query + ":" + mRuleName; } @@ -174,7 +174,7 @@ public class CMSBaseConfigDialog extends JDialog /* if the servlet or rule wasn't capable of handling the new style * of interface, just return the names from the name/value pairs that - * were passed in + * were passed in * otherwise, for each parameter name, fetch the associated * parameter type from the extendedPluginInfo that the server * returned @@ -191,10 +191,10 @@ public class CMSBaseConfigDialog extends JDialog String ht = response.get("HELP_TOKEN"); - if (ht != null) epis.setHelpToken(ht); + if (ht != null) epis.setHelpToken(ht); String hs = response.get("HELP_TEXT"); - if (hs != null) epis.setHelpSummary(hs); + if (hs != null) epis.setHelpSummary(hs); return epis; } @@ -265,7 +265,7 @@ public class CMSBaseConfigDialog extends JDialog 0, // bottom 5); // right p.add(l,gbc); - + /* if there was no text extendedplugininfo for this parameter * just make it a text box @@ -283,7 +283,7 @@ public class CMSBaseConfigDialog extends JDialog */ comp.addFocusListener(this); - gbc.weightx = 0.7; + gbc.weightx = 0.7; gbc.fill = gbc.HORIZONTAL; gbc.gridwidth = gbc.RELATIVE; gbc.anchor = gbc.WEST; @@ -298,17 +298,17 @@ public class CMSBaseConfigDialog extends JDialog * keep it from hiting the edge of the panel */ JLabel j = new JLabel(""); - gbc.weightx = 0.1; + gbc.weightx = 0.1; gbc.fill = gbc.HORIZONTAL; gbc.gridwidth = gbc.REMAINDER; gbc.anchor = gbc.WEST; gbc.insets = new Insets( CMSAdminUtil.COMPONENT_SPACE, //top 0, //left - 0, //bottom + 0, //bottom CMSAdminUtil.COMPONENT_SPACE); // right p.add(j,gbc); - + } } @@ -352,9 +352,9 @@ public class CMSBaseConfigDialog extends JDialog return mIsOK; } - + public String getRuleName() { - return mRuleName; + return mRuleName; } /*========================================================== @@ -384,7 +384,7 @@ public class CMSBaseConfigDialog extends JDialog mHelpLabel.setText(text); mHelpLabel.repaint(); - + } /** need to supply this method for focuslistener, but we @@ -392,7 +392,7 @@ public class CMSBaseConfigDialog extends JDialog */ public void focusLost(FocusEvent f) { } - + /* * mouselistener events - for JLabel @@ -451,14 +451,14 @@ public class CMSBaseConfigDialog extends JDialog public void actionPerformed(ActionEvent evt) { if (evt.getSource().equals(mOK)) { - + /* if this is a new instance of a rule, (as opposed to editing an old one) */ if (mNewInstance) { mRuleName = mPluginName.getText(); /* make sure they set the name of the rule, otherwise, show an error message */ if (mRuleName.trim().equals("")) { CMSAdminUtil.showErrorDialog(mParentFrame, mResource, - mResource.getString("INSTANCECONFIGDIALOG_DIALOG_NOINSTANCENAME_MESSAGE"), + mResource.getString("INSTANCECONFIGDIALOG_DIALOG_NOINSTANCENAME_MESSAGE"), CMSAdminUtil.ERROR_MESSAGE); return; } @@ -466,7 +466,7 @@ public class CMSBaseConfigDialog extends JDialog else { mRuleName = mPluginLabel.getText(); } - + Debug.println(4,"User pressed okay on instance config dialog"); Enumeration e = mEPIs.keys(); NameValuePairs nvp = new NameValuePairs(); @@ -481,7 +481,7 @@ public class CMSBaseConfigDialog extends JDialog nvp.put("PASSWORD_CACHE_ADD", value + ";" + password); } } - + nvp.put(paramName, value); } nvp.put(PolicyRuleDataModel.RULE_NAME, mRuleName); @@ -509,7 +509,7 @@ public class CMSBaseConfigDialog extends JDialog ex.toString(),CMSAdminUtil.ERROR_MESSAGE); } } - + if (evt.getSource().equals(mCancel)) { this.dispose(); } @@ -591,19 +591,19 @@ public class CMSBaseConfigDialog extends JDialog /* mPluginName and mPluginLabel occupy the same space in the UI, but * only one of them is visible at a time. showDialog() determines which - * is visible. If this is a new component, mPluginName is visible, and is a + * is visible. If this is a new component, mPluginName is visible, and is a * a text field, so the user can enter the name of the new instance. * Otherwise, it's just a label, showing the existing name. */ // 'Policy Rule ID' here CMSAdminUtil.resetGBC(gbc); - mRulenameCaption = CMSAdminUtil.makeJLabel(mResource, PREFIX, + mRulenameCaption = CMSAdminUtil.makeJLabel(mResource, PREFIX, "RULENAME", null); mRulenameCaption.addMouseListener(this); mPluginLabel = new JLabel(); mPluginLabel.setVisible(false); mPluginName = new JTextField(); - + gbc.fill = gbc.NONE; gbc.weightx = 0.0; gbc.gridwidth = 1; @@ -621,10 +621,10 @@ public class CMSBaseConfigDialog extends JDialog 0,CMSAdminUtil.COMPONENT_SPACE); mListPanel.add( mPluginName, gbc ); mListPanel.add( mPluginLabel, gbc ); - + // 'Policy Plugin ID' here CMSAdminUtil.resetGBC(gbc); - mImplnameCaption = CMSAdminUtil.makeJLabel(mResource, PREFIX, + mImplnameCaption = CMSAdminUtil.makeJLabel(mResource, PREFIX, "IMPLNAME", null); mImplnameCaption.addMouseListener(this); @@ -648,7 +648,7 @@ public class CMSBaseConfigDialog extends JDialog mScrollPane = new JScrollPane(mParamPanel); mScrollPane.setBorder(CMSAdminUtil.makeEtchedBorder()); - + CMSAdminUtil.resetGBC(gbc); gbc.fill = gbc.BOTH; gbc.anchor = gbc.WEST; @@ -691,14 +691,14 @@ public class CMSBaseConfigDialog extends JDialog return mListPanel; } -} +} class ExtendedPluginInfoSet extends Hashtable { /** * Add a value for this config parameter. - * the format of 'syntax' is specified in + * the format of 'syntax' is specified in * @see com.netscape.certsrv.base.IExtendedPluginInfo */ public void add(String param, String syntax, boolean oldstyle) { @@ -725,7 +725,7 @@ class ExtendedPluginInfoSet extends Hashtable { helptext = rest; // ADDED to fix bug #383969 /* semicolon = rest.indexOf(';'); - if (semicolon == -1) { // no more semicolons + if (semicolon == -1) { // no more semicolons helptext = rest; } else { @@ -786,7 +786,7 @@ class ExtendedPluginInfoCheckBox extends JCheckBox implements ExtendedPluginInfoComponent { private ExtendedPluginInfo mEpi; - + public ExtendedPluginInfoCheckBox(ExtendedPluginInfo epi, boolean b) { super("",b); @@ -805,14 +805,14 @@ implements ExtendedPluginInfoComponent return "false"; } } - + } class ExtendedPluginInfoComboBox extends JComboBox implements ExtendedPluginInfoComponent { private ExtendedPluginInfo mEpi; - + public ExtendedPluginInfoComboBox(ExtendedPluginInfo epi, Vector v) { super(v); @@ -832,7 +832,7 @@ class ExtendedPluginInfoTextField extends JTextField implements ExtendedPluginInfoComponent { private ExtendedPluginInfo mEpi; - + public ExtendedPluginInfoTextField(ExtendedPluginInfo epi, String s) { super(s); @@ -852,7 +852,7 @@ class ExtendedPluginInfoPasswordField extends JPasswordField implements ExtendedPluginInfoComponent { private ExtendedPluginInfo mEpi; - + public ExtendedPluginInfoPasswordField(ExtendedPluginInfo epi, String s) { super(s); @@ -872,7 +872,7 @@ class ExtendedPluginInfoNumberField extends JTextField implements ExtendedPluginInfoComponent { private ExtendedPluginInfo mEpi; - + public ExtendedPluginInfoNumberField(ExtendedPluginInfo epi, String s) { super(s); @@ -893,7 +893,7 @@ implements ExtendedPluginInfoComponent static class NumberDocument extends PlainDocument { - public void insertString(int offs, String str, AttributeSet a) + public void insertString(int offs, String str, AttributeSet a) throws BadLocationException { if (str == null) { @@ -902,9 +902,9 @@ implements ExtendedPluginInfoComponent char[] chars = str.toCharArray(); int j=0; - + for (int i = 0; i < chars.length; i++) { - if ( (chars[i]<'0' || chars[i]>'9') + if ( (chars[i]<'0' || chars[i]>'9') && (chars[i] != '.') && (chars[i] != '-') ) { } @@ -929,7 +929,7 @@ implements ExtendedPluginInfoComponent */ class ExtendedPluginInfo { - + public static final int TYPE_STRING = 0; public static final int TYPE_BOOLEAN = 1; public static final int TYPE_NUMBER = 2; @@ -1015,7 +1015,7 @@ class ExtendedPluginInfo { public int getType() { return mType; } - + public void setRequired(boolean b) { mRequired = b; } diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigPanel.java index 89dce60c7..415dfe238 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigPanel.java @@ -35,11 +35,11 @@ import java.awt.event.*; * @version $Revision$, $Date$ */ public abstract class CMSBaseConfigPanel extends CMSBasePanel { - + /*========================================================== * variables *==========================================================*/ - + private String mTitle; // panel title actually shows protected boolean mDirty = false; // panel dirty flag protected boolean mInit = false; // true if this panel is initialized @@ -59,32 +59,32 @@ public abstract class CMSBaseConfigPanel extends CMSBasePanel { mTitle = title; } catch (MissingResourceException e) { mTitle = "Missing Title"; - } + } } - + public CMSBaseConfigPanel() { - super(""); + super(""); mTitle = "Missing Title"; } - + /*========================================================== * abstract methods *==========================================================*/ - + //Actual Instanciation of the panels public abstract void init(); - + //Implementation for saving panel information public abstract boolean applyCallback(); - + //Implementation for reset values public abstract boolean resetCallback(); - - + + /*========================================================== * public methods *==========================================================*/ - + //Implementation for calling help public void helpCallback() { CMSAdminUtil.help(mHelpToken); @@ -96,15 +96,15 @@ public abstract class CMSBaseConfigPanel extends CMSBasePanel { */ public String getTitle() { return mTitle; - } - + } + /** * set the title of the tab */ public void setTitle(String title) { mTitle = title; - } - + } + /** * see if the contents of the panel have been changed but not applied * @return true if dirty; otherwise,false. @@ -112,7 +112,7 @@ public abstract class CMSBaseConfigPanel extends CMSBasePanel { public boolean isDirty() { return mDirty; } - + /** * Called by the Tab parent to initialize the panel */ @@ -124,11 +124,11 @@ public abstract class CMSBaseConfigPanel extends CMSBasePanel { mInit = true; } } - + /*========================================================== * EVNET HANDLER METHODS - *==========================================================*/ - + *==========================================================*/ + //=== ACTIONLISTENER ===================== public void actionPerformed(ActionEvent e) { if (mInit) @@ -160,21 +160,21 @@ public abstract class CMSBaseConfigPanel extends CMSBasePanel { if (mInit) this.setDirtyFlag(); } - + /*========================================================== * protected methods *==========================================================*/ - - //=== Dirty Flag ========================= - + + //=== Dirty Flag ========================= + //set dirty flag protected void setDirtyFlag() { mDirty = true; } - + //clear dirty flag protected void clearDirtyFlag() { mDirty = false; } - + } diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java index dbba4a763..a1767f213 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java @@ -44,7 +44,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene private JCheckBox mEnablePublishing; private JCheckBox mEnableQueue; private Color mActiveColor; - private JLabel mHostLabel, mPortLabel, mBindAsLabel, mVersionLabel; + private JLabel mHostLabel, mPortLabel, mBindAsLabel, mVersionLabel; protected JLabel mPasswordLabel; protected AdminConnection mAdmin; protected CMSBaseResourceModel mModel; @@ -70,7 +70,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene this(panelName, parent, true); mPanelName = panelName; } - + public CMSBaseLDAPPanel(String panelName, CMSTabPanel parent, boolean flag) { super(panelName, parent); mServletName = getServletName(panelName); @@ -87,7 +87,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene GridBagLayout gb = new GridBagLayout(); GridBagConstraints gbc = new GridBagConstraints(); mCenterPanel.setLayout(gb); - + mEnablePublishing = makeJCheckBox("ENABLEPUBLISHING"); mEnablePublishing.setSelected(true); CMSAdminUtil.resetGBC(gbc); @@ -95,7 +95,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene gbc.fill = gbc.NONE; gbc.gridwidth = gbc.REMAINDER; gbc.weightx = 1.0; - gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE, + gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE, DIFFERENT_COMPONENT_SPACE, 0, DIFFERENT_COMPONENT_SPACE); @@ -111,7 +111,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene gbc.fill = gbc.NONE; gbc.gridwidth = gbc.REMAINDER; gbc.weightx = 1.0; - gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE, + gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE, DIFFERENT_COMPONENT_SPACE, 0, DIFFERENT_COMPONENT_SPACE); @@ -127,7 +127,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene gbc.fill = gbc.NONE; gbc.gridwidth = gbc.REMAINDER; gbc.weightx = 1.0; - gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE, + gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE, DIFFERENT_COMPONENT_SPACE, 0, DIFFERENT_COMPONENT_SPACE); @@ -135,7 +135,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene mEnable.addItemListener(this); if (mLDAPPublishing) mCenterPanel.add(mEnable); - + //add the destination panel CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTH; @@ -150,7 +150,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene serverInfo.setLayout(gb1); if (mLDAPPublishing) serverInfo.setBorder(makeTitledBorder("DESTINATION")); - + // add host name label and text field CMSAdminUtil.resetGBC(gbc); mHostLabel = makeJLabel("HOST"); @@ -213,7 +213,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene JLabel dummy = new JLabel(" "); CMSAdminUtil.addEntryField(serverInfo, mVersionLabel, mVersionBox, dummy, gbc); - + // add cert nickname CMSAdminUtil.resetGBC(gbc); mCertLabel = makeJLabel("CERTLIST"); @@ -268,9 +268,9 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene } protected String getServletName(String panelName) { - if (panelName.equals("LDAPSETTING")) + if (panelName.equals("LDAPSETTING")) return DestDef.DEST_SERVER_ADMIN; - else if (panelName.equals("CALDAPSETTING")) + else if (panelName.equals("CALDAPSETTING")) return DestDef.DEST_CA_PUBLISHER_ADMIN; return DestDef.DEST_RA_PUBLISHER_ADMIN; } @@ -331,7 +331,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene for (int index=0; tokenizer.hasMoreTokens(); index++) { String str = (String)tokenizer.nextToken(); if (str.startsWith(SERVER_CERT_NICKNAME)) - serverCertIndex = index; + serverCertIndex = index; mCertBox.addItem(str); } } else if (name.equals(Constants.PR_LDAP_CLIENT_CERT)) { @@ -341,7 +341,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene } } - if (version.equals("")) + if (version.equals("")) mVersionBox.setSelectedIndex(1); else mVersionBox.setSelectedItem(version); @@ -462,7 +462,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene private void repaintComp(JComponent component) { component.invalidate(); component.validate(); - component.repaint(1); + component.repaint(1); } public void actionPerformed(ActionEvent e) { @@ -570,7 +570,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene showMessageDialog("EMPTYPASSWD"); return false; } - + nvps.put(Constants.PR_DIRECTORY_MANAGER_PWD, passwd); } else { nvps.put(Constants.PR_LDAP_CLIENT_CERT, @@ -632,7 +632,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene } } */ - + } mModel.progressStart(); @@ -649,7 +649,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene UtilConsoleGlobals.getActivatedFrame(), CMSAdminUtil.wrapText(report,80), "Configuration Successful", - JOptionPane.INFORMATION_MESSAGE, + JOptionPane.INFORMATION_MESSAGE, CMSAdminUtil.getImage(CMSAdminResources.IMAGE_INFO_ICON)); clearDirtyFlag(); } else { @@ -657,7 +657,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene UtilConsoleGlobals.getActivatedFrame(), CMSAdminUtil.wrapText(report,80), "Configuration Error", JOptionPane.YES_NO_OPTION, - JOptionPane.ERROR_MESSAGE, + JOptionPane.ERROR_MESSAGE, CMSAdminUtil.getImage(CMSAdminResources.IMAGE_ERROR_ICON)); if (i == JOptionPane.YES_OPTION) { mAdmin.modify(mServletName, ScopeDef.SC_LDAP, diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLogPanel.java index c0437cbc4..c4cd26ffb 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLogPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLogPanel.java @@ -67,7 +67,7 @@ public abstract class CMSBaseLogPanel extends CMSBaseTab { super(panelName, parent); mModel = parent.getResourceModel(); } - + /*========================================================== * public methods *==========================================================*/ @@ -115,7 +115,7 @@ public abstract class CMSBaseLogPanel extends CMSBaseTab { gbc.fill = gbc.NONE; gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, 0, COMPONENT_SPACE); logInfo.add(logFQC, gbc); - + mlogFQC = makeJComboBox("LOGFQC"); gbc.anchor = gbc.WEST; logInfo.add(mlogFQC, gbc); @@ -125,7 +125,7 @@ public abstract class CMSBaseLogPanel extends CMSBaseTab { gbc.fill = gbc.HORIZONTAL; gbc.weightx = 1.0; logInfo.add(dummyFQC, gbc); - + // Log File Maximum Size CMSAdminUtil.resetGBC(gbc); JLabel logMaxSiz = makeJLabel("LOGMAXSIZ"); @@ -142,7 +142,7 @@ public abstract class CMSBaseLogPanel extends CMSBaseTab { gbc.fill = gbc.HORIZONTAL; logInfo.add(mlogMaxSizText, gbc); mActiveColor = mlogMaxSizText.getBackground(); - + mMaxLabel = makeJLabel("SIZEUNIT"); gbc.weightx = 0.0; gbc.fill = gbc.NONE; @@ -314,7 +314,7 @@ public abstract class CMSBaseLogPanel extends CMSBaseTab { mlogFQC.setSelectedIndex(mFrequency); mlogMaxSizText.setText(mlogMaxSizTextData); mlogBufSizText.setText(mlogBufSizTextData); - mLogLevel.setSelectedIndex(mLevel); + mLogLevel.setSelectedIndex(mLevel); if (mIsNT) { if (mActivateNTLog.isSelected()) { @@ -353,8 +353,8 @@ public abstract class CMSBaseLogPanel extends CMSBaseTab { /*========================================================== * EVENT HANDLER METHODS - *==========================================================*/ - + *==========================================================*/ + //=== ACTIONLISTENER ===================== public void actionPerformed(ActionEvent e) { super.actionPerformed(e); diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseTab.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseTab.java index c3c707f68..6d9e445f3 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseTab.java @@ -34,7 +34,7 @@ import com.netscape.management.client.util.*; * @author Jack Pan-Chen * @version $Revision$, $Date$ */ -public abstract class CMSBaseTab extends CMSBaseConfigPanel +public abstract class CMSBaseTab extends CMSBaseConfigPanel implements IRefreshTab { /*========================================================== @@ -66,28 +66,28 @@ public abstract class CMSBaseTab extends CMSBaseConfigPanel super.clearDirtyFlag(); mParent.clearDirtyTab(this); } - + //=== OVERWRITE DIALOG MESSAGE ===================== - + protected void showMessageDialog(String keyword, int messageType ) { CMSAdminUtil.showMessageDialog(mParent.mModel.getFrame(), mResource, mPanelName, keyword, messageType); } - + protected void showMessageDialog(String keyword) { showMessageDialog(keyword, ERROR_MESSAGE); } - + protected int showConfirmDialog(String keyword, int messageType ) { return CMSAdminUtil.showConfirmDialog(mParent.mModel.getFrame(), mResource, mPanelName, keyword, messageType); - } - + } + protected int showConfirmDialog(String keyword) { return showConfirmDialog(keyword, WARNING_MESSAGE); } - + protected void showErrorDialog(String message) { CMSAdminUtil.showErrorDialog(mParent.mModel.getFrame(), mResource, message, ERROR_MESSAGE); - } + } public void refresh() { } diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSBlankPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBlankPanel.java index b3f357564..819446e9a 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSBlankPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSBlankPanel.java @@ -41,7 +41,7 @@ public class CMSBlankPanel extends CMSBaseTab { public CMSBlankPanel(ResourceModel model) { super(PANEL_NAME, null); } - + public CMSBlankPanel(ResourceModel model, CMSTabPanel parent, String name) { super(PANEL_NAME, parent); setTitle(name); @@ -50,13 +50,13 @@ public class CMSBlankPanel extends CMSBaseTab { /*========================================================== * public methods *==========================================================*/ - + /** * Actual Instanciation of the UI components - */ + */ public void init() { } - + /** * Implementation for saving panel information * @return true if save successful; otherwise, false. @@ -64,7 +64,7 @@ public class CMSBlankPanel extends CMSBaseTab { public boolean applyCallback() { return true; } - + /** * Implementation for reset values * @return true if save successful; otherwise, false. @@ -72,7 +72,7 @@ public class CMSBlankPanel extends CMSBaseTab { public boolean resetCallback() { return true; } - + /** * Implementation for calling help */ diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java index 76aa59511..9e898ed05 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java @@ -38,7 +38,7 @@ public class CMSCACertSettingPanel extends CMSCertSettingPanel { private static String PANEL_NAME = "CACERTSETTING"; private PanelMapperConfigDialog mDialog = null; private CMSTabPanel mParent; - private static final String HELPINDEX = + private static final String HELPINDEX = "configuration-ca-ldappublish-cacert-help"; /*========================================================== @@ -53,17 +53,17 @@ public class CMSCACertSettingPanel extends CMSCertSettingPanel { /*========================================================== * public methods *==========================================================*/ - + /** * Actual UI construction */ public void init() { super.init(); - + //XXX B1 - disable the publisher configuration mPublisher.setEnabled(false); //XXX B1 - disable the publisher configuration - + refresh(); } @@ -105,17 +105,17 @@ public class CMSCACertSettingPanel extends CMSCertSettingPanel { refresh(); return true; } - + /*========================================================== * EVNET HANDLER METHODS - *==========================================================*/ - + *==========================================================*/ + //=== ACTIONLISTENER ===================== public void actionPerformed(ActionEvent e) { if (e.getSource().equals(mMapper)) { Debug.println("Edit Mapper Config"); mDialog = new PanelMapperConfigDialog(_model.getFrame(), _admin); - mDialog.showDialog(_mapper.getText(), + mDialog.showDialog(_mapper.getText(), DestDef.DEST_CA_ADMIN, ScopeDef.SC_CACERT); if (!mDialog.isOK()) return; @@ -124,24 +124,24 @@ public class CMSCACertSettingPanel extends CMSCertSettingPanel { //Debug.println("Edit Publisher Config"); } } - + /*========================================================== * private methods *==========================================================*/ - + /* get config parameters associated with each mapper private NameValueParis getConfig() throws EAdminException { - + NameValuePairs response = _admin.read(DestDef.DEST_CA_ADMIN, - ScopeDef.SC_CAMAPPER, _mapper.getText()], + ScopeDef.SC_CAMAPPER, _mapper.getText()], new NameValuePairs()); return response; } */ - - /*send configuration to server + + /*send configuration to server private void sendConfig(NameValuePairs response) { - + response.add(Constants.PR_MAPPER, MAPPER[_mapper.getSelectedIndex()]); _model.progressStart(); try { @@ -153,10 +153,10 @@ public class CMSCACertSettingPanel extends CMSCertSettingPanel { return false; } _model.progressStop(); - + } */ - + private void populate(NameValuePairs nvps) { for (String name : nvps.keySet()) { String value = nvps.get(name); @@ -166,6 +166,6 @@ public class CMSCACertSettingPanel extends CMSCertSettingPanel { _publisher.setText(value); } } - } + } } diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java index 1af02a881..35f891530 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java @@ -162,7 +162,7 @@ public class CMSCAConnectorPanel extends CMSBaseTab ScopeDef.SC_CONNECTOR, name, nvps); NameValuePairs subsystems = mAdmin.search(DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_SUBSYSTEM, new NameValuePairs()); - + boolean colocated = false; if (name.equals("Data Recovery Manager Connector")) { String val = values.get("id"); @@ -171,7 +171,7 @@ public class CMSCAConnectorPanel extends CMSBaseTab } ConnectorEditor editor = new ConnectorEditor(mAdmin, - mModel.getFrame(), name, DestDef.DEST_CA_ADMIN, + mModel.getFrame(), name, DestDef.DEST_CA_ADMIN, mModel.getServerInfo().getServerId(), colocated); editor.showDialog(values); } catch (EAdminException ex) { diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java index 6f809316a..bee66d6ee 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java @@ -95,7 +95,7 @@ public class CMSCAGeneralPanel extends CMSBaseTab implements ItemListener { //gbc.weighty = 1.0; gb.setConstraints(adminPanel, gbc); // mCenterPanel.add(adminPanel); - + CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTH; gbc.gridwidth = gbc.REMAINDER; diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCALDAPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCALDAPPanel.java index 735818834..a06aac901 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSCALDAPPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCALDAPPanel.java @@ -28,7 +28,7 @@ import com.netscape.management.client.util.*; public class CMSCALDAPPanel extends CMSBaseLDAPPanel { private static String PANEL_NAME = "CALDAPSETTING"; - private static final String HELPINDEX = + private static final String HELPINDEX = "configuration-ca-ldappublish-destination-help"; public CMSCALDAPPanel(CMSTabPanel parent) { diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java index 51da9c58c..1e1516f2b 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java @@ -32,10 +32,10 @@ import java.awt.event.*; * @version $Revision$, $Date$ */ public class CMSCRLCachePanel extends CMSBaseTab { - + /*========================================================== * variables - *==========================================================*/ + *==========================================================*/ private static String PANEL_NAME = "CRLCACHE"; private JCheckBox mEnableCache; @@ -83,11 +83,11 @@ public class CMSCRLCachePanel extends CMSBaseTab { public void init() { Debug.println("CRLCachePanel: init()"); _admin = _model.getServerInfo().getAdmin(); - + GridBagLayout gb = new GridBagLayout(); GridBagConstraints gbc = new GridBagConstraints(); mCenterPanel.setLayout(gb); - + //cache panel JPanel cachePanel = new JPanel(); @@ -333,7 +333,7 @@ public class CMSCRLCachePanel extends CMSBaseTab { public boolean resetCallback() { refresh(); return true; - } + } public void actionPerformed(ActionEvent e) { if (e.getSource().equals(mEnableCache)) { diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java index 3257b90a0..4486bd80b 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java @@ -33,10 +33,10 @@ import java.util.StringTokenizer; * @version $Revision$, $Date$ */ public class CMSCRLFormatPanel extends CMSBaseTab { - + /*========================================================== * variables - *==========================================================*/ + *==========================================================*/ private static String PANEL_NAME = "CRLFORMAT"; private JCheckBox mEnableExtensions; private JCheckBox mEnableExpired; @@ -203,7 +203,7 @@ public class CMSCRLFormatPanel extends CMSBaseTab { gbc.gridwidth = 1; gbc.insets = new Insets(COMPONENT_SPACE,DIFFERENT_COMPONENT_SPACE,0,0); contentsPanel.add(mProfileCertsOnly, gbc); - + mProfiles = makeJTextField(20); gbc.anchor = gbc.WEST; gbc.gridx++; @@ -329,7 +329,7 @@ public class CMSCRLFormatPanel extends CMSBaseTab { nvps.put(Constants.PR_EXTENSIONS, Constants.TRUE); else nvps.put(Constants.PR_EXTENSIONS, Constants.FALSE); - + if (mEnableExpired.isSelected()) nvps.put(Constants.PR_INCLUDE_EXPIREDCERTS, Constants.TRUE); else @@ -344,7 +344,7 @@ public class CMSCRLFormatPanel extends CMSBaseTab { nvps.put(Constants.PR_CA_CERTS_ONLY, Constants.TRUE); else nvps.put(Constants.PR_CA_CERTS_ONLY, Constants.FALSE); - + if (mProfileCertsOnly.isSelected()) nvps.put(Constants.PR_PROFILE_CERTS_ONLY, Constants.TRUE); else @@ -401,7 +401,7 @@ public class CMSCRLFormatPanel extends CMSBaseTab { public boolean resetCallback() { refresh(); return true; - } + } public void actionPerformed(ActionEvent e) { if (e.getSource().equals(mProfileCertsOnly)) { @@ -432,7 +432,7 @@ public class CMSCRLFormatPanel extends CMSBaseTab { * Override the initialize method only for this panel. * We need to refresh in case the CRLDistributionPointExtension * has modified the caCertsOnly property for us. - **/ + **/ public void initialize() { Debug.println("CMSCRLFormatPanel: intialize()"); if (!mInit) { diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java index 553211eb8..eb4118555 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java @@ -196,7 +196,7 @@ public class CMSCRLIPPanel extends CMSBaseTab mNames); editor.showDialog(new NameValuePairs()); String name = editor.getCRLName(); - CMSResourceObject node = (CMSResourceObject)(mParent.getResourceObject()); + CMSResourceObject node = (CMSResourceObject)(mParent.getResourceObject()); CMSResourceObject crlsNode = node; node = new CMSResourceObject(); node.setName(name); @@ -238,11 +238,11 @@ public class CMSCRLIPPanel extends CMSBaseTab if (mNames.contains(name)) mNames.remove(name); mDataModel.removeElementAt(index); - if (mDataModel.size() > 0) + if (mDataModel.size() > 0) mList.setSelectedIndex(0); } - CMSResourceObject node = - (CMSResourceObject)(mParent.getResourceObject()); + CMSResourceObject node = + (CMSResourceObject)(mParent.getResourceObject()); Enumeration allchildren = node.children(); while (allchildren.hasMoreElements()) { CMSResourceObject child = (CMSResourceObject)(allchildren.nextElement()); @@ -301,11 +301,11 @@ public class CMSCRLIPPanel extends CMSBaseTab String enable = nvps.get(name + "." + Constants.PR_ENABLED); if (enable != null && enable.equalsIgnoreCase(Constants.TRUE)) { - mDataModel.addElement(new JLabel(name, + mDataModel.addElement(new JLabel(name, CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE), JLabel.LEFT)); } else { - mDataModel.addElement(new JLabel(name, + mDataModel.addElement(new JLabel(name, CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE), JLabel.LEFT)); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java index d420686e3..b55022921 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java @@ -36,10 +36,10 @@ import java.util.Vector; * @version $Revision$, $Date$ */ public class CMSCRLSettingPanel extends CMSBaseTab { - + /*========================================================== * variables - *==========================================================*/ + *==========================================================*/ private static String PANEL_NAME = "CRLSETTING"; private JCheckBox mEnableCRL; @@ -107,7 +107,7 @@ public class CMSCRLSettingPanel extends CMSBaseTab { gbc.weightx = 1.0; gbc.weighty = 0.0; gb.setConstraints(schemaPanel, gbc); - mCenterPanel.add(schemaPanel); + mCenterPanel.add(schemaPanel); GridBagLayout gb4 = new GridBagLayout(); schemaPanel.setLayout(gb4); @@ -190,8 +190,8 @@ public class CMSCRLSettingPanel extends CMSBaseTab { gbc.weightx = 1.0; gbc.weighty = 1.0; gb.setConstraints(freqPanel, gbc); - mCenterPanel.add(freqPanel); - + mCenterPanel.add(freqPanel); + //add components GridBagLayout gb2 = new GridBagLayout(); freqPanel.setLayout(gb2); @@ -218,7 +218,7 @@ public class CMSCRLSettingPanel extends CMSBaseTab { gbc.gridwidth = 1; gbc.insets = new Insets(COMPONENT_SPACE,DIFFERENT_COMPONENT_SPACE,0,0); freqPanel.add(mDaily, gbc); - + mDailyAt = makeJTextField(30); gbc.anchor = gbc.WEST; gbc.gridx++; diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCertSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCertSettingPanel.java index 975ba97da..7cb8ad90a 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSCertSettingPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCertSettingPanel.java @@ -44,7 +44,7 @@ public abstract class CMSCertSettingPanel extends CMSBaseTab { /*========================================================== * constructors *==========================================================*/ - + public CMSCertSettingPanel(String panelName, CMSTabPanel parent) { super(panelName, parent); _model = parent.getResourceModel(); @@ -53,7 +53,7 @@ public abstract class CMSCertSettingPanel extends CMSBaseTab { /*========================================================== * public methods *==========================================================*/ - + /** * Actual UI construction */ @@ -63,7 +63,7 @@ public abstract class CMSCertSettingPanel extends CMSBaseTab { GridBagConstraints gbc = new GridBagConstraints(); CMSAdminUtil.resetGBC(gbc); mCenterPanel.setLayout(gb); - + JPanel mapPanel = new JPanel(); GridBagLayout gb2 = new GridBagLayout(); mapPanel.setLayout(gb2); @@ -74,13 +74,13 @@ public abstract class CMSCertSettingPanel extends CMSBaseTab { gbc.weightx = 1.0; gb.setConstraints(mapPanel, gbc); mCenterPanel.add(mapPanel); - + CMSAdminUtil.resetGBC(gbc); JLabel mapperLabel = makeJLabel("MAPPER"); _mapper = new JLabel(""); mMapper = makeJButton("MAPPER"); addEntryField(mapPanel, mapperLabel, _mapper, mMapper , gbc); - + JPanel certSetting = new JPanel(); GridBagLayout gb1 = new GridBagLayout(); certSetting.setLayout(gb1); @@ -100,11 +100,11 @@ public abstract class CMSCertSettingPanel extends CMSBaseTab { mPublisher = makeJButton("PUBLISHER"); addEntryField(certSetting, publisherLabel, _publisher, mPublisher, gbc); } - + /*========================================================== * protected methods *==========================================================*/ - + protected int getIndex(String value, String[] source) { for (int i=0; i<source.length; i++) { if (value.equals(source[i])) @@ -112,13 +112,13 @@ public abstract class CMSCertSettingPanel extends CMSBaseTab { } return -1; } - + /** * Add 3 components in the same row to a panel, assumed to be using * GridBagLayout. Customized for the LDAP certificate mappings/publishing * UI. */ - protected void addEntryField(JPanel panel, JComponent field1, + protected void addEntryField(JPanel panel, JComponent field1, JComponent field2, JComponent field3, GridBagConstraints gbc) { gbc.fill = gbc.NONE; gbc.weightx = 0.0; @@ -145,6 +145,6 @@ public abstract class CMSCertSettingPanel extends CMSBaseTab { 0,DIFFERENT_COMPONENT_SPACE); panel.add( field3, gbc ); } - + } diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferenceDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferenceDialog.java index 69e208be5..a477bc5c4 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferenceDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferenceDialog.java @@ -24,7 +24,7 @@ import java.awt.*; /** * Allows user to select the SSL cipher preferences. - * + * * @author Christine Ho * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.config @@ -41,17 +41,17 @@ public class CMSCipherPreferenceDialog extends AbstractDialog { private static final ResourceSet mHelpResource = new ResourceSet("com.netscape.admin.certsrv.certsrv-help"); Help help; - + public CMSCipherPreferenceDialog(JFrame parent, boolean isDomestic) { this(parent, isDomestic, false); } - public CMSCipherPreferenceDialog(JFrame parent, boolean isDomestic, + public CMSCipherPreferenceDialog(JFrame parent, boolean isDomestic, boolean hasFortezza) { this(parent, isDomestic, hasFortezza, SSL2|SSL3); } - public CMSCipherPreferenceDialog(JFrame parent, boolean isDomestic, + public CMSCipherPreferenceDialog(JFrame parent, boolean isDomestic, boolean hasFortezza, int SSLVersion) { super(parent, "", true, OK | CANCEL | HELP); @@ -103,10 +103,10 @@ public class CMSCipherPreferenceDialog extends AbstractDialog { switch(sslVersion) { case SSL2: cipher = ssl2CipherPref.getCipherList(); - break; + break; case SSL3: cipher = ssl3CipherPref.getCipherList(); - break; + break; default: break; } diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferencePane.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferencePane.java index 88faf2a71..a36f4bb32 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferencePane.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferencePane.java @@ -16,7 +16,7 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- package com.netscape.admin.certsrv.config; - + import com.netscape.admin.certsrv.security.*; import java.awt.event.*; import java.awt.*; diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java index 2d35133df..45ecbdd42 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java @@ -75,13 +75,13 @@ public class CMSEAGeneralPanel extends CMSBaseTab implements ItemListener { gbc.weighty = 1.0; gb.setConstraints(agentsPanel, gbc); mCenterPanel.add(agentsPanel); - + CMSAdminUtil.resetGBC(gbc); JLabel numberLabel = makeJLabel("NUMBER"); mNumberOfAgentsText = makeJTextField(30); CMSAdminUtil.addEntryField(agentsPanel, numberLabel, mNumberOfAgentsText, gbc); - + refresh(); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java index 913974eaf..06b0cba4d 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java @@ -31,7 +31,7 @@ import com.netscape.admin.certsrv.keycert.*; import com.netscape.admin.certsrv.managecert.*; /** - * Encryption panel used for setup server encryption options. + * Encryption panel used for setup server encryption options. * This is a wrapper class that emulates the CMSBaseTab API * calls. * @@ -51,10 +51,10 @@ public class CMSEncryptionPanel extends CMSBaseTab { private JPanel mEncryptPane; private JComboBox mSelection, mTokenList, mCertList; private Hashtable mCertMapping; //maps the function list items to tags - private String mSelectedItem, mSelectedToken, mSelectedCert; - private JButton mWizard, mCipherPref, mSetup; + private String mSelectedItem, mSelectedToken, mSelectedCert; + private JButton mWizard, mCipherPref, mSetup; private Hashtable mTokenCertList; //container for tokens and certs (Vector) - private boolean mIsDomestic = false; + private boolean mIsDomestic = false; private boolean mHasFortezza = false; private Vector mCipherPrefStore; private CMSCipherPreferenceDialog mCipherDialog; @@ -63,7 +63,7 @@ public class CMSEncryptionPanel extends CMSBaseTab { private boolean mWarningOn = false; private static final String HELPINDEX = "configuration-system-encryption-help"; - + /**========================================================= * constructors * @param parent the parent panel @@ -79,7 +79,7 @@ public class CMSEncryptionPanel extends CMSBaseTab { mCipherPrefStore = new Vector(); mHelpToken = HELPINDEX; } - + /*========================================================== * public methods *==========================================================*/ @@ -93,19 +93,19 @@ public class CMSEncryptionPanel extends CMSBaseTab { GridBagConstraints gbc = new GridBagConstraints(); CMSAdminUtil.resetGBC(gbc); mCenterPanel.setLayout(gb); - + //certificate settings JPanel top = new JPanel(); GridBagLayout gb2 = new GridBagLayout(); top.setLayout(gb2); top.setBorder( new CompoundBorder( BorderFactory.createTitledBorder( - mResource.getString("ENCRYPTION_BORDER_CERT_LABEL")), + mResource.getString("ENCRYPTION_BORDER_CERT_LABEL")), new EmptyBorder(-3, 0, DIFFERENT_COMPONENT_SPACE - 3, 0))); - + //add selection combobox JLabel label1 = makeJLabel("SELECT"); mSelection = new JComboBox(); @@ -116,10 +116,10 @@ public class CMSEncryptionPanel extends CMSBaseTab { mSelectedItem = (String) mSelection.getSelectedItem(); } else { //disable if nothing there - mSelection.setEnabled(false); + mSelection.setEnabled(false); } mSelection.addItemListener(this); - + //add encryption panel mEncryptPane = createCertEntry(); //mEncryptPane = new InnerEncryptionPane(mConsoleInfo); @@ -134,13 +134,13 @@ public class CMSEncryptionPanel extends CMSBaseTab { COMPONENT_SPACE,0,COMPONENT_SPACE); gb2.setConstraints(mEncryptPane, gbc); top.add(mEncryptPane); - + CMSAdminUtil.resetGBC(gbc); gbc.gridwidth = gbc.REMAINDER; gbc.weightx = 1.0; gb.setConstraints(top, gbc); mCenterPanel.add(top); - + mWizard = makeJButton("WIZARD"); mCipherPref = makeJButton("CIPHERPREF"); mSetup = makeJButton("SETUP"); @@ -150,20 +150,20 @@ public class CMSEncryptionPanel extends CMSBaseTab { //addButtonEntryField(mCenterPanel, mSetup, mWizard, mCipherPref, gbc); addButtonEntryField(mCenterPanel, mSetup, mWizard, gbc); //addButtonEntryField(mCenterPanel, mCipherPref, gbc); - + /* retrieve data from server and * feed data into mEncryptionPane for display ... */ refresh(); } - + /** * Implementation for saving panel information * @return true if save successful; otherwise, false. */ public boolean applyCallback() { if (mWarningOn) { - String errorMsg = + String errorMsg = mResource.getString(mPanelName+"_LABEL_WARNING_LABEL"); JOptionPane.showMessageDialog(new JFrame(), errorMsg, "Warning", JOptionPane.WARNING_MESSAGE, @@ -174,22 +174,22 @@ public class CMSEncryptionPanel extends CMSBaseTab { //save current changes if modified saveChanges((String) mSelection.getSelectedItem()); - + //construct NVP parameters NameValuePairs nvp = new NameValuePairs(); for (Enumeration e = mCertMapping.keys() ; e.hasMoreElements() ;) { - CipherEntryData data = + CipherEntryData data = (CipherEntryData)mCertMapping.get(e.nextElement()); nvp.put(data.getTagName(), data.getTokenName() + "," + data.getCertName()); } - + if (updateCertMap(nvp)) { mWarningOn = false; clearDirtyFlag(); return true; } - - return false; + + return false; } /** @@ -208,7 +208,7 @@ public class CMSEncryptionPanel extends CMSBaseTab { * refresh the panel and update data */ public void refresh() { - + //call server to get the encryption settings NameValuePairs response; try { @@ -219,14 +219,14 @@ public class CMSEncryptionPanel extends CMSBaseTab { e.getMessage(), CMSAdminUtil.ERROR_MESSAGE); return; } - + //setup the data and UI updateFlag = true; cleanup(); setupDataContainer(response); setupComboSelection(); updateFlag = false; - + clearDirtyFlag(); } @@ -246,47 +246,47 @@ public class CMSEncryptionPanel extends CMSBaseTab { } */ if (e.getSource().equals(mSetup)) { - ManageCertDialog manageDialog = + ManageCertDialog manageDialog = new ManageCertDialog(mParent.getResourceModel().getFrame()); manageDialog.showDialog(mParent.getResourceModel().getServerInfo().getAdmin()); } if (e.getSource().equals(mWizard)) { Debug.println("Wizard"); - - //XXX launch OUR OWN wizard + + //XXX launch OUR OWN wizard CertSetupWizardInfo info = new CertSetupWizardInfo(mConnection, mConsoleInfo); CertSetupWizard wizard = new CertSetupWizard(mParent.getResourceModel(), info); // mParent.getResourceModel().getFrame(), info); //KeyCertWizard wizard = new KeyCertWizard(mConnection); - + //XXX we should update the settings to reflect the changes - - + + return; - } + } if (e.getSource().equals(mCipherPref)) { Debug.println("Wizard"); - + if (mCipherDialog == null) { mCipherDialog = new CMSCipherPreferenceDialog(mParent.mModel.getFrame(), - mIsDomestic, - mHasFortezza, + mIsDomestic, + mHasFortezza, CMSCipherPreferenceDialog.SSL2|CMSCipherPreferenceDialog.SSL3); - + } - + refresh(); setupCipherDialog(mCipherDialog); - + mCipherDialog.show(); - + if (!mCipherDialog.isModified()) return; - + //Save the cipher settings StringBuffer buf = new StringBuffer(); - + if (mCipherDialog.isSSLEnabled(mCipherDialog.SSL2)) { String[] v2 = mCipherDialog.getSSLPreference(mCipherDialog.SSL2); for (int i=0; i< v2.length; i++) { @@ -297,30 +297,30 @@ public class CMSEncryptionPanel extends CMSBaseTab { } } } - + if (mCipherDialog.isSSLEnabled(mCipherDialog.SSL3)) { String[] v3 = mCipherDialog.getSSLPreference(mCipherDialog.SSL3); for (int i=0; i< v3.length; i++) { if (mCipherDialog.isCipherEnabled(v3[i])) { - if (buf.length()>0) + if (buf.length()>0) buf.append(","); buf.append(v3[i]); } } } - + updateCipherPref(buf.toString()); - + //save the new settings mCipherDialog.setSaved(true); - + return; } } - + //== ItemListener == public void itemStateChanged(ItemEvent e){ - + if (e.getSource().equals(mSelection)) { if (e.getStateChange() == e.SELECTED) { if (!mSelectionIgnore) { @@ -349,35 +349,35 @@ public class CMSEncryptionPanel extends CMSBaseTab { } mWarningOn = true; } - + /*========================================================== * Private Methods *==========================================================*/ - + //save the mappings if changes made private void saveChanges(String entry) { if ( (!mSelectedToken.equals((String)mTokenList.getSelectedItem())) || (!mSelectedCert.equals((String)mCertList.getSelectedItem())) ) { - + CipherEntryData data = (CipherEntryData) mCertMapping.get(entry); data.setData((String)mTokenList.getSelectedItem(), (String)mCertList.getSelectedItem()); } } - //cleanup the + //cleanup the private void cleanup() { mTokenCertList.clear(); mCipherPrefStore.removeAllElements(); mTokenList.removeAllItems(); mCertList.removeAllItems(); } - + //setup the cipher dialog private void setupCipherDialog(CMSCipherPreferenceDialog dialog) { Debug.println("setupCipherDialog"); dialog.setSSLEnabled(dialog.SSL3,true); - + //set selected/unselected ciphers String[] v2 = dialog.getSSLPreference(dialog.SSL2); @@ -410,26 +410,26 @@ public class CMSEncryptionPanel extends CMSBaseTab { dialog.setCipherEnabled(v3[i], false); } } - + mCipherDialog.setSaved(true); } - + //initialize the data containers private void setupDataContainer(NameValuePairs response) { - + //setup security version flag String version = response.get(Constants.PR_CIPHER_VERSION); if ( (version != null) && (version.equals( Constants.PR_CIPHER_VERSION_DOMESTIC)) ) { - mIsDomestic = true; + mIsDomestic = true; } - + //setup fortezza flag String fortezza = response.get(Constants.PR_CIPHER_FORTEZZA); if ( (fortezza != null) && (fortezza.equalsIgnoreCase("TRUE")) ){ - mHasFortezza = true; + mHasFortezza = true; } - + //setup cipher preference settings String cipherpref = response.get(Constants.PR_CIPHER_PREF); //Debug.println("cipher preference: "+cipherpref); @@ -441,9 +441,9 @@ public class CMSEncryptionPanel extends CMSBaseTab { mCipherPrefStore.addElement(pref); } } else { - Debug.println("ERROR: CMSEncryptionPanel: setupDataContainer()- no cert pref list"); + Debug.println("ERROR: CMSEncryptionPanel: setupDataContainer()- no cert pref list"); } - + //setup the cipher entry data - loop through table and retrieve //the current mappings mSelectionIgnore = true; @@ -457,7 +457,7 @@ public class CMSEncryptionPanel extends CMSBaseTab { String token = tokenizer.nextToken().trim(); String cert = tokenizer.nextToken().trim(); data.setData(token, cert); - } catch(Exception ex) { + } catch(Exception ex) { Debug.println("ERROR: CMSEncryptionPanel: setupDataContainer()- no token/cert not complete"); } } else { @@ -468,7 +468,7 @@ public class CMSEncryptionPanel extends CMSBaseTab { } } mSelectionIgnore = false; - + //setup the token-cert list data table String tokenlist = response.get(Constants.PR_TOKEN_LIST); if ( (tokenlist != null) && (!tokenlist.trim().equals("")) ) { @@ -476,7 +476,7 @@ public class CMSEncryptionPanel extends CMSBaseTab { while (tokenizer.hasMoreTokens()) { String token = tokenizer.nextToken().trim(); Debug.println("Token: "+token); - + //get the certificate associated with this token String certList = response.get(Constants.PR_TOKEN_PREFIX + token); Vector certVector = new Vector(); @@ -486,31 +486,31 @@ public class CMSEncryptionPanel extends CMSBaseTab { certVector.addElement(tokenizer2.nextToken().trim()); } } else { - Debug.println("WARNING: CMSEncryptionPanel: setupDataContainer()- no certlist for: "+token); + Debug.println("WARNING: CMSEncryptionPanel: setupDataContainer()- no certlist for: "+token); } - + //set the token-cert to hashtable mTokenCertList.put(token, certVector); mTokenList.addItem(token); } } else { - Debug.println("ERROR: CMSEncryptionPanel: setupDataContainer()- no tokenlist"); + Debug.println("ERROR: CMSEncryptionPanel: setupDataContainer()- no tokenlist"); } - + //setup the initial combobox selection String newToken = (String) mTokenList.getSelectedItem(); mSelectedToken = newToken; mCertList.removeAllItems(); Vector list = (Vector) mTokenCertList.get(newToken); for (int i=0; i< list.size(); i++) - mCertList.addItem(list.elementAt(i)); + mCertList.addItem(list.elementAt(i)); } - + //setup combobox selection private void setupComboSelection() { //get current function selection CipherEntryData data = (CipherEntryData) mCertMapping.get(mSelection.getSelectedItem()); - + //select correct token from the token list String oldToken = (String) mTokenList.getSelectedItem(); String newToken = data.getTokenName(); @@ -523,7 +523,7 @@ public class CMSEncryptionPanel extends CMSBaseTab { mCertList.setSelectedItem(data.getCertName()); mSelectedCert = data.getCertName(); } - + //setup the certlist combo private void setupCertCombo() { String newToken = (String) mTokenList.getSelectedItem(); @@ -532,7 +532,7 @@ public class CMSEncryptionPanel extends CMSBaseTab { for (int i=0; i< list.size(); i++) mCertList.addItem(list.elementAt(i)); } - + //creating the certificate mapping UI components private JPanel createCertEntry() { JPanel panel = new JPanel(); @@ -540,15 +540,15 @@ public class CMSEncryptionPanel extends CMSBaseTab { GridBagConstraints gbc = new GridBagConstraints(); CMSAdminUtil.resetGBC(gbc); panel.setLayout(gb); - + //set border panel.setBorder( new CompoundBorder( - BorderFactory.createTitledBorder(mResource.getString("ENCRYPTION_BORDER_MAPTO_LABEL")), + BorderFactory.createTitledBorder(mResource.getString("ENCRYPTION_BORDER_MAPTO_LABEL")), new EmptyBorder(-3, 0, CMSAdminUtil.DIFFERENT_COMPONENT_SPACE, 0))); - + //add components mTokenList = new JComboBox(); mTokenList.addItemListener(this); @@ -559,13 +559,13 @@ public class CMSEncryptionPanel extends CMSBaseTab { CMSAdminUtil.addEntryField(panel, label1, mTokenList, label2, mCertList, gbc); return panel; } - + /** * The certificates used by each subsystem are stored as cert list * strings in the resource file using the PR_ prefix tags. */ private void updateCertSelection() { - //get installed subsystem + //get installed subsystem Vector v = mServerInfo.getInstalledSubsystems(); //add default system certificate list @@ -583,7 +583,7 @@ public class CMSEncryptionPanel extends CMSBaseTab { loadCertList(certname); } } - + //create additional subsystem certificate list for (int i=0; i< v.size(); i++) { String name = (String)v.elementAt(i); @@ -597,11 +597,11 @@ public class CMSEncryptionPanel extends CMSBaseTab { } } } catch (MissingResourceException e) { - Debug.println("ERROR: unable retrieving subsystem certificate list: "+name); + Debug.println("ERROR: unable retrieving subsystem certificate list: "+name); } - } + } } - + //register the certificate and mapping entry private void loadCertList(String certTag) { //add to selection list @@ -616,7 +616,7 @@ public class CMSEncryptionPanel extends CMSBaseTab { mCertMapping.put(name, new CipherEntryData(certTag)); } - private static void addTopEntryField(JPanel panel, JComponent label, + private static void addTopEntryField(JPanel panel, JComponent label, JComponent field, GridBagConstraints gbc) { gbc.fill = gbc.NONE; gbc.weightx = 0.0; @@ -636,7 +636,7 @@ public class CMSEncryptionPanel extends CMSBaseTab { panel.add( field, gbc ); } - private static void addButtonEntryField(JPanel panel, + private static void addButtonEntryField(JPanel panel, JComponent field, GridBagConstraints gbc) { gbc.fill = gbc.NONE; gbc.weightx = 0.0; @@ -657,9 +657,9 @@ public class CMSEncryptionPanel extends CMSBaseTab { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, 0,COMPONENT_SPACE); panel.add( field, gbc ); - } + } - private static void addButtonEntryField(JPanel panel, JComponent label, + private static void addButtonEntryField(JPanel panel, JComponent label, JComponent field, GridBagConstraints gbc) { gbc.fill = gbc.NONE; gbc.weightx = 0.0; @@ -669,7 +669,7 @@ public class CMSEncryptionPanel extends CMSBaseTab { //gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE,DIFFERENT_COMPONENT_SPACE,0,0); gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE,0,0); panel.add(new JLabel("")); - + gbc.gridx++; gbc.weightx = 1.0; panel.add( label, gbc ); @@ -684,9 +684,9 @@ public class CMSEncryptionPanel extends CMSBaseTab { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, 0,COMPONENT_SPACE); panel.add( field, gbc ); - } + } - private static void addButtonEntryField(JPanel panel, JComponent label, + private static void addButtonEntryField(JPanel panel, JComponent label, JComponent field, JComponent field1, GridBagConstraints gbc) { gbc.fill = gbc.NONE; gbc.weightx = 0.0; @@ -696,7 +696,7 @@ public class CMSEncryptionPanel extends CMSBaseTab { //gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE,DIFFERENT_COMPONENT_SPACE,0,0); gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE,0,0); panel.add(new JLabel("")); - + gbc.gridx++; gbc.weightx = 1.0; panel.add( label, gbc ); @@ -722,14 +722,14 @@ public class CMSEncryptionPanel extends CMSBaseTab { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, 0,COMPONENT_SPACE); panel.add( field1, gbc ); - } + } /*========================================================== - * SEND STUFF TO SERVER - *==========================================================*/ - + * SEND STUFF TO SERVER + *==========================================================*/ + //retrieve security information from the server side - private NameValuePairs updateSecurityInformation() + private NameValuePairs updateSecurityInformation() throws EAdminException { Debug.println("Get Security Information"); @@ -738,32 +738,32 @@ public class CMSEncryptionPanel extends CMSBaseTab { nvp.put(Constants.PR_CIPHER_VERSION, ""); nvp.put(Constants.PR_CIPHER_FORTEZZA, ""); nvp.put(Constants.PR_TOKEN_LIST, ""); - + //create installed certificate list data request for (Enumeration e = mCertMapping.elements(); e.hasMoreElements() ;) { CipherEntryData data = (CipherEntryData)e.nextElement(); nvp.put(data.getTagName(), ""); } - + NameValuePairs response; - + response = mConnection.read(DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_ENCRYPTION, Constants.RS_ID_CONFIG, - nvp); - + nvp); + Debug.println("Received: "+response.toString()); - + return response; } - + //modify cipher preference private void updateCipherPref(String list) { Debug.println("Set Cipher Preference: "+list); - + NameValuePairs nvp = new NameValuePairs(); nvp.put(Constants.PR_CIPHER_PREF, list); - + //send to server try { mConnection.modify(DestDef.DEST_SERVER_ADMIN, @@ -777,11 +777,11 @@ public class CMSEncryptionPanel extends CMSBaseTab { return; } } - + //modify certificate mapping private boolean updateCertMap(NameValuePairs config) { Debug.println("Set Certificate Mapping: "+config.toString()); - + //send to server try { mConnection.modify(DestDef.DEST_SERVER_ADMIN, @@ -794,42 +794,42 @@ public class CMSEncryptionPanel extends CMSBaseTab { e.getMessage(), CMSAdminUtil.ERROR_MESSAGE); return false; } - + return true; - } - + } + } //internal data structure class CipherEntryData { - + String mTag; String mToken; String mCert; - + public CipherEntryData(String tag) { mTag = tag; } - + public void setData(String token, String cert) { mToken = token; mCert = cert; } - + public String getCertName() { - return mCert; + return mCert; } - + public String getTokenName() { - return mToken; + return mToken; } - + public String getTagName() { - return mTag; + return mTag; } - + public String toString() { - return mTag+"-"+mToken+":"+mCert; + return mTag+"-"+mToken+":"+mCert; } } diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java index 23b4ececa..7160276d7 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java @@ -47,7 +47,7 @@ public class CMSErrorLogPanel extends CMSBaseLogPanel { mHelpToken = HELPINDEX; mIsNT = isNT; } - + /*========================================================== * public methods *==========================================================*/ @@ -90,14 +90,14 @@ public class CMSErrorLogPanel extends CMSBaseLogPanel { private void parseVals(NameValuePairs nvp) { if (nvp.get(Constants.PR_LOG_ENABLED).equalsIgnoreCase( - Constants.TRUE)) + Constants.TRUE)) activateLog.setSelected(true); else activateLog.setSelected(false); mLevel = Integer.parseInt(nvp.get(Constants.PR_LOG_LEVEL)); mlogBufSizTextData = nvp.get(Constants.PR_LOG_BUFFERSIZE); mlogMaxSizTextData = nvp.get(Constants.PR_LOG_MAXFILESIZE); - int val = + int val = Integer.parseInt(nvp.get(Constants.PR_LOG_ROLLEROVER_INTERVAL)); mFrequency = getRollOverIndex(val); } @@ -159,7 +159,7 @@ public class CMSErrorLogPanel extends CMSBaseLogPanel { clearDirtyFlag(); return true; } - + /** * Implementation for reset values * @return true if save successful; otherwise, false. @@ -171,8 +171,8 @@ public class CMSErrorLogPanel extends CMSBaseLogPanel { /*========================================================== * EVENT HANDLER METHODS - *==========================================================*/ - + *==========================================================*/ + //=== ACTIONLISTENER ===================== public void actionPerformed(ActionEvent e) { super.actionPerformed(e); diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java index f408e7297..8a0160101 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java @@ -27,7 +27,7 @@ import java.awt.event.*; /** * KRA recovery management tab - * + * * @author Christine Ho * @version $Revision$, $Date$ */ @@ -186,7 +186,7 @@ public class CMSKRAAutoPanel extends CMSBaseUGTab { } public void actionPerformed(ActionEvent e) { - + if (e.getActionCommand().equals("autoButton")) { String text = mEnableAuto.getText(); if (text.equals(mEnableLabel)) { @@ -211,7 +211,7 @@ public class CMSKRAAutoPanel extends CMSBaseUGTab { refresh(); } else if (e.getSource().equals(mHelp)) { helpCallback(); - } + } } public void mouseClicked(MouseEvent e) { diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java index 641a6641e..6bfec15b2 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java @@ -33,7 +33,7 @@ import java.awt.event.*; public class CMSLDAPSettingPanel extends CMSBaseTab { private static String PANEL_NAME = "LDAPSETTING"; - private static final String HELPINDEX = + private static final String HELPINDEX = "configuration-database-settings-help"; private JTextField mHostNameText; private JTextField mPortText; @@ -306,7 +306,7 @@ public class CMSLDAPSettingPanel extends CMSBaseTab { nvps.put(Constants.PR_LDAP_MAX_CONNS, maxConns); nvps.put(Constants.PR_LDAP_MIN_CONNS, minConns); /* - nvps.add(Constants.PR_LDAP_VERSION, + nvps.add(Constants.PR_LDAP_VERSION, (String)mVersionBox.getSelectedItem()); */ diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java index 03458d2b1..0716f2bc8 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java @@ -47,7 +47,7 @@ public class CMSNetworkPanel extends CMSBaseTab { private static final int MAX_PORT = 65535; private static final int MIN_PORT = 1; - private Color mActiveColor; + private Color mActiveColor; // TextField for port private JTextField mAdminSSLPortText; @@ -88,7 +88,7 @@ public class CMSNetworkPanel extends CMSBaseTab { mModel = parent.getResourceModel(); mHelpToken = HELPINDEX; } - + /*========================================================== * public methods *==========================================================*/ @@ -122,7 +122,7 @@ public class CMSNetworkPanel extends CMSBaseTab { JLabel adminBacklog = makeJLabel("ADMINBACKLOG"); mAdminSSLBacklogText = makeJTextField(10); JLabel dummy1 = new JLabel(" "); - CMSAdminUtil.addEntryField(adminPanel, adminSSLport, + CMSAdminUtil.addEntryField(adminPanel, adminSSLport, mAdminSSLPortText, adminBacklog, mAdminSSLBacklogText, dummy1, gbc); mActiveColor = mAdminSSLPortText.getBackground(); @@ -138,7 +138,7 @@ public class CMSNetworkPanel extends CMSBaseTab { gbc.weightx = 1.0; gb.setConstraints(agentPanel, gbc); mCenterPanel.add(agentPanel); - + CMSAdminUtil.resetGBC(gbc); JLabel agentPort = makeJLabel("AGENTSSLPORT"); mAgentSSLPortText = makeJTextField(10); @@ -168,7 +168,7 @@ public class CMSNetworkPanel extends CMSBaseTab { mGatewayBacklogText = makeJTextField(10); mEnableLabel = makeJLabel("ENABLED"); mEnable = makeJCheckBox(); - CMSAdminUtil.addEntryField(gatewayPanel, mPortLabel, mGatewayPortText, + CMSAdminUtil.addEntryField(gatewayPanel, mPortLabel, mGatewayPortText, mBacklogLabel, mGatewayBacklogText, mEnableLabel, mEnable, gbc); CMSAdminUtil.resetGBC(gbc); @@ -177,10 +177,10 @@ public class CMSNetworkPanel extends CMSBaseTab { mSSLBacklogLabel = makeJLabel("SECUREEEBACKLOG"); mGatewaySSLBacklogText = makeJTextField(10); JLabel dummy2 = new JLabel(" "); - CMSAdminUtil.addEntryField(gatewayPanel, mSSLPortLabel, + CMSAdminUtil.addEntryField(gatewayPanel, mSSLPortLabel, mGatewaySSLPortText, mSSLBacklogLabel, mGatewaySSLBacklogText, dummy2, gbc); - + refresh(); } @@ -200,14 +200,14 @@ public class CMSNetworkPanel extends CMSBaseTab { //String docroot = mDocRootText.getText().trim(); //check blank fields - if (adminSSLPortStr.equals("") || + if (adminSSLPortStr.equals("") || (gatewayPortStr.equals("") && mGatewayPortText.isEnabled()) || - (gatewaySSLPortStr.equals("") && mGatewaySSLPortText.isEnabled()) || - agentSSLPortStr.equals("") || - adminSSLBacklogStr.equals("") || + (gatewaySSLPortStr.equals("") && mGatewaySSLPortText.isEnabled()) || + agentSSLPortStr.equals("") || + adminSSLBacklogStr.equals("") || (gatewayBacklogStr.equals("") && mGatewayBacklogText.isEnabled()) || (gatewaySSLBacklogStr.equals("") && mGatewaySSLBacklogText.isEnabled()) || - agentSSLBacklogStr.equals("") ) { + agentSSLBacklogStr.equals("") ) { showMessageDialog("BLANKFIELD"); return false; } @@ -380,11 +380,11 @@ public class CMSNetworkPanel extends CMSBaseTab { mAgentSSLBacklogText.setText(str); } else if (name.equals(Constants.PR_GATEWAY_S_BACKLOG)) { if (str.equals(DISABLED)) { - enableFields(mSSLBacklogLabel, mGatewaySSLBacklogText, + enableFields(mSSLBacklogLabel, mGatewaySSLBacklogText, false, getBackground()); mGatewaySSLBacklogText.setText(""); } else { - enableFields(mSSLBacklogLabel, mGatewaySSLBacklogText, + enableFields(mSSLBacklogLabel, mGatewaySSLBacklogText, true, mActiveColor); mGatewaySSLBacklogText.setText(str); } @@ -427,7 +427,7 @@ public class CMSNetworkPanel extends CMSBaseTab { repaint(1); } - private void enableFields(JLabel label, JTextComponent text, + private void enableFields(JLabel label, JTextComponent text, boolean enabled, Color color) { label.setEnabled(enabled); text.setEnabled(enabled); diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java index 37dfbef44..4b3a9d737 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java @@ -79,7 +79,7 @@ public class CMSOCSPGeneralPanel extends CMSBaseTab implements ItemListener { //gbc.weighty = 1.0; // gb.setConstraints(adminPanel, gbc); // mCenterPanel.add(adminPanel); - + CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTH; @@ -89,7 +89,7 @@ public class CMSOCSPGeneralPanel extends CMSBaseTab implements ItemListener { gbc.weighty = 1.0; gb.setConstraints(signingPanel, gbc); mCenterPanel.add(signingPanel); - + CMSAdminUtil.resetGBC(gbc); JLabel signingLabel = makeJLabel("ALGORITHM"); diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java index 47cb6c865..f53aae76c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java @@ -37,13 +37,13 @@ import com.netscape.admin.certsrv.connection.*; * @date 07/21/98 */ -public class CMSPasswordDialog extends JDialog +public class CMSPasswordDialog extends JDialog implements ActionListener, DocumentListener, MouseListener { - + /*========================================================== * variables - *==========================================================*/ + *==========================================================*/ private static final int WIDTH = 300; private static final int HEIGHT = 216; @@ -59,12 +59,12 @@ public class CMSPasswordDialog extends JDialog private ResourceBundle mResource; private AdminConnection mAdmin; private JButton mOK, mCancel, mHelp; - - + + /*========================================================== * constructors *==========================================================*/ - + /** * @param parent parent frame */ @@ -72,7 +72,7 @@ public class CMSPasswordDialog extends JDialog super(parent, true); mParentFrame = parent; mAdmin = conn; - mResource = + mResource = ResourceBundle.getBundle(CMSAdminResources.class.getName()); setTitle(mResource.getString(PREFIX+"_TITLE")); setLocationRelativeTo(parent); @@ -96,30 +96,30 @@ public class CMSPasswordDialog extends JDialog center.add(contentPanel); CMSAdminUtil.resetGBC(gbc); - JLabel lUsername = + JLabel lUsername = new JLabel(mResource.getString(PREFIX+"_LABEL_USERID_LABEL")); lUsername.setToolTipText( mResource.getString(PREFIX+"_LABEL_USERID_TTIP")); mUsernameField = new JLabel(uid); - + CMSAdminUtil.addEntryField(contentPanel, lUsername, mUsernameField, gbc); CMSAdminUtil.resetGBC(gbc); - JLabel lOldPassword= + JLabel lOldPassword= new JLabel(mResource.getString(PREFIX+"_LABEL_OLDPASSWORD_LABEL")); lOldPassword.setToolTipText( mResource.getString(PREFIX+"_LABEL_OLDPASSWORD_TTIP")); mOldPasswordField = new JPasswordField(); mOldPasswordField.getDocument().addDocumentListener(this); mOldPasswordField.addMouseListener(this); - CMSAdminUtil.addEntryField(contentPanel, lOldPassword, + CMSAdminUtil.addEntryField(contentPanel, lOldPassword, mOldPasswordField, gbc); CMSAdminUtil.resetGBC(gbc); - JLabel lPassword= + JLabel lPassword= new JLabel(mResource.getString(PREFIX+"_LABEL_PASSWORD_LABEL")); lPassword.setToolTipText( mResource.getString(PREFIX+"_LABEL_PASSWORD_TTIP")); @@ -130,13 +130,13 @@ public class CMSPasswordDialog extends JDialog gbc); CMSAdminUtil.resetGBC(gbc); - JLabel lPasswordAgain= + JLabel lPasswordAgain= new JLabel(mResource.getString(PREFIX+"_LABEL_PASSWORD_AGAIN_LABEL")); lPassword.setToolTipText( mResource.getString(PREFIX+"_LABEL_PASSWORD_AGAIN_TTIP")); mPasswordFieldAgain = new JPasswordField(); mPasswordFieldAgain.getDocument().addDocumentListener(this); - mPasswordFieldAgain.addMouseListener(this); + mPasswordFieldAgain.addMouseListener(this); CMSAdminUtil.addEntryField(contentPanel, lPasswordAgain, mPasswordFieldAgain, gbc); @@ -200,19 +200,19 @@ public class CMSPasswordDialog extends JDialog public String getPassword() { return mPassword; } - - + + /*========================================================== * EVNET HANDLER METHODS *==========================================================*/ - + public void actionPerformed(ActionEvent evt) { if (evt.getSource().equals(mOK)) { String userid = mUsernameField.getText().trim(); String oldpassword = mOldPasswordField.getText().trim(); String newpassword = mPasswordField.getText().trim(); String passwordAgain = mPasswordFieldAgain.getText().trim(); - + /* PROACTIVE VERIFICATION if (oldpassword.equals("") || newpassword.equals("") || passwordAgain.equals("")) { @@ -225,9 +225,9 @@ public class CMSPasswordDialog extends JDialog CMSAdminUtil.showMessageDialog(mParentFrame, mResource, PREFIX, "CONFIRMED", CMSAdminUtil.ERROR_MESSAGE); return; - } - - + } + + NameValuePairs nvps = new NameValuePairs(); nvps.put(Constants.PR_OLD_AGENT_PWD, oldpassword); nvps.put(Constants.PR_AGENT_PWD, newpassword); @@ -241,7 +241,7 @@ public class CMSPasswordDialog extends JDialog if (!ex.getMessage().equals("Server Error")) return; } - + mCanceled = false; this.dispose(); return; @@ -253,21 +253,21 @@ public class CMSPasswordDialog extends JDialog return; } } - - + + //== DocumentListener == public void insertUpdate(DocumentEvent e) { setButtons(); } - + public void removeUpdate(DocumentEvent e){ setButtons(); } - + public void changedUpdate(DocumentEvent e){ setButtons(); } - + //==== MOUSELISTENER ====================== public void mouseClicked(MouseEvent e) { setButtons(); @@ -277,34 +277,34 @@ public class CMSPasswordDialog extends JDialog public void mouseReleased(MouseEvent e) {} public void mouseEntered(MouseEvent e) {} public void mouseExited(MouseEvent e) { - setButtons(); - } - - + setButtons(); + } + + /*========================================================== * private methods - *==========================================================*/ - + *==========================================================*/ + private JPanel makeActionPane() { - mOK = CMSAdminUtil.makeJButton(mResource, PREFIX, "OK", null, + mOK = CMSAdminUtil.makeJButton(mResource, PREFIX, "OK", null, this); mOK.setEnabled(false); - mCancel = CMSAdminUtil.makeJButton(mResource, PREFIX, "CANCEL", + mCancel = CMSAdminUtil.makeJButton(mResource, PREFIX, "CANCEL", null, this); JButton[] buttons = { mOK, mCancel}; JButtonFactory.resize( buttons ); return CMSAdminUtil.makeJButtonPanel(buttons); - } - + } + //set buttons private void setButtons() { if ( (mPasswordField.getText().trim().equals("")) || (mPasswordFieldAgain.getText().trim().equals("")) || (mOldPasswordField.getText().trim().equals("")) ) { - mOK.setEnabled(false); + mOK.setEnabled(false); } else { - mOK.setEnabled(true); + mOK.setEnabled(true); } - } - + } + } diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java index d4fb62340..4beb2a6b4 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java @@ -45,8 +45,8 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab { protected static String RULE_STAT = null; protected static String RULE_IMPL = null; protected static String RULE_TYPE = null; - - + + protected AdminConnection mConnection; protected JScrollPane mScrollPane; @@ -138,25 +138,25 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab { } mModel.progressStop(); Debug.println(response.toString()); - + CMSBaseConfigDialog dialog = makeEditConfigDialog( response, mModel.getFrame(), mModel.getServerInfo().getAdmin(), mDestination); - + dialog.setModel(mModel); dialog.setInstanceScope(mScope); dialog.showDialog(response, data.get(RULE_NAME)); - + if(!dialog.isOK()) return; - refresh(); + refresh(); } - + if (e.getSource().equals(mAdd)) { Debug.println("Add"); - PluginSelectionDialog dialog = + PluginSelectionDialog dialog = getPluginSelectionDialog( mModel.getFrame(), mConnection, @@ -168,7 +168,7 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab { dialog.showDialog(); refresh(); } - + if (e.getSource().equals(mDelete)) { Debug.println("Delete"); if(mTable.getSelectedRow()< 0) @@ -191,8 +191,8 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab { } public void mouseReleased(MouseEvent e) { - setButtons(); - } + setButtons(); + } /*========================================================== * protected methods @@ -201,8 +201,8 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab { mDataModel.removeAllRows(); update(); - - setButtons(); + + setButtons(); } /** @@ -251,7 +251,7 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab { mScrollPane.setBackground(Color.white); mTable.addMouseListener(this); setLabelCellRenderer(mTable,0); - + CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTH; gbc.fill = gbc.BOTH; @@ -289,7 +289,7 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab { Debug.println("Table.getColumnModel = "+table.getColumnModel()); table.getColumnModel().getColumn(index).setCellRenderer(new LabelCellRenderer(new JLabel())); } - + //Set the first column's cellrender as label cell protected void setLabelCellEditor(JTable table, int index) { table.getColumnModel().getColumn(index).setCellRenderer(new PasswordCellRenderer()); @@ -299,26 +299,26 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab { //set buttons protected void setButtons() { - + //enable and diable buttons accordingly //Debug.println("setButtons() - "+mTable.getSelectedRow()); - + if (mTable.getSelectionModel().isSelectionEmpty()) { mDelete.setEnabled(false); mEdit.setEnabled(false); return; } - + if(mDataModel.getRowCount()<=0) { mDelete.setEnabled(false); mEdit.setEnabled(false); return; } - + mDelete.setEnabled(true); mEdit.setEnabled(true); } - + //============================================= // SEND REQUESTS TO THE SERVER SIDE //============================================= @@ -386,11 +386,11 @@ Debug.println("xxxxxxx plugin " + plugin); } mDataModel.processData(data); } - } + } if (mDataModel.getRowCount() >0) mTable.setRowSelectionInterval(0,0); - + mTable.invalidate(); mTable.validate(); mTable.repaint(1); @@ -398,7 +398,7 @@ Debug.println("xxxxxxx plugin " + plugin); } private void delete() { - + mModel.progressStart(); //get entry name NameValuePairs data = (NameValuePairs) @@ -419,7 +419,7 @@ Debug.println("xxxxxxx plugin " + plugin); mModel.progressStop(); //send comment to server and refetch the content refresh(); - + } //this returns the onfiguration @@ -430,13 +430,13 @@ Debug.println("xxxxxxx plugin " + plugin); if (mId != null && mId.length() > 0) { request.put(mId, ""); } - + NameValuePairs response = mConnection.read(mDestination, mScope, data.get(RULE_NAME), request); return response; } - - + + } diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java index 734425b41..7b284f1d6 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java @@ -44,7 +44,7 @@ public class CMSRACLMPanel extends CMSBaseTab { private JTextField mIntervalText; private Color mActiveColor; private CMSTabPanel mParent; - private static final String HELPINDEX = + private static final String HELPINDEX = "configuration-ra-clm-help"; public CMSRACLMPanel(CMSTabPanel parent) { @@ -83,13 +83,13 @@ public class CMSRACLMPanel extends CMSBaseTab { gbc.weighty = 1.0; gb.setConstraints(adminPanel, gbc); mCenterPanel.add(adminPanel); - + CMSAdminUtil.resetGBC(gbc); JLabel validLbl = makeJLabel("VALID"); mValidText = makeJTextField(4); mActiveColor = mValidText.getBackground(); JLabel day1Lbl = makeJLabel("DAYS"); - CMSAdminUtil.addEntryField(adminPanel, validLbl, mValidText, + CMSAdminUtil.addEntryField(adminPanel, validLbl, mValidText, day1Lbl, gbc); CMSAdminUtil.resetGBC(gbc); @@ -129,7 +129,7 @@ public class CMSRACLMPanel extends CMSBaseTab { JLabel intervalLbl = makeJLabel("INTERVAL"); mIntervalText = makeJTextField(4); JLabel day2Lbl = makeJLabel("DAYS"); - CMSAdminUtil.addEntryField(subPanel, intervalLbl, mIntervalText, + CMSAdminUtil.addEntryField(subPanel, intervalLbl, mIntervalText, day2Lbl, gbc); refresh(); @@ -172,7 +172,7 @@ public class CMSRACLMPanel extends CMSBaseTab { mNotifyEnable.setSelected(notificationEnabled); } else if (name.equals(Constants.PR_RENEWAL_VALIDITY)) { mValidText.setText(value); - } else if (name.equals(Constants.PR_RENEWAL_EMAIL)) { + } else if (name.equals(Constants.PR_RENEWAL_EMAIL)) { mEmailText.setText(value); } else if (name.equals(Constants.PR_RENEWAL_NUMNOTIFICATION)) { mNotifiedText.setText(value); @@ -217,7 +217,7 @@ public class CMSRACLMPanel extends CMSBaseTab { mValidText.setEnabled(enable); mValidText.setEditable(enable); mValidText.setBackground(color); - mNotifyEnable.setEnabled(enable); + mNotifyEnable.setEnabled(enable); mNotifyEnable.setBackground(color); //enableNotification(enable, color); } @@ -239,9 +239,9 @@ public class CMSRACLMPanel extends CMSBaseTab { public void actionPerformed(ActionEvent e) { super.actionPerformed(e); - if (e.getSource().equals(mRenewEnable) || + if (e.getSource().equals(mRenewEnable) || e.getSource().equals(mNotifyEnable)) { - enableRenewal(mRenewEnable.isSelected(), + enableRenewal(mRenewEnable.isSelected(), mNotifyEnable.isSelected()); } } @@ -262,7 +262,7 @@ public class CMSRACLMPanel extends CMSBaseTab { return false; } nvps.put(Constants.PR_RENEWAL_VALIDITY, validStr); - + if (mNotifyEnable.isSelected()) { nvps.put(Constants.PR_RENEWAL_EXPIREDNOTIFIEDENABLED, Constants.TRUE); diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java index 7733a43d7..c257165d4 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java @@ -177,7 +177,7 @@ public class CMSRAConnectorPanel extends CMSBaseTab NameValuePairs subsystems = mAdmin.search(DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_SUBSYSTEM, new NameValuePairs()); - + boolean colocated = false; if (name.equals("Data Recovery Manager Connector")) { String val = values.get("id"); diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java index 6605385b0..0f27dbcf9 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java @@ -71,7 +71,7 @@ public class CMSRAGeneralPanel extends CMSBaseTab { gbc.weighty = 1.0; gb.setConstraints(adminPanel, gbc); mCenterPanel.add(adminPanel); - + CMSAdminUtil.resetGBC(gbc); mEEEnable = makeJCheckBox("EE"); gbc.anchor = gbc.NORTHWEST; @@ -93,7 +93,7 @@ public class CMSRAGeneralPanel extends CMSBaseTab { gb1.setConstraints(mRAEnable, gbc); adminPanel.add(mRAEnable); */ - + refresh(); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSRuleDataModel.java index 2c12183c7..b618f91be 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSRuleDataModel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSRuleDataModel.java @@ -39,10 +39,10 @@ public abstract class CMSRuleDataModel extends CMSContentTableModel * variables *==========================================================*/ public static final String RULE_NAME = "RULENAME"; - public static final String RULE_STAT = "STATUS"; + public static final String RULE_STAT = "STATUS"; public static final String RULE_IMPL = "IMPL"; public static final String RULE_TYPE = "TYPE"; - + protected static String[] mColumns = null; protected Vector mRules; @@ -61,22 +61,22 @@ public abstract class CMSRuleDataModel extends CMSContentTableModel *==========================================================*/ protected abstract String[] getColumns(); - + /** * clean up the table including the datat objects */ public void removeAllRows() { super.removeAllRows(); mRules.removeAllElements(); - } - - + } + + public Vector getRules() { - return (Vector) mRules.clone(); + return (Vector) mRules.clone(); } - + public boolean isCellEditable(int row, int col) { return false; } - + } diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java index 0275e3cb0..6636f059b 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java @@ -35,7 +35,7 @@ public class CMSSMTPPanel extends CMSBaseTab { private static String PANEL_NAME = "SMTPSETTING"; private JTextField mServerText; private JTextField mPortText; - private Color mActiveColor; + private Color mActiveColor; private AdminConnection mAdmin; private CMSBaseResourceModel mModel; private CMSTabPanel mParent; @@ -80,7 +80,7 @@ public class CMSSMTPPanel extends CMSBaseTab { JLabel portLabel = makeJLabel("PORT"); mPortText = makeJTextField(30); CMSAdminUtil.addEntryField(smtpInfo, portLabel, mPortText, gbc); - + refresh(); } @@ -92,7 +92,7 @@ public class CMSSMTPPanel extends CMSBaseTab { try { NameValuePairs val = mAdmin.read(DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_SMTP, Constants.RS_ID_CONFIG, nvps); - + populate(val); } catch (EAdminException e) { showErrorDialog(e.toString()); diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java index b5b589eb0..238397ee0 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java @@ -52,7 +52,7 @@ public class CMSSNMPPanel extends CMSBaseTab { private JLabel mOrgnLabel; private JLabel mLocLabel; private JLabel mContactLabel; - private static final String HELPINDEX = + private static final String HELPINDEX = "configuration-system-snmp-help"; public CMSSNMPPanel(CMSTabPanel parent) { @@ -93,7 +93,7 @@ public class CMSSNMPPanel extends CMSBaseTab { mOffB = makeJButton("OFF"); JButton[] bArray = {mOnB, mOffB}; JPanel buttonPanel = CMSAdminUtil.makeJButtonPanel(bArray); - + GridBagLayout gb1 = new GridBagLayout(); snmpInfo.setLayout(gb1); @@ -140,7 +140,7 @@ public class CMSSNMPPanel extends CMSBaseTab { gbc.gridheight = gbc.REMAINDER; gb1.setConstraints(buttonPanel, gbc); snmpInfo.add(buttonPanel); - + refresh(); } @@ -208,7 +208,7 @@ public class CMSSNMPPanel extends CMSBaseTab { enableTextField(true, mActiveColor); } else { enableTextField(false, getBackground()); - } + } } } diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherPreference.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherPreference.java index 4e95d25db..500523473 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherPreference.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherPreference.java @@ -19,14 +19,14 @@ package com.netscape.admin.certsrv.config; import com.netscape.admin.certsrv.security.*; /** - * Constructs panel containing a SSL2 cipher suites + * Constructs panel containing a SSL2 cipher suites * * @author Christine Ho * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.config */ -public class CMSSSL2CipherPreference extends CMSCipherPreferencePane +public class CMSSSL2CipherPreference extends CMSCipherPreferencePane implements ICipherConstants { public CMSSSL2CipherPreference(boolean isDomestic) { diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherSet.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherSet.java index fa18107cb..eb5065fce 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherSet.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherSet.java @@ -23,7 +23,7 @@ import java.util.*; /** * Constructs a SSL2 cipher suites. - * + * * @author Christine Ho * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.config diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherPreference.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherPreference.java index 63444fc75..777c9d466 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherPreference.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherPreference.java @@ -20,14 +20,14 @@ package com.netscape.admin.certsrv.config; import com.netscape.admin.certsrv.security.*; /** - * Constructs panel containing a SSL3 cipher suites + * Constructs panel containing a SSL3 cipher suites * * @author Christine Ho * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.config */ -public class CMSSSL3CipherPreference extends CMSCipherPreferencePane +public class CMSSSL3CipherPreference extends CMSCipherPreferencePane implements ICipherConstants { public CMSSSL3CipherPreference(boolean isDomestic, boolean hasFortezza) { diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherSet.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherSet.java index 0286f3820..df07a4968 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherSet.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherSet.java @@ -23,7 +23,7 @@ import com.netscape.admin.certsrv.*; /** * Constructs a SSL3 cipher suites. - * + * * @author Christine Ho * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.config diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java index ab957a69c..76f467091 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java @@ -38,7 +38,7 @@ public class CMSSelfTestsPanel extends CMSBaseTab private static final String PROP_TITLE = "On-Demand Self Tests Results"; private static String PANEL_NAME = "SELFTESTS"; private AdminConnection mAdmin; - private JButton mOnDemand; + private JButton mOnDemand; private CMSBaseResourceModel mModel; private CMSTabPanel mParent; private static final String HELPINDEX = @@ -145,12 +145,12 @@ public class CMSSelfTestsPanel extends CMSBaseTab NameValuePairs nvps = new NameValuePairs(); NameValuePairs nvps1; - + nvps.put(Constants.PR_RUN_SELFTESTS_ON_DEMAND, Constants.TRUE); - + if( evt.getSource().equals( mOnDemand ) ) { Debug.println( "Run self tests on-demand . . ." ); - + mModel.progressStart(); try { nvps1 = mAdmin.process( DestDef.DEST_SERVER_ADMIN, diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java index ca424c3a0..c454063a1 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java @@ -52,24 +52,24 @@ public class CMSUserCertSettingPanel extends CMSCertSettingPanel { mParent = parent; if (panelName.equals("RAUSERCERTSETTING")) mHelpToken = RAHELPINDEX; - else + else mHelpToken = CAHELPINDEX; } /*========================================================== * public methods *==========================================================*/ - + /** * Actual UI construction */ public void init() { - super.init(); - + super.init(); + //XXX B1 - disable the publisher configuration mPublisher.setEnabled(false); - //XXX B1 - disable the publisher configuration - + //XXX B1 - disable the publisher configuration + refresh(); } @@ -114,14 +114,14 @@ public class CMSUserCertSettingPanel extends CMSCertSettingPanel { /*========================================================== * EVNET HANDLER METHODS - *==========================================================*/ - + *==========================================================*/ + //=== ACTIONLISTENER ===================== public void actionPerformed(ActionEvent e) { if (e.getSource().equals(mMapper)) { Debug.println("Edit Mapper Config"); mDialog = new PanelMapperConfigDialog(_model.getFrame(), _admin); - mDialog.showDialog(_mapper.getText(), + mDialog.showDialog(_mapper.getText(), _servletName, ScopeDef.SC_USERCERT); if (!mDialog.isOK()) return; @@ -150,6 +150,6 @@ public class CMSUserCertSettingPanel extends CMSCertSettingPanel { } } } - + } diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMStoAdminEncryptionPane.java b/base/console/src/com/netscape/admin/certsrv/config/CMStoAdminEncryptionPane.java index ea448b4e0..1977b5428 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CMStoAdminEncryptionPane.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CMStoAdminEncryptionPane.java @@ -39,12 +39,12 @@ import javax.swing.event.*; */ /* replace "implements ActionListener" with - *"implements IPluginConfigPanel" when the + *"implements IPluginConfigPanel" when the * com.netscape.management.admserv.config.* package is available public class CMStoAdminEncryptionPane extends EncryptionPane implements IPluginConfigPanel{ */ -public class CMStoAdminEncryptionPane extends EncryptionPane +public class CMStoAdminEncryptionPane extends EncryptionPane implements ActionListener { protected boolean mEncryptionPaneDirty = false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsConfigDialog.java index 9a4f5ae17..26346f58e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsConfigDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsConfigDialog.java @@ -73,4 +73,4 @@ public class CRLExtensionsConfigDialog extends CMSBaseConfigDialog init(nvp,parent,conn,dest,id); } -} +} diff --git a/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsInstanceTab.java index 5c687ea90..d48600fa5 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsInstanceTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsInstanceTab.java @@ -43,7 +43,7 @@ public class CRLExtensionsInstanceTab extends CMSPluginInstanceTab { * variables *==========================================================*/ private static final String PANEL_NAME = "CRLEXTSRULE"; - + private final static String CAHELPINDEX = "configuration-ca-crlinstances-help"; /*========================================================== @@ -56,7 +56,7 @@ public class CRLExtensionsInstanceTab extends CMSPluginInstanceTab { mDataModel = new RuleRuleDataModel(); mScope = ScopeDef.SC_CRLEXTS_RULES; RULE_NAME = CRLExtensionsRuleDataModel.RULE_NAME; - RULE_STAT = CRLExtensionsRuleDataModel.RULE_STAT; + RULE_STAT = CRLExtensionsRuleDataModel.RULE_STAT; mHelpToken = CAHELPINDEX; } @@ -67,7 +67,7 @@ public class CRLExtensionsInstanceTab extends CMSPluginInstanceTab { mDataModel = new RuleRuleDataModel(); mScope = ScopeDef.SC_CRLEXTS_RULES; RULE_NAME = CRLExtensionsRuleDataModel.RULE_NAME; - RULE_STAT = CRLExtensionsRuleDataModel.RULE_STAT; + RULE_STAT = CRLExtensionsRuleDataModel.RULE_STAT; mHelpToken = CAHELPINDEX; mId = id; } @@ -77,7 +77,7 @@ public class CRLExtensionsInstanceTab extends CMSPluginInstanceTab { NameValuePairs nvp, JFrame parent, AdminConnection conn, - String dest) + String dest) { if (mId != null && mId.length() > 0) return new CRLExtensionsConfigDialog(nvp, parent, conn, dest, mId); @@ -89,7 +89,7 @@ public class CRLExtensionsInstanceTab extends CMSPluginInstanceTab { JFrame parent, AdminConnection conn, String dest, - CMSPluginInstanceTab pluginType) + CMSPluginInstanceTab pluginType) { return new CRLExtensionsPluginSelectionDialog(parent, conn, dest, pluginType); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsPluginSelectionDialog.java index aa169235d..9f7ed87c2 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsPluginSelectionDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsPluginSelectionDialog.java @@ -40,7 +40,7 @@ public class CRLExtensionsPluginSelectionDialog extends PluginSelectionDialog * variables *==========================================================*/ private static final String PREFIX = "CRLEXTSELECTIONDIALOG"; - private static final String CAHELPINDEX = + private static final String CAHELPINDEX = "configuration-ca-add-crlextensionrule-dbox-help"; /*========================================================== @@ -48,9 +48,9 @@ public class CRLExtensionsPluginSelectionDialog extends PluginSelectionDialog *==========================================================*/ public CRLExtensionsPluginSelectionDialog( JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest, - CMSPluginInstanceTab pluginType) + CMSPluginInstanceTab pluginType) { super(PREFIX, parent,conn, dest, pluginType); // mScope = ScopeDef.SC_RULE_IMPLS; diff --git a/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java index e5ae9352a..1d0553c0e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java @@ -55,7 +55,7 @@ public class CRLExtensionsRuleDataModel extends CMSRuleDataModel v.addElement(new JLabel(obj.get(RULE_NAME), CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE), JLabel.LEFT)); - v.addElement(mResource.getString("CRLEXTSRULE_LABEL_ENABLED_LABEL")); + v.addElement(mResource.getString("CRLEXTSRULE_LABEL_ENABLED_LABEL")); } else { v.addElement(new JLabel(obj.get(RULE_NAME), CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE), diff --git a/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java b/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java index 040b21b83..0cde2d21c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java +++ b/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java @@ -36,7 +36,7 @@ import com.netscape.certsrv.common.*; public class CRLIPEditor extends JDialog implements ActionListener { private final static String PREFIX = "CRLIPEDITOR"; - private final static String HELPINDEX = + private final static String HELPINDEX = "configuration-revocation"; private JButton mOK, mCancel, mHelp; private String mName; @@ -319,7 +319,7 @@ public class CRLIPEditor extends JDialog implements ActionListener { } this.dispose(); } catch (EAdminException ex) { - CMSAdminUtil.showMessageDialog(mParentFrame, + CMSAdminUtil.showMessageDialog(mParentFrame, "Error", ex.toString(), CMSAdminUtil.ERROR_MESSAGE); } } else if (e.getSource().equals(mHelp)) { diff --git a/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java b/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java index 6f711eca9..293d13d9f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java @@ -39,7 +39,7 @@ import com.netscape.certsrv.common.*; public class ConnectorEditor extends JDialog implements ActionListener, MouseListener { private final static String PREFIX = "CONNECTOREDITOR"; - private final static String HELPINDEX = + private final static String HELPINDEX = "configuration-ra-connector-editor-help"; private final static String HELPINDEX1 = "configuration-overview"; @@ -226,7 +226,7 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis mHostText.setText(val); } else if (name.equals(Constants.PR_PORT)) { mPortText.setText(val); - // Inserted by beomsuk + // Inserted by beomsuk } else if (name.equals(Constants.PR_TIMEOUT)) { if (val == null || val.equals("")) mTimeoutText.setText("30"); @@ -472,13 +472,13 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis gbc.anchor = gbc.WEST; gbc.weightx = 1.0; gbc.fill = gbc.HORIZONTAL; - gbc.insets = new Insets(2*CMSAdminUtil.COMPONENT_SPACE, + gbc.insets = new Insets(2*CMSAdminUtil.COMPONENT_SPACE, 4*CMSAdminUtil.COMPONENT_SPACE, CMSAdminUtil.COMPONENT_SPACE, CMSAdminUtil.COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; gb.setConstraints(mHeading, gbc); mainPanel.add(mHeading); - + CMSAdminUtil.resetGBC(gbc); mDataModel = new ListCertsModel(); mCertTable = new JTable(mDataModel); @@ -551,15 +551,15 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis } public void actionPerformed(ActionEvent e) { - + if (e.getSource().equals(mEnableBox)) { mEnable = mEnableBox.isSelected(); enableConnector(); - } else if (e.getSource().equals(mCancel)) + } else if (e.getSource().equals(mCancel)) this.dispose(); else if (e.getSource().equals(mOK)) { NameValuePairs nvps = new NameValuePairs(); - + if (mEnable) { nvps.put(Constants.PR_LOCAL, Constants.FALSE); nvps.put(Constants.PR_HOST, mHostText.getText()); @@ -572,7 +572,7 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis return; } } catch (NumberFormatException ex) { - CMSAdminUtil.showMessageDialog(mParentFrame, mResource, PREFIX, + CMSAdminUtil.showMessageDialog(mParentFrame, mResource, PREFIX, "NONINTEGER", CMSAdminUtil.ERROR_MESSAGE); return; } @@ -587,12 +587,12 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis return; } } catch (NumberFormatException ex) { - CMSAdminUtil.showMessageDialog(mParentFrame, mResource, PREFIX, + CMSAdminUtil.showMessageDialog(mParentFrame, mResource, PREFIX, "TIMEOUTNONINTEGER", CMSAdminUtil.ERROR_MESSAGE); return; } nvps.put(Constants.PR_TIMEOUT, timeoutStr); - + if (mName.equals("Data Recovery Manager Connector")) { nvps.put(Constants.PR_URI, "/kra/agent/kra/connector"); } else if (mName.equals("Registration Manager Connector")) { @@ -611,7 +611,7 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis mName, nvps); this.dispose(); } catch (EAdminException ex) { - CMSAdminUtil.showMessageDialog(mParentFrame, + CMSAdminUtil.showMessageDialog(mParentFrame, "Error", ex.toString(), CMSAdminUtil.ERROR_MESSAGE); } } else if (e.getSource().equals(mHelp)) { @@ -621,11 +621,11 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis private NameValuePairs getCertsList(String scope) { try { - NameValuePairs nvps = + NameValuePairs nvps = mAdmin.search(DestDef.DEST_SERVER_ADMIN, scope, new NameValuePairs()); return nvps; } catch (EAdminException ex) { - CMSAdminUtil.showMessageDialog(mParentFrame, + CMSAdminUtil.showMessageDialog(mParentFrame, "Error", ex.toString(), CMSAdminUtil.ERROR_MESSAGE); return null; } diff --git a/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java index 66e9b4397..99b2881d6 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java @@ -33,7 +33,7 @@ import java.awt.event.*; public class GeneralLogPanel extends CMSBaseTab { private static String PANEL_NAME = "GENERALLOG"; - private static final String HELPINDEX = + private static final String HELPINDEX = "configuration-general-logs-settings-help"; private JCheckBox mEnable; private Color mActiveColor; @@ -157,7 +157,7 @@ public class GeneralLogPanel extends CMSBaseTab { mEnable.setSelected(false); } else if (name.equals(Constants.PR_DEBUG_LOG_LEVEL)) { mLevelText.setText(value); - } + } /* else if (name.equals(Constants.PR_DEBUG_LOG_SHOWCALLER)) { if (value.equals(Constants.TRUE)) diff --git a/base/console/src/com/netscape/admin/certsrv/config/JobsConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/JobsConfigDialog.java index 307ddbbc4..5b38a17d2 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/JobsConfigDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/JobsConfigDialog.java @@ -46,7 +46,7 @@ public class JobsConfigDialog extends CMSBaseConfigDialog *==========================================================*/ public JobsConfigDialog(NameValuePairs nvp, JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest) { super(parent, dest); @@ -59,4 +59,4 @@ public class JobsConfigDialog extends CMSBaseConfigDialog init(nvp,parent,conn,dest); } -} +} diff --git a/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java index d3a605433..24de6a8e9 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java @@ -40,7 +40,7 @@ public class JobsImplDataModel extends CMSContentTableModel public static final String IMPL_NAME = "NAME"; public static final String IMPL_CLASS = "CLASS"; public static final String IMPL_DESC = "DESC"; - + private static String[] mColumns = {JOBS_IMPL, CLASSNAME}; /*========================================================== diff --git a/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java index 57848c649..c9c3ac173 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java @@ -43,19 +43,19 @@ public class JobsImplTab extends CMSBaseUGTab { private static final String IMPL_NAME = JobsImplDataModel.IMPL_NAME; private static final String IMPL_CLASS = JobsImplDataModel.IMPL_CLASS; private static final String IMPL_DESC = JobsImplDataModel.IMPL_DESC; - + private static final String PANEL_NAME = "JOBSIMPL"; private static final String DIALOG_PREFIX = "JOBSREGISTERDIALOG"; - + private AdminConnection mConnection; private String mDestination; - + protected JScrollPane mScrollPane; protected JTable mTable; //table protected JobsImplDataModel mDataModel; //table model protected JobsRegisterDialog mEditor=null; //keep single copy protected ViewDialog mViewer=null; //keep single copy - + protected JButton mRefresh, mAdd, mDelete, mView, mHelp; private final static String HELPINDEX = "jobsscheduler-certsrv-jobplugin-help"; @@ -106,13 +106,13 @@ public class JobsImplTab extends CMSBaseUGTab { if(mTable.getSelectedRow()< 0) return; NameValuePairs obj = (NameValuePairs) - mDataModel.getObjectValueAt(mTable.getSelectedRow()); + mDataModel.getObjectValueAt(mTable.getSelectedRow()); if (mViewer==null) mViewer = new ViewDialog(mModel.getFrame()); mViewer.showDialog(obj.get(IMPL_NAME), obj.get(IMPL_CLASS), obj.get(IMPL_DESC)); - } + } if (e.getSource().equals(mHelp)) { helpCallback(); } @@ -124,7 +124,7 @@ public class JobsImplTab extends CMSBaseUGTab { } public void mouseReleased(MouseEvent e) { - setButtons(); + setButtons(); } /*========================================================== @@ -133,8 +133,8 @@ public class JobsImplTab extends CMSBaseUGTab { public void refresh() { mDataModel.removeAllRows(); - update(); - + update(); + setButtons(); mTable.invalidate(); mTable.validate(); @@ -218,7 +218,7 @@ public class JobsImplTab extends CMSBaseUGTab { //set buttons private void setButtons() { - + //enable and diable buttons accordingly //Debug.println("setButtons() - "+mTable.getSelectedRow()); //Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty()); @@ -227,24 +227,24 @@ public class JobsImplTab extends CMSBaseUGTab { mView.setEnabled(false); return; } - + if(mDataModel.getRowCount()<=0) { mDelete.setEnabled(false); mView.setEnabled(false); return; } - + mDelete.setEnabled(true); - mView.setEnabled(true); - + mView.setEnabled(true); + } - + //============================================= // SEND REQUESTS TO THE SERVER SIDE //============================================= private void update() { //send request and parse data - + mModel.progressStart(); NameValuePairs response; try { @@ -283,18 +283,18 @@ public class JobsImplTab extends CMSBaseUGTab { } data.put(entry,obj); } - + CMSAdminUtil.bubbleSort(vals); - + for (int y=0; y< vals.length ; y++) { mDataModel.processData(data.get(vals[y])); } - + data.clear(); - + if (mDataModel.getRowCount() >0) mTable.setRowSelectionInterval(0,0); - + mModel.progressStop(); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/JobsInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/JobsInstanceTab.java index 059a741ce..1c457c720 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/JobsInstanceTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/JobsInstanceTab.java @@ -42,7 +42,7 @@ public class JobsInstanceTab extends CMSPluginInstanceTab { * variables *==========================================================*/ private static final String PANEL_NAME = "JOBSRULE"; - + private final static String HELPINDEX = "jobsscheduler-certsrv-jobrules-help"; @@ -56,7 +56,7 @@ public class JobsInstanceTab extends CMSPluginInstanceTab { mDataModel = new JobsRuleDataModel(); mScope = ScopeDef.SC_JOBS_INSTANCE; RULE_NAME = JobsRuleDataModel.RULE_NAME; - RULE_STAT = JobsRuleDataModel.RULE_STAT; + RULE_STAT = JobsRuleDataModel.RULE_STAT; mHelpToken = HELPINDEX; } @@ -67,7 +67,7 @@ public class JobsInstanceTab extends CMSPluginInstanceTab { JFrame parent, AdminConnection conn, String dest - ) + ) { return new JobsConfigDialog(nvp, @@ -81,7 +81,7 @@ public class JobsInstanceTab extends CMSPluginInstanceTab { AdminConnection conn, String dest, CMSPluginInstanceTab pluginType - ) + ) { return new JobsPluginSelectionDialog(parent,conn,dest,pluginType); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/JobsPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/JobsPluginSelectionDialog.java index d07e5ed32..ba3403b5c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/JobsPluginSelectionDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/JobsPluginSelectionDialog.java @@ -41,7 +41,7 @@ public class JobsPluginSelectionDialog extends PluginSelectionDialog * variables *==========================================================*/ private static final String PREFIX = "JOBSSELECTIONDIALOG"; - private static final String HELPINDEX = + private static final String HELPINDEX = "jobsscheduler-certsrv-add-jobrule-dbox-help"; /*========================================================== @@ -49,9 +49,9 @@ public class JobsPluginSelectionDialog extends PluginSelectionDialog *==========================================================*/ public JobsPluginSelectionDialog( JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest, - CMSPluginInstanceTab pluginType) + CMSPluginInstanceTab pluginType) { super(PREFIX, parent,conn, dest, pluginType); mScope = ScopeDef.SC_JOBS_IMPLS; diff --git a/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java index 76fbd9a38..9bce4799b 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java @@ -56,7 +56,7 @@ public class JobsRuleDataModel extends CMSRuleDataModel v.addElement(new JLabel(obj.get(RULE_NAME), CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE), JLabel.LEFT)); - v.addElement(mResource.getString("JOBSRULE_LABEL_ENABLED_LABEL")); + v.addElement(mResource.getString("JOBSRULE_LABEL_ENABLED_LABEL")); } else { v.addElement(new JLabel(obj.get(RULE_NAME), CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE), diff --git a/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java index b6a93d191..86b8e90ff 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java @@ -32,7 +32,7 @@ import java.awt.event.*; * @version $Revision$, $Date$ */ public class JobsSettingPanel extends CMSBaseTab implements ItemListener { - private static final String HELPINDEX = + private static final String HELPINDEX = "jobsscheduler-certsrv-setting-jobrule-help"; private JTextField mFrequencyText; private JCheckBox mEnable; @@ -48,7 +48,7 @@ public class JobsSettingPanel extends CMSBaseTab implements ItemListener { this(panelName, parent, true); mPanelName = panelName; } - + public JobsSettingPanel(String panelName, CMSTabPanel parent, boolean flag) { super(panelName, parent); mServletName = DestDef.DEST_JOBS_ADMIN; @@ -63,7 +63,7 @@ public class JobsSettingPanel extends CMSBaseTab implements ItemListener { GridBagLayout gb = new GridBagLayout(); GridBagConstraints gbc = new GridBagConstraints(); mCenterPanel.setLayout(gb); - + //add the enable checkbox mEnable = makeJCheckBox("ENABLE"); mEnable.setSelected(true); @@ -72,13 +72,13 @@ public class JobsSettingPanel extends CMSBaseTab implements ItemListener { gbc.fill = gbc.NONE; gbc.gridwidth = gbc.REMAINDER; gbc.weightx = 1.0; - gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE, + gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE, DIFFERENT_COMPONENT_SPACE, 0, DIFFERENT_COMPONENT_SPACE); gb.setConstraints(mEnable, gbc); mCenterPanel.add(mEnable); - + //add the frequency panel CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTH; @@ -92,7 +92,7 @@ public class JobsSettingPanel extends CMSBaseTab implements ItemListener { GridBagLayout gb1 = new GridBagLayout(); serverInfo.setLayout(gb1); serverInfo.setBorder(makeTitledBorder("FREQUENCY")); - + // add frequency label and text field CMSAdminUtil.resetGBC(gbc); mFrequencyLabel = makeJLabel("FREQUENCY"); diff --git a/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java b/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java index 5821127d4..3df1832fd 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java @@ -62,7 +62,7 @@ public class KeyCreateDialog extends JDialog /*========================================================== * constructors *==========================================================*/ - + public KeyCreateDialog(JFrame parent, AdminConnection conn) { super(parent,true); KeyCreateDialog2(PREFIX, parent, conn); @@ -128,7 +128,7 @@ public class KeyCreateDialog extends JDialog } if (evt.getSource().equals(mOK)) { - + /* REPLACED BY PROACTIVE ENFORCEMENT if (mNameField.getText().trim().equals("")) { CMSAdminUtil.showMessageDialog(mParentFrame, mResource, mPrefix, @@ -162,15 +162,15 @@ public class KeyCreateDialog extends JDialog public void insertUpdate(DocumentEvent e) { setButtons(); } - + public void removeUpdate(DocumentEvent e){ setButtons(); } - + public void changedUpdate(DocumentEvent e){ setButtons(); } - + //==== MOUSELISTENER ====================== public void mouseClicked(MouseEvent e) { setButtons(); @@ -180,13 +180,13 @@ public class KeyCreateDialog extends JDialog public void mouseReleased(MouseEvent e) {} public void mouseEntered(MouseEvent e) {} public void mouseExited(MouseEvent e) { - setButtons(); + setButtons(); } - + /*========================================================== * protected methods - *==========================================================*/ - + *==========================================================*/ + protected void setDisplay() { getContentPane().setLayout(new BorderLayout()); JPanel center = new JPanel(); @@ -219,19 +219,19 @@ public class KeyCreateDialog extends JDialog /*========================================================== * private methods - *==========================================================*/ + *==========================================================*/ //set arrow buttons private void setButtons() { - if ( mNameField.getText().trim().equals("")) { + if ( mNameField.getText().trim().equals("")) { //|| //(mClassField.getText().trim().equals("")) ) { - mOK.setEnabled(false); + mOK.setEnabled(false); } else { - mOK.setEnabled(true); + mOK.setEnabled(true); } - } - + } + private JPanel makeActionPane() { mOK = CMSAdminUtil.makeJButton(mResource, mPrefix, "OK", null, this); mOK.setEnabled(false); @@ -259,7 +259,7 @@ public class KeyCreateDialog extends JDialog //JLabel label2 = CMSAdminUtil.makeJLabel(mResource, mPrefix, "CLASS", null); //mClassField = new JTextField(); //mClassField.getDocument().addDocumentListener(this); - //mClassField.addMouseListener(this); + //mClassField.addMouseListener(this); //CMSAdminUtil.addEntryField(content, label2, mClassField, gbc); //if (mType) { @@ -268,10 +268,10 @@ public class KeyCreateDialog extends JDialog // JLabel label3 = CMSAdminUtil.makeJLabel(mResource, mPrefix, "TYPE", null); // mTypeField = new JTextField(); // mTypeField.getDocument().addDocumentListener(this); - // mTypeField.addMouseListener(this); + // mTypeField.addMouseListener(this); // CMSAdminUtil.addEntryField(content, label3, mTypeField, gbc); //} - + return content; } diff --git a/base/console/src/com/netscape/admin/certsrv/config/ListCertsModel.java b/base/console/src/com/netscape/admin/certsrv/config/ListCertsModel.java index b239edfb9..70ab973df 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ListCertsModel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ListCertsModel.java @@ -37,9 +37,9 @@ public class ListCertsModel extends CMSTableModel *==========================================================*/ public static final String COL1 = "CERTNICKNAMENAME"; public static final String COL2 = "SERIALNUMBER"; - public static final String COL3 = "ISSUERNAME"; + public static final String COL3 = "ISSUERNAME"; public static final String COL4 = "TOKENNAME"; - + private static String[] mColumns = {COL1, COL2, COL3, COL4}; /*========================================================== diff --git a/base/console/src/com/netscape/admin/certsrv/config/ListKeysModel.java b/base/console/src/com/netscape/admin/certsrv/config/ListKeysModel.java index 78f033be5..bf80db90f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ListKeysModel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ListKeysModel.java @@ -37,9 +37,9 @@ public class ListKeysModel extends CMSTableModel *==========================================================*/ public static final String COL1 = "KEYNAME"; public static final String COL2 = "SERIALNUMBER"; - public static final String COL3 = "ISSUERNAME"; + public static final String COL3 = "ISSUERNAME"; public static final String COL4 = "TOKENNAME"; - + private static String[] mColumns = {COL1}; /*========================================================== diff --git a/base/console/src/com/netscape/admin/certsrv/config/LogConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/LogConfigDialog.java index 7f3833034..5333d36a0 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/LogConfigDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/LogConfigDialog.java @@ -46,7 +46,7 @@ public class LogConfigDialog extends CMSBaseConfigDialog *==========================================================*/ public LogConfigDialog(NameValuePairs nvp, JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest) { super(parent, dest); diff --git a/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java index a5af0b1dc..7e65ba0ff 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java @@ -40,7 +40,7 @@ public class LogImplDataModel extends CMSContentTableModel public static final String IMPL_NAME = "NAME"; public static final String IMPL_CLASS = "CLASS"; public static final String IMPL_DESC = "DESC"; - + private static String[] mColumns = {LOG_IMPL, CLASSNAME}; /*========================================================== diff --git a/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java index 1b654fead..bb399e183 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java @@ -43,19 +43,19 @@ public class LogImplTab extends CMSBaseUGTab { private static final String IMPL_NAME = LogImplDataModel.IMPL_NAME; private static final String IMPL_CLASS = LogImplDataModel.IMPL_CLASS; private static final String IMPL_DESC = LogImplDataModel.IMPL_DESC; - + private static final String PANEL_NAME = "LOGIMPL"; private static final String DIALOG_PREFIX = "LOGREGISTERDIALOG"; - + private AdminConnection mConnection; private String mDestination; - + protected JScrollPane mScrollPane; protected JTable mTable; //table protected LogImplDataModel mDataModel; //table model protected LogRegisterDialog mEditor=null; //keep single copy protected ViewDialog mViewer=null; //keep single copy - + protected JButton mRefresh, mAdd, mDelete, mView, mHelp; private final static String HELPINDEX = "configuration-log-plugin-help"; @@ -106,13 +106,13 @@ public class LogImplTab extends CMSBaseUGTab { if(mTable.getSelectedRow()< 0) return; NameValuePairs obj = (NameValuePairs) - mDataModel.getObjectValueAt(mTable.getSelectedRow()); + mDataModel.getObjectValueAt(mTable.getSelectedRow()); if (mViewer==null) mViewer = new ViewDialog(mModel.getFrame()); mViewer.showDialog(obj.get(IMPL_NAME), obj.get(IMPL_CLASS), obj.get(IMPL_DESC)); - } + } if (e.getSource().equals(mHelp)) { helpCallback(); } @@ -124,7 +124,7 @@ public class LogImplTab extends CMSBaseUGTab { } public void mouseReleased(MouseEvent e) { - setButtons(); + setButtons(); } /*========================================================== @@ -133,8 +133,8 @@ public class LogImplTab extends CMSBaseUGTab { public void refresh() { mDataModel.removeAllRows(); - update(); - + update(); + setButtons(); mTable.invalidate(); mTable.validate(); @@ -218,7 +218,7 @@ public class LogImplTab extends CMSBaseUGTab { //set buttons private void setButtons() { - + //enable and diable buttons accordingly //Debug.println("setButtons() - "+mTable.getSelectedRow()); //Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty()); @@ -227,24 +227,24 @@ public class LogImplTab extends CMSBaseUGTab { mView.setEnabled(false); return; } - + if(mDataModel.getRowCount()<=0) { mDelete.setEnabled(false); mView.setEnabled(false); return; } - + mDelete.setEnabled(true); - mView.setEnabled(true); - + mView.setEnabled(true); + } - + //============================================= // SEND REQUESTS TO THE SERVER SIDE //============================================= private void update() { //send request and parse data - + mModel.progressStart(); NameValuePairs response; try { @@ -275,18 +275,18 @@ public class LogImplTab extends CMSBaseUGTab { obj.put(IMPL_DESC, value.substring(x + 1)); data.put(entry,obj); } - + CMSAdminUtil.bubbleSort(vals); - + for (int y=0; y< vals.length ; y++) { mDataModel.processData(data.get(vals[y])); } - + data.clear(); - + if (mDataModel.getRowCount() >0) mTable.setRowSelectionInterval(0,0); - + mModel.progressStop(); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/LogInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/LogInstanceTab.java index 99b86e5eb..f69557d4a 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/LogInstanceTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/LogInstanceTab.java @@ -42,7 +42,7 @@ public class LogInstanceTab extends CMSPluginInstanceTab { * variables *==========================================================*/ private static final String PANEL_NAME = "LOGRULE"; - + private final static String HELPINDEX = "configuration-loginstances-help"; @@ -57,7 +57,7 @@ public class LogInstanceTab extends CMSPluginInstanceTab { mScope = ScopeDef.SC_LOG_RULES; RULE_NAME = LogRuleDataModel.RULE_NAME; RULE_IMPL = LogRuleDataModel.RULE_IMPL; - RULE_STAT = LogRuleDataModel.RULE_STAT; + RULE_STAT = LogRuleDataModel.RULE_STAT; mHelpToken = HELPINDEX; } @@ -68,7 +68,7 @@ public class LogInstanceTab extends CMSPluginInstanceTab { JFrame parent, AdminConnection conn, String dest - ) + ) { return new LogConfigDialog(nvp, @@ -82,7 +82,7 @@ public class LogInstanceTab extends CMSPluginInstanceTab { AdminConnection conn, String dest, CMSPluginInstanceTab pluginType - ) + ) { return new LogPluginSelectionDialog(parent,conn,dest,pluginType); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/LogPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/LogPluginSelectionDialog.java index 83c8ab2e8..b1d5662a0 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/LogPluginSelectionDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/LogPluginSelectionDialog.java @@ -49,9 +49,9 @@ public class LogPluginSelectionDialog extends PluginSelectionDialog *==========================================================*/ public LogPluginSelectionDialog( JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest, - CMSPluginInstanceTab pluginType) + CMSPluginInstanceTab pluginType) { super(PREFIX, parent,conn, dest, pluginType); mScope = ScopeDef.SC_LOG_IMPLS; diff --git a/base/console/src/com/netscape/admin/certsrv/config/MapperConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/MapperConfigDialog.java index 119823d58..80969a793 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/MapperConfigDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/MapperConfigDialog.java @@ -46,7 +46,7 @@ public class MapperConfigDialog extends CMSBaseConfigDialog *==========================================================*/ public MapperConfigDialog(NameValuePairs nvp, JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest) { super(parent, dest); @@ -61,4 +61,4 @@ public class MapperConfigDialog extends CMSBaseConfigDialog init(nvp,parent,conn,dest); } -} +} diff --git a/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java index 23d6ee0b4..77da97def 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java @@ -40,7 +40,7 @@ public class MapperImplDataModel extends CMSContentTableModel public static final String IMPL_NAME = "NAME"; public static final String IMPL_CLASS = "CLASS"; public static final String IMPL_DESC = "DESC"; - + private static String[] mColumns = {MAPPER_IMPL, CLASSNAME}; /*========================================================== diff --git a/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java index 2ad54da60..c12d05df6 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java @@ -43,19 +43,19 @@ public class MapperImplTab extends CMSBaseUGTab { private static final String IMPL_NAME = MapperImplDataModel.IMPL_NAME; private static final String IMPL_CLASS = MapperImplDataModel.IMPL_CLASS; private static final String IMPL_DESC = MapperImplDataModel.IMPL_DESC; - + private static final String PANEL_NAME = "MAPPERIMPL"; private static final String DIALOG_PREFIX = "MAPPERREGISTERDIALOG"; - + private AdminConnection mConnection; private String mDestination; - + protected JScrollPane mScrollPane; protected JTable mTable; //table protected MapperImplDataModel mDataModel; //table model protected MapperRegisterDialog mEditor=null; //keep single copy protected ViewDialog mViewer=null; //keep single copy - + protected JButton mRefresh, mAdd, mDelete, mView, mHelp; private final static String RAHELPINDEX = "configuration-ra-mapperplugin-help"; private final static String CAHELPINDEX = "configuration-ca-mapperplugin-help"; @@ -111,13 +111,13 @@ public class MapperImplTab extends CMSBaseUGTab { if(mTable.getSelectedRow()< 0) return; NameValuePairs obj = (NameValuePairs) - mDataModel.getObjectValueAt(mTable.getSelectedRow()); + mDataModel.getObjectValueAt(mTable.getSelectedRow()); if (mViewer==null) mViewer = new ViewDialog(mModel.getFrame()); mViewer.showDialog(obj.get(IMPL_NAME), obj.get(IMPL_CLASS), obj.get(IMPL_DESC)); - } + } if (e.getSource().equals(mHelp)) { helpCallback(); } @@ -129,7 +129,7 @@ public class MapperImplTab extends CMSBaseUGTab { } public void mouseReleased(MouseEvent e) { - setButtons(); + setButtons(); } /*========================================================== @@ -138,8 +138,8 @@ public class MapperImplTab extends CMSBaseUGTab { public void refresh() { mDataModel.removeAllRows(); - update(); - + update(); + setButtons(); mTable.invalidate(); mTable.validate(); @@ -223,7 +223,7 @@ public class MapperImplTab extends CMSBaseUGTab { //set buttons private void setButtons() { - + //enable and diable buttons accordingly //Debug.println("setButtons() - "+mTable.getSelectedRow()); //Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty()); @@ -232,24 +232,24 @@ public class MapperImplTab extends CMSBaseUGTab { mView.setEnabled(false); return; } - + if(mDataModel.getRowCount()<=0) { mDelete.setEnabled(false); mView.setEnabled(false); return; } - + mDelete.setEnabled(true); - mView.setEnabled(true); - + mView.setEnabled(true); + } - + //============================================= // SEND REQUESTS TO THE SERVER SIDE //============================================= private void update() { //send request and parse data - + mModel.progressStart(); NameValuePairs response; try { @@ -280,18 +280,18 @@ public class MapperImplTab extends CMSBaseUGTab { obj.put(IMPL_DESC, value.substring(x + 1)); data.put(entry,obj); } - + CMSAdminUtil.bubbleSort(vals); - + for (int y=0; y< vals.length ; y++) { mDataModel.processData(data.get(vals[y])); } - + data.clear(); - + if (mDataModel.getRowCount() >0) mTable.setRowSelectionInterval(0,0); - + mModel.progressStop(); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/MapperInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/MapperInstanceTab.java index a531ecf30..9e50c67f3 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/MapperInstanceTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/MapperInstanceTab.java @@ -42,7 +42,7 @@ public class MapperInstanceTab extends CMSPluginInstanceTab { * variables *==========================================================*/ private static final String PANEL_NAME = "MAPPERRULE"; - + private final static String RAHELPINDEX = "configuration-ra-mapperinstances-help"; private final static String CAHELPINDEX = "configuration-ca-mapperinstances-help"; private final static String KRAHELPINDEX = "configuration-kra-mapperinstances-help"; @@ -58,9 +58,9 @@ public class MapperInstanceTab extends CMSPluginInstanceTab { mDataModel = new MapperRuleDataModel(); mScope = ScopeDef.SC_MAPPER_RULES; RULE_NAME = MapperRuleDataModel.RULE_NAME; - RULE_STAT = MapperRuleDataModel.RULE_STAT; + RULE_STAT = MapperRuleDataModel.RULE_STAT; - if (mDestination.equals(DestDef.DEST_RA_MAPPER_ADMIN)) + if (mDestination.equals(DestDef.DEST_RA_MAPPER_ADMIN)) mHelpToken = RAHELPINDEX; else mHelpToken = CAHELPINDEX; @@ -72,7 +72,7 @@ public class MapperInstanceTab extends CMSPluginInstanceTab { JFrame parent, AdminConnection conn, String dest - ) + ) { return new MapperConfigDialog(nvp, @@ -86,7 +86,7 @@ public class MapperInstanceTab extends CMSPluginInstanceTab { AdminConnection conn, String dest, CMSPluginInstanceTab pluginType - ) + ) { return new MapperPluginSelectionDialog(parent,conn,dest,pluginType); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/MapperPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/MapperPluginSelectionDialog.java index ce0e10e9a..f393ae05d 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/MapperPluginSelectionDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/MapperPluginSelectionDialog.java @@ -41,7 +41,7 @@ public class MapperPluginSelectionDialog extends PluginSelectionDialog * variables *==========================================================*/ private static final String PREFIX = "MAPPERSELECTIONDIALOG"; - private static final String CAHELPINDEX = + private static final String CAHELPINDEX = "configuration-ca-add-mapperrule-dbox-help"; private static final String RAHELPINDEX = "configuration-ra-add-mapperrule-dbox-help"; @@ -51,9 +51,9 @@ public class MapperPluginSelectionDialog extends PluginSelectionDialog *==========================================================*/ public MapperPluginSelectionDialog( JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest, - CMSPluginInstanceTab pluginType) + CMSPluginInstanceTab pluginType) { super(PREFIX, parent,conn, dest, pluginType); mScope = ScopeDef.SC_MAPPER_IMPLS; diff --git a/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresConfigDialog.java index 87097ddc0..024196284 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresConfigDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresConfigDialog.java @@ -57,4 +57,4 @@ public class OCSPStoresConfigDialog extends CMSBaseConfigDialog init(nvp,parent,conn,dest); } -} +} diff --git a/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java index ff234c7fd..110ba7806 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java @@ -40,7 +40,7 @@ public class OCSPStoresInstanceTab extends CMSPluginInstanceTab { * variables *==========================================================*/ private static final String PANEL_NAME = "OCSPSTORESRULE"; - + private final static String OCSPHELPINDEX = "configuration-ocsp-storeinstances-help"; @@ -53,9 +53,9 @@ public class OCSPStoresInstanceTab extends CMSPluginInstanceTab { mConnection = model.getServerInfo().getAdmin(); mDataModel = new OCSPStoresRuleDataModel(); mScope = ScopeDef.SC_OCSPSTORES_RULES; - RULE_NAME = OCSPStoresRuleDataModel.RULE_NAME; + RULE_NAME = OCSPStoresRuleDataModel.RULE_NAME; RULE_IMPL = OCSPStoresRuleDataModel.RULE_IMPL; - RULE_STAT = OCSPStoresRuleDataModel.RULE_STAT; + RULE_STAT = OCSPStoresRuleDataModel.RULE_STAT; mHelpToken = OCSPHELPINDEX; } @@ -64,7 +64,7 @@ public class OCSPStoresInstanceTab extends CMSPluginInstanceTab { NameValuePairs nvp, JFrame parent, AdminConnection conn, - String dest) + String dest) { return new OCSPStoresConfigDialog(nvp, parent, conn, dest); } @@ -73,7 +73,7 @@ public class OCSPStoresInstanceTab extends CMSPluginInstanceTab { JFrame parent, AdminConnection conn, String dest, - CMSPluginInstanceTab pluginType) + CMSPluginInstanceTab pluginType) { return new OCSPStoresPluginSelectionDialog(parent, conn, dest, pluginType); } @@ -108,7 +108,7 @@ public class OCSPStoresInstanceTab extends CMSPluginInstanceTab { mModel.progressStart(); //get entry name NameValuePairs data = (NameValuePairs) - mDataModel.getObjectValueAt(mTable.getSelectedRow()); + mDataModel.getObjectValueAt(mTable.getSelectedRow()); NameValuePairs nvps = new NameValuePairs(); //send comment to server for the removal of user diff --git a/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresPluginSelectionDialog.java index 32365c27c..68c952c7b 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresPluginSelectionDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresPluginSelectionDialog.java @@ -40,7 +40,7 @@ public class OCSPStoresPluginSelectionDialog extends PluginSelectionDialog * variables *==========================================================*/ private static final String PREFIX = "OCSPSTORESELECTIONDIALOG"; - private static final String OCSPHELPINDEX = + private static final String OCSPHELPINDEX = "configuration-ocsp-add-crlextensionrule-dbox-help"; /*========================================================== @@ -48,9 +48,9 @@ public class OCSPStoresPluginSelectionDialog extends PluginSelectionDialog *==========================================================*/ public OCSPStoresPluginSelectionDialog( JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest, - CMSPluginInstanceTab pluginType) + CMSPluginInstanceTab pluginType) { super(PREFIX, parent,conn, dest, pluginType); // mScope = ScopeDef.SC_RULE_IMPLS; diff --git a/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java index 5cd67e276..05c9c74ad 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java @@ -55,7 +55,7 @@ public class OCSPStoresRuleDataModel extends CMSRuleDataModel v.addElement(new JLabel(obj.get(RULE_NAME), CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE), JLabel.LEFT)); - v.addElement(mResource.getString("OCSPSTORESRULE_LABEL_ENABLED_LABEL")); + v.addElement(mResource.getString("OCSPSTORESRULE_LABEL_ENABLED_LABEL")); } else { v.addElement(new JLabel(obj.get(RULE_NAME), CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE), diff --git a/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java index 5de06c7f9..d920c1681 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java @@ -57,7 +57,7 @@ public class PanelMapperConfigDialog extends JDialog private AdminConnection mConn; private JButton mOK, mCancel, mHelp; private JComboBox mSelection; - + private static final String CAHELPINDEX = "configuration-ldappublish-camapper-dbox-help"; private static final String RAHELPINDEX = @@ -97,7 +97,7 @@ public class PanelMapperConfigDialog extends JDialog mScope = scope; Debug.println("MapperConfigDialog: showDialog() - mapper: "+ mRuleName+" dest: "+mDest+" scope: "+mScope); - + if (!refresh(name)) return; @@ -127,7 +127,7 @@ public class PanelMapperConfigDialog extends JDialog mTable.setValueAt(str, row, col); } } - + try { saveConfiguration(); } catch (EAdminException e) { @@ -136,7 +136,7 @@ public class PanelMapperConfigDialog extends JDialog e.toString(), CMSAdminUtil.ERROR_MESSAGE); return; } - + mIsOK = true; this.dispose(); } @@ -164,37 +164,37 @@ public class PanelMapperConfigDialog extends JDialog } } } - + /*========================================================== * private methods *==========================================================*/ - + private void saveEdit() { - + //save any current edit component Component component = mTable.getEditorComponent(); - + } - - //setup and refresh the UI components + + //setup and refresh the UI components private boolean refresh(String mapperName) { - + //get mapper listing if (!getMapperListing(mapperName)) return false; - + //setup UI if (! setupConfigUI(mapperName)) return false; - + return true; } - - //retrieve the mapper class listing and update + + //retrieve the mapper class listing and update //the selection UI private boolean getMapperListing(String mapperName) { NameValuePairs response; - + try { response = getMapperList(); }catch (EAdminException e) { @@ -202,22 +202,22 @@ public class PanelMapperConfigDialog extends JDialog e.toString(), CMSAdminUtil.ERROR_MESSAGE); return false; } - + Debug.println("MapperList: "+response.toString()); mSelection.removeAllItems(); - + for (String name : response.keySet()) { mSelection.addItem(name.trim()); } - + mSelection.setSelectedItem(mapperName); return true; } - + //retrieve the config parameters for the mapper //and update the config UI private boolean setupConfigUI(String mapperName) { - + try { mData = getConfiguration(mapperName); }catch (EAdminException e) { @@ -228,7 +228,7 @@ public class PanelMapperConfigDialog extends JDialog Debug.println("MapperConfigDialog: showDialog() config: "+mData.toString()); mDataModel.removeAllRows(); - + for (String entry : mData.keySet()) { entry = entry.trim(); if (!entry.equals(Constants.PR_MAPPER)) { @@ -243,7 +243,7 @@ public class PanelMapperConfigDialog extends JDialog mTable.repaint(); return true; } - + private void setDisplay() { getContentPane().setLayout(new BorderLayout()); JPanel center = new JPanel(); @@ -311,7 +311,7 @@ public class PanelMapperConfigDialog extends JDialog mScrollPane.setBackground(Color.white); //setLabelCellRenderer(mTable,1); setCellEditor(mTable,1); - + CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTH; gbc.gridwidth = gbc.REMAINDER; @@ -330,41 +330,41 @@ public class PanelMapperConfigDialog extends JDialog //Set the index column's cellrender as label cell private void setLabelCellRenderer(JTable table, int index) { table.getColumnModel().getColumn(index).setCellRenderer( - new DefaultTableCellRenderer()); + new DefaultTableCellRenderer()); } - + //set the index column's cell editor private void setCellEditor(JTable table, int index) { table.getColumnModel().getColumn(index).setCellEditor( - new DefaultCellEditor(new JTextField())); + new DefaultCellEditor(new JTextField())); } - + //retrieve the mapper listing from the server side - private NameValuePairs getMapperList() - throws EAdminException + private NameValuePairs getMapperList() + throws EAdminException { - return mConn.search(mDest, getMapperScope(), + return mConn.search(mDest, getMapperScope(), new NameValuePairs()); } - + //retrieve the configuration parameters for specific //mapper class - private NameValuePairs getConfiguration(String mapper) - throws EAdminException + private NameValuePairs getConfiguration(String mapper) + throws EAdminException { - return mConn.read(mDest, getMapperScope(), + return mConn.read(mDest, getMapperScope(), mapper, new NameValuePairs()); } - + //get the mapper scope private String getMapperScope() { - + if (mScope.equals(ScopeDef.SC_CACERT)) return ScopeDef.SC_CAMAPPER; else return ScopeDef.SC_USERMAPPER; } - + //save the configuration settings for the mapper private void saveConfiguration() throws EAdminException { NameValuePairs nvp = getData(); @@ -380,12 +380,12 @@ public class PanelMapperConfigDialog extends JDialog } return response; } - + /** * Add a label and a textfield to a panel, assumed to be using * GridBagLayout. */ - private static void addEntryField(JPanel panel, JComponent label, + private static void addEntryField(JPanel panel, JComponent label, JComponent field, GridBagConstraints gbc) { gbc.fill = gbc.NONE; gbc.weightx = 0.0; @@ -405,5 +405,5 @@ public class PanelMapperConfigDialog extends JDialog CMSAdminUtil.COMPONENT_SPACE, 0,CMSAdminUtil.COMPONENT_SPACE); panel.add( field, gbc ); - } + } } diff --git a/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java index 437881186..ed1c21aa9 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java @@ -60,9 +60,9 @@ public class PluginSelectionDialog extends JDialog protected CMSBaseResourceModel mModel=null; public PluginSelectionDialog( - String prefix, - JFrame parent, - AdminConnection conn, + String prefix, + JFrame parent, + AdminConnection conn, String dest) { this( prefix, @@ -76,11 +76,11 @@ public class PluginSelectionDialog extends JDialog * constructors *==========================================================*/ public PluginSelectionDialog( - String prefix, - JFrame parent, - AdminConnection conn, + String prefix, + JFrame parent, + AdminConnection conn, String dest, - CMSPluginInstanceTab pluginType) + CMSPluginInstanceTab pluginType) { super(parent,true); mParentFrame = parent; @@ -341,18 +341,18 @@ public class PluginSelectionDialog extends JDialog vals[i++] = name.trim(); Debug.println("PluginSelectionDialog::update() - adding '" + vals[i - 1] + "'"); } - + CMSAdminUtil.bubbleSort(vals); - + for (int y=0; y< vals.length ; y++) { try { - mDataModel.addElement(new JLabel(vals[y], + mDataModel.addElement(new JLabel(vals[y], CMSAdminUtil.getImage(mImageName), JLabel.LEFT)); } catch (Exception ex) { Debug.println("PluginSelectionDialog could not get image for '"+ mImageName+"'. Adding without image"); - mDataModel.addElement(new JLabel(vals[y], + mDataModel.addElement(new JLabel(vals[y], JLabel.LEFT)); } } @@ -364,12 +364,12 @@ public class PluginSelectionDialog extends JDialog protected NameValuePairs getDefaultConfig() throws EAdminException { String id = ((JLabel)mDataModel.elementAt(mList.getSelectedIndex())).getText(); NameValuePairs response; - response = mConnection.read(mDestination, mScope, id, + response = mConnection.read(mDestination, mScope, id, new NameValuePairs()); Debug.println(response.toString()); return response; } - + } diff --git a/base/console/src/com/netscape/admin/certsrv/config/PolicyConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyConfigDialog.java index 8dec3cabf..c5a09837f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/PolicyConfigDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyConfigDialog.java @@ -46,7 +46,7 @@ public class PolicyConfigDialog extends CMSBaseConfigDialog *==========================================================*/ public PolicyConfigDialog(NameValuePairs nvp, JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest) { super(parent, dest); @@ -61,4 +61,4 @@ public class PolicyConfigDialog extends CMSBaseConfigDialog init(nvp,parent,conn,dest); } -} +} diff --git a/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java index 59ea36ec8..00baf6b8e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java @@ -40,7 +40,7 @@ public class PolicyImplDataModel extends CMSContentTableModel public static final String IMPL_NAME = "NAME"; public static final String IMPL_CLASS = "CLASS"; public static final String IMPL_DESC = "DESC"; - + private static String[] mColumns = {POLICY_IMPL, CLASSNAME}; /*========================================================== diff --git a/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java index f4fab7260..dbdfe8228 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java @@ -43,19 +43,19 @@ public class PolicyImplTab extends CMSBaseUGTab { private static final String IMPL_NAME = PolicyImplDataModel.IMPL_NAME; private static final String IMPL_CLASS = PolicyImplDataModel.IMPL_CLASS; private static final String IMPL_DESC = PolicyImplDataModel.IMPL_DESC; - + private static final String PANEL_NAME = "POLICYIMPL"; private static final String DIALOG_PREFIX = "POLICYREGISTERDIALOG"; - + private AdminConnection mConnection; private String mDestination; - + protected JScrollPane mScrollPane; protected JTable mTable; //table protected PolicyImplDataModel mDataModel; //table model protected PolicyRegisterDialog mEditor=null; //keep single copy protected ViewDialog mViewer=null; //keep single copy - + protected JButton mRefresh, mAdd, mDelete, mView, mHelp; private final static String RAHELPINDEX = "configuration-ra-policyplugin-help"; private final static String CAHELPINDEX = "configuration-ca-policyplugin-help"; @@ -113,13 +113,13 @@ public class PolicyImplTab extends CMSBaseUGTab { if(mTable.getSelectedRow()< 0) return; NameValuePairs obj = (NameValuePairs) - mDataModel.getObjectValueAt(mTable.getSelectedRow()); + mDataModel.getObjectValueAt(mTable.getSelectedRow()); if (mViewer==null) mViewer = new ViewDialog(mModel.getFrame()); mViewer.showDialog(obj.get(IMPL_NAME), obj.get(IMPL_CLASS), obj.get(IMPL_DESC)); - } + } if (e.getSource().equals(mHelp)) { helpCallback(); } @@ -131,7 +131,7 @@ public class PolicyImplTab extends CMSBaseUGTab { } public void mouseReleased(MouseEvent e) { - setButtons(); + setButtons(); } /*========================================================== @@ -140,8 +140,8 @@ public class PolicyImplTab extends CMSBaseUGTab { public void refresh() { mDataModel.removeAllRows(); - update(); - + update(); + setButtons(); mTable.invalidate(); mTable.validate(); @@ -225,7 +225,7 @@ public class PolicyImplTab extends CMSBaseUGTab { //set buttons private void setButtons() { - + //enable and diable buttons accordingly //Debug.println("setButtons() - "+mTable.getSelectedRow()); //Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty()); @@ -234,24 +234,24 @@ public class PolicyImplTab extends CMSBaseUGTab { mView.setEnabled(false); return; } - + if(mDataModel.getRowCount()<=0) { mDelete.setEnabled(false); mView.setEnabled(false); return; } - + mDelete.setEnabled(true); - mView.setEnabled(true); - + mView.setEnabled(true); + } - + //============================================= // SEND REQUESTS TO THE SERVER SIDE //============================================= private void update() { //send request and parse data - + mModel.progressStart(); NameValuePairs response; try { @@ -282,18 +282,18 @@ public class PolicyImplTab extends CMSBaseUGTab { obj.put(IMPL_DESC, value.substring(x + 1)); data.put(entry,obj); } - + CMSAdminUtil.bubbleSort(vals); - + for (int y=0; y< vals.length ; y++) { mDataModel.processData(data.get(vals[y])); } - + data.clear(); - + if (mDataModel.getRowCount() >0) mTable.setRowSelectionInterval(0,0); - + mModel.progressStop(); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/PolicyInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyInstanceTab.java index 9bf8fb54b..5d13c7a49 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/PolicyInstanceTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyInstanceTab.java @@ -42,7 +42,7 @@ public class PolicyInstanceTab extends CMSPluginInstanceTab { * variables *==========================================================*/ private static final String PANEL_NAME = "POLICYRULE"; - + protected JButton mOrder; private final static String RAHELPINDEX = "configuration-ra-policyrules-help"; private final static String CAHELPINDEX = "configuration-ca-policyrules-help"; @@ -59,9 +59,9 @@ public class PolicyInstanceTab extends CMSPluginInstanceTab { mDataModel = new PolicyRuleDataModel(); mScope = ScopeDef.SC_POLICY_RULES; RULE_NAME = PolicyRuleDataModel.RULE_NAME; - RULE_STAT = PolicyRuleDataModel.RULE_STAT; + RULE_STAT = PolicyRuleDataModel.RULE_STAT; - if (mDestination.equals(DestDef.DEST_RA_POLICY_ADMIN)) + if (mDestination.equals(DestDef.DEST_RA_POLICY_ADMIN)) mHelpToken = RAHELPINDEX; else if (mDestination.equals(DestDef.DEST_KRA_POLICY_ADMIN)) mHelpToken = KRAHELPINDEX; @@ -75,7 +75,7 @@ public class PolicyInstanceTab extends CMSPluginInstanceTab { JFrame parent, AdminConnection conn, String dest - ) + ) { return new PolicyConfigDialog(nvp, @@ -89,7 +89,7 @@ public class PolicyInstanceTab extends CMSPluginInstanceTab { AdminConnection conn, String dest, CMSPluginInstanceTab pluginType - ) + ) { return new PolicyPluginSelectionDialog(parent,conn,dest,pluginType); } @@ -99,12 +99,12 @@ public class PolicyInstanceTab extends CMSPluginInstanceTab { public void moreActionPerformed(ActionEvent e) { if (e.getSource().equals(mOrder)) { Debug.println("Order"); - PolicyRuleOrderDialog dialog = - new PolicyRuleOrderDialog(mModel.getFrame(), + PolicyRuleOrderDialog dialog = + new PolicyRuleOrderDialog(mModel.getFrame(), mConnection, mDestination); - dialog.showDialog(mDataModel.getRules()); + dialog.showDialog(mDataModel.getRules()); refresh(); - } + } } /** @@ -126,7 +126,7 @@ public class PolicyInstanceTab extends CMSPluginInstanceTab { //set buttons protected void setButtons() { super.setButtons(); - + if (mDataModel.getRowCount()<=0) { mOrder.setEnabled(false); } @@ -134,6 +134,6 @@ public class PolicyInstanceTab extends CMSPluginInstanceTab { mOrder.setEnabled(true); } } - - + + } diff --git a/base/console/src/com/netscape/admin/certsrv/config/PolicyPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyPluginSelectionDialog.java index 6ef26b767..11120ce69 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/PolicyPluginSelectionDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyPluginSelectionDialog.java @@ -41,7 +41,7 @@ public class PolicyPluginSelectionDialog extends PluginSelectionDialog * variables *==========================================================*/ private static final String PREFIX = "POLICYSELECTIONDIALOG"; - private static final String CAHELPINDEX = + private static final String CAHELPINDEX = "configuration-ca-add-policyrule-dbox-help"; private static final String RAHELPINDEX = "configuration-ra-add-policyrule-dbox-help"; @@ -53,9 +53,9 @@ public class PolicyPluginSelectionDialog extends PluginSelectionDialog *==========================================================*/ public PolicyPluginSelectionDialog( JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest, - CMSPluginInstanceTab pluginType) + CMSPluginInstanceTab pluginType) { super(PREFIX, parent,conn, dest, pluginType); mScope = ScopeDef.SC_POLICY_IMPLS; diff --git a/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java index 9bbeda334..5adf42cdd 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java @@ -56,7 +56,7 @@ public class PolicyRuleDataModel extends CMSRuleDataModel v.addElement(new JLabel(obj.get(RULE_NAME), CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE), JLabel.LEFT)); - v.addElement(mResource.getString("POLICYRULE_LABEL_ENABLED_LABEL")); + v.addElement(mResource.getString("POLICYRULE_LABEL_ENABLED_LABEL")); } else { v.addElement(new JLabel(obj.get(RULE_NAME), CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE), diff --git a/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java index 1c99d999f..e4149df13 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java @@ -99,12 +99,12 @@ public class PolicyRuleOrderDialog extends JDialog mDataModel.clear(); for (int i=0; i<rules.size(); i++) mDataModel.addElement( - new JLabel((String)rules.elementAt(i), + new JLabel((String)rules.elementAt(i), CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE), JLabel.LEFT)); if (mDataModel.getSize() >0) mList.setSelectedIndex(0); - + refresh(); setArrowButtons(); this.show(); @@ -147,7 +147,7 @@ public class PolicyRuleOrderDialog extends JDialog mDataModel.insertElementAt(obj,index+1); mList.setSelectedIndex(index+1); setArrowButtons(); - refresh(); + refresh(); } if (evt.getSource().equals(mHelp)) { CMSAdminUtil.help(mHelpToken); @@ -161,7 +161,7 @@ public class PolicyRuleOrderDialog extends JDialog public void mousePressed(MouseEvent e) {} public void mouseReleased(MouseEvent e) { - setArrowButtons(); + setArrowButtons(); } public void mouseEntered(MouseEvent e) {} public void mouseExited(MouseEvent e) { @@ -282,12 +282,12 @@ public class PolicyRuleOrderDialog extends JDialog x++; buf.append(((JLabel)mDataModel.getElementAt(i)).getText()); } - + NameValuePairs nvp = new NameValuePairs(); nvp.put(Constants.PR_POLICY_ORDER, buf.toString()); - + Debug.println("ORDER: "+buf.toString()); - + mConnection.modify(mDestination, ScopeDef.SC_POLICY_RULES, Constants.RS_ID_ORDER, @@ -296,7 +296,7 @@ public class PolicyRuleOrderDialog extends JDialog //set arrow buttons private void setArrowButtons() { - + //enable and diable buttons accordingly Debug.println("setArrowButtons() - "+mList.getSelectedIndex()); if (mList.getSelectedIndex()< 0) { @@ -305,7 +305,7 @@ public class PolicyRuleOrderDialog extends JDialog mOK.setEnabled(false); return; } - + if (mList.getSelectedIndex()==0) mUp.setEnabled(false); else @@ -314,7 +314,7 @@ public class PolicyRuleOrderDialog extends JDialog mDown.setEnabled(true); else mDown.setEnabled(false); - mOK.setEnabled(true); + mOK.setEnabled(true); } //refresh the table content diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileComponentCellEditor.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileComponentCellEditor.java index b1e2769db..e64a09254 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ProfileComponentCellEditor.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileComponentCellEditor.java @@ -31,14 +31,14 @@ import javax.swing.*; public class ProfileComponentCellEditor implements TableCellEditor { protected EventListenerList listenerList = new EventListenerList(); protected ChangeEvent changeEvent = null; - + protected JComponent editorComponent = null; protected JComponent container = null; // Can be tree or table public Component getComponent() { return editorComponent; } - + public Object getCellEditorValue() { return editorComponent; } @@ -46,28 +46,28 @@ public class ProfileComponentCellEditor implements TableCellEditor { public boolean isCellEditable(EventObject anEvent) { return true; } - + public boolean shouldSelectCell(EventObject anEvent) { return true; } - + public boolean stopCellEditing() { fireEditingStopped(); return true; } - + public void cancelCellEditing() { fireEditingCanceled(); } - + public void addCellEditorListener(CellEditorListener l) { listenerList.add(CellEditorListener.class, l); } - + public void removeCellEditorListener(CellEditorListener l) { listenerList.remove(CellEditorListener.class, l); } - + protected void fireEditingStopped() { Object[] listeners = listenerList.getListenerList(); // Process the listeners last to first, notifying @@ -78,10 +78,10 @@ public class ProfileComponentCellEditor implements TableCellEditor { if (changeEvent == null) changeEvent = new ChangeEvent(this); ((CellEditorListener)listeners[i+1]).editingStopped(changeEvent); - } + } } } - + protected void fireEditingCanceled() { // Guaranteed to return a non-null array Object[] listeners = listenerList.getListenerList(); @@ -93,14 +93,14 @@ public class ProfileComponentCellEditor implements TableCellEditor { if (changeEvent == null) changeEvent = new ChangeEvent(this); ((CellEditorListener)listeners[i+1]).editingCanceled(changeEvent); - } + } } } - + // implements javax.swing.table.TableCellEditor public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - + editorComponent = (JComponent)value; container = table; return editorComponent; diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java index a8d312d2a..14b772675 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java @@ -47,7 +47,7 @@ public class ProfileConfigDialog extends CMSBaseConfigDialog *==========================================================*/ public ProfileConfigDialog(NameValuePairs nvp, JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest) { super(parent, dest); @@ -370,7 +370,7 @@ public class ProfileConfigDialog extends CMSBaseConfigDialog nvp.put("auth", mAuthField.getText()); nvp.put("desc", mDescField.getText()); // nvp.add("config", mConfigField.getText()); - // mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN, + // mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN, mAdminConnection.add(mDest, ScopeDef.SC_PROFILE_RULES, instanceName, nvp); @@ -392,5 +392,5 @@ public class ProfileConfigDialog extends CMSBaseConfigDialog CMSAdminUtil.help(mHelpToken); } - } -} + } +} diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java index d10e19215..1d87b60fd 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java @@ -57,7 +57,7 @@ public class ProfileEditDialog extends CMSBaseConfigDialog *==========================================================*/ public ProfileEditDialog(NameValuePairs nvp, JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest) { super(parent, dest); @@ -242,7 +242,7 @@ public class ProfileEditDialog extends CMSBaseConfigDialog policyColNames.addElement("Id"); policyColNames.addElement("Defaults"); policyColNames.addElement("Constraints"); - Vector policyData = new Vector(); + Vector policyData = new Vector(); Vector policyRow = new Vector(); policyRow.addElement("p1"); policyRow.addElement("p1"); @@ -257,11 +257,11 @@ public class ProfileEditDialog extends CMSBaseConfigDialog mPolicyDelete = CMSAdminUtil.makeJButton(mResource, PREFIX, "DELETE", null, this); JPanel buttonPanel = createUserButtonPanel(mPolicyAdd, mPolicyDelete, mPolicyEdit); - JPanel lpanel = createListPanel(mPolicyTable, buttonPanel, + JPanel lpanel = createListPanel(mPolicyTable, buttonPanel, policyColNames, policyData); Vector inputColNames = new Vector(); - inputColNames.addElement("Id"); + inputColNames.addElement("Id"); inputColNames.addElement("Inputs"); Vector inputData = new Vector(); Vector inputRow = new Vector(); @@ -276,7 +276,7 @@ public class ProfileEditDialog extends CMSBaseConfigDialog mInputDelete = CMSAdminUtil.makeJButton(mResource, PREFIX, "DELETE", null, this); JPanel buttonPanel1 = createUserButtonPanel(mInputAdd, mInputDelete, mInputEdit); - JPanel lpanel1 = createListPanel(mInputTable, buttonPanel1, + JPanel lpanel1 = createListPanel(mInputTable, buttonPanel1, inputColNames, inputData); Vector outputColNames = new Vector(); @@ -292,11 +292,11 @@ public class ProfileEditDialog extends CMSBaseConfigDialog mOutputTable = new JTable(model2); mOutputEdit = CMSAdminUtil.makeJButton(mResource, PREFIX, "EDIT", null, this); mOutputAdd = CMSAdminUtil.makeJButton(mResource, PREFIX, "ADD", null, this); - mOutputDelete = CMSAdminUtil.makeJButton(mResource, PREFIX, "DELETE", + mOutputDelete = CMSAdminUtil.makeJButton(mResource, PREFIX, "DELETE", null , this); JPanel buttonPanel2 = createUserButtonPanel(mOutputAdd, mOutputDelete, mOutputEdit); - JPanel lpanel2 = createListPanel(mOutputTable, buttonPanel2, + JPanel lpanel2 = createListPanel(mOutputTable, buttonPanel2, outputColNames, outputData); // JPanel lpanel2 = createOutputPanel(); @@ -377,11 +377,11 @@ public class ProfileEditDialog extends CMSBaseConfigDialog return null; } - public JPanel createListPanel(JTable table, JPanel buttonPanel, + public JPanel createListPanel(JTable table, JPanel buttonPanel, Vector column, Vector datav) { Vector colNames = column; - Vector data = datav; + Vector data = datav; JPanel listPanel = new JPanel(); GridBagLayout gb = new GridBagLayout(); @@ -448,7 +448,7 @@ public class ProfileEditDialog extends CMSBaseConfigDialog if (evt.getSource().equals(mPolicyAdd)) { String profileId = mPluginName.getText(); - Debug.println("Add Policy"); + Debug.println("Add Policy"); ProfilePolicySelectionDialog dialog = new ProfilePolicySelectionDialog(mDefSetId, profileId, "PROFILEPOLICYSELDIALOG", @@ -456,15 +456,15 @@ public class ProfileEditDialog extends CMSBaseConfigDialog mAdminConnection, DestDef.DEST_REGISTRY_ADMIN, mDest); - dialog.setModel(mModel); - dialog.setDisplay(); - dialog.showDialog(); + dialog.setModel(mModel); + dialog.setDisplay(); + dialog.showDialog(); refresh(); } if (evt.getSource().equals(mInputAdd)) { String profileId = mPluginName.getText(); - Debug.println("Add Input"); + Debug.println("Add Input"); ProfileNonPolicySelDialog dialog = new ProfileNonPolicySelDialog(profileId, "PROFILEINPUTSELDIALOG", mModel.getFrame(), @@ -491,11 +491,11 @@ public class ProfileEditDialog extends CMSBaseConfigDialog } if (evt.getSource().equals(mPolicyDelete)) { - JTable table = getTable(); - if (table.getSelectedRowCount() <= 0) { + JTable table = getTable(); + if (table.getSelectedRowCount() <= 0) { String msg = mResource.getString( PREFIX+"_DIALOG_NOPOLICY_MESSAGE"); - CMSAdminUtil.showErrorDialog(mModel.getFrame(), + CMSAdminUtil.showErrorDialog(mModel.getFrame(), mResource, msg, CMSAdminUtil.ERROR_MESSAGE); return; } @@ -507,8 +507,8 @@ public class ProfileEditDialog extends CMSBaseConfigDialog table.getValueAt(table.getSelectedRow(), 1); try { deletePolicy(mPluginName.getText().trim(),policyId); - - ProfileEditDataModel model = + + ProfileEditDataModel model = (ProfileEditDataModel)table.getModel(); model.removeRow(table.getSelectedRow()); table.invalidate(); @@ -587,21 +587,21 @@ public class ProfileEditDialog extends CMSBaseConfigDialog } } - if (evt.getSource().equals(mPolicyEdit)) { + if (evt.getSource().equals(mPolicyEdit)) { JTable table = getTable(); // pick selected entry - if (table.getSelectedRowCount() <= 0) { - CMSAdminUtil.showErrorDialog(mModel.getFrame(), - mResource, - "You must select a policy first", + if (table.getSelectedRowCount() <= 0) { + CMSAdminUtil.showErrorDialog(mModel.getFrame(), + mResource, + "You must select a policy first", CMSAdminUtil.ERROR_MESSAGE); return; } String policyId = (String) - table.getValueAt(table.getSelectedRow(), 0) + ":" + + table.getValueAt(table.getSelectedRow(), 0) + ":" + table.getValueAt(table.getSelectedRow(), 1); - Debug.println("Edit"); + Debug.println("Edit"); NameValuePairs nvp = new NameValuePairs(); ProfilePolicyEditDialog dialog = new ProfilePolicyEditDialog(nvp, @@ -612,8 +612,8 @@ public class ProfileEditDialog extends CMSBaseConfigDialog dialog.setModel(mModel); String name = mPluginName.getText() + ";" + policyId; - Debug.println(" XXXX name=" + name); - dialog.showDialog(null, name); + Debug.println(" XXXX name=" + name); + dialog.showDialog(null, name); } if (evt.getSource().equals(mInputEdit)) { @@ -635,7 +635,7 @@ public class ProfileEditDialog extends CMSBaseConfigDialog new ProfileNonPolicyNewDialog(nvp, mModel.getFrame(), mAdminConnection, - //DestDef.DEST_CA_PROFILE_ADMIN, + //DestDef.DEST_CA_PROFILE_ADMIN, mDest, ScopeDef.SC_PROFILE_INPUT_CONFIG, false); dialog.setModel(mModel); @@ -678,7 +678,7 @@ public class ProfileEditDialog extends CMSBaseConfigDialog NameValuePairs nvp = new NameValuePairs(); try { - if (mModel != null) + if (mModel != null) mModel.progressStart(); String instanceName = mPluginName.getText(); @@ -690,15 +690,15 @@ public class ProfileEditDialog extends CMSBaseConfigDialog // nvp.add("config", mConfigField.getText()); /* - // mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN, + // mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN, ScopeDef.SC_PROFILE_RULES, instanceName, nvp); */ - //DestDef.DEST_CA_PROFILE_ADMIN, + //DestDef.DEST_CA_PROFILE_ADMIN, mAdminConnection.modify(mDest, ScopeDef.SC_PROFILE_RULES, instanceName, nvp); mIsOK = true; - if (mModel != null) + if (mModel != null) mModel.progressStop(); this.dispose(); } catch (EAdminException ex) { @@ -712,9 +712,9 @@ public class ProfileEditDialog extends CMSBaseConfigDialog this.dispose(); } - } + } - private void deletePolicy(String profileId, String policyId) + private void deletePolicy(String profileId, String policyId) throws EAdminException{ NameValuePairs nvps = new NameValuePairs(); nvps.put("POLICYID", policyId); @@ -754,23 +754,23 @@ public class ProfileEditDialog extends CMSBaseConfigDialog mModel.progressStart(); // retrieve profile information - NameValuePairs response = null; - NameValuePairs request = new NameValuePairs(); + NameValuePairs response = null; + NameValuePairs request = new NameValuePairs(); try { //response = mAdminConnection.read(DestDef.DEST_CA_PROFILE_ADMIN, response = mAdminConnection.read(mDest, ScopeDef.SC_PROFILE_RULES, name, request); - } catch (EAdminException e) { -// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString()); - mModel.progressStop(); - } + } catch (EAdminException e) { +// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString()); + mModel.progressStop(); + } mModel.progressStop(); String enable = response.get("enable"); if (response != null) { - mPluginName.setEnabled(false); + mPluginName.setEnabled(false); mPluginName.setBackground(getBackground()); mPluginName.setText(name); mNameField.setText(response.get("name")); @@ -801,28 +801,28 @@ public class ProfileEditDialog extends CMSBaseConfigDialog mOutputDelete.setEnabled(false); } } - + private void setProfileOtherInfo(String name) { if (mModel != null) mModel.progressStart(); JTable table = getTable(); NameValuePairs request = new NameValuePairs(); - NameValuePairs response = null; + NameValuePairs response = null; if (table == mPolicyTable) { try { response = mAdminConnection.read( mDest, ScopeDef.SC_PROFILE_POLICIES, name, request); } catch (EAdminException e) { - CMSAdminUtil.showErrorDialog(mParentFrame, mResource, - e.toString(), CMSAdminUtil.ERROR_MESSAGE); + CMSAdminUtil.showErrorDialog(mParentFrame, mResource, + e.toString(), CMSAdminUtil.ERROR_MESSAGE); if (mModel != null) - mModel.progressStop(); + mModel.progressStop(); return; } if (mModel != null) - mModel.progressStop(); + mModel.progressStop(); if (response != null) { populatePolicies(response, table); } @@ -832,15 +832,15 @@ public class ProfileEditDialog extends CMSBaseConfigDialog mDest, ScopeDef.SC_PROFILE_INPUT, name, request); } catch (EAdminException e) { - CMSAdminUtil.showErrorDialog(mParentFrame, mResource, - e.toString(), CMSAdminUtil.ERROR_MESSAGE); + CMSAdminUtil.showErrorDialog(mParentFrame, mResource, + e.toString(), CMSAdminUtil.ERROR_MESSAGE); if (mModel != null) - mModel.progressStop(); + mModel.progressStop(); return; } if (mModel != null) - mModel.progressStop(); + mModel.progressStop(); if (response != null) { populateNonPolicy(response, table); } @@ -850,15 +850,15 @@ public class ProfileEditDialog extends CMSBaseConfigDialog mDest, ScopeDef.SC_PROFILE_OUTPUT, name, request); } catch (EAdminException e) { - CMSAdminUtil.showErrorDialog(mParentFrame, mResource, - e.toString(), CMSAdminUtil.ERROR_MESSAGE); + CMSAdminUtil.showErrorDialog(mParentFrame, mResource, + e.toString(), CMSAdminUtil.ERROR_MESSAGE); if (mModel != null) - mModel.progressStop(); + mModel.progressStop(); return; } if (mModel != null) - mModel.progressStop(); + mModel.progressStop(); if (response != null) { populateNonPolicy(response, table); } @@ -885,11 +885,11 @@ public class ProfileEditDialog extends CMSBaseConfigDialog String def = st.nextToken(); String con = st.nextToken(); Vector<String> row = new Vector<String>(); - + StringTokenizer st1 = new StringTokenizer(entry, ":"); String setId = st1.nextToken(); String id = st1.nextToken(); - + if (mDefSetId == null) { mDefSetId = setId; } @@ -928,4 +928,4 @@ public class ProfileEditDialog extends CMSBaseConfigDialog model.setInfo(d, colNames); table.setModel(model); } -} +} diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java index eee2531cf..cdaf6d978 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java @@ -41,7 +41,7 @@ public class ProfileImplDataModel extends CMSContentTableModel public static final String IMPL_CLASS = "CLASS"; public static final String IMPL_TYPE = "TYPE"; public static final String IMPL_DESC = "DESC"; - + private static String[] mColumns = {POLICY_IMPL, IMPL_TYPE, CLASSNAME}; /*========================================================== diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java index c7d28dd07..2e1f5e27f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java @@ -44,19 +44,19 @@ public class ProfileImplTab extends CMSBaseUGTab { private static final String IMPL_TYPE = ProfileImplDataModel.IMPL_TYPE; private static final String IMPL_CLASS = ProfileImplDataModel.IMPL_CLASS; private static final String IMPL_DESC = ProfileImplDataModel.IMPL_DESC; - + private static final String PANEL_NAME = "PROFILEIMPL"; private static final String DIALOG_PREFIX = "PROFILEREGISTERDIALOG"; - + private AdminConnection mConnection; private String mDestination; - + protected JScrollPane mScrollPane; protected JTable mTable; //table protected ProfileImplDataModel mDataModel; //table model protected ProfileRegisterDialog mEditor=null; //keep single copy protected ViewDialog mViewer=null; //keep single copy - + protected JButton mRefresh, mAdd, mDelete, mView, mHelp; private final static String HELPINDEX = "configuration-certificateprofiles"; @@ -107,13 +107,13 @@ public class ProfileImplTab extends CMSBaseUGTab { if(mTable.getSelectedRow()< 0) return; NameValuePairs obj = (NameValuePairs) - mDataModel.getObjectValueAt(mTable.getSelectedRow()); + mDataModel.getObjectValueAt(mTable.getSelectedRow()); if (mViewer==null) mViewer = new ViewDialog(mModel.getFrame()); mViewer.showDialog(obj.get(IMPL_NAME), obj.get(IMPL_CLASS), obj.get(IMPL_DESC)); - } + } if (e.getSource().equals(mHelp)) { helpCallback(); } @@ -125,7 +125,7 @@ public class ProfileImplTab extends CMSBaseUGTab { } public void mouseReleased(MouseEvent e) { - setButtons(); + setButtons(); } /*========================================================== @@ -134,8 +134,8 @@ public class ProfileImplTab extends CMSBaseUGTab { public void refresh() { mDataModel.removeAllRows(); - update(); - + update(); + setButtons(); mTable.invalidate(); mTable.validate(); @@ -219,7 +219,7 @@ public class ProfileImplTab extends CMSBaseUGTab { //set buttons private void setButtons() { - + //enable and diable buttons accordingly //Debug.println("setButtons() - "+mTable.getSelectedRow()); //Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty()); @@ -228,24 +228,24 @@ public class ProfileImplTab extends CMSBaseUGTab { mView.setEnabled(false); return; } - + if(mDataModel.getRowCount()<=0) { mDelete.setEnabled(false); mView.setEnabled(false); return; } - + mDelete.setEnabled(true); - mView.setEnabled(true); - + mView.setEnabled(true); + } - + //============================================= // SEND REQUESTS TO THE SERVER SIDE //============================================= private void update() { //send request and parse data - + mModel.progressStart(); NameValuePairs response = new NameValuePairs(); NameValuePairs response1; @@ -342,18 +342,18 @@ public class ProfileImplTab extends CMSBaseUGTab { obj.put(IMPL_DESC, value.substring(x + 1, x_end)); data.put(entry,obj); } - + CMSAdminUtil.bubbleSort(vals); - + for (int y=0; y< vals.length ; y++) { mDataModel.processData(data.get(vals[y])); } - + data.clear(); - + if (mDataModel.getRowCount() >0) mTable.setRowSelectionInterval(0,0); - + mModel.progressStop(); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileInstanceTab.java index 6dbc1dceb..f06cea67b 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ProfileInstanceTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileInstanceTab.java @@ -42,7 +42,7 @@ public class ProfileInstanceTab extends CMSPluginInstanceTab { * variables *==========================================================*/ private static final String PANEL_NAME = "PROFILERULE"; - + protected JButton mOrder; private final static String HELPINDEX = "configuration-certificateprofiles"; private ResourceBundle mResource; @@ -59,7 +59,7 @@ public class ProfileInstanceTab extends CMSPluginInstanceTab { mScope = ScopeDef.SC_POLICY_RULES; mDest = dest; RULE_NAME = PolicyRuleDataModel.RULE_NAME; - RULE_STAT = PolicyRuleDataModel.RULE_STAT; + RULE_STAT = PolicyRuleDataModel.RULE_STAT; mResource = ResourceBundle.getBundle( CMSAdminResources.class.getName()); @@ -71,7 +71,7 @@ public class ProfileInstanceTab extends CMSPluginInstanceTab { JFrame parent, AdminConnection conn, String dest - ) + ) { return new ProfileEditDialog(nvp, parent, @@ -84,7 +84,7 @@ public class ProfileInstanceTab extends CMSPluginInstanceTab { JFrame parent, AdminConnection conn, String dest - ) + ) { return new ProfileConfigDialog(nvp, @@ -98,7 +98,7 @@ public class ProfileInstanceTab extends CMSPluginInstanceTab { AdminConnection conn, String dest, CMSPluginInstanceTab pluginType - ) + ) { return new ProfilePluginSelectionDialog(parent,conn,DestDef.DEST_REGISTRY_ADMIN, dest, pluginType); } @@ -107,9 +107,9 @@ public class ProfileInstanceTab extends CMSPluginInstanceTab { //=== ACTIONLISTENER ===================== public void actionPerformed(ActionEvent e) { if (e.getSource().equals(mEdit) || e.getSource().equals(mDelete)) { - if(mTable.getSelectedRow()< 0) - return; - NameValuePairs data = (NameValuePairs) + if(mTable.getSelectedRow()< 0) + return; + NameValuePairs data = (NameValuePairs) mDataModel.getObjectValueAt(mTable.getSelectedRow()); // dont check enable and disable here. We want to // view profile even though it is enabled @@ -121,12 +121,12 @@ public class ProfileInstanceTab extends CMSPluginInstanceTab { public void moreActionPerformed(ActionEvent e) { if (e.getSource().equals(mOrder)) { Debug.println("Order"); - PolicyRuleOrderDialog dialog = - new PolicyRuleOrderDialog(mModel.getFrame(), + PolicyRuleOrderDialog dialog = + new PolicyRuleOrderDialog(mModel.getFrame(), mConnection, mDestination); - dialog.showDialog(mDataModel.getRules()); + dialog.showDialog(mDataModel.getRules()); refresh(); - } + } } /** @@ -148,7 +148,7 @@ public class ProfileInstanceTab extends CMSPluginInstanceTab { //set buttons protected void setButtons() { super.setButtons(); - + if (mDataModel.getRowCount()<=0) { mOrder.setEnabled(false); } @@ -156,6 +156,6 @@ public class ProfileInstanceTab extends CMSPluginInstanceTab { mOrder.setEnabled(true); } } - - + + } diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileListDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileListDataModel.java index 2e4633046..bb5d05591 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ProfileListDataModel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileListDataModel.java @@ -37,7 +37,7 @@ import com.netscape.certsrv.common.*; public class ProfileListDataModel extends DefaultListModel { private Vector mObjectContainer = new Vector(); - + public Object getObjectValueAt(int row) { return mObjectContainer.elementAt(row); } @@ -51,7 +51,7 @@ public class ProfileListDataModel extends DefaultListModel { super.addElement(displayData); mObjectContainer.addElement(extraData); } - + public void clear() { super.clear(); mObjectContainer.clear(); diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java index e597b242b..38b8d5664 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java @@ -50,7 +50,7 @@ public class ProfileNonPolicyNewDialog extends CMSBaseConfigDialog *==========================================================*/ public ProfileNonPolicyNewDialog(NameValuePairs nvp, JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest, String scope, boolean new1) { super(parent, dest); @@ -59,7 +59,7 @@ public class ProfileNonPolicyNewDialog extends CMSBaseConfigDialog mHelpToken = "configuration-certificateprofiles"; mImplName_token = Constants.PR_POLICY_IMPL_NAME; mImplType = Constants.PR_EXT_PLUGIN_IMPLTYPE_POLICY; - mIsNew = new1; + mIsNew = new1; mScope = scope; init(nvp,parent,conn,dest); @@ -289,8 +289,8 @@ setLabelCellEditor(mTable, 1); if (evt.getSource().equals(mOK)) { try { - if (mModel != null) { - mModel.progressStart(); + if (mModel != null) { + mModel.progressStart(); } NameValuePairs nvp = new NameValuePairs(); @@ -312,21 +312,21 @@ setLabelCellEditor(mTable, 1); if (mIsNew) { String name = instanceName + ";" + id + ";" + mParamId; - // mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN, + // mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN, mAdminConnection.add(mDest, mScope, name, nvp); //ScopeDef.SC_PROFILE_INPUT, name, nvp); } else { String name = instanceName + ";" + id; - //mAdminConnection.modify(DestDef.DEST_CA_PROFILE_ADMIN, + //mAdminConnection.modify(DestDef.DEST_CA_PROFILE_ADMIN, mAdminConnection.modify(mDest, mScope, name, nvp); //ScopeDef.SC_PROFILE_INPUT_CONFIG, name, nvp); } - + mIsOK = true; - if (mModel != null) { - mModel.progressStop(); + if (mModel != null) { + mModel.progressStop(); } this.dispose(); @@ -342,7 +342,7 @@ setLabelCellEditor(mTable, 1); this.dispose(); } - } + } public void showDialog(NameValuePairs data, String profileId, String paramId) { @@ -358,28 +358,28 @@ setLabelCellEditor(mTable, 1); mModel.progressStart(); // retrieve profile information - NameValuePairs response = null; - NameValuePairs request = new NameValuePairs(); + NameValuePairs response = null; + NameValuePairs request = new NameValuePairs(); try { - if (mIsNew) + if (mIsNew) response = mAdminConnection.read(DestDef.DEST_REGISTRY_ADMIN, //ScopeDef.SC_PROFILE_INPUT, mScope, paramId, request); else // response = mAdminConnection.read(DestDef.DEST_CA_PROFILE_ADMIN, response = mAdminConnection.read(mDest, - //ScopeDef.SC_PROFILE_INPUT_CONFIG, + //ScopeDef.SC_PROFILE_INPUT_CONFIG, mScope, profileId+";"+mInputId, request); - } catch (EAdminException e) { -// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString()); - mModel.progressStop(); - } + } catch (EAdminException e) { +// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString()); + mModel.progressStop(); + } mModel.progressStop(); - Vector defcolNames = new Vector(); - defcolNames.addElement("Parameter"); - defcolNames.addElement("Value"); - Vector defdata = new Vector(); + Vector defcolNames = new Vector(); + defcolNames.addElement("Parameter"); + defcolNames.addElement("Value"); + Vector defdata = new Vector(); for (String entry : response.keySet()) { entry = entry.trim(); @@ -397,7 +397,7 @@ setLabelCellEditor(mTable, 1); syntaxVal = value.substring(start_pos+1, end_pos); val = value.substring(end_pos+1); - Vector row = new Vector(); + Vector row = new Vector(); row.addElement(entry); row.addElement(val); defdata.addElement(row); @@ -426,4 +426,4 @@ setLabelCellEditor(mTable, 1); table.getColumnModel().getColumn(index).setCellEditor( new DefaultCellEditor(new JTextField())); } -} +} diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java index 8d97ffd13..99ec1abc1 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java @@ -74,9 +74,9 @@ public class ProfileNonPolicySelDialog extends JDialog public ProfileNonPolicySelDialog ( String profileId, - String prefix, - JFrame parent, - AdminConnection conn, + String prefix, + JFrame parent, + AdminConnection conn, String dest, String extraDest, String scope) { this( profileId, prefix, @@ -102,11 +102,11 @@ public class ProfileNonPolicySelDialog extends JDialog *==========================================================*/ public ProfileNonPolicySelDialog( String profileId, - String prefix, - JFrame parent, - AdminConnection conn, + String prefix, + JFrame parent, + AdminConnection conn, String dest, String extraDest, String scope, - CMSPluginInstanceTab pluginType) + CMSPluginInstanceTab pluginType) { super(parent,true); mProfileId = profileId; @@ -172,7 +172,7 @@ public class ProfileNonPolicySelDialog extends JDialog scope = ScopeDef.SC_PROFILE_OUTPUT; } - ProfileNonPolicyNewDialog dialog = + ProfileNonPolicyNewDialog dialog = new ProfileNonPolicyNewDialog( response, mParentFrame, @@ -182,7 +182,7 @@ public class ProfileNonPolicySelDialog extends JDialog dialog.setModel(mModel); String name = ((JLabel)mListModel.elementAt(mList.getSelectedIndex())).getText(); - + dialog.showDialog(response, mProfileId, getID(name)); if(!dialog.isOK()) { @@ -272,7 +272,7 @@ public class ProfileNonPolicySelDialog extends JDialog mListPanel.setLayout(gb); //content.setBorder(CMSAdminUtil.makeEtchedBorder()); - JLabel label = CMSAdminUtil.makeJLabel(mResource, mPrefix, + JLabel label = CMSAdminUtil.makeJLabel(mResource, mPrefix, "SELECT", null); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTH; @@ -359,9 +359,9 @@ public class ProfileNonPolicySelDialog extends JDialog // vals[i++] = ((String)e.nextElement()).trim(); Debug.println("PluginSelectionDialog::update() - adding '"+vals[i-1]+"'"); } - + CMSAdminUtil.bubbleSort(vals); - + for (int y=0; y< vals.length ; y++) { try { mListModel.addElement(new JLabel(vals[y], JLabel.LEFT)); diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java index ec3bb4c7c..2ed1f8bbd 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java @@ -45,9 +45,9 @@ public class ProfilePluginSelectionDialog extends PluginSelectionDialog *==========================================================*/ public ProfilePluginSelectionDialog( JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest, - CMSPluginInstanceTab pluginType) + CMSPluginInstanceTab pluginType) { super(PREFIX, parent,conn, dest, pluginType); mScope = ScopeDef.SC_PROFILE_IMPLS; diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java index 34b95c0f1..c37a8e55a 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java @@ -50,7 +50,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog *==========================================================*/ public ProfilePolicyEditDialog(NameValuePairs nvp, JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest) { super(parent, dest); @@ -300,7 +300,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog // setLabelCellRenderer(mDefaultTable,1); //setLabelCellEditor(mDefaultTable, 1); mDefaultTable.setDefaultRenderer(JComponent.class, new JComponentCellRenderer()); - mDefaultTable.setDefaultEditor(JComponent.class, + mDefaultTable.setDefaultEditor(JComponent.class, new ProfileComponentCellEditor()); CMSAdminUtil.resetGBC(gbc); @@ -363,7 +363,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog mConstraintTable.addMouseListener(this); // setLabelCellRenderer(mConstraintTable,0); mConstraintTable.setDefaultRenderer(JComponent.class, new JComponentCellRenderer()); - mConstraintTable.setDefaultEditor(JComponent.class, + mConstraintTable.setDefaultEditor(JComponent.class, new ProfileComponentCellEditor()); CMSAdminUtil.resetGBC(gbc); @@ -443,7 +443,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog String policyId = mDescField.getText() + ":" + mIdField.getText(); String name = instanceName + ";" + policyId; - + /* nvp.add("impl", mImplName.getText()); nvp.add("name", mNameField.getText()); @@ -464,7 +464,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog } - //mAdminConnection.modify(DestDef.DEST_CA_PROFILE_ADMIN, + //mAdminConnection.modify(DestDef.DEST_CA_PROFILE_ADMIN, mAdminConnection.modify(mDest, ScopeDef.SC_PROFILE_DEFAULT_POLICY, name, nvp); @@ -486,7 +486,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog nvp.put(name1, val); } instanceName = mPluginName.getText(); -//DestDef.DEST_CA_PROFILE_ADMIN, +//DestDef.DEST_CA_PROFILE_ADMIN, mAdminConnection.modify(mDest, ScopeDef.SC_PROFILE_CONSTRAINT_POLICY, name, nvp); @@ -503,7 +503,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog this.dispose(); } - } + } private String getHelpDescription(String value) { int start_pos = value.indexOf(';'); @@ -562,32 +562,32 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog String pid = st1.nextToken(); // retrieve profile information - NameValuePairs response = null; - NameValuePairs request = new NameValuePairs(); + NameValuePairs response = null; + NameValuePairs request = new NameValuePairs(); try { //response = mAdminConnection.read(DestDef.DEST_CA_PROFILE_ADMIN, response = mAdminConnection.read(mDest, ScopeDef.SC_PROFILE_DEFAULT_POLICY, name, request); - } catch (EAdminException e) { -// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString()); - mModel.progressStop(); - } + } catch (EAdminException e) { +// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString()); + mModel.progressStop(); + } mModel.progressStop(); - Vector defcolNames = new Vector(); - defcolNames.addElement("Parameter"); - defcolNames.addElement("Value"); - Vector defdata = new Vector(); + Vector defcolNames = new Vector(); + defcolNames.addElement("Parameter"); + defcolNames.addElement("Value"); + Vector defdata = new Vector(); for (String entry : response.keySet()) { entry = entry.trim(); String value = response.get(entry); Debug.println("ProfilePolicyEditDialog entry= "+entry); - Debug.println("ProfilePolicyEditDialog value= "+value); + Debug.println("ProfilePolicyEditDialog value= "+value); Object obj = getComponent(value); - Vector row = new Vector(); + Vector row = new Vector(); JLabel label = new JLabel(entry); ((Component)obj).addFocusListener(this); mHelpDesc.put(obj, getHelpDescription(value)); @@ -620,22 +620,22 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog ScopeDef.SC_PROFILE_CONSTRAINT_POLICY, name, request); - } catch (EAdminException e) { -// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString()); - mModel.progressStop(); - } - mModel.progressStop(); + } catch (EAdminException e) { +// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString()); + mModel.progressStop(); + } + mModel.progressStop(); - Vector colNames = new Vector(); - colNames.addElement("Parameter"); - colNames.addElement("Value"); - Vector d = new Vector(); + Vector colNames = new Vector(); + colNames.addElement("Parameter"); + colNames.addElement("Value"); + Vector d = new Vector(); for (String entry : response.keySet()) { entry = entry.trim(); String value = response.get(entry); Debug.println("entry= "+entry); - Debug.println("value= "+value); + Debug.println("value= "+value); Object obj = getComponent(value); Vector row = new Vector(); @@ -649,7 +649,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog ProfilePolicyEditDataModel model = new ProfilePolicyEditDataModel(); model.setInfo(d, colNames); mConstraintTable.setModel(model); - + this.show(); } @@ -668,8 +668,8 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog } class JComponentCellRenderer implements TableCellRenderer { - public Component getTableCellRendererComponent(JTable table, - Object value, boolean isSelected, boolean hasFocus, int row, + public Component getTableCellRendererComponent(JTable table, + Object value, boolean isSelected, boolean hasFocus, int row, int column) { return (JComponent)value; } @@ -695,4 +695,4 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog Debug.println("focusLost"); } -} +} diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java index 941917808..98706dfcb 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java @@ -53,7 +53,7 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog *==========================================================*/ public ProfilePolicyNewDialog(String defSetId, NameValuePairs nvp, JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest) { super(parent, dest); @@ -461,10 +461,10 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog // create policy String policyId = policySetStr + ":" + policyIDStr; String name = instanceName + ";" + policyId + ";" + mDefaultId + ";" + mConstraintId; - //mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN, + //mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN, mAdminConnection.add(mDest, ScopeDef.SC_PROFILE_POLICIES, name, nvp); - + /* nvp.add("impl", mImplName.getText()); nvp.add("name", mNameField.getText()); @@ -485,7 +485,7 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog } - //mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN, + //mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN, mAdminConnection.add(mDest, ScopeDef.SC_PROFILE_DEFAULT_POLICY, name, nvp); @@ -506,7 +506,7 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog nvp.put(name1, val); } instanceName = mPluginName.getText(); - //mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN, + //mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN, mAdminConnection.add(mDest, ScopeDef.SC_PROFILE_CONSTRAINT_POLICY, name, nvp); @@ -523,7 +523,7 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog this.dispose(); } - } + } public void showDialog(NameValuePairs data, String name) { @@ -539,29 +539,29 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog mConstraintId = conId; // retrieve profile information - NameValuePairs response = null; - NameValuePairs request = new NameValuePairs(); + NameValuePairs response = null; + NameValuePairs request = new NameValuePairs(); try { name = profileId + ";" + defId; response = mAdminConnection.read(DestDef.DEST_REGISTRY_ADMIN, ScopeDef.SC_PROFILE_DEFAULT_POLICY, defId, request); - } catch (EAdminException e) { -// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString()); - mModel.progressStop(); - } + } catch (EAdminException e) { +// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString()); + mModel.progressStop(); + } mModel.progressStop(); - Vector defcolNames = new Vector(); - defcolNames.addElement("Parameter"); - defcolNames.addElement("Value"); - Vector defdata = new Vector(); + Vector defcolNames = new Vector(); + defcolNames.addElement("Parameter"); + defcolNames.addElement("Value"); + Vector defdata = new Vector(); for (String entry : response.keySet()) { entry = entry.trim(); String value = response.get(entry); Debug.println("entry= "+entry); - Debug.println("value= "+value); + Debug.println("value= "+value); Object obj = getComponent(value); Vector row = new Vector(); @@ -591,22 +591,22 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog ScopeDef.SC_PROFILE_CONSTRAINT_POLICY, conId, request); - } catch (EAdminException e) { -// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString()); - mModel.progressStop(); - } - mModel.progressStop(); + } catch (EAdminException e) { +// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString()); + mModel.progressStop(); + } + mModel.progressStop(); - Vector colNames = new Vector(); - colNames.addElement("Parameter"); - colNames.addElement("Value"); - Vector d = new Vector(); + Vector colNames = new Vector(); + colNames.addElement("Parameter"); + colNames.addElement("Value"); + Vector d = new Vector(); for (String entry : response.keySet()) { entry = entry.trim(); String value = response.get(entry); Debug.println("entry= "+entry); - Debug.println("value= "+value); + Debug.println("value= "+value); Object obj = getComponent(value); Vector row = new Vector(); @@ -619,7 +619,7 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog ProfilePolicyEditDataModel model = new ProfilePolicyEditDataModel(); model.setInfo(d, colNames); mConstraintTable.setModel(model); - + String desc = mDescField.getText(); if (desc == null || desc.equals("")) { if (mDefSetId != null) { @@ -648,11 +648,11 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog } private Object getComponent(String value) { - int start_pos = value.indexOf(';'); - int end_pos = value.lastIndexOf(';'); + int start_pos = value.indexOf(';'); + int end_pos = value.lastIndexOf(';'); int end1_pos = value.lastIndexOf(';',end_pos-1); - String syntax = null; - String syntaxVal = null; + String syntax = null; + String syntaxVal = null; String v = null; syntax = value.substring(0,start_pos); @@ -711,4 +711,4 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog public void focusLost(FocusEvent f) { Debug.println("focusLost"); } -} +} diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java index 44fe9886b..e601fbb9f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java @@ -69,8 +69,8 @@ public class ProfilePolicySelectionDialog extends JDialog String profileId, String prefix, JFrame parent, - AdminConnection conn, - String dest) + AdminConnection conn, + String dest) { this(defSetId, profileId, prefix, parent, conn, dest, null, null); } @@ -78,9 +78,9 @@ public class ProfilePolicySelectionDialog extends JDialog public ProfilePolicySelectionDialog( String defSetId, String profileId, - String prefix, - JFrame parent, - AdminConnection conn, + String prefix, + JFrame parent, + AdminConnection conn, String dest, String extraDest) { this(defSetId, profileId, prefix, @@ -100,18 +100,18 @@ public class ProfilePolicySelectionDialog extends JDialog CMSPluginInstanceTab pluginType) { this(defSetId, profileId, prefix, parent, conn, dest, null, pluginType); } - + /*========================================================== * constructors *==========================================================*/ public ProfilePolicySelectionDialog( String defSetId, String profileId, - String prefix, - JFrame parent, - AdminConnection conn, + String prefix, + JFrame parent, + AdminConnection conn, String dest, String extraDest, - CMSPluginInstanceTab pluginType) + CMSPluginInstanceTab pluginType) { super(parent,true); mDefSetId = defSetId; @@ -198,7 +198,7 @@ public class ProfilePolicySelectionDialog extends JDialog String id = ((JLabel)mDefaultModel.elementAt(mDefaultList.getSelectedIndex())).getText(); response.add(Constants.PR_POLICY_IMPL_NAME,id); */ - ProfilePolicyNewDialog dialog = + ProfilePolicyNewDialog dialog = new ProfilePolicyNewDialog( mDefSetId, response, @@ -213,8 +213,8 @@ public class ProfilePolicySelectionDialog extends JDialog String defaultName = ((JLabel)mDefaultModel.elementAt(mDefaultList.getSelectedIndex())).getText(); String conName = ((JLabel)mConstraintModel.elementAt(mConstraintList.getSelectedIndex())).getText(); - - String namex = mProfileId + ";" + getID(defaultName, mDefaultData) + + + String namex = mProfileId + ";" + getID(defaultName, mDefaultData) + ";" + getID(conName, mConstraintData); dialog.showDialog(response,namex); @@ -263,8 +263,8 @@ public class ProfilePolicySelectionDialog extends JDialog GridBagConstraints gbc = new GridBagConstraints(); center.setLayout(gb); - // default content panel - mDefaultLabel = CMSAdminUtil.makeJLabel(mResource, mPrefix, + // default content panel + mDefaultLabel = CMSAdminUtil.makeJLabel(mResource, mPrefix, "DEFAULTNAME", null); center.add(mDefaultLabel); @@ -279,7 +279,7 @@ public class ProfilePolicySelectionDialog extends JDialog center.add(content); // constraint content panel - mConstraintLabel = CMSAdminUtil.makeJLabel(mResource, mPrefix, + mConstraintLabel = CMSAdminUtil.makeJLabel(mResource, mPrefix, "CONSTRAINTNAME", null); center.add(mConstraintLabel); @@ -408,10 +408,10 @@ public class ProfilePolicySelectionDialog extends JDialog return; String name = ((JLabel)mDefaultModel.elementAt(mDefaultList.getSelectedIndex())).getText(); NameValuePairs response=null; - + try { - response = mConnection.read(mDestination, - ScopeDef.SC_SUPPORTED_CONSTRAINTPOLICIES, + response = mConnection.read(mDestination, + ScopeDef.SC_SUPPORTED_CONSTRAINTPOLICIES, getID(name, mDefaultData), new NameValuePairs()); Debug.println(response.toString()); } catch (Exception ex) { @@ -424,7 +424,7 @@ public class ProfilePolicySelectionDialog extends JDialog mConstraintList.invalidate(); mConstraintList.validate(); repaint(); - } + } } //================================================= @@ -432,7 +432,7 @@ public class ProfilePolicySelectionDialog extends JDialog //================================================= //save order information to the server - protected boolean update(String scope, DefaultListModel model, + protected boolean update(String scope, DefaultListModel model, Hashtable data) { NameValuePairs response; @@ -471,18 +471,18 @@ public class ProfilePolicySelectionDialog extends JDialog data.put(name, friendlyName); Debug.println("PluginSelectionDialog::update() - adding '"+vals[i-1]+"'"); } - + CMSAdminUtil.bubbleSort(vals); - + for (int y=0; y< vals.length ; y++) { try { - model.addElement(new JLabel(vals[y], + model.addElement(new JLabel(vals[y], CMSAdminUtil.getImage(mImageName), JLabel.LEFT)); } catch (Exception ex) { Debug.println("PluginSelectionDialog could not get image for '"+ mImageName+"'. Adding without image"); - model.addElement(new JLabel(vals[y], + model.addElement(new JLabel(vals[y], JLabel.LEFT)); } } @@ -492,15 +492,15 @@ public class ProfilePolicySelectionDialog extends JDialog protected NameValuePairs getDefaultConfig() throws EAdminException { String name = ((JLabel)mDefaultModel.elementAt(mDefaultList.getSelectedIndex())).getText(); NameValuePairs response; - response = mConnection.read(mDestination, - ScopeDef.SC_SUPPORTED_CONSTRAINTPOLICIES, getID(name.trim(), mDefaultData), + response = mConnection.read(mDestination, + ScopeDef.SC_SUPPORTED_CONSTRAINTPOLICIES, getID(name.trim(), mDefaultData), new NameValuePairs()); Debug.println(response.toString()); return response; } - + private String getID(String name, Hashtable t) { Enumeration keys = t.keys(); while (keys.hasMoreElements()) { diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java index c576adbe6..912ea1944 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java @@ -124,7 +124,7 @@ public class ProfileRegisterDialog extends JDialog } if (evt.getSource().equals(mOK)) { - + /* REPLACED BY PROACTIVE ENFORCEMENT if (mNameField.getText().trim().equals("")) { CMSAdminUtil.showMessageDialog(mParentFrame, mResource, mPrefix, @@ -158,15 +158,15 @@ public class ProfileRegisterDialog extends JDialog public void insertUpdate(DocumentEvent e) { setButtons(); } - + public void removeUpdate(DocumentEvent e){ setButtons(); } - + public void changedUpdate(DocumentEvent e){ setButtons(); } - + //==== MOUSELISTENER ====================== public void mouseClicked(MouseEvent e) { setButtons(); @@ -176,13 +176,13 @@ public class ProfileRegisterDialog extends JDialog public void mouseReleased(MouseEvent e) {} public void mouseEntered(MouseEvent e) {} public void mouseExited(MouseEvent e) { - setButtons(); + setButtons(); } - + /*========================================================== * protected methods - *==========================================================*/ - + *==========================================================*/ + protected void setDisplay() { getContentPane().setLayout(new BorderLayout()); JPanel center = new JPanel(); @@ -215,18 +215,18 @@ public class ProfileRegisterDialog extends JDialog /*========================================================== * private methods - *==========================================================*/ + *==========================================================*/ //set arrow buttons private void setButtons() { if ( (mNameField.getText().trim().equals("")) || (mClassField.getText().trim().equals("")) ) { - mOK.setEnabled(false); + mOK.setEnabled(false); } else { - mOK.setEnabled(true); + mOK.setEnabled(true); } - } - + } + private JPanel makeActionPane() { mOK = CMSAdminUtil.makeJButton(mResource, mPrefix, "OK", null, this); mOK.setEnabled(false); @@ -254,7 +254,7 @@ public class ProfileRegisterDialog extends JDialog JLabel label2 = CMSAdminUtil.makeJLabel(mResource, mPrefix, "CLASS", null); mClassField = new JTextField(); mClassField.getDocument().addDocumentListener(this); - mClassField.addMouseListener(this); + mClassField.addMouseListener(this); CMSAdminUtil.addEntryField(content, label2, mClassField, gbc); CMSAdminUtil.resetGBC(gbc); @@ -262,7 +262,7 @@ public class ProfileRegisterDialog extends JDialog JLabel label3 = CMSAdminUtil.makeJLabel(mResource, mPrefix, "TYPE", null); mTypeField = new JTextField(); mTypeField.getDocument().addDocumentListener(this); - mTypeField.addMouseListener(this); + mTypeField.addMouseListener(this); CMSAdminUtil.addEntryField(content, label3, mTypeField, gbc); CMSAdminUtil.resetGBC(gbc); @@ -270,9 +270,9 @@ public class ProfileRegisterDialog extends JDialog JLabel label4 = CMSAdminUtil.makeJLabel(mResource, mPrefix, "DESC", null); mDescField = new JTextField(); mDescField.getDocument().addDocumentListener(this); - mDescField.addMouseListener(this); + mDescField.addMouseListener(this); CMSAdminUtil.addEntryField(content, label4, mDescField, gbc); - + return content; } diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java index 7a3ba2827..ac4814fc3 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java @@ -54,7 +54,7 @@ public class ProfileRuleDataModel extends CMSRuleDataModel v.addElement(new JLabel(obj.get(RULE_NAME), CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE), JLabel.LEFT)); - v.addElement(mResource.getString("POLICYRULE_LABEL_ENABLED_LABEL")); + v.addElement(mResource.getString("POLICYRULE_LABEL_ENABLED_LABEL")); } else { v.addElement(new JLabel(obj.get(RULE_NAME), CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE), diff --git a/base/console/src/com/netscape/admin/certsrv/config/PublisherConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherConfigDialog.java index 90d67ba9e..4c2497c67 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/PublisherConfigDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/PublisherConfigDialog.java @@ -46,7 +46,7 @@ public class PublisherConfigDialog extends CMSBaseConfigDialog *==========================================================*/ public PublisherConfigDialog(NameValuePairs nvp, JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest) { super(parent, dest); @@ -61,4 +61,4 @@ public class PublisherConfigDialog extends CMSBaseConfigDialog init(nvp,parent,conn,dest); } -} +} diff --git a/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java index aefa4b1cc..575f731d6 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java @@ -40,7 +40,7 @@ public class PublisherImplDataModel extends CMSContentTableModel public static final String IMPL_NAME = "NAME"; public static final String IMPL_CLASS = "CLASS"; public static final String IMPL_DESC = "DESC"; - + private static String[] mColumns = {PUBLISHER_IMPL, CLASSNAME}; /*========================================================== diff --git a/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java index 79fedfe5e..dd38c6a36 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java @@ -43,19 +43,19 @@ public class PublisherImplTab extends CMSBaseUGTab { private static final String IMPL_NAME = PublisherImplDataModel.IMPL_NAME; private static final String IMPL_CLASS = PublisherImplDataModel.IMPL_CLASS; private static final String IMPL_DESC = PublisherImplDataModel.IMPL_DESC; - + private static final String PANEL_NAME = "PUBLISHERIMPL"; private static final String DIALOG_PREFIX = "PUBLISHERREGISTERDIALOG"; - + private AdminConnection mConnection; private String mDestination; - + protected JScrollPane mScrollPane; protected JTable mTable; //table protected PublisherImplDataModel mDataModel; //table model protected PublisherRegisterDialog mEditor=null; //keep single copy protected ViewDialog mViewer=null; //keep single copy - + protected JButton mRefresh, mAdd, mDelete, mView, mHelp; private final static String RAHELPINDEX = "configuration-ra-publisherplugin-help"; private final static String CAHELPINDEX = "configuration-ca-publisherplugin-help"; @@ -111,13 +111,13 @@ public class PublisherImplTab extends CMSBaseUGTab { if(mTable.getSelectedRow()< 0) return; NameValuePairs obj = (NameValuePairs) - mDataModel.getObjectValueAt(mTable.getSelectedRow()); + mDataModel.getObjectValueAt(mTable.getSelectedRow()); if (mViewer==null) mViewer = new ViewDialog(mModel.getFrame()); mViewer.showDialog(obj.get(IMPL_NAME), obj.get(IMPL_CLASS), obj.get(IMPL_DESC)); - } + } if (e.getSource().equals(mHelp)) { helpCallback(); } @@ -129,7 +129,7 @@ public class PublisherImplTab extends CMSBaseUGTab { } public void mouseReleased(MouseEvent e) { - setButtons(); + setButtons(); } /*========================================================== @@ -138,8 +138,8 @@ public class PublisherImplTab extends CMSBaseUGTab { public void refresh() { mDataModel.removeAllRows(); - update(); - + update(); + setButtons(); mTable.invalidate(); mTable.validate(); @@ -223,7 +223,7 @@ public class PublisherImplTab extends CMSBaseUGTab { //set buttons private void setButtons() { - + //enable and diable buttons accordingly //Debug.println("setButtons() - "+mTable.getSelectedRow()); //Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty()); @@ -232,24 +232,24 @@ public class PublisherImplTab extends CMSBaseUGTab { mView.setEnabled(false); return; } - + if(mDataModel.getRowCount()<=0) { mDelete.setEnabled(false); mView.setEnabled(false); return; } - + mDelete.setEnabled(true); - mView.setEnabled(true); - + mView.setEnabled(true); + } - + //============================================= // SEND REQUESTS TO THE SERVER SIDE //============================================= private void update() { //send request and parse data - + mModel.progressStart(); NameValuePairs response; try { @@ -281,18 +281,18 @@ public class PublisherImplTab extends CMSBaseUGTab { obj.put(IMPL_DESC, value.substring(x + 1)); data.put(entry,obj); } - + CMSAdminUtil.bubbleSort(vals); - + for (int y=0; y< vals.length ; y++) { mDataModel.processData(data.get(vals[y])); } - + data.clear(); - + if (mDataModel.getRowCount() >0) mTable.setRowSelectionInterval(0,0); - + mModel.progressStop(); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/PublisherInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherInstanceTab.java index e9d3bdbb0..d6b7908cd 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/PublisherInstanceTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/PublisherInstanceTab.java @@ -42,7 +42,7 @@ public class PublisherInstanceTab extends CMSPluginInstanceTab { * variables *==========================================================*/ private static final String PANEL_NAME = "PUBLISHERRULE"; - + private final static String RAHELPINDEX = "configuration-ra-publisherinstances-help"; private final static String CAHELPINDEX = "configuration-ca-publisherinstances-help"; private final static String KRAHELPINDEX = "configuration-kra-publisherinstances-help"; @@ -58,9 +58,9 @@ public class PublisherInstanceTab extends CMSPluginInstanceTab { mDataModel = new PublisherRuleDataModel(); mScope = ScopeDef.SC_PUBLISHER_RULES; RULE_NAME = PublisherRuleDataModel.RULE_NAME; - RULE_STAT = PublisherRuleDataModel.RULE_STAT; + RULE_STAT = PublisherRuleDataModel.RULE_STAT; - if (mDestination.equals(DestDef.DEST_RA_PUBLISHER_ADMIN)) + if (mDestination.equals(DestDef.DEST_RA_PUBLISHER_ADMIN)) mHelpToken = RAHELPINDEX; else mHelpToken = CAHELPINDEX; @@ -72,7 +72,7 @@ public class PublisherInstanceTab extends CMSPluginInstanceTab { JFrame parent, AdminConnection conn, String dest - ) + ) { return new PublisherConfigDialog(nvp, @@ -86,7 +86,7 @@ public class PublisherInstanceTab extends CMSPluginInstanceTab { AdminConnection conn, String dest, CMSPluginInstanceTab pluginType - ) + ) { return new PublisherPluginSelectionDialog(parent,conn,dest,pluginType); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/PublisherPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherPluginSelectionDialog.java index 536d9096f..4837295ca 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/PublisherPluginSelectionDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/PublisherPluginSelectionDialog.java @@ -41,7 +41,7 @@ public class PublisherPluginSelectionDialog extends PluginSelectionDialog * variables *==========================================================*/ private static final String PREFIX = "PUBLISHERSELECTIONDIALOG"; - private static final String CAHELPINDEX = + private static final String CAHELPINDEX = "configuration-ca-add-publisherrule-dbox-help"; private static final String RAHELPINDEX = "configuration-ra-add-publisherrule-dbox-help"; @@ -51,9 +51,9 @@ public class PublisherPluginSelectionDialog extends PluginSelectionDialog *==========================================================*/ public PublisherPluginSelectionDialog( JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest, - CMSPluginInstanceTab pluginType) + CMSPluginInstanceTab pluginType) { super(PREFIX, parent,conn, dest, pluginType); mScope = ScopeDef.SC_PUBLISHER_IMPLS; diff --git a/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java index fe48419c7..51a1dece5 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java @@ -114,7 +114,7 @@ public class RegisterDialog extends JDialog } if (evt.getSource().equals(mOK)) { - + /* REPLACED BY PROACTIVE ENFORCEMENT if (mNameField.getText().trim().equals("")) { CMSAdminUtil.showMessageDialog(mParentFrame, mResource, mPrefix, @@ -148,15 +148,15 @@ public class RegisterDialog extends JDialog public void insertUpdate(DocumentEvent e) { setButtons(); } - + public void removeUpdate(DocumentEvent e){ setButtons(); } - + public void changedUpdate(DocumentEvent e){ setButtons(); } - + //==== MOUSELISTENER ====================== public void mouseClicked(MouseEvent e) { setButtons(); @@ -166,13 +166,13 @@ public class RegisterDialog extends JDialog public void mouseReleased(MouseEvent e) {} public void mouseEntered(MouseEvent e) {} public void mouseExited(MouseEvent e) { - setButtons(); + setButtons(); } - + /*========================================================== * protected methods - *==========================================================*/ - + *==========================================================*/ + protected void setDisplay() { getContentPane().setLayout(new BorderLayout()); JPanel center = new JPanel(); @@ -205,18 +205,18 @@ public class RegisterDialog extends JDialog /*========================================================== * private methods - *==========================================================*/ + *==========================================================*/ //set arrow buttons private void setButtons() { if ( (mNameField.getText().trim().equals("")) || (mClassField.getText().trim().equals("")) ) { - mOK.setEnabled(false); + mOK.setEnabled(false); } else { - mOK.setEnabled(true); + mOK.setEnabled(true); } - } - + } + private JPanel makeActionPane() { mOK = CMSAdminUtil.makeJButton(mResource, mPrefix, "OK", null, this); mOK.setEnabled(false); @@ -244,7 +244,7 @@ public class RegisterDialog extends JDialog JLabel label2 = CMSAdminUtil.makeJLabel(mResource, mPrefix, "CLASS", null); mClassField = new JTextField(); mClassField.getDocument().addDocumentListener(this); - mClassField.addMouseListener(this); + mClassField.addMouseListener(this); CMSAdminUtil.addEntryField(content, label2, mClassField, gbc); if (mType) { @@ -253,10 +253,10 @@ public class RegisterDialog extends JDialog JLabel label3 = CMSAdminUtil.makeJLabel(mResource, mPrefix, "TYPE", null); mTypeField = new JTextField(); mTypeField.getDocument().addDocumentListener(this); - mTypeField.addMouseListener(this); + mTypeField.addMouseListener(this); CMSAdminUtil.addEntryField(content, label3, mTypeField, gbc); } - + return content; } diff --git a/base/console/src/com/netscape/admin/certsrv/config/RuleConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/RuleConfigDialog.java index 7f7cff092..0ce8c2ea4 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/RuleConfigDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/RuleConfigDialog.java @@ -61,4 +61,4 @@ public class RuleConfigDialog extends CMSBaseConfigDialog init(nvp,parent,conn,dest); } -} +} diff --git a/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java index 86a4fa6d4..2337a698c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java @@ -40,7 +40,7 @@ public class RuleImplDataModel extends CMSContentTableModel public static final String IMPL_NAME = "NAME"; public static final String IMPL_CLASS = "CLASS"; public static final String IMPL_DESC = "DESC"; - + private static String[] mColumns = {RULE_IMPL, CLASSNAME}; /*========================================================== diff --git a/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java index 098cbcbd1..c69cefd86 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java @@ -43,19 +43,19 @@ public class RuleImplTab extends CMSBaseUGTab { private static final String IMPL_NAME = RuleImplDataModel.IMPL_NAME; private static final String IMPL_CLASS = RuleImplDataModel.IMPL_CLASS; private static final String IMPL_DESC = RuleImplDataModel.IMPL_DESC; - + private static final String PANEL_NAME = "RULEIMPL"; private static final String DIALOG_PREFIX = "RULEREGISTERDIALOG"; - + private AdminConnection mConnection; private String mDestination; - + protected JScrollPane mScrollPane; protected JTable mTable; //table protected RuleImplDataModel mDataModel; //table model protected RuleRegisterDialog mEditor=null; //keep single copy protected ViewDialog mViewer=null; //keep single copy - + protected JButton mRefresh, mAdd, mDelete, mView, mHelp; private final static String RAHELPINDEX = "configuration-ra-ruleplugin-help"; private final static String CAHELPINDEX = "configuration-ca-ruleplugin-help"; @@ -111,13 +111,13 @@ public class RuleImplTab extends CMSBaseUGTab { if(mTable.getSelectedRow()< 0) return; NameValuePairs obj = (NameValuePairs) - mDataModel.getObjectValueAt(mTable.getSelectedRow()); + mDataModel.getObjectValueAt(mTable.getSelectedRow()); if (mViewer==null) mViewer = new ViewDialog(mModel.getFrame()); mViewer.showDialog(obj.get(IMPL_NAME), obj.get(IMPL_CLASS), obj.get(IMPL_DESC)); - } + } if (e.getSource().equals(mHelp)) { helpCallback(); } @@ -129,7 +129,7 @@ public class RuleImplTab extends CMSBaseUGTab { } public void mouseReleased(MouseEvent e) { - setButtons(); + setButtons(); } /*========================================================== @@ -138,8 +138,8 @@ public class RuleImplTab extends CMSBaseUGTab { public void refresh() { mDataModel.removeAllRows(); - update(); - + update(); + setButtons(); mTable.invalidate(); mTable.validate(); @@ -223,7 +223,7 @@ public class RuleImplTab extends CMSBaseUGTab { //set buttons private void setButtons() { - + //enable and diable buttons accordingly //Debug.println("setButtons() - "+mTable.getSelectedRow()); //Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty()); @@ -232,24 +232,24 @@ public class RuleImplTab extends CMSBaseUGTab { mView.setEnabled(false); return; } - + if(mDataModel.getRowCount()<=0) { mDelete.setEnabled(false); mView.setEnabled(false); return; } - + mDelete.setEnabled(true); - mView.setEnabled(true); - + mView.setEnabled(true); + } - + //============================================= // SEND REQUESTS TO THE SERVER SIDE //============================================= private void update() { //send request and parse data - + mModel.progressStart(); NameValuePairs response; try { @@ -280,18 +280,18 @@ public class RuleImplTab extends CMSBaseUGTab { obj.put(IMPL_DESC, value.substring(x + 1)); data.put(entry,obj); } - + CMSAdminUtil.bubbleSort(vals); - + for (int y=0; y< vals.length ; y++) { mDataModel.processData(data.get(vals[y])); } - + data.clear(); - + if (mDataModel.getRowCount() >0) mTable.setRowSelectionInterval(0,0); - + mModel.progressStop(); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/RuleInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/RuleInstanceTab.java index 04a649ed0..dfc5f8159 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/RuleInstanceTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/RuleInstanceTab.java @@ -45,7 +45,7 @@ public class RuleInstanceTab extends CMSPluginInstanceTab { * variables *==========================================================*/ private static final String PANEL_NAME = "RULERULE"; - + private final static String RAHELPINDEX = "configuration-ra-ruleinstances-help"; private final static String CAHELPINDEX = "configuration-ca-ruleinstances-help"; @@ -60,9 +60,9 @@ public class RuleInstanceTab extends CMSPluginInstanceTab { mDataModel = new RuleRuleDataModel(); mScope = ScopeDef.SC_RULE_RULES; RULE_NAME = RuleRuleDataModel.RULE_NAME; - RULE_STAT = RuleRuleDataModel.RULE_STAT; + RULE_STAT = RuleRuleDataModel.RULE_STAT; - if (mDestination.equals(DestDef.DEST_RA_RULE_ADMIN)) + if (mDestination.equals(DestDef.DEST_RA_RULE_ADMIN)) mHelpToken = RAHELPINDEX; else mHelpToken = CAHELPINDEX; @@ -74,7 +74,7 @@ public class RuleInstanceTab extends CMSPluginInstanceTab { JFrame parent, AdminConnection conn, String dest - ) + ) { return new RuleConfigDialog(nvp, @@ -88,7 +88,7 @@ public class RuleInstanceTab extends CMSPluginInstanceTab { AdminConnection conn, String dest, CMSPluginInstanceTab pluginType - ) + ) { return new RulePluginSelectionDialog(parent,conn,dest,pluginType); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/RulePluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/RulePluginSelectionDialog.java index f1021bc6c..cc7fb1076 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/RulePluginSelectionDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/RulePluginSelectionDialog.java @@ -41,7 +41,7 @@ public class RulePluginSelectionDialog extends PluginSelectionDialog * variables *==========================================================*/ private static final String PREFIX = "RULESELECTIONDIALOG"; - private static final String CAHELPINDEX = + private static final String CAHELPINDEX = "configuration-ca-add-rulerule-dbox-help"; private static final String RAHELPINDEX = "configuration-ra-add-rulerule-dbox-help"; @@ -51,9 +51,9 @@ public class RulePluginSelectionDialog extends PluginSelectionDialog *==========================================================*/ public RulePluginSelectionDialog( JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest, - CMSPluginInstanceTab pluginType) + CMSPluginInstanceTab pluginType) { super(PREFIX, parent,conn, dest, pluginType); mScope = ScopeDef.SC_RULE_IMPLS; diff --git a/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java index cee7727a1..776224c82 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java +++ b/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java @@ -55,7 +55,7 @@ public class RuleRuleDataModel extends CMSRuleDataModel v.addElement(new JLabel(obj.get(RULE_NAME), CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE), JLabel.LEFT)); - v.addElement(mResource.getString("RULERULE_LABEL_ENABLED_LABEL")); + v.addElement(mResource.getString("RULERULE_LABEL_ENABLED_LABEL")); } else { v.addElement(new JLabel(obj.get(RULE_NAME), CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE), diff --git a/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java b/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java index ac8b5e610..9a8bc2308 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java @@ -43,17 +43,17 @@ public class TKSKeysTab extends CMSBaseUGTab { *==========================================================*/ private static final String PANEL_NAME = "TKSKEYS"; private CryptoManager mCryptoManager = null; - + private AdminConnection mConnection; private String mDestination; private CMSBaseResourceModel mModel; private ConsoleInfo mConsoleInfo; - private JComboBox mToken; + private JComboBox mToken; protected JScrollPane mScrollPane; protected JTable mTable; //table protected ListKeysModel mDataModel; //table model protected KeyCreateDialog mEditor=null; //keep single copy - + protected JButton mRefresh, mAdd, mHelp; private final static String HELPINDEX = "configuration-log-plugin-help"; @@ -68,7 +68,7 @@ public class TKSKeysTab extends CMSBaseUGTab { mDataModel = new ListKeysModel(); mDestination = destination; mHelpToken = HELPINDEX; - + } /*========================================================== @@ -109,8 +109,8 @@ public class TKSKeysTab extends CMSBaseUGTab { if(row < 0) return; - - + + } //==== MOUSELISTENER ====================== @@ -119,7 +119,7 @@ public class TKSKeysTab extends CMSBaseUGTab { } public void mouseReleased(MouseEvent e) { - setButtons(); + setButtons(); } /*========================================================== @@ -128,8 +128,8 @@ public class TKSKeysTab extends CMSBaseUGTab { public void refresh() { mDataModel.removeAllRows(); - update(); - + update(); + setButtons(); mTable.invalidate(); mTable.validate(); @@ -142,8 +142,8 @@ public class TKSKeysTab extends CMSBaseUGTab { protected JPanel createButtonPanel() { //edit, add, delete, help buttons required //actionlister to this object - - + + mAdd = makeJButton("ADD"); JButton[] buttons = {mAdd}; @@ -181,9 +181,9 @@ public class TKSKeysTab extends CMSBaseUGTab { CMSAdminUtil.COMPONENT_SPACE, CMSAdminUtil.COMPONENT_SPACE, CMSAdminUtil.COMPONENT_SPACE*30); - gb.setConstraints(mToken, gbc); + gb.setConstraints(mToken, gbc); mListPanel.add(mToken); - + //center table mTable = new JTable(mDataModel); @@ -220,11 +220,11 @@ public class TKSKeysTab extends CMSBaseUGTab { gbc.insets = EMPTY_INSETS; gb.setConstraints(buttonPanel, gbc); mListPanel.add(buttonPanel); - + NameValuePairs response=null; try { response = mConnection.search(mDestination, - ScopeDef.SC_TOKEN, new NameValuePairs()); + ScopeDef.SC_TOKEN, new NameValuePairs()); } catch (EAdminException e) { //display error dialog showErrorDialog(e.getMessage()); @@ -237,7 +237,7 @@ public class TKSKeysTab extends CMSBaseUGTab { for (String entry : response.keySet()) { vals[i++] = entry.trim(); } - + int sindex = 0; CMSAdminUtil.quickSort(vals, 0, response.size()-1); for (i=0; i<vals.length; i++) { @@ -245,7 +245,7 @@ public class TKSKeysTab extends CMSBaseUGTab { String entry = vals[i]; String value = response.get(entry); // look for the comma separator - + StringTokenizer st = new StringTokenizer(value, ","); while (st.hasMoreTokens()) { String currentToken= st.nextToken(); @@ -268,29 +268,29 @@ public class TKSKeysTab extends CMSBaseUGTab { //set buttons private void setButtons() { - + //enable and diable buttons accordingly //Debug.println("setButtons() - "+mTable.getSelectedRow()); //Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty()); - + } - + //============================================= // SEND REQUESTS TO THE SERVER SIDE //============================================= private void update() { //send request and parse data - + mModel.progressStart(); - + NameValuePairs response; NameValuePairs request; request = new NameValuePairs(); request.put(Constants.PR_TOKEN_LIST, (String) mToken.getSelectedItem()); try { response = mConnection.search(mDestination, - ScopeDef.SC_TKSKEYSLIST, request); + ScopeDef.SC_TKSKEYSLIST, request); } catch (EAdminException e) { //display error dialog showErrorDialog(e.getMessage()); @@ -308,7 +308,7 @@ public class TKSKeysTab extends CMSBaseUGTab { for (String entry : response.keySet()) { vals[i++] = entry.trim(); } - + int sindex = 0; CMSAdminUtil.quickSort(vals, 0, response.size()-1); for (i=0; i<vals.length; i++) { @@ -348,7 +348,7 @@ public class TKSKeysTab extends CMSBaseUGTab { (String)(mDataModel.getValueAt(row, 0)); String id = nickname+":SERIAL#<"+mDataModel.getValueAt(row, 1)+">" +mDataModel.getValueAt(row, 2); - + //send comment to server for the removal of user try { mConnection.delete(mDestination, ScopeDef.SC_USERCERTSLIST, id); diff --git a/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java b/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java index de0a075a1..ff8f06a4e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java +++ b/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java @@ -43,17 +43,17 @@ public class UserCertsTab extends CMSBaseUGTab { * variables *==========================================================*/ private static final String PANEL_NAME = "USERCERTS"; - + private AdminConnection mConnection; private String mDestination; private CMSBaseResourceModel mModel; private ConsoleInfo mConsoleInfo; - + protected JScrollPane mScrollPane; protected JTable mTable; //table protected ListCertsModel mDataModel; //table model protected CertViewDialog mEditor=null; //keep single copy - + protected JButton mRefresh, mAdd, mDelete, mView, mHelp; private final static String HELPINDEX = "configuration-log-plugin-help"; @@ -119,7 +119,7 @@ public class UserCertsTab extends CMSBaseUGTab { (String)(mTable.getValueAt(row, 0)); String serialno = (String)(mTable.getValueAt(row, 1)); String issuername = (String)(mTable.getValueAt(row, 2)); - + try { NameValuePairs nvps = new NameValuePairs(); nvps.put(Constants.PR_NICK_NAME, nickname); @@ -138,7 +138,7 @@ public class UserCertsTab extends CMSBaseUGTab { CMSAdminUtil.showErrorDialog(mModel.getFrame(), mResource, ex.toString(), CMSAdminUtil.ERROR_MESSAGE); } - } + } } //==== MOUSELISTENER ====================== @@ -147,7 +147,7 @@ public class UserCertsTab extends CMSBaseUGTab { } public void mouseReleased(MouseEvent e) { - setButtons(); + setButtons(); } /*========================================================== @@ -156,8 +156,8 @@ public class UserCertsTab extends CMSBaseUGTab { public void refresh() { mDataModel.removeAllRows(); - update(); - + update(); + setButtons(); mTable.invalidate(); mTable.validate(); @@ -241,7 +241,7 @@ public class UserCertsTab extends CMSBaseUGTab { //set buttons private void setButtons() { - + //enable and diable buttons accordingly //Debug.println("setButtons() - "+mTable.getSelectedRow()); //Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty()); @@ -250,29 +250,29 @@ public class UserCertsTab extends CMSBaseUGTab { mView.setEnabled(false); return; } - + if(mDataModel.getRowCount()<=0) { mDelete.setEnabled(false); mView.setEnabled(false); return; } - + mDelete.setEnabled(true); - mView.setEnabled(true); - + mView.setEnabled(true); + } - + //============================================= // SEND REQUESTS TO THE SERVER SIDE //============================================= private void update() { //send request and parse data - + mModel.progressStart(); NameValuePairs response; try { response = mConnection.search(mDestination, - ScopeDef.SC_USERCERTSLIST, new NameValuePairs()); + ScopeDef.SC_USERCERTSLIST, new NameValuePairs()); } catch (EAdminException e) { //display error dialog showErrorDialog(e.getMessage()); @@ -290,7 +290,7 @@ public class UserCertsTab extends CMSBaseUGTab { for (String entry : response.keySet()) { vals[i++] = entry.trim(); } - + int sindex = 0; String snickname = ""; CMSAdminUtil.quickSort(vals, 0, response.size()-1); @@ -313,7 +313,7 @@ public class UserCertsTab extends CMSBaseUGTab { } mTable.setRowSelectionInterval(0,0); } - + mModel.progressStop(); } @@ -324,7 +324,7 @@ public class UserCertsTab extends CMSBaseUGTab { (String)(mDataModel.getValueAt(row, 0)); String id = nickname+":SERIAL#<"+mDataModel.getValueAt(row, 1)+">" +mDataModel.getValueAt(row, 2); - + //send comment to server for the removal of user try { mConnection.delete(mDestination, ScopeDef.SC_USERCERTSLIST, id); diff --git a/base/console/src/com/netscape/admin/certsrv/config/ViewDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ViewDialog.java index 277b3d2be..e3c40a276 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ViewDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ViewDialog.java @@ -30,7 +30,7 @@ import javax.swing.table.*; import com.netscape.certsrv.common.*; /** - * Policy Implementation Information viewer + * Policy Implementation Information viewer * * @author Jack Pan-Chen * @version $Revision$, $Date$ @@ -148,7 +148,7 @@ public class ViewDialog extends JDialog JLabel label1 = CMSAdminUtil.makeJLabel(mResource, PREFIX, "NAME", null); mNameField = new JLabel(); CMSAdminUtil.addEntryField(content, label1, mNameField, gbc); - + CMSAdminUtil.resetGBC(gbc); JLabel label2 = CMSAdminUtil.makeJLabel(mResource, PREFIX, "CLASS", null); mClassField = new JLabel(); @@ -162,7 +162,7 @@ public class ViewDialog extends JDialog CMSAdminUtil.COMPONENT_SPACE,0,0); gb3.setConstraints(label3, gbc); content.add(label3); - + CMSAdminUtil.resetGBC(gbc); mTextArea = new JTextArea("",30,10); mTextArea.setFont(mClassField.getFont()); @@ -183,7 +183,7 @@ public class ViewDialog extends JDialog gbc.weighty=1.0; gb3.setConstraints(scrollPanel, gbc); content.add(scrollPanel); - + return content; } } diff --git a/base/console/src/com/netscape/admin/certsrv/config/ViewSelfTestsDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ViewSelfTestsDialog.java index 09d7892ef..fdd18b2f8 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/ViewSelfTestsDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/ViewSelfTestsDialog.java @@ -31,7 +31,7 @@ import javax.swing.event.*; import javax.swing.table.*; /** - * Self Tests Implementation Information viewer + * Self Tests Implementation Information viewer * * @author Matthew Harmsen * @author Thomas Kwan @@ -166,7 +166,7 @@ public class ViewSelfTestsDialog extends JDialog gbc.weighty = 1.0; gb3.setConstraints( scrollPanel, gbc ); content.add( scrollPanel ); - + return content; } } diff --git a/base/console/src/com/netscape/admin/certsrv/config/WBaseCertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseCertExtensionPage.java index 6c92ed61e..c5ff4ce2b 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/WBaseCertExtensionPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseCertExtensionPage.java @@ -48,7 +48,7 @@ public class WBaseCertExtensionPage extends WizardBasePanel { protected static final String DEFAULT_CERT_LEN = "100"; protected String mPanelName; protected boolean mModified=false; - + public WBaseCertExtensionPage(String panelName) { super(panelName); } @@ -73,7 +73,7 @@ public class WBaseCertExtensionPage extends WizardBasePanel { setErrorMessage("INVALID"); return false; } - + } if (mMIMECheckBox.isSelected()) { @@ -100,7 +100,7 @@ public class WBaseCertExtensionPage extends WizardBasePanel { enableExtendedKey(extendedKey); - if (derExt) + if (derExt) enableMIMEExt(derExt, mActiveColor); else enableMIMEExt(derExt, getBackground()); @@ -111,15 +111,15 @@ public class WBaseCertExtensionPage extends WizardBasePanel { // If signed by self, no request will be generated // check if a signing cert installed, make cmc note invisible String type = wizardInfo.getCertType(); - if ((type.equals(Constants.PR_KRA_TRANSPORT_CERT) && + if ((type.equals(Constants.PR_KRA_TRANSPORT_CERT) && wizardInfo.isKRACertLocalCA()) || - (type.equals(Constants.PR_SERVER_CERT) && + (type.equals(Constants.PR_SERVER_CERT) && wizardInfo.isSSLCertLocalCA()) || type.equals(Constants.PR_OCSP_SIGNING_CERT) || (type.equals(Constants.PR_CA_SIGNING_CERT) && wizardInfo.isCACertLocalCA()) || (type.equals(Constants.PR_SERVER_CERT) || - type.equals(Constants.PR_KRA_TRANSPORT_CERT)) && ( + type.equals(Constants.PR_KRA_TRANSPORT_CERT)) && ( (wizardInfo.isCAInstalled() && wizardInfo.isCACertInstalledDone()) || (wizardInfo.isRAInstalled() && @@ -220,7 +220,7 @@ public class WBaseCertExtensionPage extends WizardBasePanel { JPanel panel = new JPanel(); GridBagLayout gb1 = new GridBagLayout(); panel.setLayout(gb1); - + mCertPathBox = makeJCheckBox("CERTPATHLENGTH"); CMSAdminUtil.resetGBC(gbc); gbc.insets = new Insets(0, 0, 0, COMPONENT_SPACE); @@ -289,7 +289,7 @@ public class WBaseCertExtensionPage extends WizardBasePanel { gbc.fill = gbc.NONE; gbc.weightx = 1.0; add(mSSLMail, gbc); - + mObjectSigning = makeJCheckBox("OBJECTSIGNING"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -315,7 +315,7 @@ public class WBaseCertExtensionPage extends WizardBasePanel { gbc.fill = gbc.NONE; gbc.weightx = 1.0; add(mOCSPSigning, gbc); - + mAIACheckBox = makeJCheckBox("AIA"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -380,7 +380,7 @@ public class WBaseCertExtensionPage extends WizardBasePanel { COMPONENT_SPACE); gbc.fill = gbc.NONE; add(mMIMECheckBox, gbc); - + mMIMEText = new JTextArea("", 40, 70); JScrollPane scrollPane = new JScrollPane(mMIMEText, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, @@ -400,7 +400,7 @@ public class WBaseCertExtensionPage extends WizardBasePanel { COMPONENT_SPACE); add(scrollPane, gbc); mActiveColor = mMIMEText.getBackground(); - + mPaste = makeJButton("PASTE"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHEAST; @@ -421,17 +421,17 @@ public class WBaseCertExtensionPage extends WizardBasePanel { if (source.equals(mPaste)) { mMIMEText.paste(); } else if (source.equals(mBasicCheckBox)) { - if (mBasicCheckBox.isSelected()) + if (mBasicCheckBox.isSelected()) enableBasicConstraints(true, mActiveColor); else enableBasicConstraints(false, getBackground()); } else if (source.equals(mExtendedKeyCheckBox)) { - if (mExtendedKeyCheckBox.isSelected()) + if (mExtendedKeyCheckBox.isSelected()) enableExtendedKey(true); else enableExtendedKey(false); } else if (source.equals(mMIMECheckBox)) { - if (mMIMECheckBox.isSelected()) + if (mMIMECheckBox.isSelected()) enableMIMEExt(true, mActiveColor); else enableMIMEExt(false, getBackground()); diff --git a/base/console/src/com/netscape/admin/certsrv/config/WBaseCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseCertRequestPage.java index 6b9a1667b..9eb63ca97 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/WBaseCertRequestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseCertRequestPage.java @@ -43,7 +43,7 @@ public class WBaseCertRequestPage extends WizardBasePanel { protected JTextField mEmailText, mContactEmailTxt, mNameTxt, mContactPhoneTxt; protected JLabel mContactPhoneLbl, mContactEmailLbl, mNameLbl; protected JTextArea mContactText; - + public WBaseCertRequestPage(String panelName) { super(panelName); } @@ -135,10 +135,10 @@ public class WBaseCertRequestPage extends WizardBasePanel { mEmailText = new JTextField(30); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.WEST; - gbc.insets = new Insets(COMPONENT_SPACE, 0, 0, COMPONENT_SPACE); + gbc.insets = new Insets(COMPONENT_SPACE, 0, 0, COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mEmailText, gbc); - + mURLBtn = makeJRadioButton("URL", false); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.WEST; @@ -154,7 +154,7 @@ public class WBaseCertRequestPage extends WizardBasePanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mURLText, gbc); - + ButtonGroup methodGroup = new ButtonGroup(); methodGroup.add(mEmailBtn); methodGroup.add(mURLBtn); @@ -169,7 +169,7 @@ public class WBaseCertRequestPage extends WizardBasePanel { CMSAdminUtil.resetGBC(gbc); gbc.weightx = 1.0; gbc.anchor = gbc.NORTHWEST; - gbc.gridwidth = gbc.REMAINDER; + gbc.gridwidth = gbc.REMAINDER; gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(mContactText, gbc); @@ -187,7 +187,7 @@ public class WBaseCertRequestPage extends WizardBasePanel { gbc.anchor = gbc.NORTHWEST; gbc.insets = new Insets(COMPONENT_SPACE, 0, 0, 0); add(panel, gbc); - + mNameLbl = makeJLabel("NAME"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.EAST; @@ -221,7 +221,7 @@ public class WBaseCertRequestPage extends WizardBasePanel { gbc.gridwidth = gbc.REMAINDER; gbc.weightx = 1.0; panel.add(mContactEmailTxt, gbc); - + mContactPhoneLbl = makeJLabel("PHONE"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.WEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/WBaseDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseDNPage.java index 97774727b..44ad29fed 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/WBaseDNPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseDNPage.java @@ -98,7 +98,7 @@ public class WBaseDNPage extends WizardBasePanel implements IWizardPanel { } if (str.equals("") && !displayWarning) { - String errorMsg = + String errorMsg = mResource.getString(mPanelName+"_DIALOG_MISSINGO_MESSAGE"); JOptionPane.showMessageDialog(new JFrame(), errorMsg, "Warning", JOptionPane.WARNING_MESSAGE, @@ -184,7 +184,7 @@ public class WBaseDNPage extends WizardBasePanel implements IWizardPanel { gbc.gridwidth = gbc.REMAINDER; add(dnDesc, gbc); */ - + /* JTextArea desc = createTextArea( CMSAdminUtil.wrapText(mResource.getString( @@ -210,7 +210,7 @@ public class WBaseDNPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mDNComponents, gbc); - + cnLabel = makeJLabel("CN"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.EAST; @@ -219,7 +219,7 @@ public class WBaseDNPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE); add(cnLabel, gbc); - mCNText = new JTextField(30); + mCNText = new JTextField(30); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.WEST; gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, 0, @@ -365,7 +365,7 @@ public class WBaseDNPage extends WizardBasePanel implements IWizardPanel { mSubjectStringText = new JTextField(256); /* - mSubjectStringText = new JTextArea(null, null, 0, 0); + mSubjectStringText = new JTextArea(null, null, 0, 0); mSubjectStringText.setBorder(BorderFactory.createLineBorder(Color.black)); JScrollPane scrollPane = new JScrollPane(mSubjectStringText, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, @@ -391,7 +391,7 @@ public class WBaseDNPage extends WizardBasePanel implements IWizardPanel { gbc.gridheight = gbc.REMAINDER; gbc.gridwidth = gbc.REMAINDER; add(d1, gbc); - + mCNText.getDocument().addDocumentListener((DocumentListener)mSubjectDNText); mOUText.getDocument().addDocumentListener((DocumentListener)mSubjectDNText); @@ -425,10 +425,10 @@ public class WBaseDNPage extends WizardBasePanel implements IWizardPanel { CMSAdminUtil.repaintComp(cLabel); CMSAdminUtil.repaintComp(subjectDNLabel); if (enable) - CMSAdminUtil.enableJTextField(mSubjectStringText, !enable, + CMSAdminUtil.enableJTextField(mSubjectStringText, !enable, getBackground()); else - CMSAdminUtil.enableJTextField(mSubjectStringText, !enable, + CMSAdminUtil.enableJTextField(mSubjectStringText, !enable, mActiveColor); } @@ -437,10 +437,10 @@ public class WBaseDNPage extends WizardBasePanel implements IWizardPanel { enableFields(true, mActiveColor); } else { enableFields(false, getBackground()); - } + } } - public class SubjectDNTextArea extends JTextArea implements + public class SubjectDNTextArea extends JTextArea implements DocumentListener { public SubjectDNTextArea(int rows, int columns) { @@ -454,7 +454,7 @@ public class WBaseDNPage extends WizardBasePanel implements IWizardPanel { public void removeUpdate(DocumentEvent e) { super.setText(updateStr()); } - + public void changedUpdate(DocumentEvent e) { super.setText(updateStr()); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/WBaseDNValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseDNValidityPage.java index 3a5837624..202b42dae 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/WBaseDNValidityPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseDNValidityPage.java @@ -66,9 +66,9 @@ public class WBaseDNValidityPage extends WizardBasePanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(desc, gbc); - + JLabel cnLabel = makeJLabel("CN"); - mCNText = new JTextField(30); + mCNText = new JTextField(30); /* JTextArea dummy = createTextArea(" ", 1, 1); CMSAdminUtil.addComponents(this, cnLabel, mCNText, dummy, gbc); @@ -136,7 +136,7 @@ public class WBaseDNValidityPage extends WizardBasePanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(desc1, gbc); - + validityLbl = makeJLabel("VALIDITY"); mValidityText = new JTextField(5); mUnitBox = makeJComboBox("VALIDITY"); @@ -154,7 +154,7 @@ public class WBaseDNValidityPage extends WizardBasePanel { super.init(); } - public class SubjectDNTextArea extends JTextArea implements + public class SubjectDNTextArea extends JTextArea implements DocumentListener { public SubjectDNTextArea(int rows, int columns) { @@ -168,7 +168,7 @@ public class WBaseDNValidityPage extends WizardBasePanel { public void removeUpdate(DocumentEvent e) { super.setText(updateStr()); } - + public void changedUpdate(DocumentEvent e) { super.setText(updateStr()); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/WBaseKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseKeyPage.java index 1266099b1..cd5ebfc25 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/WBaseKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseKeyPage.java @@ -32,13 +32,13 @@ import com.netscape.certsrv.common.*; * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.config.install */ -public class WBaseKeyPage extends WizardBasePanel { +public class WBaseKeyPage extends WizardBasePanel { protected JComboBox mKeyTypeBox; protected JComboBox mKeyLengthBox; //protected JComboBox mTokenBox; //protected JPasswordField mPasswordText; protected JTextField mKeyLengthText; - + public WBaseKeyPage(String panelName) { super(panelName); } @@ -59,7 +59,7 @@ public class WBaseKeyPage extends WizardBasePanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(desc, gbc); - + /* JTextArea desc1 = createTextArea( CMSAdminUtil.wrapText(mResource.getString( @@ -93,7 +93,7 @@ public class WBaseKeyPage extends WizardBasePanel { CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,0, + gbc.insets = new Insets(COMPONENT_SPACE,0, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(dummy, gbc); @@ -133,7 +133,7 @@ public class WBaseKeyPage extends WizardBasePanel { /* JLabel keyTypeLbl = makeJLabel("KEYTYPE"); - mKeyTypeBox = makeJComboBox("KEYTYPE"); + mKeyTypeBox = makeJComboBox("KEYTYPE"); //JTextArea dummy2 = createTextArea(" ", 1, 10); //CMSAdminUtil.addComponents(this, keyTypeLbl, mKeyTypeBox, dummy2, gbc); CMSAdminUtil.addComponents(this, keyTypeLbl, mKeyTypeBox, gbc); @@ -147,15 +147,15 @@ public class WBaseKeyPage extends WizardBasePanel { CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHEAST; gbc.fill = gbc.NONE; - gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, + gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); panel.add(keyTypeLbl, gbc); - + mKeyTypeBox = makeJComboBox("KEYTYPE"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, + gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); gbc.fill = gbc.NONE; panel.add(mKeyTypeBox, gbc); @@ -190,7 +190,7 @@ public class WBaseKeyPage extends WizardBasePanel { JPanel panel1 = new JPanel(); GridBagLayout gb2 = new GridBagLayout(); panel1.setLayout(gb2); - + JLabel keyLengthCustomLbl = makeJLabel("KEYLENGTH"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHEAST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/WBaseManualCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseManualCertRequestPage.java index 195979f9c..7c36571d8 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/WBaseManualCertRequestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseManualCertRequestPage.java @@ -59,14 +59,14 @@ public class WBaseManualCertRequestPage extends WizardBasePanel { protected String mPanelName, mDir; protected JTextArea mFileName; protected JTextArea mDesc; - + protected JTextField mHostText, mPortText; protected JLabel mHostLbl, mPortLbl; protected JLabel mSSLText; protected JCheckBox mSSL; // ssl or not protected String mHost, mPort; protected JLabel mSendNowText; - protected JCheckBox mSendNowBox; + protected JCheckBox mSendNowBox; protected Color mActiveColor; public static final int MAX_PORT = 65535; public static final int MIN_PORT = 1; @@ -105,7 +105,7 @@ public class WBaseManualCertRequestPage extends WizardBasePanel { mReq = wizardInfo.getCertRequest(); } if (mReqFormat.equals(ConfigConstants.PR_REQUEST_PKCS10)){ - + // Break the long single line:header,64 byte lines,trailer // Assuming this is the only format we generate. String CERT_NEW_REQUEST_HEADER = "-----BEGIN NEW CERTIFICATE REQUEST-----"; @@ -136,7 +136,7 @@ public class WBaseManualCertRequestPage extends WizardBasePanel { mReq = str; } - if (mReq == null) + if (mReq == null) return false; mText.setText(mReq); @@ -158,7 +158,7 @@ public class WBaseManualCertRequestPage extends WizardBasePanel { String port = wizardInfo.getCMEEPort(); if (port != null && !port.equals("")) mPortText.setText(port); - + String portType = wizardInfo.getCMEEType(); if (portType != null && portType.equals("http")) mSSL.setSelected(false); @@ -177,7 +177,7 @@ public class WBaseManualCertRequestPage extends WizardBasePanel { } mDesc.setText(desc); - return true; + return true; } public boolean validatePanel() { @@ -220,7 +220,7 @@ public class WBaseManualCertRequestPage extends WizardBasePanel { if (mHost != null && !mHost.equals("")) wizardInfo.setCMHost(mHost); if (mPort != null && !mPort.equals("")) - wizardInfo.setCMEEPort(mPort); + wizardInfo.setCMEEPort(mPort); if (mSSL.isSelected()) wizardInfo.setCMEEType("https"); else @@ -280,10 +280,10 @@ public class WBaseManualCertRequestPage extends WizardBasePanel { wizardInfo.setX509RequestError(reqError); // rejected request should not be saved as requestSuccStage!! - if ( (reqID != null) && !reqID.equals("") && + if ( (reqID != null) && !reqID.equals("") && (wizardInfo.getRequestError() == null) && - (reqStatus.equals(Constants.PR_REQUEST_SUCCESS) - || reqStatus.equals(Constants.PR_REQUEST_PENDING) + (reqStatus.equals(Constants.PR_REQUEST_SUCCESS) + || reqStatus.equals(Constants.PR_REQUEST_PENDING) || reqStatus.equals(Constants.PR_REQUEST_SVC_PENDING)) ) { data = new Hashtable(); diff --git a/base/console/src/com/netscape/admin/certsrv/config/WBaseValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseValidityPage.java index 61d9506e6..2af0c5a89 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/WBaseValidityPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseValidityPage.java @@ -152,7 +152,7 @@ January 2038. JLabel dayLbl = makeJLabel("DAY"); add(dayLbl, gbc); - + JLabel hourLbl = makeJLabel("HOUR"); add(hourLbl, gbc); @@ -187,7 +187,7 @@ January 2038. gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, 0, COMPONENT_SPACE); add(mBYear, gbc); - + mBMonth = new JTextField(""+(nowDate.get(Calendar.MONTH)+1)); mBMonth.setColumns(3); add(mBMonth, gbc); diff --git a/base/console/src/com/netscape/admin/certsrv/config/WMNNewAgent.java b/base/console/src/com/netscape/admin/certsrv/config/WMNNewAgent.java index 425eddaaa..4480e4de0 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/WMNNewAgent.java +++ b/base/console/src/com/netscape/admin/certsrv/config/WMNNewAgent.java @@ -48,7 +48,7 @@ class WMNNewAgent extends WizardBasePanel private NewAgentModel mDataModel; private JTable mTable; protected JScrollPane mScrollPane; - private static final String HELPINDEX = + private static final String HELPINDEX = "configuration-kra-wizard-newagentpwd-keyscheme-help"; /*========================================================== diff --git a/base/console/src/com/netscape/admin/certsrv/config/WMNOldAgent.java b/base/console/src/com/netscape/admin/certsrv/config/WMNOldAgent.java index 07973f6c9..4c5a6182b 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/WMNOldAgent.java +++ b/base/console/src/com/netscape/admin/certsrv/config/WMNOldAgent.java @@ -48,7 +48,7 @@ class WMNOldAgent extends WizardBasePanel private AutoRecoveryModel mDataModel; private JTable mTable; protected JScrollPane mScrollPane; - private static final String HELPINDEX = + private static final String HELPINDEX = "configuration-kra-wizard-agentpwd-keyscheme-help"; /*========================================================== @@ -65,7 +65,7 @@ class WMNOldAgent extends WizardBasePanel /*========================================================== * public methods - *==========================================================*/ + *==========================================================*/ public boolean initializePanel(WizardInfo info) { //let's set the values diff --git a/base/console/src/com/netscape/admin/certsrv/config/WMNResultPage.java b/base/console/src/com/netscape/admin/certsrv/config/WMNResultPage.java index 55b1d1ccf..db1d7eadc 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/WMNResultPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/WMNResultPage.java @@ -43,7 +43,7 @@ class WMNResultPage extends WizardBasePanel *==========================================================*/ private static final String PANELNAME = "WMNRESULTPAGE"; - private static final String HELPINDEX = + private static final String HELPINDEX = "configuration-kra-wizard-newagentpwd-keyscheme-help"; /*========================================================== diff --git a/base/console/src/com/netscape/admin/certsrv/config/WMNSelection.java b/base/console/src/com/netscape/admin/certsrv/config/WMNSelection.java index db7753b1d..f3e7fd53e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/WMNSelection.java +++ b/base/console/src/com/netscape/admin/certsrv/config/WMNSelection.java @@ -78,7 +78,7 @@ class WMNSelection extends WizardBasePanel if ((mMField.getText().trim().equals("")) || (mNField.getText().trim().equals("")) ) { setErrorMessage("CANNOTBEBLANK"); - return false; + return false; } String str = mMField.getText().trim(); diff --git a/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java index ce0ced102..568566a88 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java @@ -47,7 +47,7 @@ public class WMessageDigestPage extends WizardBasePanel implements IWizardPanel protected String mCAKeyType; protected JTextArea mSignedByTypeLbl; private static final String HELPINDEX = "install-cert-mda-wizard-help"; - + public WMessageDigestPage(String panelName) { super(panelName); mPanelName = panelName; @@ -62,23 +62,23 @@ public class WMessageDigestPage extends WizardBasePanel implements IWizardPanel setBorder(makeTitledBorder(mPanelName)); if (mCAKeyType.equals("RSA")) { - mECCHashTypeBox.setVisible(false); + mECCHashTypeBox.setVisible(false); mDSAHashTypeBox.setVisible(false); mRSAHashTypeBox.setVisible(true); String sha1 = mResource.getString(mPanelName+"_COMBOBOX_RSAHASHTYPE_VALUE_2"); mRSAHashTypeBox.setSelectedItem(sha1); } else if (mCAKeyType.equals("ECC")) { - mECCHashTypeBox.setVisible(true); + mECCHashTypeBox.setVisible(true); mDSAHashTypeBox.setVisible(false); mRSAHashTypeBox.setVisible(false); } else { - mECCHashTypeBox.setVisible(false); + mECCHashTypeBox.setVisible(false); mDSAHashTypeBox.setVisible(true); mRSAHashTypeBox.setVisible(false); } mHelpIndex = HELPINDEX; - return true; + return true; } public boolean validatePanel() { @@ -93,7 +93,7 @@ public class WMessageDigestPage extends WizardBasePanel implements IWizardPanel mSignedByTypeLbl.setVisible(false); return; } - + if (mCAKeyType.equals("RSA")) { mRSASignedByTypeBox.setVisible(true); mDSASignedByTypeBox.setVisible(false); @@ -107,7 +107,7 @@ public class WMessageDigestPage extends WizardBasePanel implements IWizardPanel mDSASignedByTypeBox.setVisible(true); mRSASignedByTypeBox.setVisible(false); } - + mSignedByTypeLbl.setVisible(true); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/WarningDialog.java b/base/console/src/com/netscape/admin/certsrv/config/WarningDialog.java index bedf0b67f..4cb157411 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/WarningDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/config/WarningDialog.java @@ -62,12 +62,12 @@ public class WarningDialog extends JDialog getRootPane().setDoubleBuffered(true); setDisplay(); } - + public void actionPerformed(ActionEvent evt) { if (evt.getSource().equals(mClose)) { this.hide(); this.dispose(); - } + } } private void setDisplay() { @@ -110,9 +110,9 @@ public class WarningDialog extends JDialog } private JPanel makeActionPane() { - mClose = CMSAdminUtil.makeJButton(mResource, PREFIX, "CLOSE", + mClose = CMSAdminUtil.makeJButton(mResource, PREFIX, "CLOSE", null, this); - + Dimension d = mClose.getMinimumSize(); if (d.width < CMSAdminUtil.DEFAULT_BUTTON_SIZE) { d.width = CMSAdminUtil.DEFAULT_BUTTON_SIZE; @@ -150,7 +150,7 @@ public class WarningDialog extends JDialog desc.setBackground(getBackground()); desc.setEditable(false); desc.setCaretColor(getBackground()); - JScrollPane scrollPane = new JScrollPane(desc, + JScrollPane scrollPane = new JScrollPane(desc, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); CMSAdminUtil.resetGBC(gbc); @@ -164,7 +164,7 @@ public class WarningDialog extends JDialog gbc.gridwidth = gbc.REMAINDER; gbc.gridheight = gbc.REMAINDER; content.add(scrollPane, gbc); - + return content; } } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizard.java b/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizard.java index 557dc2739..e59da68f5 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizard.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizard.java @@ -33,7 +33,7 @@ import com.netscape.admin.certsrv.wizard.*; public class InstallWizard extends WizardWidget implements Runnable { - public InstallWizard(JFrame parent, InstallWizardInfo info, + public InstallWizard(JFrame parent, InstallWizardInfo info, IWizardDone wizDone) { super(parent, wizDone); setWizardInfo(info); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java b/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java index a88101cc4..aa639ecb3 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java @@ -72,7 +72,7 @@ public class InstallWizardInfo extends WizardInfo { public InstallWizardInfo(ConsoleInfo consoleInfo) { super(); - mConsoleInfo = consoleInfo; + mConsoleInfo = consoleInfo; } public JFrame getAdminFrame() { @@ -85,7 +85,7 @@ public class InstallWizardInfo extends WizardInfo { return true; else return false; - + } public void setAdminFrame(JFrame frame) { @@ -102,7 +102,7 @@ public class InstallWizardInfo extends WizardInfo { public String getCloneCertsList() { String s = (String)get(ConfigConstants.PR_CLONE_CERTIFICATES); - if (s == null || s.equals("")) + if (s == null || s.equals("")) return " "; return s; } @@ -120,7 +120,7 @@ public class InstallWizardInfo extends WizardInfo { public boolean isCACloningDone() { String str = (String)get(ConfigConstants.STAGE_CACLONING); - + if (str != null && str.equals(ConfigConstants.TRUE)) return true; else @@ -133,9 +133,9 @@ public class InstallWizardInfo extends WizardInfo { public boolean isOCSPCloningDone() { String str = (String)get(ConfigConstants.STAGE_OCSPCLONING); - if (str != null && str.equals(ConfigConstants.TRUE)) + if (str != null && str.equals(ConfigConstants.TRUE)) return true; - + return false; } @@ -145,27 +145,27 @@ public class InstallWizardInfo extends WizardInfo { public boolean isRACloningDone() { String str = (String)get(ConfigConstants.STAGE_RACLONING); - if (str != null && str.equals(ConfigConstants.TRUE)) + if (str != null && str.equals(ConfigConstants.TRUE)) return true; - + return false; } - + public void setRACloningDone(String str) { put(ConfigConstants.STAGE_RACLONING, str); } public boolean isKRACloningDone() { String str = (String)get(ConfigConstants.STAGE_KRACLONING); - if (str != null && str.equals(ConfigConstants.TRUE)) + if (str != null && str.equals(ConfigConstants.TRUE)) return true; - + return false; } public boolean isTKSCloningDone() { String str = (String)get(ConfigConstants.STAGE_TKSCLONING); - if (str != null && str.equals(ConfigConstants.TRUE)) + if (str != null && str.equals(ConfigConstants.TRUE)) return true; return false; @@ -248,9 +248,9 @@ public class InstallWizardInfo extends WizardInfo { public boolean isAdministratorDone() { String str = (String)get(ConfigConstants.STAGE_SETUP_ADMINISTRATOR); - if (str == null || str.equals("") || str.equals(ConfigConstants.FALSE)) + if (str == null || str.equals("") || str.equals(ConfigConstants.FALSE)) return false; - + return true; } @@ -281,7 +281,7 @@ public class InstallWizardInfo extends WizardInfo { return true; return false; } - + public boolean isRACertRequestBack() { String str = (String)get(ConfigConstants.RA_CERT_REQUEST_BACK); if (str != null && str.equals(ConfigConstants.TRUE)) @@ -295,35 +295,35 @@ public class InstallWizardInfo extends WizardInfo { return true; return false; } - + public boolean isKRACertRequestBack() { String str = (String)get(ConfigConstants.KRA_CERT_REQUEST_BACK); if (str != null && str.equals(ConfigConstants.TRUE)) return true; return false; } - + public boolean isSSLCertRequestBack() { String str = (String)get(ConfigConstants.SSL_CERT_REQUEST_BACK); if (str != null && str.equals(ConfigConstants.TRUE)) return true; return false; } - + public boolean isSelfSignedCACertDone() { String str = (String)get(ConfigConstants.STAGE_CA_SELFSIGNED_CERT); if (str != null && str.equals(ConfigConstants.TRUE)) return true; return false; } - + public boolean isCACertRequestDone() { String str = (String)get(ConfigConstants.STAGE_CA_CERT_REQUEST); if (str != null && str.equals(ConfigConstants.TRUE)) return true; return false; } - + public boolean isCACertInstalledDone() { String str = (String)get(ConfigConstants.STAGE_CA_CERT_INSTALL); if (str != null && str.equals(ConfigConstants.TRUE)) @@ -375,7 +375,7 @@ public class InstallWizardInfo extends WizardInfo { return true; return false; } - + public boolean isOCSPLocalCertDone() { String str = (String)get(ConfigConstants.STAGE_OCSP_LOCAL_CERT); if (str != null && str.equals(ConfigConstants.TRUE)) @@ -389,7 +389,7 @@ public class InstallWizardInfo extends WizardInfo { return true; return false; } - + public boolean isOCSPCertInstalledDone() { String str = (String)get(ConfigConstants.STAGE_OCSP_CERT_INSTALL); if (str != null && str.equals(ConfigConstants.TRUE)) @@ -531,7 +531,7 @@ public class InstallWizardInfo extends WizardInfo { if (str != null && str.equals(ConfigConstants.TRUE)) return true; return false; - } + } public String getSingleSignOnPassword() { return mPassword; @@ -629,7 +629,7 @@ public class InstallWizardInfo extends WizardInfo { val = "8001"; return val; } - + public void setEESecurePort(String port) { put(ConfigConstants.PR_EE_SECURE_PORT, port); } @@ -651,7 +651,7 @@ public class InstallWizardInfo extends WizardInfo { return true; return false; } - + public void setEEEnable(String enable) { put(ConfigConstants.PR_EE_PORT_ENABLE, enable); } @@ -835,7 +835,7 @@ public class InstallWizardInfo extends WizardInfo { public String getKeyCurveName() { String val = (String)get(ConfigConstants.PR_KEY_CURVENAME); - if (val ==null) + if (val ==null) val = "nistp521"; return val; } @@ -847,7 +847,7 @@ public class InstallWizardInfo extends WizardInfo { public String getKeyType() { String type = (String)get(ConfigConstants.PR_KEY_TYPE); // work around the historical mistake, - // not touching files around the places. + // not touching files around the places. if ( type == null || type.equals("")) { String certType = getCertType(); if (certType.equals(Constants.PR_CA_SIGNING_CERT)) { @@ -1214,7 +1214,7 @@ public class InstallWizardInfo extends WizardInfo { public void setInstalledKRA(String val) { put(ConfigConstants.PR_KRA, val); } - + public void setInstalledTKS(String val) { put(ConfigConstants.PR_TKS, val); } @@ -1403,7 +1403,7 @@ public class InstallWizardInfo extends WizardInfo { public void setTotalAgents(String val) { put(ConfigConstants.PR_AGENT_N, val); } - + public String getTotalAgents() { return (String)get(ConfigConstants.PR_AGENT_N); } @@ -1603,7 +1603,7 @@ public class InstallWizardInfo extends WizardInfo { public String getEndRequestNumber() { return (String)get(ConfigConstants.PR_ENDREQUEST_NUMBER); } - + public boolean isCloning() { String str = (String)get("cloning"); if (str != null && str.equals(ConfigConstants.TRUE)) @@ -1692,21 +1692,21 @@ public class InstallWizardInfo extends WizardInfo { return false; return true; } - + public boolean isRACertRequestSucc() { String str = (String)get(ConfigConstants.STAGE_RA_REQ_SUCCESS); if (str == null || str.equals("") || str.equals(ConfigConstants.FALSE)) return false; return true; } - + public boolean isKRACertRequestSucc() { String str = (String)get(ConfigConstants.STAGE_KRA_REQ_SUCCESS); if (str == null || str.equals("") || str.equals(ConfigConstants.FALSE)) return false; return true; } - + public boolean isSSLCertRequestSucc() { String str = (String)get(ConfigConstants.STAGE_SSL_REQ_SUCCESS); if (str == null || str.equals("") || str.equals(ConfigConstants.FALSE)) diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIAdminPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIAdminPage.java index 467632102..4d1681477 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIAdminPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIAdminPage.java @@ -36,12 +36,12 @@ import com.netscape.management.client.console.*; */ class WIAdminPage extends WizardBasePanel implements IWizardPanel { private JCheckBox mEnable; - private JTextField mIDText, mFullNameText, mPasswordText, + private JTextField mIDText, mFullNameText, mPasswordText, mPasswordAgainText; private static final String PANELNAME = "ADMININSTALLWIZARD"; private static final String HELPINDEX = "install-administrator-configuration-wizard-help"; - + WIAdminPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -68,12 +68,12 @@ class WIAdminPage extends WizardBasePanel implements IWizardPanel { return false; if (wizardInfo.isAdministratorDone()) return false; - mIDText.setText(wizardInfo.getCertAdminUid()); + mIDText.setText(wizardInfo.getCertAdminUid()); mFullNameText.setText(wizardInfo.getCertAdminName()); setBorder(makeTitledBorder(PANELNAME)); - - return true; + + return true; } public boolean validatePanel() { @@ -83,22 +83,22 @@ class WIAdminPage extends WizardBasePanel implements IWizardPanel { setErrorMessage("BLANKPASSWD"); return false; } - + if (!password.equals(passwordAgain)) { setErrorMessage("NOTSAMEPASSWD"); return false; } - + if (mIDText.getText().trim().equals("")) { setErrorMessage("BLANKADMINID"); return false; } - - if (mFullNameText.getText().trim().equals("")) { + + if (mFullNameText.getText().trim().equals("")) { setErrorMessage("BLANKADMINNAME"); return false; } - + return true; } @@ -111,9 +111,9 @@ class WIAdminPage extends WizardBasePanel implements IWizardPanel { rawData = rawData+"&"+ConfigConstants.PR_CERT_ADMINNAME+"="+mFullNameText.getText(); rawData = rawData+"&"+ConfigConstants.PR_CERT_ADMINPASSWD+"="+mPasswordAgainText.getText(); if (mEnable.isSelected()) { - rawData = rawData+"&"+ConfigConstants.PR_ENABLE+"=true"; + rawData = rawData+"&"+ConfigConstants.PR_ENABLE+"=true"; } else { - rawData = rawData+"&"+ConfigConstants.PR_ENABLE+"=false"; + rawData = rawData+"&"+ConfigConstants.PR_ENABLE+"=false"; } if (wizardInfo.getInternalDBPasswd() != null) rawData = rawData+"&"+ConfigConstants.PR_DB_PWD+"="+wizardInfo.getInternalDBPasswd(); @@ -155,7 +155,7 @@ class WIAdminPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(desc, gbc); - + CMSAdminUtil.resetGBC(gbc); JLabel idLbl = makeJLabel("ADMINID"); gbc.anchor = gbc.NORTHEAST; @@ -163,7 +163,7 @@ class WIAdminPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.fill = gbc.NONE; add(idLbl, gbc); - + CMSAdminUtil.resetGBC(gbc); mIDText = makeJTextField(30); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIAllCertsInstalledPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIAllCertsInstalledPage.java index b84460814..a9994a159 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIAllCertsInstalledPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIAllCertsInstalledPage.java @@ -40,7 +40,7 @@ class WIAllCertsInstalledPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "ALLCERTSINSTALLEDWIZARD"; private static final String HELPINDEX = "install-allcerts-getinstalled-wizard-help"; - + WIAllCertsInstalledPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -77,7 +77,7 @@ class WIAllCertsInstalledPage extends WizardBasePanel implements IWizardPanel { } } } - } + } else if (wizardInfo.isRAInstalled() && wizardInfo.isKRAInstalled()) { if (raCertInstalled(wizardInfo) && kraCertInstalled(wizardInfo)) @@ -148,8 +148,8 @@ class WIAllCertsInstalledPage extends WizardBasePanel implements IWizardPanel { } setBorder(makeTitledBorder(PANELNAME)); mLabel.setVisible(false); - - return true; + + return true; } private boolean caCertInstalled(InstallWizardInfo wizardInfo) { @@ -202,8 +202,8 @@ class WIAllCertsInstalledPage extends WizardBasePanel implements IWizardPanel { rawData = rawData+"&"+ConfigConstants.OPTYPE+"="+OpDef.OP_READ; // #344791 - help server to make up the hostname /* - data.put(ConfigConstants.PR_HOST, - consoleInfo.get(ConfigConstants.PR_HOST)); + data.put(ConfigConstants.PR_HOST, + consoleInfo.get(ConfigConstants.PR_HOST)); */ startProgressStatus(); boolean ready = send(rawData, wizardInfo); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1CustomPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1CustomPage.java index 6f8c26032..65264ab7f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1CustomPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1CustomPage.java @@ -37,7 +37,7 @@ class WICACert1CustomPage extends WBaseKeyPage implements IWizardPanel { private static final String PANELNAME = "CACERT1CUSTOMWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WICACert1CustomPage() { super(PANELNAME); init(); @@ -48,7 +48,7 @@ class WICACert1CustomPage extends WBaseKeyPage implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1Page.java index c3ca75420..8b511ced5 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1Page.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1Page.java @@ -37,18 +37,18 @@ class WICACert1Page extends WizardBasePanel implements IWizardPanel { private JComboBox mKeyLengthBox; //private JComboBox mTokenBox; //private JPasswordField mPasswordText; - + private static final String PANELNAME = "CACERT1WIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WICACert1Page() { super(PANELNAME); init(); } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean isLastPage() { @@ -83,7 +83,7 @@ class WICACert1Page extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(desc, gbc); - + /* JTextArea desc1 = createTextArea( CMSAdminUtil.wrapText(mResource.getString( @@ -117,7 +117,7 @@ class WICACert1Page extends WizardBasePanel implements IWizardPanel { CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,0, + gbc.insets = new Insets(COMPONENT_SPACE,0, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(dummy, gbc); @@ -161,15 +161,15 @@ class WICACert1Page extends WizardBasePanel implements IWizardPanel { CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHEAST; gbc.fill = gbc.NONE; - gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, + gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); panel.add(keyTypeLbl, gbc); - + mKeyTypeBox = makeJComboBox("KEYTYPE"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, + gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); gbc.fill = gbc.NONE; panel.add(mKeyTypeBox, gbc); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICACert2Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert2Page.java index 79fc00b02..dce6afad5 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICACert2Page.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert2Page.java @@ -37,7 +37,7 @@ class WICACert2Page extends WBaseDNPage implements IWizardPanel { private static final String PANELNAME = "CACERT2WIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WICACert2Page() { super(PANELNAME); init(); @@ -48,7 +48,7 @@ class WICACert2Page extends WBaseDNPage implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertDNPage.java index 531de6be5..f224cb59e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertDNPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertDNPage.java @@ -21,7 +21,7 @@ import com.netscape.admin.certsrv.wizard.*; import javax.swing.*; /** - * Subject DN page for CA signing certificate + * Subject DN page for CA signing certificate * * @author Christine Ho * @version $Revision$, $Date$ diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertExtensionPage.java index 1a1a1a8b9..b1faf554a 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertExtensionPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertExtensionPage.java @@ -69,7 +69,7 @@ class WICACertExtensionPage extends WICertExtensionPage { mExtendedKeyCheckBox.setSelected(false); mKeyUsageBox.setSelected(true); } - + if (wizardInfo.isCAInstalled() && wizardInfo.isKRAInstalled()) mHelpIndex = CAKRAHELPINDEX; else diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertPage.java index b962c6ca1..e92122bbf 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertPage.java @@ -39,7 +39,7 @@ class WICACertPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "CACERTWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WICACertPage() { super(PANELNAME); init(); @@ -50,7 +50,7 @@ class WICACertPage extends WizardBasePanel implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { @@ -94,12 +94,12 @@ class WICACertPage extends WizardBasePanel implements IWizardPanel { mSubordinateBtn = makeJRadioButton("SUBORDINATE", false); CMSAdminUtil.resetGBC(gbc); gbc.weightx = 1.0; - gbc.insets = new Insets(0,COMPONENT_SPACE, COMPONENT_SPACE, + gbc.insets = new Insets(0,COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mSubordinateBtn, gbc); - JTextArea desc1 = createTextArea( + JTextArea desc1 = createTextArea( CMSAdminUtil.wrapText(mResource.getString( "CACERTWIZARD_TEXT_HEADING1_LABEL"), 80), 2, 80); CMSAdminUtil.resetGBC(gbc); @@ -132,7 +132,7 @@ class WICACertPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, 0, COMPONENT_SPACE); add(mUrlBtn, gbc); - + mUrlText = makeJTextField(30); CMSAdminUtil.resetGBC(gbc); gbc.gridwidth = gbc.REMAINDER; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertSubmitPage.java index efa2d8b0c..299f5947b 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertSubmitPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertSubmitPage.java @@ -55,8 +55,8 @@ class WICACertSubmitPage extends WICertSubmitPage implements IWizardPanel { if (wizardInfo.isCloning() && wizardInfo.isCACloningDone()) return false; - - wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, + + wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_CA_SIGNING_CERT); if (!wizardInfo.isCAInstalled() || wizardInfo.isMigrationEnable() || wizardInfo.isSelfSignedCACertDone() || wizardInfo.isCACertRequestDone() || diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertValidityPage.java index cb8fa550d..3948c908f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertValidityPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertValidityPage.java @@ -38,7 +38,7 @@ class WICACertValidityPage extends WICertValidityPage { private static final String PANELNAME = "INSTALLCACERTVALIDWIZARD"; private static final String CAHELPINDEX = "install-cacert-validity-wizard-help"; private static final String CAKRAHELPINDEX = "install-cakracert-validity-wizard-help"; - + WICACertValidityPage(JDialog parent) { super(PANELNAME); mParent = parent; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java index accc866b2..8c413ca01 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java @@ -82,10 +82,10 @@ class WICAKeyPage extends WIKeyPage implements IWizardPanel { int counts = mKeyTypeBox.getItemCount(); if (counts == 1) - mKeyTypeBox.addItem("DSA"); + mKeyTypeBox.addItem("DSA"); if (mWizardInfo.isCAInstalled() && mWizardInfo.isKRAInstalled()) { - if (mWizardInfo.isCACertLocalCA()) + if (mWizardInfo.isCACertLocalCA()) mHelpIndex = CAKRALOCALHELPINDEX; else mHelpIndex = CAKRAREMOTEHELPINDEX; @@ -102,7 +102,7 @@ class WICAKeyPage extends WIKeyPage implements IWizardPanel { public void getUpdateInfo(WizardInfo info) { super.getUpdateInfo(info); mWizardInfo.setCATokenName(mWizardInfo.getTokenName()); - + if (mPassword.isEditable()) { String tokenname = mWizardInfo.getCATokenName(); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICAMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICAMessageDigestPage.java index e19fc6586..bfe1e595f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICAMessageDigestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICAMessageDigestPage.java @@ -41,7 +41,7 @@ import com.netscape.management.client.util.*; * @see com.netscape.admin.certsrv.config.install */ class WICAMessageDigestPage extends WMessageDigestPage { - + private static final String PANELNAME = "INSTALLCAMESSAGEDIGESTWIZARD"; WICAMessageDigestPage(JDialog parent) { @@ -67,12 +67,12 @@ class WICAMessageDigestPage extends WMessageDigestPage { mCAKeyType = wizardInfo.getCAKeyType(); - return super.initializePanel(info); + return super.initializePanel(info); } public void getUpdateInfo(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - if (mDSAHashTypeBox.isVisible()) + if (mDSAHashTypeBox.isVisible()) wizardInfo.setHashType((String)mDSAHashTypeBox.getSelectedItem()); else wizardInfo.setHashType((String)mRSAHashTypeBox.getSelectedItem()); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICAOCSPServicePage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICAOCSPServicePage.java index 9245b14bf..d2f810414 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICAOCSPServicePage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICAOCSPServicePage.java @@ -67,7 +67,7 @@ class WICAOCSPServicePage extends WizardBasePanel implements IWizardPanel { String serial; InstallWizardInfo wizardInfo = (InstallWizardInfo)info; setBorder(makeTitledBorder(PANELNAME)); - // If ca's signing cert is not generated, + // If ca's signing cert is not generated, // we allow "back" to modify the panel if (!wizardInfo.isCAInstalled()) return false; @@ -78,10 +78,10 @@ class WICAOCSPServicePage extends WizardBasePanel implements IWizardPanel { mDesc.setText(mResource.getString(PANELNAME+"_TEXT_HEADING_LABEL")); - return true; + return true; } - public boolean validatePanel() + public boolean validatePanel() { mEnable = mOCSPServiceCB.isSelected(); return true; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java index 3b1653d7f..19295344c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java @@ -45,15 +45,15 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { private String mEndSerialNumber = null; private JTextField mEndSerialNumberText; private JLabel mEndSerialNumberLabel; - + private String mbeginRequestNumber; private JTextField mbeginRequestNumberText; private JLabel mbeginRequestNumberLabel; - + private String mEndRequestNumber = null; private JTextField mEndRequestNumberText; private JLabel mEndRequestNumberLabel; - + private static final String DEFAULT_SERIAL_NUMBER = "1"; private static final String PANELNAME = "CASERIALNUMBERWIZARD"; private static final String HELPINDEX = @@ -80,9 +80,9 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { String serial; InstallWizardInfo wizardInfo = (InstallWizardInfo)info; setBorder(makeTitledBorder(PANELNAME)); - // If ca's signing cert is not generated, + // If ca's signing cert is not generated, // we allow "back" to modify the panel - + if (!wizardInfo.isCAInstalled() || wizardInfo.isMigrationEnable() || wizardInfo.isSelfSignedCACertDone() || wizardInfo.isCACertRequestDone() ||wizardInfo.isNumberPageDone()) @@ -91,7 +91,7 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { if (wizardInfo.isCloning()) mDesc.setText(mResource.getString(PANELNAME+"_TEXT_HEADING_LABEL") + mResource.getString(PANELNAME+"_TEXT_MORE_LABEL")); - else + else mDesc.setText(mResource.getString(PANELNAME+"_TEXT_HEADING_LABEL")); @@ -104,14 +104,14 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { mbeginRequestNumberText.setText(serial); else mbeginRequestNumberText.setText(DEFAULT_SERIAL_NUMBER); - + if ((serial = wizardInfo.getCAEndSerialNumber()) != null) mEndSerialNumberText.setText(serial); if ((serial = wizardInfo.getEndRequestNumber()) != null) mEndRequestNumberText.setText(serial); - - return true; + + return true; } private String hexToDecimal(String hex, boolean isHex) @@ -191,7 +191,7 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { else mEndRequestNumber = ""; } - + if (num != null && endNum != null && num.compareTo(endNum) > 0) { setErrorMessage("Ending number must be greater than starting number."); return false; @@ -210,13 +210,13 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { public boolean concludePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - if (mSerialNumber != null && !mSerialNumber.equals("")) + if (mSerialNumber != null && !mSerialNumber.equals("")) wizardInfo.setCASerialNumber(mSerialNumber); else { wizardInfo.setCASerialNumber(DEFAULT_SERIAL_NUMBER); mSerialNumber = DEFAULT_SERIAL_NUMBER; } - if (mbeginRequestNumber != null && !mbeginRequestNumber.equals("")) + if (mbeginRequestNumber != null && !mbeginRequestNumber.equals("")) wizardInfo.setRequestNumber(mbeginRequestNumber); else { wizardInfo.setRequestNumber(DEFAULT_SERIAL_NUMBER); @@ -225,16 +225,16 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { String rawData = ConfigConstants.TASKID+"="+TaskId.TASK_SET_CA_SERIAL; rawData = rawData+"&"+ConfigConstants.OPTYPE+"="+OpDef.OP_MODIFY; - if (mSerialNumber != null && !mSerialNumber.equals("")) + if (mSerialNumber != null && !mSerialNumber.equals("")) rawData = rawData+"&"+ConfigConstants.PR_CA_SERIAL_NUMBER+"="+ mSerialNumber; - if (mEndSerialNumber != null && !mEndSerialNumber.equals("")) + if (mEndSerialNumber != null && !mEndSerialNumber.equals("")) rawData = rawData+"&"+ConfigConstants.PR_CA_ENDSERIAL_NUMBER+"="+ mEndSerialNumber; - if (mbeginRequestNumber != null && !mbeginRequestNumber.equals("")) + if (mbeginRequestNumber != null && !mbeginRequestNumber.equals("")) rawData = rawData+"&"+ConfigConstants.PR_REQUEST_NUMBER+"="+ mbeginRequestNumber; - if (mEndRequestNumber != null && !mEndSerialNumber.equals("")) + if (mEndRequestNumber != null && !mEndSerialNumber.equals("")) rawData = rawData+"&"+ConfigConstants.PR_ENDREQUEST_NUMBER+"="+ mEndRequestNumber; if (wizardInfo.getInternalDBPasswd() != null) @@ -322,7 +322,7 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mbeginRequestNumberLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mbeginRequestNumberText = makeJTextField(30); gbc.anchor = gbc.NORTHWEST; @@ -331,7 +331,7 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mbeginRequestNumberText, gbc); - + CMSAdminUtil.resetGBC(gbc); mEndRequestNumberLabel = makeJLabel("ENDREQUESTNUMBER"); gbc.anchor = gbc.EAST; @@ -339,7 +339,7 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mEndRequestNumberLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mEndRequestNumberText = makeJTextField(30); gbc.anchor = gbc.NORTHWEST; @@ -348,7 +348,7 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mEndRequestNumberText, gbc); - + /* CMSAdminUtil.resetGBC(gbc); mSerialNumberLabel = makeJLabel("PWD"); @@ -357,7 +357,7 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(mSerialNumberLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mSerialNumberText = makeJSerialNumberField(30); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertDNPage.java index cf7e623ad..f541a0389 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICertDNPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICertDNPage.java @@ -66,7 +66,7 @@ class WICertDNPage extends WBaseDNPage { populateDN(str); */ - return true; + return true; } public boolean validatePanel() { @@ -84,7 +84,7 @@ class WICertDNPage extends WBaseDNPage { } else { str = str2; } - + if (str.equals("")) { setErrorMessage("BLANKFIELD"); return false; @@ -123,7 +123,7 @@ class WICertDNPage extends WBaseDNPage { wizardInfo.addEntry(Constants.PR_SUBJECT_NAME, str); try { - connection.validate(DestDef.DEST_SERVER_ADMIN, + connection.validate(DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_SUBJECT_NAME, nvps); } catch (EAdminException e) { //showErrorDialog(e.toString()); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java index 8c989685a..f44b1a3ec 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java @@ -29,10 +29,10 @@ import com.netscape.admin.certsrv.config.*; * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.config.install */ -class WICertExtensionPage extends WBaseCertExtensionPage implements +class WICertExtensionPage extends WBaseCertExtensionPage implements IWizardPanel { protected String mHelpIndex; - + WICertExtensionPage(String panelName) { super(panelName); mPanelName = panelName; @@ -45,7 +45,7 @@ class WICertExtensionPage extends WBaseCertExtensionPage implements public boolean initializePanel(WizardInfo info) { setBorder(makeTitledBorder(mPanelName)); - return super.initializePanel(info); + return super.initializePanel(info); } public boolean concludePanel(WizardInfo info) { @@ -60,7 +60,7 @@ class WICertExtensionPage extends WBaseCertExtensionPage implements rawData = rawData+ConfigConstants.OPTYPE+"="+OpDef.OP_MODIFY; rawData = rawData+ConfigConstants.PR_CERTIFICATE_EXTENSION+"="+ mMIMEText.getText().trim(); - + startProgressStatus(); ready = send(rawData, wizardInfo); endProgressStatus(); @@ -105,14 +105,14 @@ class WICertExtensionPage extends WBaseCertExtensionPage implements if (mMIMECheckBox.isSelected()) nvps.put(Constants.PR_DER_EXTENSION, mMIMEText.getText().trim()); - wizardInfo.put(wizardInfo.ALL_CERT_INFO, nvps); + wizardInfo.put(wizardInfo.ALL_CERT_INFO, nvps); } mModified = true; return ready; } - private void addValidityPeriod(InstallWizardInfo wizardInfo, + private void addValidityPeriod(InstallWizardInfo wizardInfo, NameValuePairs nvps) { nvps.put(Constants.PR_BEGIN_YEAR, wizardInfo.getBeginYear()); nvps.put(Constants.PR_BEGIN_MONTH, wizardInfo.getBeginMonth()); @@ -143,7 +143,7 @@ class WICertExtensionPage extends WBaseCertExtensionPage implements } private void addExtendedKey(NameValuePairs nvps) { - if (mSSLClient.isSelected()) + if (mSSLClient.isSelected()) nvps.put(Constants.PR_SSL_CLIENT_BIT, Constants.TRUE); if (mSSLServer.isSelected()) nvps.put(Constants.PR_SSL_SERVER_BIT, Constants.TRUE); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertRequestPage.java index d4926e1e9..c891c1a0a 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICertRequestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICertRequestPage.java @@ -38,7 +38,7 @@ class WICertRequestPage extends WBaseCertRequestPage implements IWizardPanel { private static final String PANELNAME = "CERTREQUESTWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WICertRequestPage() { super(PANELNAME); init(); @@ -49,7 +49,7 @@ class WICertRequestPage extends WBaseCertRequestPage implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICertSetupStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertSetupStatusPage.java index ff9ca97a6..eaa52c6a4 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICertSetupStatusPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICertSetupStatusPage.java @@ -80,7 +80,7 @@ class WICertSetupStatusPage extends WizardBasePanel implements IWizardPanel { desc.setText(mResource.getString( "INSTALLCONFIGSTATUSWIZARD_OCSPTEXT_DESC_LABEL")); } else if (wizardInfo.isRAInstalled()) { - if (wizardInfo.isKRAInstalled()) + if (wizardInfo.isKRAInstalled()) desc.setText(mResource.getString( "INSTALLCONFIGSTATUSWIZARD_RAKRATEXT_DESC_LABEL")); else @@ -98,7 +98,7 @@ class WICertSetupStatusPage extends WizardBasePanel implements IWizardPanel { CMSAdmin admin = (CMSAdmin)wizardInfo.get("CMSAdmin"); IPage viewInstance = (IPage)wizardInfo.get("viewInstance"); - if (viewInstance != null) + if (viewInstance != null) admin.updateMenu(viewInstance); return true; } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertSubmitPage.java index 18beac219..3fcd127fc 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICertSubmitPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICertSubmitPage.java @@ -42,7 +42,7 @@ class WICertSubmitPage extends WizardBasePanel implements IWizardPanel { protected String mHelpIndex; private String mPanelName; protected InstallWizardInfo mWizardInfo; - + WICertSubmitPage(String panelName) { super(panelName); mPanelName = panelName; @@ -57,13 +57,13 @@ class WICertSubmitPage extends WizardBasePanel implements IWizardPanel { setBorder(makeTitledBorder(mPanelName)); mWizardInfo = (InstallWizardInfo)info; if (!mWizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT)) { - if (mWizardInfo.isCACertRequestDone() && + if (mWizardInfo.isCACertRequestDone() && !mWizardInfo.isCACertInstalledDone()) { mSubordinateButton.setSelected(true); mSelfButton.setSelected(false); } } - return true; + return true; } public boolean validatePanel() { @@ -88,7 +88,7 @@ class WICertSubmitPage extends WizardBasePanel implements IWizardPanel { mPanelName+"_TEXT_HEADING_LABEL")); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mLabel, gbc); @@ -96,7 +96,7 @@ class WICertSubmitPage extends WizardBasePanel implements IWizardPanel { mSelfButton = makeJRadioButton("SELF", true); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mSelfButton, gbc); @@ -104,7 +104,7 @@ class WICertSubmitPage extends WizardBasePanel implements IWizardPanel { mSubordinateButton = makeJRadioButton("SUB", false); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(0,COMPONENT_SPACE, + gbc.insets = new Insets(0,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mSubordinateButton, gbc); @@ -129,7 +129,7 @@ class WICertSubmitPage extends WizardBasePanel implements IWizardPanel { public void actionPerformed(ActionEvent e) { if (!mWizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT)) { if (e.getSource().equals(mSelfButton)) { - if (mWizardInfo.isCACertRequestDone() && + if (mWizardInfo.isCACertRequestDone() && !mWizardInfo.isCACertInstalledDone()) { String errorMsg = mResource.getString(mPanelName+"_LABEL_INCOMPLETE_LABEL"); JOptionPane.showMessageDialog(mParent, errorMsg, "Warning", diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertValidityPage.java index 8f2acd493..477fed1ae 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICertValidityPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICertValidityPage.java @@ -41,7 +41,7 @@ import com.netscape.management.client.console.*; class WICertValidityPage extends WBaseValidityPage implements IWizardPanel { private String mPanelName; protected String mHelpIndex; - + WICertValidityPage(String panelName) { super(panelName); mPanelName = panelName; @@ -111,7 +111,7 @@ class WICertValidityPage extends WBaseValidityPage implements IWizardPanel { setErrorMessage(mResource.getString(mPanelName+"_ERROR1")); return false; } - } else + } else setErrorMessage(str); return ready; } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java index d5722df32..8f2ee32af 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java @@ -41,10 +41,10 @@ class WICloneCAKeyCertPage extends WizardBasePanel implements IWizardPanel { protected InstallWizardInfo mWizardInfo; protected JComboBox mCANicknameBox, mOCSPNicknameBox, mSSLNicknameBox; private static final String PANELNAME = "CLONECAKEYCERTWIZARD"; - private static final String CAHELPINDEX = + private static final String CAHELPINDEX = "install-cacertclone-wizard-help"; - + WICloneCAKeyCertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -77,8 +77,8 @@ class WICloneCAKeyCertPage extends WizardBasePanel implements IWizardPanel { return false; if (wizardInfo.isCACloningDone()) return false; - if (!wizardInfo.isCAInstalled() || wizardInfo.isMigrationEnable() - || wizardInfo.isSelfSignedCACertDone() + if (!wizardInfo.isCAInstalled() || wizardInfo.isMigrationEnable() + || wizardInfo.isSelfSignedCACertDone() || wizardInfo.isCACertRequestDone()) return false; @@ -116,7 +116,7 @@ class WICloneCAKeyCertPage extends WizardBasePanel implements IWizardPanel { mOCSPNicknameBox.addItem(s1); } - return true; + return true; } public boolean validatePanel() { @@ -195,7 +195,7 @@ class WICloneCAKeyCertPage extends WizardBasePanel implements IWizardPanel { PANELNAME+"_TEXT_HEADING_LABEL")); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(heading, gbc); @@ -207,7 +207,7 @@ class WICloneCAKeyCertPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(caNicknameLbl, gbc); - + CMSAdminUtil.resetGBC(gbc); mCANicknameBox = new JComboBox(); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java index bea79b2e0..e32c367a2 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java @@ -41,10 +41,10 @@ class WICloneKRAKeyCertPage extends WizardBasePanel implements IWizardPanel { protected InstallWizardInfo mWizardInfo; protected JComboBox mKRANicknameBox, mStorageNicknameBox, mSSLNicknameBox; private static final String PANELNAME = "CLONEKRAKEYCERTWIZARD"; - private static final String KRAHELPINDEX = + private static final String KRAHELPINDEX = "install-kracertclone-wizard-help"; - + WICloneKRAKeyCertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -117,7 +117,7 @@ class WICloneKRAKeyCertPage extends WizardBasePanel implements IWizardPanel { mKRANicknameBox.addItem(s1); } - return true; + return true; } public boolean validatePanel() { @@ -196,7 +196,7 @@ class WICloneKRAKeyCertPage extends WizardBasePanel implements IWizardPanel { PANELNAME+"_TEXT_HEADING_LABEL")); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(heading, gbc); @@ -208,7 +208,7 @@ class WICloneKRAKeyCertPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(kraNicknameLbl, gbc); - + CMSAdminUtil.resetGBC(gbc); mKRANicknameBox = new JComboBox(); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneMasterPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneMasterPage.java index c8498f306..f67253173 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneMasterPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneMasterPage.java @@ -140,9 +140,9 @@ class WICloneMasterPage extends WizardBasePanel implements IWizardPanel { Debug.println("WICloneMasterPage: in concludePanel"); InstallWizardInfo wizardInfo = (InstallWizardInfo)info; wizardInfo.setCLAHost(mHost); - wizardInfo.setCLAPort(mPort); - wizardInfo.setCLAPortEE(mPortEE); - wizardInfo.setCLATimeout(mTimeout); + wizardInfo.setCLAPort(mPort); + wizardInfo.setCLAPortEE(mPortEE); + wizardInfo.setCLATimeout(mTimeout); ConsoleInfo consoleInfo = wizardInfo.getAdminConsoleInfo(); CMSConfigCert configCertCgi = new CMSConfigCert(); configCertCgi.initialize(wizardInfo); @@ -202,7 +202,7 @@ class WICloneMasterPage extends WizardBasePanel implements IWizardPanel { data.put(ConfigConstants.CLA_TIMEOUT, wizardInfo.getCLATimeout()); data.put(ConfigConstants.CLONE_CA, ConfigConstants.TRUE); - } else { + } else { Debug.println("WICloneMasterPage: Cloning page yes NOT selected"); // admin will have to manually add if not through wizard } @@ -214,7 +214,7 @@ class WICloneMasterPage extends WizardBasePanel implements IWizardPanel { CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CONFIGDB"); boolean ready = configCertCgi.configCert(data); dlg.setVisible(false); - + endProgressStatus(); if (!ready) { @@ -354,7 +354,7 @@ class WICloneMasterPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE); add(mTimeunitLbl, gbc); */ - + JLabel label = new JLabel(" "); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.WEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java index 9061b5f7a..94aee9a08 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java @@ -41,10 +41,10 @@ class WICloneOCSPKeyCertPage extends WizardBasePanel implements IWizardPanel { protected InstallWizardInfo mWizardInfo; protected JComboBox mOCSPNicknameBox, mSSLNicknameBox; private static final String PANELNAME = "CLONEOCSPKEYCERTWIZARD"; - private static final String OCSPHELPINDEX = + private static final String OCSPHELPINDEX = "install-ocspcertclone-wizard-help"; - + WICloneOCSPKeyCertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -100,7 +100,7 @@ class WICloneOCSPKeyCertPage extends WizardBasePanel implements IWizardPanel { mOCSPNicknameBox.addItem(s1); } - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIClonePage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIClonePage.java index cdfa23199..56d903852 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIClonePage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIClonePage.java @@ -40,7 +40,7 @@ class WIClonePage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "CLONEINSTALLWIZARD"; private static final String HELPINDEX = "install-general-intro-wizard-help"; - + WIClonePage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -61,14 +61,14 @@ class WIClonePage extends WizardBasePanel implements IWizardPanel { public boolean initializePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; setBorder(makeTitledBorder(PANELNAME)); - + if //(wizardInfo.isKRACertLocalCA() || !wizardInfo.isInstallCertNow() || (!wizardInfo.isCloning()||wizardInfo.isClonePageDone()) return false; - + mAdminFrame = wizardInfo.getAdminFrame(); - return true; + return true; } public boolean validatePanel() { @@ -88,9 +88,9 @@ class WIClonePage extends WizardBasePanel implements IWizardPanel { boolean ready = send(rawData, wizardInfo); Debug.println("WIClonePage:concludePanel() 2"); - + endProgressStatus(); - + if (!ready) { String str = getErrorMessage(wizardInfo); if (str == null) diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java index 7194ee3cc..63cffdea0 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java @@ -41,10 +41,10 @@ class WICloneRAKeyCertPage extends WizardBasePanel implements IWizardPanel { protected InstallWizardInfo mWizardInfo; protected JComboBox mRANicknameBox, mSSLNicknameBox; private static final String PANELNAME = "CLONERAKEYCERTWIZARD"; - private static final String CAHELPINDEX = + private static final String CAHELPINDEX = "install-racertclone-wizard-help"; - + WICloneRAKeyCertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -102,7 +102,7 @@ class WICloneRAKeyCertPage extends WizardBasePanel implements IWizardPanel { mSSLNicknameBox.addItem(s1); } - return true; + return true; } public boolean validatePanel() { @@ -137,10 +137,10 @@ class WICloneRAKeyCertPage extends WizardBasePanel implements IWizardPanel { data.put(ConfigConstants.PR_CERT_INSTANCE_NAME, consoleInfo.get(ConfigConstants.PR_CERT_INSTANCE_NAME)); data.put(ConfigConstants.PR_CLONE_RA_TOKEN_NAME, mRATokenname); - data.put(ConfigConstants.PR_CLONE_RA_NICKNAME, + data.put(ConfigConstants.PR_CLONE_RA_NICKNAME, mRANicknameBox.getSelectedItem()); data.put(ConfigConstants.PR_CLONE_SSL_TOKEN_NAME, mSSLTokenname); - data.put(ConfigConstants.PR_CLONE_SSL_NICKNAME, + data.put(ConfigConstants.PR_CLONE_SSL_NICKNAME, mSSLNicknameBox.getSelectedItem()); startProgressStatus(); @@ -173,7 +173,7 @@ class WICloneRAKeyCertPage extends WizardBasePanel implements IWizardPanel { PANELNAME+"_TEXT_HEADING_LABEL")); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(heading, gbc); @@ -185,7 +185,7 @@ class WICloneRAKeyCertPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(raNicknameLbl, gbc); - + CMSAdminUtil.resetGBC(gbc); mRANicknameBox = new JComboBox(); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java index baeaaec8d..52c103521 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java @@ -40,10 +40,10 @@ class WICloneTKSKeyCertPage extends WizardBasePanel implements IWizardPanel { protected InstallWizardInfo mWizardInfo; protected JComboBox mSSLNicknameBox; private static final String PANELNAME = "CLONETKSKEYCERTWIZARD"; - private static final String TKSHELPINDEX = + private static final String TKSHELPINDEX = "install-tkscertclone-wizard-help"; - + WICloneTKSKeyCertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -86,7 +86,7 @@ class WICloneTKSKeyCertPage extends WizardBasePanel implements IWizardPanel { mSSLNicknameBox.addItem(s1); } - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIConfigWebServerPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIConfigWebServerPage.java index ad9e8b4d6..41bed883a 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIConfigWebServerPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIConfigWebServerPage.java @@ -83,20 +83,20 @@ class WIConfigWebServerPage extends WizardBasePanel implements IWizardPanel { data.put(ConfigConstants.TASKID,TaskId.TASK_CONFIG_WEB_SERVER); data.put(ConfigConstants.OPTYPE, OpDef.OP_MODIFY); - data.put(ConfigConstants.PR_CERT_INSTANCE_NAME, + data.put(ConfigConstants.PR_CERT_INSTANCE_NAME, consoleInfo.get(ConfigConstants.PR_CERT_INSTANCE_NAME)); - data.put(ConfigConstants.PR_WEB_SERVERROOT, + data.put(ConfigConstants.PR_WEB_SERVERROOT, mServerRootText.getText().trim()); data.put(ConfigConstants.PR_USER_ID, mUserIDText.getText().trim()); - + startProgressStatus(); CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CREATEWEBSERVER"); - + boolean ready = configCertCgi.configCert(data); dlg.setVisible(false); - + endProgressStatus(); if (!ready) { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICreateInternalDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICreateInternalDBPage.java index 4aee62e27..7b494205f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICreateInternalDBPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICreateInternalDBPage.java @@ -82,7 +82,7 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { enableRemoteDB(mEnable.isSelected()); } } - + private void enableLocalDB(boolean e) { Color c; @@ -156,15 +156,15 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { mPasswordText.setText(""); mPasswordAgainText.setText(""); mRemoteBaseDNText.setText("o=netscapeCertificateServer"); - mRemoteDatabaseText.setText("userRoot"); + mRemoteDatabaseText.setText("userRoot"); mRemoteBindAsText.setText("cn=directory manager"); enableLocalDB(mEnable.isSelected()); enableRemoteDB(mEnable.isSelected()); mLocal.setEnabled(mEnable.isSelected()); mRemote.setEnabled(mEnable.isSelected()); - return true; + return true; } - + return false; } @@ -270,10 +270,10 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { wizardInfo.setDBBindDN(mBindAsText.getText().trim()); wizardInfo.setDBName(mInstanceIDText.getText().trim()); } - + startProgressStatus(); //CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CREATEDB"); - + boolean ready = send(rawData, wizardInfo); if (ready) { @@ -282,7 +282,7 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { ready = send(rawData, wizardInfo); } //dlg.setVisible(false); - + endProgressStatus(); if (!ready) { @@ -332,7 +332,7 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { gbc.anchor = gbc.NORTHWEST; gbc.fill = gbc.NONE; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(COMPONENT_SPACE, 2*COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE, 2*COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mLocal, gbc); @@ -355,13 +355,13 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { mActiveColor = mInstanceIDText.getBackground(); CMSAdminUtil.resetGBC(gbc); - JLabel portNumber = makeJLabel("PORT"); + JLabel portNumber = makeJLabel("PORT"); gbc.anchor = gbc.NORTHEAST; gbc.fill = gbc.NONE; gbc.insets = new Insets(0, 0, COMPONENT_SPACE,COMPONENT_SPACE); add(portNumber, gbc); - + CMSAdminUtil.resetGBC(gbc); mPortText = makeJTextField(10); gbc.anchor = gbc.WEST; @@ -370,7 +370,7 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(mPortText, gbc); - + CMSAdminUtil.resetGBC(gbc); mBindAsLabel = makeJLabel("ADMIN"); //gbc.anchor = gbc.NORTHWEST; @@ -396,7 +396,7 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(mPasswordLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mPasswordText = makeJPasswordField(30); gbc.anchor = gbc.WEST; @@ -428,7 +428,7 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { gbc.anchor = gbc.NORTHWEST; gbc.fill = gbc.NONE; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(COMPONENT_SPACE, 2*COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE, 2*COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mRemote, gbc); @@ -454,13 +454,13 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { add(mRemoteHostText, gbc); CMSAdminUtil.resetGBC(gbc); - JLabel portNumber1 = makeJLabel("PORT"); + JLabel portNumber1 = makeJLabel("PORT"); gbc.anchor = gbc.NORTHEAST; gbc.fill = gbc.NONE; gbc.insets = new Insets(0, 0, COMPONENT_SPACE,COMPONENT_SPACE); add(portNumber1, gbc); - + CMSAdminUtil.resetGBC(gbc); mRemotePortText = makeJTextField(10); gbc.anchor = gbc.WEST; @@ -469,7 +469,7 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(mRemotePortText, gbc); - + CMSAdminUtil.resetGBC(gbc); JLabel baseDNLbl = makeJLabel("BASEDN"); gbc.anchor = gbc.NORTHEAST; @@ -512,7 +512,7 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(passwordLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mRemotePasswordText = makeJPasswordField(30); gbc.anchor = gbc.WEST; @@ -546,7 +546,7 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(dummy1, gbc); - + CMSAdminUtil.resetGBC(gbc); mSchema = makeJCheckBox("SCHEMA", true); gbc.anchor = gbc.NORTHWEST; @@ -570,8 +570,8 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { wizardInfo.setDBCreated(ConfigConstants.TRUE); wizardInfo.setDBCreateNow(ConfigConstants.FALSE); wizardInfo.setCreateDBDone(ConfigConstants.TRUE); - - if (mEnable.isSelected()) + + if (mEnable.isSelected()) wizardInfo.setCloneDBCreated("true"); else { wizardInfo.setUpdateDBInfoDone(ConfigConstants.TRUE); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIDBEnrollPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDBEnrollPage.java index d63a07129..e07ba063e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIDBEnrollPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDBEnrollPage.java @@ -50,7 +50,7 @@ class WIDBEnrollPage extends WizardBasePanel implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { @@ -112,7 +112,7 @@ class WIDBEnrollPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, 0, COMPONENT_SPACE); panel.add(hostName, gbc); - + CMSAdminUtil.resetGBC(gbc); mHostNameText = makeJTextField(30); gbc.anchor = gbc.NORTHWEST; @@ -121,7 +121,7 @@ class WIDBEnrollPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; panel.add(mHostNameText, gbc); - + /* CMSAdminUtil.resetGBC(gbc); JTextArea dummy = createTextArea(" ", 2, 5); @@ -132,13 +132,13 @@ class WIDBEnrollPage extends WizardBasePanel implements IWizardPanel { */ CMSAdminUtil.resetGBC(gbc); - JLabel portNumber = makeJLabel("PORT"); + JLabel portNumber = makeJLabel("PORT"); gbc.anchor = gbc.NORTHEAST; gbc.fill = gbc.NONE; gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); panel.add(portNumber, gbc); - + CMSAdminUtil.resetGBC(gbc); mPortText = makeJTextField(10); gbc.anchor = gbc.NORTHWEST; @@ -147,7 +147,7 @@ class WIDBEnrollPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); panel.add(mPortText, gbc); - + CMSAdminUtil.resetGBC(gbc); JLabel versionLbl = makeJLabel("VERSION"); gbc.anchor = gbc.NORTHEAST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCACertPage.java index 442fa2b29..b1b4d28ec 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCACertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCACertPage.java @@ -32,7 +32,7 @@ class WIDisplayCACertPage extends WIDisplayCertPage { private static final String PANELNAME = "INSTALLDISPLAYCACERTWIZARD"; private static final String CAHELPINDEX = "install-cacert-display-wizard-help"; private static final String CAKRAHELPINDEX = "install-cakracert-display-wizard-help"; - + WIDisplayCACertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -68,7 +68,7 @@ class WIDisplayCACertPage extends WIDisplayCertPage { ConfigConstants.TRUE); return true; } - + return false; } } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java index 30e0bac13..ca180ad42 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java @@ -42,7 +42,7 @@ class WIDisplayCertPage extends WizardBasePanel implements IWizardPanel { private JTextField mCertNameField; protected String mPanelName; protected String mHelpIndex; - + WIDisplayCertPage(String panelName) { super(panelName); mPanelName = panelName; @@ -80,7 +80,7 @@ class WIDisplayCertPage extends WizardBasePanel implements IWizardPanel { certType); } } - if ((tokenName != null) && + if ((tokenName != null) && !(tokenName.equalsIgnoreCase(Constants.PR_INTERNAL_TOKEN_NAME))) { Debug.println("tokenName="+tokenName); mCertNameField.setText(tokenName+":"+wizardInfo.getNickname()); @@ -88,7 +88,7 @@ class WIDisplayCertPage extends WizardBasePanel implements IWizardPanel { Debug.println("tokenName=null"); mCertNameField.setText(wizardInfo.getNickname()); } - return true; + return true; } private String reformat(String content, String certOrder) { @@ -140,7 +140,7 @@ class WIDisplayCertPage extends WizardBasePanel implements IWizardPanel { } else setErrorMessage(str); } - + return ready; } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayKRACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayKRACertPage.java index cae06e6cf..1973a6902 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayKRACertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayKRACertPage.java @@ -33,7 +33,7 @@ class WIDisplayKRACertPage extends WIDisplayCertPage { private static final String KRAHELPINDEX = "install-kracert-display-wizard-help"; private static final String CAKRAHELPINDEX = "install-cakra-kracert-display-wizard-help"; private static final String RAKRAHELPINDEX = "install-rakra-kracert-display-wizard-help"; - + WIDisplayKRACertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -70,7 +70,7 @@ class WIDisplayKRACertPage extends WIDisplayCertPage { ConfigConstants.TRUE); return true; } - + return false; } } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayOCSPCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayOCSPCertPage.java index e9db0e436..dac57fe7d 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayOCSPCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayOCSPCertPage.java @@ -32,7 +32,7 @@ import com.netscape.management.client.util.*; class WIDisplayOCSPCertPage extends WIDisplayCertPage { private static final String PANELNAME = "INSTALLDISPLAYOCSPCERTWIZARD"; private static final String OCSPHELPINDEX = "install-ocspcert-display-wizard-help"; - + WIDisplayOCSPCertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -64,7 +64,7 @@ class WIDisplayOCSPCertPage extends WIDisplayCertPage { ConfigConstants.TRUE); return true; } - + return false; } } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayRACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayRACertPage.java index 891e68038..ac8128fca 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayRACertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayRACertPage.java @@ -32,7 +32,7 @@ class WIDisplayRACertPage extends WIDisplayCertPage { private static final String PANELNAME = "INSTALLDISPLAYRACERTWIZARD"; private static final String RAHELPINDEX = "install-racert-display-wizard-help"; private static final String RAKRAHELPINDEX = "install-rakracert-display-wizard-help"; - + WIDisplayRACertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -66,7 +66,7 @@ class WIDisplayRACertPage extends WIDisplayCertPage { ConfigConstants.TRUE); return true; } - + return false; } } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplaySSLCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplaySSLCertPage.java index 3a791b4ed..0bbbb4af8 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplaySSLCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplaySSLCertPage.java @@ -31,7 +31,7 @@ import com.netscape.certsrv.common.*; class WIDisplaySSLCertPage extends WIDisplayCertPage { private static final String PANELNAME = "INSTALLDISPLAYSSLCERTWIZARD"; private static final String HELPINDEX = "install-sslcert-display-wizard-help"; - + WIDisplaySSLCertPage(JDialog parent) { super(PANELNAME); mHelpIndex = HELPINDEX; @@ -63,7 +63,7 @@ class WIDisplaySSLCertPage extends WIDisplayCertPage { ConfigConstants.TRUE); return true; } - + return false; } } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIExistingDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIExistingDBPage.java index 93bbde830..5dd302dba 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIExistingDBPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIExistingDBPage.java @@ -66,16 +66,16 @@ class WIExistingDBPage extends WizardBasePanel implements IWizardPanel { public void actionPerformed(ActionEvent e) { } - + public boolean initializePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; if (wizardInfo.isCloning() && !wizardInfo.isConnectDBDone()) { setBorder(makeTitledBorder(PANELNAME)); mRMBindAsText.setText(wizardInfo.getDBBindDN()); - return true; + return true; } - + return false; } @@ -88,7 +88,7 @@ class WIExistingDBPage extends WizardBasePanel implements IWizardPanel { if (rmhostname.equals("")) { setErrorMessage("EMPTYHOST"); return false; - } + } if (rmport.equals("")) { setErrorMessage("EMPTYPORT"); @@ -129,10 +129,10 @@ class WIExistingDBPage extends WizardBasePanel implements IWizardPanel { rawData = rawData+"&"+ConfigConstants.PR_DB_NAME+"="+mRMBaseDNText.getText(); wizardInfo.setInternalDBPasswd(mRMPasswordText.getText().trim()); wizardInfo.setDBBindDN(mRMBindAsText.getText().trim()); - + startProgressStatus(); //CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CONNECTDB"); - + boolean ready = send(rawData, wizardInfo); if (ready) { @@ -141,7 +141,7 @@ class WIExistingDBPage extends WizardBasePanel implements IWizardPanel { ready = send(rawData, wizardInfo); } //dlg.setVisible(false); - + endProgressStatus(); if (!ready) { @@ -195,13 +195,13 @@ class WIExistingDBPage extends WizardBasePanel implements IWizardPanel { add(mRMHostText, gbc); CMSAdminUtil.resetGBC(gbc); - JLabel portNumber = makeJLabel("REMOTEPORT"); + JLabel portNumber = makeJLabel("REMOTEPORT"); gbc.anchor = gbc.NORTHEAST; gbc.fill = gbc.NONE; gbc.insets = new Insets(0, 0, COMPONENT_SPACE,COMPONENT_SPACE); add(portNumber, gbc); - + CMSAdminUtil.resetGBC(gbc); mRMPortText = makeJTextField(10); gbc.anchor = gbc.WEST; @@ -210,7 +210,7 @@ class WIExistingDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(mRMPortText, gbc); - + CMSAdminUtil.resetGBC(gbc); JLabel mRMBindAsLabel = makeJLabel("REMOTEADMIN"); //gbc.anchor = gbc.NORTHWEST; @@ -236,7 +236,7 @@ class WIExistingDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(mRMPasswordLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mRMPasswordText = makeJPasswordField(30); gbc.anchor = gbc.WEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertPage.java index 2bbb2f570..41d361f6d 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertPage.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.common.*; /** * Generate the CA signing certificate - * + * * @author Christine Ho * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.keycert @@ -52,7 +52,7 @@ class WIGenCAKeyCertPage extends WIGenKeyCertPage { if (wizardInfo.isCloning() && wizardInfo.isCACloningDone()) return false; - if (!wizardInfo.isCACertLocalCA() || !wizardInfo.isCAInstalled() || + if (!wizardInfo.isCACertLocalCA() || !wizardInfo.isCAInstalled() || wizardInfo.isMigrationEnable() || wizardInfo.isSelfSignedCACertDone() || wizardInfo.isCACertRequestDone() || wizardInfo.isCACertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertReqPage.java index c1f3c11ea..56ed8522c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertReqPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertReqPage.java @@ -55,7 +55,7 @@ class WIGenCAKeyCertReqPage extends WIGenKeyCertReqPage { if (wizardInfo.isCACertLocalCA() || !wizardInfo.isCAInstalled() || wizardInfo.isMigrationEnable() || wizardInfo.isSelfSignedCACertDone() || (wizardInfo.isCACertRequestDone() && - !wizardInfo.isCACertRequestBack()) || + !wizardInfo.isCACertRequestBack()) || wizardInfo.isCACertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertPage.java index 98ef24812..ce55fd720 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertPage.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.common.*; /** * Generate the KRA transport certificate - * + * * @author Christine Ho * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.keycert diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertReqPage.java index f6e5df9fe..f2f598b21 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertReqPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertReqPage.java @@ -54,7 +54,7 @@ class WIGenKRAKeyCertReqPage extends WIGenKeyCertReqPage { return false; if (wizardInfo.isKRACertLocalCA() || !wizardInfo.isKRAInstalled() || (wizardInfo.isKRACertRequestDone() && - !wizardInfo.isKRACertRequestBack()) || + !wizardInfo.isKRACertRequestBack()) || wizardInfo.isKRALocalCertDone() || wizardInfo.isKRACertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java index 8272d44df..7a905999e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java @@ -34,7 +34,7 @@ class WIGenKeyCertPage extends WizardBasePanel implements IWizardPanel { private JTextArea desc; private String mPanelName; protected String mHelpIndex; - + WIGenKeyCertPage(String panelName) { super(panelName); mPanelName = panelName; @@ -51,7 +51,7 @@ class WIGenKeyCertPage extends WizardBasePanel implements IWizardPanel { String str = mResource.getString(mPanelName+"_TEXT_NEWKEY_LABEL"); desc.setText(str); - return true; + return true; } public boolean validatePanel() { @@ -86,15 +86,15 @@ class WIGenKeyCertPage extends WizardBasePanel implements IWizardPanel { rawData = rawData+"&"+name+"="+value; } } - + startProgressStatus(); - + //CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CREATECERT"); - + boolean ready = send(rawData, wizardInfo); - + //dlg.setVisible(false); - + endProgressStatus(); if (!ready) { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java index b5c0378c3..cb7100d16 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java @@ -33,14 +33,14 @@ import com.netscape.certsrv.common.*; class WIGenKeyCertReqPage extends WizardBasePanel implements IWizardPanel { private JTextArea desc; private String mPanelName; - private static final String CERTREQ_BEGIN_HEADING = + private static final String CERTREQ_BEGIN_HEADING = "-----BEGIN NEW CERTIFICATE REQUEST-----"; - private static final String CERTREQ_END_HEADING = + private static final String CERTREQ_END_HEADING = "-----END NEW CERTIFICATE REQUEST-----"; private static final int LINE_COUNT = 76; protected String mHelpIndex; protected String mTokenName; - + protected JRadioButton mPKCS10; protected JRadioButton mCMC; protected String mSigningCert = null; @@ -126,7 +126,7 @@ class WIGenKeyCertReqPage extends WizardBasePanel implements IWizardPanel { CMSAdminUtil.repaintComp(mPKCS10); } - return true; + return true; } public boolean validatePanel() { @@ -206,12 +206,12 @@ class WIGenKeyCertReqPage extends WizardBasePanel implements IWizardPanel { return ready; } - + private String reformat(String pkcs) { int beginIndex = CERTREQ_BEGIN_HEADING.length(); int endIndex = CERTREQ_END_HEADING.length(); int totalLen = pkcs.length(); - String content = pkcs.substring(beginIndex, totalLen-endIndex); + String content = pkcs.substring(beginIndex, totalLen-endIndex); String result = CERTREQ_BEGIN_HEADING+"\n"; int index = 0; while (content.length() >= LINE_COUNT) { @@ -273,7 +273,7 @@ class WIGenKeyCertReqPage extends WizardBasePanel implements IWizardPanel { ButtonGroup group = new ButtonGroup(); group.add(mCMC); group.add(mPKCS10); - + CMSAdminUtil.resetGBC(gbc); JLabel d1 = new JLabel(" "); gbc.anchor = gbc.NORTHWEST; @@ -282,7 +282,7 @@ class WIGenKeyCertReqPage extends WizardBasePanel implements IWizardPanel { gbc.gridheight = gbc.REMAINDER; gbc.gridwidth = gbc.REMAINDER; add(d1, gbc); - + super.init(); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertPage.java index 2e2fbdbed..d5beea55f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertPage.java @@ -27,7 +27,7 @@ import com.netscape.management.client.util.*; /** * Generate the OCSP signing certificate - * + * * @author Christine Ho * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.keycert @@ -51,7 +51,7 @@ class WIGenOCSPKeyCertPage extends WIGenKeyCertPage { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; Debug.println("+++++++++++++++++++++++++++++=WIGenOCSPKeyCertPage "); - if (!wizardInfo.isOCSPInstalled()) + if (!wizardInfo.isOCSPInstalled()) return false; mHelpIndex = OCSPHELPINDEX; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertReqPage.java index 7c27f673d..e23fa9d9c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertReqPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertReqPage.java @@ -54,7 +54,7 @@ class WIGenOCSPKeyCertReqPage extends WIGenKeyCertReqPage { if (wizardInfo.isOCSPCertLocalCA() || !wizardInfo.isOCSPInstalled() || (wizardInfo.isOCSPCertRequestDone() && - !wizardInfo.isOCSPCertRequestBack()) || + !wizardInfo.isOCSPCertRequestBack()) || wizardInfo.isOCSPLocalCertDone() || wizardInfo.isOCSPCertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertPage.java index 05859e54c..6b8a8477a 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertPage.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.common.*; /** * Generate the RA signing certificate - * + * * @author Christine Ho * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.keycert diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertReqPage.java index 89aa21f14..4517a236e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertReqPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertReqPage.java @@ -53,7 +53,7 @@ class WIGenRAKeyCertReqPage extends WIGenKeyCertReqPage { return false; if (wizardInfo.isRACertLocalCA() || !wizardInfo.isRAInstalled() || (wizardInfo.isRACertRequestDone() && - !wizardInfo.isRACertRequestBack()) || + !wizardInfo.isRACertRequestBack()) || wizardInfo.isRALocalCertDone() || wizardInfo.isRACertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenSSLKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenSSLKeyCertReqPage.java index 58a85f790..ecf1afbe9 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenSSLKeyCertReqPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenSSLKeyCertReqPage.java @@ -54,7 +54,7 @@ class WIGenSSLKeyCertReqPage extends WIGenKeyCertReqPage { return false; if (wizardInfo.isSSLCertLocalCA() || wizardInfo.isMigrationEnable() || (wizardInfo.isSSLCertRequestDone() && - !wizardInfo.isSSLCertRequestBack()) || + !wizardInfo.isSSLCertRequestBack()) || wizardInfo.isSSLLocalCertDone() || wizardInfo.isSSLCertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenServerKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenServerKeyCertPage.java index e93c378f6..bde7f8d4e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenServerKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenServerKeyCertPage.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.common.*; /** * Generate the SSL server certificate - * + * * @author Christine Ho * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.keycert diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert1Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert1Page.java index 240134536..b3a36cd70 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert1Page.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert1Page.java @@ -25,8 +25,8 @@ import com.netscape.admin.certsrv.wizard.*; import com.netscape.certsrv.common.*; /** - * This page is to install the certificate in the internal token. The user can - * import the cert from the file or paste the Base 64 encoded blob in the + * This page is to install the certificate in the internal token. The user can + * import the cert from the file or paste the Base 64 encoded blob in the * text area. * * @author Christine Ho @@ -42,7 +42,7 @@ class WIInstallCert1Page extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "INSTALLCERT1WIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WIInstallCert1Page() { super(PANELNAME); init(); @@ -53,7 +53,7 @@ class WIInstallCert1Page extends WizardBasePanel implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { @@ -124,7 +124,7 @@ class WIInstallCert1Page extends WizardBasePanel implements IWizardPanel { mBase64Text = new JTextArea(null, null, 0, 0); mBase64Text.setLineWrap(true); mBase64Text.setWrapStyleWord(true); - JScrollPane scrollPane = new JScrollPane(mBase64Text, + JScrollPane scrollPane = new JScrollPane(mBase64Text, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); scrollPane.setPreferredSize(new Dimension(50, 20)); @@ -132,7 +132,7 @@ class WIInstallCert1Page extends WizardBasePanel implements IWizardPanel { gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; gbc.weighty = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, 0, + gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, 0, COMPONENT_SPACE); gbc.fill = gbc.BOTH; gbc.gridwidth = gbc.REMAINDER; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert2Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert2Page.java index fc9eaacb0..543925c1d 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert2Page.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert2Page.java @@ -37,7 +37,7 @@ class WIInstallCert2Page extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "INSTALLCERT2WIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WIInstallCert2Page() { super(PANELNAME); init(); @@ -48,7 +48,7 @@ class WIInstallCert2Page extends WizardBasePanel implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { @@ -97,14 +97,14 @@ class WIInstallCert2Page extends WizardBasePanel implements IWizardPanel { gbc.weightx = 1.0; gbc.fill = gbc.BOTH; add(subjectScrollPane, gbc); - + JTextArea issueText = new JTextArea(null, null, 0, 0); JScrollPane issueScrollPane = new JScrollPane(issueText, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); //issueScrollPane.setPreferredSize(new Dimension(50, 30)); CMSAdminUtil.resetGBC(gbc); - gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, + gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); gbc.anchor = gbc.NORTHWEST; gbc.weighty = 1.0; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCertStatusPage.java index 860e5b60e..1af8353be 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCertStatusPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCertStatusPage.java @@ -49,7 +49,7 @@ class WIInstallCertStatusPage extends WizardBasePanel implements IWizardPanel { protected String mHelpIndex; protected String mCertChain; protected String mCertFilePath; - + WIInstallCertStatusPage(String panelName) { super(panelName); mPanelName = panelName; @@ -61,7 +61,7 @@ class WIInstallCertStatusPage extends WizardBasePanel implements IWizardPanel { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; String str = mResource.getString(mPanelName+"_TEXT_DESC_LABEL"); desc.setText(str); - return true; + return true; } public boolean isLastPage() { @@ -118,9 +118,9 @@ class WIInstallCertStatusPage extends WizardBasePanel implements IWizardPanel { return true; } else { setErrorMessage(mResource.getString(mPanelName+"_ERROR1")); - return false; + return false; } - } else + } else setErrorMessage(str); } return ready; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallIntroPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallIntroPage.java index 29ddd0a46..dde93d3f4 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallIntroPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallIntroPage.java @@ -43,7 +43,7 @@ class WIInstallIntroPage extends WizardBasePanel implements IWizardPanel { protected JRadioButton mNo; protected String mPanelName; protected String mHelpIndex; - + WIInstallIntroPage(String panelName) { super(panelName); mPanelName = panelName; @@ -57,7 +57,7 @@ class WIInstallIntroPage extends WizardBasePanel implements IWizardPanel { public boolean initializePanel(WizardInfo info) { setBorder(makeTitledBorder(mPanelName)); - return true; + return true; } public boolean validatePanel() { @@ -83,26 +83,26 @@ class WIInstallIntroPage extends WizardBasePanel implements IWizardPanel { gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(heading, gbc); mNo = makeJRadioButton("NO", false); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mNo, gbc); - + mYes = makeJRadioButton("YES", true); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; - gbc.insets = new Insets(0,COMPONENT_SPACE, + gbc.insets = new Insets(0,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mYes, gbc); - + JLabel dummy = new JLabel(""); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -112,7 +112,7 @@ class WIInstallIntroPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(dummy, gbc); - + ButtonGroup buttonGrp = new ButtonGroup(); buttonGrp.add(mYes); buttonGrp.add(mNo); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRACertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRACertStatusPage.java index d33601151..2587c791a 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRACertStatusPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRACertStatusPage.java @@ -53,7 +53,7 @@ class WIInstallKRACertStatusPage extends WIInstallCertStatusPage { !wizardInfo.isKRAInstalled() || wizardInfo.isKRACertChainImportDone()) return false; - if (wizardInfo.hasEntireKRAChain()) + if (wizardInfo.hasEntireKRAChain()) return false; wizardInfo.setCertType(Constants.PR_KRA_TRANSPORT_CERT); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPCertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPCertStatusPage.java index c98b7b045..5f44ceb06 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPCertStatusPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPCertStatusPage.java @@ -53,7 +53,7 @@ class WIInstallOCSPCertStatusPage extends WIInstallCertStatusPage { !wizardInfo.isOCSPInstalled() || wizardInfo.isOCSPCertChainImportDone()) return false; - if (wizardInfo.hasEntireOCSPChain()) + if (wizardInfo.hasEntireOCSPChain()) return false; wizardInfo.setCertType(Constants.PR_OCSP_SIGNING_CERT); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRACertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRACertStatusPage.java index 326f5067a..b3fc368fb 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRACertStatusPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRACertStatusPage.java @@ -52,7 +52,7 @@ class WIInstallRACertStatusPage extends WIInstallCertStatusPage { !wizardInfo.isRAInstalled() || wizardInfo.isRACertChainImportDone()) return false; - if (wizardInfo.hasEntireRAChain()) + if (wizardInfo.hasEntireRAChain()) return false; wizardInfo.setCertType(Constants.PR_RA_SIGNING_CERT); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBInfoPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBInfoPage.java index 5338e820d..be0bd1f20 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBInfoPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBInfoPage.java @@ -28,7 +28,7 @@ import com.netscape.admin.certsrv.task.*; import com.netscape.management.client.console.*; /** - * This panel asks for the information of the current internal database. + * This panel asks for the information of the current internal database. * * @author Christine Ho * @version $Revision$, $Date$ @@ -66,7 +66,7 @@ class WIInternalDBInfoPage extends WizardBasePanel implements IWizardPanel { return false; setBorder(makeTitledBorder(PANELNAME)); mBindAsText.setText(wizardInfo.getDBBindDN()); - return true; + return true; } public boolean validatePanel() { @@ -149,7 +149,7 @@ class WIInternalDBInfoPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(mPasswordLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mPasswordText = makeJPasswordField(30); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBPage.java index 936d252d8..c6ab70d8b 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBPage.java @@ -69,7 +69,7 @@ class WIInternalDBPage extends WizardBasePanel implements IWizardPanel { } public void actionPerformed(ActionEvent e) { - if (e.getSource().equals(mSchema)) { + if (e.getSource().equals(mSchema)) { if (mSchema.isSelected()) { mRMDBNameAsText.setEnabled(true); mRMDBNameAsText.setBackground(mActiveColor); @@ -77,11 +77,11 @@ class WIInternalDBPage extends WizardBasePanel implements IWizardPanel { mRMDBNameAsText.setEnabled(false); mRMDBNameAsText.setBackground(getBackground()); } - } else { - super.actionPerformed(e); + } else { + super.actionPerformed(e); } } - + public boolean initializePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; @@ -91,9 +91,9 @@ class WIInternalDBPage extends WizardBasePanel implements IWizardPanel { setBorder(makeTitledBorder(PANELNAME)); mRMBaseText.setText("o="+wizardInfo.getDBName()+", o=netscapeCertificateServer"); mRMBindAsText.setText(wizardInfo.getDBBindDN()); - return true; + return true; } - + return false; } @@ -126,10 +126,10 @@ class WIInternalDBPage extends WizardBasePanel implements IWizardPanel { wizardInfo.setInternalDBPasswd(mRMPasswordText.getText().trim()); wizardInfo.setDBBindDN(mRMBindAsText.getText().trim()); wizardInfo.setDBName(mRMBaseText.getText().trim()); - + startProgressStatus(); //CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CREATEDB"); - + boolean ready = send(rawData, wizardInfo); if (ready) { @@ -138,7 +138,7 @@ class WIInternalDBPage extends WizardBasePanel implements IWizardPanel { ready = send(rawData, wizardInfo); } //dlg.setVisible(false); - + endProgressStatus(); if (!ready) { @@ -194,13 +194,13 @@ class WIInternalDBPage extends WizardBasePanel implements IWizardPanel { mActiveColor = mRMHostText.getBackground(); CMSAdminUtil.resetGBC(gbc); - JLabel portNumber = makeJLabel("REMOTEPORT"); + JLabel portNumber = makeJLabel("REMOTEPORT"); gbc.anchor = gbc.NORTHEAST; gbc.fill = gbc.NONE; gbc.insets = new Insets(0, 0, COMPONENT_SPACE,COMPONENT_SPACE); add(portNumber, gbc); - + CMSAdminUtil.resetGBC(gbc); mRMPortText = makeJTextField(10); gbc.anchor = gbc.WEST; @@ -209,7 +209,7 @@ class WIInternalDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(mRMPortText, gbc); - + CMSAdminUtil.resetGBC(gbc); mRMBaseLabel = makeJLabel("REMOTEDN"); gbc.anchor = gbc.NORTHEAST; @@ -252,7 +252,7 @@ class WIInternalDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(mRMPasswordLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mRMPasswordText = makeJPasswordField(30); gbc.anchor = gbc.WEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java index 3bc9bd2f3..ff2adab5d 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java @@ -54,7 +54,7 @@ class WIInternalTokenLogonPage extends WITokenLogonPage implements IWizardPanel public boolean initializePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - String pwd = + String pwd = (String)wizardInfo.get("TOKEN:"+Constants.PR_INTERNAL_TOKEN_NAME); if (pwd != null) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroMigrationPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroMigrationPage.java index 616911252..5045dbfa8 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroMigrationPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroMigrationPage.java @@ -39,11 +39,11 @@ class WIIntroMigrationPage extends WizardBasePanel implements IWizardPanel { private JRadioButton mNo; private static final String PANELNAME = "INTROMIGRATIONWIZARD"; private String mHelpIndex; - private static final String CAHELPINDEX = + private static final String CAHELPINDEX = "install-ca-migration-enable-wizard-help"; - private static final String CAKRAHELPINDEX = + private static final String CAKRAHELPINDEX = "install-cakra-migration-enable-wizard-help"; - + WIIntroMigrationPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -66,7 +66,7 @@ class WIIntroMigrationPage extends WizardBasePanel implements IWizardPanel { if (!wizardInfo.isCAInstalled() || wizardInfo.isMigrationDone()) return false; if (wizardInfo.isCAInstalled() && wizardInfo.isKRAInstalled()) - mHelpIndex = CAKRAHELPINDEX; + mHelpIndex = CAKRAHELPINDEX; else mHelpIndex = CAHELPINDEX; setBorder(makeTitledBorder(PANELNAME)); @@ -91,7 +91,7 @@ class WIIntroMigrationPage extends WizardBasePanel implements IWizardPanel { // do the data migration data.put(ConfigConstants.TASKID, TaskId.TASK_MIGRATION); data.put(ConfigConstants.OPTYPE, OpDef.OP_MODIFY); - data.put(ConfigConstants.PR_ENABLE_MIGRATION, + data.put(ConfigConstants.PR_ENABLE_MIGRATION, ConfigConstants.FALSE); } @@ -138,8 +138,8 @@ class WIIntroMigrationPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mYes, gbc); - - mNo = makeJRadioButton("NO", true); + + mNo = makeJRadioButton("NO", true); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.insets = new Insets(0,COMPONENT_SPACE, diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroPage.java index 208a92cb8..9419b02c4 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroPage.java @@ -45,7 +45,7 @@ class WIIntroPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "INTROINSTALLWIZARD"; private static final String HELPINDEX = "install-general-intro-wizard-help"; - + WIIntroPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -74,7 +74,7 @@ class WIIntroPage extends WizardBasePanel implements IWizardPanel { mSubsystemButton.setVisible(false); mMigrationButton.setVisible(false); String stages = wizardInfo.getStages(); - + if (stages != null && !stages.equals("")) { StringTokenizer tokenizer = new StringTokenizer(stages, ":"); mLabel.setVisible(true); @@ -89,7 +89,7 @@ class WIIntroPage extends WizardBasePanel implements IWizardPanel { } } } - return true; + return true; } public boolean validatePanel() { @@ -104,13 +104,13 @@ class WIIntroPage extends WizardBasePanel implements IWizardPanel { String rawData = ConfigConstants.TASKID+"="+TaskId.TASK_GET_DEFAULT_INFO; rawData = rawData+"&"+ConfigConstants.OPTYPE+"="+ OpDef.OP_READ; boolean ready = send(rawData, wizardInfo); - if (ready) { + if (ready) { rawData = ConfigConstants.TASKID+"="+TaskId.TASK_TOKEN_INFO; rawData = rawData+"&"+ConfigConstants.OPTYPE+"="+OpDef.OP_READ; rawData = rawData+"&"+ConfigConstants.PR_CMS_SEED+"="+ (new Long(WizardBasePanel.mSeed).toString()); - ready = send(rawData, wizardInfo); + ready = send(rawData, wizardInfo); } endProgressStatus(); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroSingleSignonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroSingleSignonPage.java index 659dd6969..083ce16b9 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroSingleSignonPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroSingleSignonPage.java @@ -61,7 +61,7 @@ class WIIntroSingleSignonPage extends WizardBasePanel implements IWizardPanel { public boolean initializePanel(WizardInfo info) { setBorder(makeTitledBorder(PANELNAME)); - return true; + return true; } public boolean validatePanel() { @@ -81,7 +81,7 @@ class WIIntroSingleSignonPage extends WizardBasePanel implements IWizardPanel { consoleInfo.get(ConfigConstants.PR_CERT_INSTANCE_NAME)); data.put(ConfigConstants.PR_ADMIN_PASSWD, (String)consoleInfo.get(ConfigConstants.PR_ADMIN_PASSWD)); - + boolean ready = configCertCgi.configCert(data); return ready; } @@ -106,7 +106,7 @@ class WIIntroSingleSignonPage extends WizardBasePanel implements IWizardPanel { gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(heading, gbc); */ @@ -115,26 +115,26 @@ class WIIntroSingleSignonPage extends WizardBasePanel implements IWizardPanel { gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(heading, gbc); mNo = makeJRadioButton("NO", true); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mNo, gbc); - + mYes = makeJRadioButton("YES", false); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; - gbc.insets = new Insets(0,COMPONENT_SPACE, + gbc.insets = new Insets(0,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mYes, gbc); - + JLabel dummy = new JLabel(""); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -144,7 +144,7 @@ class WIIntroSingleSignonPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(dummy, gbc); - + ButtonGroup buttonGrp = new ButtonGroup(); buttonGrp.add(mYes); buttonGrp.add(mNo); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertDNPage.java index 2dca713b5..4e200b676 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertDNPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertDNPage.java @@ -21,7 +21,7 @@ import com.netscape.admin.certsrv.wizard.*; import javax.swing.*; /** - * Subject DN page for KRA transport certificate + * Subject DN page for KRA transport certificate * * @author Christine Ho * @version $Revision$, $Date$ diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertExtensionPage.java index 2b1f0dc99..9132fbcc3 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertExtensionPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertExtensionPage.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.common.*; import com.netscape.admin.certsrv.config.*; /** - * Certificate Extension page for KRA transport certificate. + * Certificate Extension page for KRA transport certificate. * * @author Christine Ho * @version $Revision$, $Date$ @@ -55,7 +55,7 @@ class WIKRACertExtensionPage extends WICertExtensionPage { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; if (wizardInfo.isCloning() && wizardInfo.isKRACloningDone()) return false; - if (!wizardInfo.isKRAInstalled() || + if (!wizardInfo.isKRAInstalled() || wizardInfo.isKRALocalCertDone() || wizardInfo.isKRACertRequestDone() || wizardInfo.isKRACertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertSubmitPage.java index 992bd7f14..8b197732f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertSubmitPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertSubmitPage.java @@ -50,7 +50,7 @@ class WIKRACertSubmitPage extends WICertSubmitPage implements IWizardPanel { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; if (wizardInfo.isCloning() && wizardInfo.isKRACloningDone()) return false; - wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, + wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_KRA_TRANSPORT_CERT); if (!wizardInfo.isKRAInstalled() || wizardInfo.isKRACertRequestDone() || wizardInfo.isKRACertInstalledDone() || diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertValidityPage.java index feaa29983..694b26cf5 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertValidityPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertValidityPage.java @@ -39,7 +39,7 @@ class WIKRACertValidityPage extends WICertValidityPage { private static final String KRAHELPINDEX = "install-kracert-validity-wizard-help"; private static final String RAKRAHELPINDEX = "install-rakracert-validity-wizard-help"; private static final String CAKRAHELPINDEX = "install-cakra-kracert-validity-wizard-help"; - + WIKRACertValidityPage(JDialog parent) { super(PANELNAME); mParent = parent; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAMessageDigestPage.java index 38941ec7b..91e54901e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAMessageDigestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAMessageDigestPage.java @@ -41,7 +41,7 @@ import com.netscape.management.client.util.*; * @see com.netscape.admin.certsrv.config.install */ class WIKRAMessageDigestPage extends WMessageDigestPage { - + private static final String PANELNAME = "INSTALLKRAMESSAGEDIGESTWIZARD"; WIKRAMessageDigestPage(JDialog parent) { @@ -66,12 +66,12 @@ class WIKRAMessageDigestPage extends WMessageDigestPage { mCAKeyType = wizardInfo.getCAKeyType(); - return super.initializePanel(info); + return super.initializePanel(info); } public void getUpdateInfo(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - if (mDSAHashTypeBox.isVisible()) + if (mDSAHashTypeBox.isVisible()) wizardInfo.setHashType((String)mDSAHashTypeBox.getSelectedItem()); else wizardInfo.setHashType((String)mRSAHashTypeBox.getSelectedItem()); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRANumberPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRANumberPage.java index 000b3eb9f..4575f2a83 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRANumberPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRANumberPage.java @@ -49,11 +49,11 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { private String mbeginRequestNumber; private JTextField mbeginRequestNumberText; private JLabel mbeginRequestNumberLabel; - + private String mEndRequestNumber = null; private JTextField mEndRequestNumberText; private JLabel mEndRequestNumberLabel; - + private static final String DEFAULT_SERIAL_NUMBER = "1"; private static final String PANELNAME = "KRAREQUESTNUMBERWIZARD"; private static final String HELPINDEX = @@ -84,11 +84,11 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { !wizardInfo.isKRAInstalled() || wizardInfo.isKRACertInstalledDone()|| wizardInfo.isNumberPageDone()) return false; - + if (wizardInfo.isCloning()) mDesc.setText(mResource.getString(PANELNAME+"_TEXT_HEADING_LABEL") + mResource.getString(PANELNAME+"_TEXT_MORE_LABEL")); - else + else mDesc.setText(mResource.getString(PANELNAME+"_TEXT_HEADING_LABEL")); @@ -107,7 +107,7 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { if ((serial = wizardInfo.getEndRequestNumber()) != null) mEndRequestNumberText.setText(serial); - return true; + return true; } private String hexToDecimal(String hex, boolean isHex) @@ -188,7 +188,7 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { else mEndRequestNumber = ""; } - + if (num != null && endNum != null && num.compareTo(endNum) > 0) { setErrorMessage("Ending number must be greater than starting number."); return false; @@ -206,13 +206,13 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { public boolean concludePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - if (mSerialNumber != null && !mSerialNumber.equals("")) + if (mSerialNumber != null && !mSerialNumber.equals("")) wizardInfo.setCASerialNumber(mSerialNumber); else { wizardInfo.setCASerialNumber(DEFAULT_SERIAL_NUMBER); mSerialNumber = DEFAULT_SERIAL_NUMBER; } - if (mbeginRequestNumber != null && !mbeginRequestNumber.equals("")) + if (mbeginRequestNumber != null && !mbeginRequestNumber.equals("")) wizardInfo.setRequestNumber(mbeginRequestNumber); else { wizardInfo.setRequestNumber(DEFAULT_SERIAL_NUMBER); @@ -221,16 +221,16 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { String rawData = ConfigConstants.TASKID+"="+TaskId.TASK_SET_KRA_NUMBER; rawData = rawData+"&"+ConfigConstants.OPTYPE+"="+OpDef.OP_MODIFY; - if (mSerialNumber != null && !mSerialNumber.equals("")) + if (mSerialNumber != null && !mSerialNumber.equals("")) rawData = rawData+"&"+ConfigConstants.PR_CA_SERIAL_NUMBER+"="+ mSerialNumber; - if (mEndSerialNumber != null && !mEndSerialNumber.equals("")) + if (mEndSerialNumber != null && !mEndSerialNumber.equals("")) rawData = rawData+"&"+ConfigConstants.PR_CA_ENDSERIAL_NUMBER+"="+ mEndSerialNumber; - if (mbeginRequestNumber != null && !mbeginRequestNumber.equals("")) + if (mbeginRequestNumber != null && !mbeginRequestNumber.equals("")) rawData = rawData+"&"+ConfigConstants.PR_REQUEST_NUMBER+"="+ mbeginRequestNumber; - if (mEndRequestNumber != null && !mEndSerialNumber.equals("")) + if (mEndRequestNumber != null && !mEndSerialNumber.equals("")) rawData = rawData+"&"+ConfigConstants.PR_ENDREQUEST_NUMBER+"="+ mEndRequestNumber; if (wizardInfo.getInternalDBPasswd() != null) @@ -294,7 +294,7 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE); add(mSerialNumberText, gbc); - + CMSAdminUtil.resetGBC(gbc); mEndSerialNumberLabel = makeJLabel("ENDSERIALNUMBER"); gbc.anchor = gbc.EAST; @@ -311,7 +311,7 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mEndSerialNumberText, gbc); - + CMSAdminUtil.resetGBC(gbc); mbeginRequestNumberLabel = makeJLabel("REQUESTNUMBER"); gbc.anchor = gbc.EAST; @@ -319,7 +319,7 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mbeginRequestNumberLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mbeginRequestNumberText = makeJTextField(30); gbc.anchor = gbc.NORTHWEST; @@ -328,7 +328,7 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mbeginRequestNumberText, gbc); - + CMSAdminUtil.resetGBC(gbc); mEndRequestNumberLabel = makeJLabel("ENDREQUESTNUMBER"); gbc.anchor = gbc.EAST; @@ -336,7 +336,7 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mEndRequestNumberLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mEndRequestNumberText = makeJTextField(30); gbc.anchor = gbc.NORTHWEST; @@ -345,7 +345,7 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mEndRequestNumberText, gbc); - + /* CMSAdminUtil.resetGBC(gbc); mSerialNumberLabel = makeJLabel("PWD"); @@ -354,7 +354,7 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(mSerialNumberLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mSerialNumberText = makeJSerialNumberField(30); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme1Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme1Page.java index d6171e651..390e20b64 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme1Page.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme1Page.java @@ -44,7 +44,7 @@ class WIKRAScheme1Page extends WizardBasePanel implements IWizardPanel { private static final String RAKRAHELPINDEX = "install-rakra-mnscheme-wizard-help"; private int mRequired, mAvail; - + WIKRAScheme1Page(JDialog parent) { super(PANELNAME); mParent = parent; @@ -80,7 +80,7 @@ class WIKRAScheme1Page extends WizardBasePanel implements IWizardPanel { mHelpIndex = RAKRAHELPINDEX; else mHelpIndex = KRAHELPINDEX; - return true; + return true; } public boolean validatePanel() { @@ -135,7 +135,7 @@ class WIKRAScheme1Page extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.fill = gbc.NONE; add(requiredLbl, gbc); - + CMSAdminUtil.resetGBC(gbc); mRequiredText = makeJTextField(5); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme2Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme2Page.java index f8c9c9f8e..027a8b404 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme2Page.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme2Page.java @@ -48,7 +48,7 @@ class WIKRAScheme2Page extends WizardBasePanel implements IWizardPanel { "install-cakra-scheme-usrpwds-wizard-help"; private static final String RAKRAHELPINDEX = "install-rakra-scheme-usrpwds-wizard-help"; - + WIKRAScheme2Page(JDialog parent) { super(PANELNAME); mParent = parent; @@ -99,7 +99,7 @@ class WIKRAScheme2Page extends WizardBasePanel implements IWizardPanel { else mHelpIndex = KRAHELPINDEX; - return true; + return true; } public boolean validatePanel() { @@ -185,15 +185,15 @@ class WIKRAScheme2Page extends WizardBasePanel implements IWizardPanel { public boolean concludePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - - String rawData = ""; + + String rawData = ""; int total = Integer.parseInt(wizardInfo.getTotalAgents()); for (int i=0; i<total; i++) { String val1 = (String)mDataModel.getValueAt(i,1); String val2 = (String)mDataModel.getValueAt(i,2); rawData = rawData+ConfigConstants.PR_AGENT_UID+i+"="+val1; rawData = rawData+"&"+ConfigConstants.PR_AGENT_PWD+i+"="+val2; - } + } rawData = rawData+"&"+ConfigConstants.TASKID+"="+TaskId.TASK_AGENTS; rawData = rawData+"&"+ConfigConstants.OPTYPE+"="+OpDef.OP_MODIFY; @@ -242,7 +242,7 @@ class WIKRAScheme2Page extends WizardBasePanel implements IWizardPanel { scrollPane.setHorizontalScrollBarPolicy(scrollPane.HORIZONTAL_SCROLLBAR_NEVER); scrollPane.setVerticalScrollBarPolicy(scrollPane.VERTICAL_SCROLLBAR_ALWAYS); mTable.setAutoscrolls(true); - mTable.sizeColumnsToFit(true); + mTable.sizeColumnsToFit(true); mTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION); scrollPane.setBackground(Color.white); setLabelCellRenderer(mTable, 1); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAStorageKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAStorageKeyPage.java index 6cce19d95..7f42e7671 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAStorageKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAStorageKeyPage.java @@ -30,7 +30,7 @@ import javax.swing.event.*; import java.awt.event.*; /** - * Install KRA storage key. + * Install KRA storage key. * * @author Christine Ho * @version $Revision$, $Date$ @@ -45,7 +45,7 @@ class WIKRAStorageKeyPage extends WizardBasePanel implements IWizardPanel { "install-cakra-storagekey-wizard-help"; private static final String RAKRAHELPINDEX = "install-rakra-storagekey-wizard-help"; - + protected JComboBox mKeyTypeBox, mKeyLengthBox, mDSAKeyLengthBox, mTokenBox; protected JPasswordField mPassword, mPasswordAgain, mSOPPassword; protected JLabel keyTypeLbl, keyLengthCustomText, keyLengthLbl, unitLbl, @@ -122,7 +122,7 @@ class WIKRAStorageKeyPage extends WizardBasePanel implements IWizardPanel { //mTokenBox.setSelectedIndex(0); mTokenBox.addItemListener(this); - return true; + return true; } public boolean validatePanel() { @@ -131,13 +131,13 @@ class WIKRAStorageKeyPage extends WizardBasePanel implements IWizardPanel { public void actionPerformed(ActionEvent e) { int index = mTokenBox.getSelectedIndex(); - if (index > 0) { + if (index > 0) { mPassword.setEnabled(true); mPassword.setBackground(mActiveColor); } else { // Internal Token mPassword.setEnabled(false); - mPassword.setBackground(getBackground()); + mPassword.setBackground(getBackground()); } } @@ -293,7 +293,7 @@ class WIKRAStorageKeyPage extends WizardBasePanel implements IWizardPanel { gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); panel2.add(mSOPPassword, gbc); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java index d67d0e339..425ecb869 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java @@ -55,7 +55,7 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { protected InstallWizardInfo mWizardInfo; protected String mHelpIndex; protected boolean mIsCAKey; - + WIKeyPage(String panelName) { super(panelName); mPanelName = panelName; @@ -85,13 +85,13 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { int i=0; mTokenInitialized = new String[count]; while (tokenizer.hasMoreElements()) { - mTokenInitialized[i] = (String)tokenizer.nextToken(); + mTokenInitialized[i] = (String)tokenizer.nextToken(); i++; } String loginList = mWizardInfo.getTokensLogin(); - tokenizer = new StringTokenizer(loginList, ":"); - i=0; + tokenizer = new StringTokenizer(loginList, ":"); + i=0; mTokenLogin = new String[count]; while (tokenizer.hasMoreElements()) { mTokenLogin[i] = (String)tokenizer.nextToken(); @@ -111,7 +111,7 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { } enableKeyLengthFields(); - return true; + return true; } public boolean validatePanel() { @@ -155,7 +155,7 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { if (index > 0) return validateHardwareToken(index); - else + else return validateInternalToken(index); } @@ -252,7 +252,7 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { startProgressStatus(); // CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "INITTOKEN"); - + boolean ready = send(rawData, mWizardInfo); if (ready) { @@ -307,14 +307,14 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(panel, gbc); - + CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.gridwidth = gbc.REMAINDER; gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(panel2, gbc); - + JTextArea selectTokenLbl = createTextArea(mResource.getString( mPanelName+"_LABEL_SELECTTOKEN_LABEL")); CMSAdminUtil.resetGBC(gbc); @@ -322,7 +322,7 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { gbc.gridwidth = gbc.REMAINDER; gbc.insets = new Insets(0, 0, COMPONENT_SPACE,0); panel.add(selectTokenLbl, gbc); - + JLabel tokenLbl = makeJLabel("TOKEN"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.CENTER; @@ -501,7 +501,7 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { gbc.anchor = gbc.NORTHWEST; gbc.fill = gbc.NONE; //gbc.gridheight = gbc.REMAINDER; - gbc.insets = new Insets(0, COMPONENT_SPACE, + gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, 0); panel1.add(mKeyLengthText, gbc); mActiveColor = mKeyLengthText.getBackground(); @@ -537,7 +537,7 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { // the prefix "TOKEN:" and the value is the token password. mWizardInfo.put("TOKEN:"+name, mPassword.getText().trim()); } - + mTokenBox.removeItemListener(this); } @@ -578,13 +578,13 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { enableFields(keyLengthCustomText, mKeyLengthText, true, mActiveColor); enableFields(unit1Lbl, null, true, mActiveColor); } else { - enableFields(keyLengthCustomText, mKeyLengthText, false, + enableFields(keyLengthCustomText, mKeyLengthText, false, getBackground()); enableFields(unit1Lbl, null, false, getBackground()); } } - protected void enableFields(JComponent comp1, JTextComponent comp2, boolean enable, + protected void enableFields(JComponent comp1, JTextComponent comp2, boolean enable, Color color) { if (comp1 != null) { comp1.setEnabled(enable); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WILDAPPublishingPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WILDAPPublishingPage.java index 5cb6b3db3..0dd19333c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WILDAPPublishingPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WILDAPPublishingPage.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.common.*; class WILDAPPublishingPage extends WizardBasePanel implements IWizardPanel { private JTextField mHostNameText, mPortText, mBindAsText; private JCheckBox mSecurePort, mEnable; - private JLabel mBindAsLabel, mCertLabel; + private JLabel mBindAsLabel, mCertLabel; private JComboBox mAuthBox, mCertBox, mVersionBox; private static final String PANELNAME = "LDAPPUBLISHINGWIZARD"; @@ -55,7 +55,7 @@ class WILDAPPublishingPage extends WizardBasePanel implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { @@ -118,7 +118,7 @@ class WILDAPPublishingPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, 0, COMPONENT_SPACE); panel.add(hostName, gbc); - + CMSAdminUtil.resetGBC(gbc); mHostNameText = makeJTextField(30); gbc.anchor = gbc.NORTHWEST; @@ -127,7 +127,7 @@ class WILDAPPublishingPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; panel.add(mHostNameText, gbc); - + /* CMSAdminUtil.resetGBC(gbc); JTextArea dummy = createTextArea(" ", 2, 5); @@ -138,13 +138,13 @@ class WILDAPPublishingPage extends WizardBasePanel implements IWizardPanel { */ CMSAdminUtil.resetGBC(gbc); - JLabel portNumber = makeJLabel("PORT"); + JLabel portNumber = makeJLabel("PORT"); gbc.anchor = gbc.NORTHEAST; gbc.fill = gbc.NONE; gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); panel.add(portNumber, gbc); - + CMSAdminUtil.resetGBC(gbc); mPortText = makeJTextField(10); gbc.anchor = gbc.NORTHWEST; @@ -152,7 +152,7 @@ class WILDAPPublishingPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); panel.add(mPortText, gbc); - + CMSAdminUtil.resetGBC(gbc); mSecurePort = makeJCheckBox("SECUREPORT"); gbc.anchor = gbc.NORTHWEST; @@ -259,7 +259,7 @@ class WILDAPPublishingPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); panel.add(dummy2, gbc); - + /* CMSAdminUtil.resetGBC(gbc); JTextArea dummy1 = createTextArea(" ", 2, 30); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WILoggingPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WILoggingPage.java index a28a4795d..c3431b51a 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WILoggingPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WILoggingPage.java @@ -47,7 +47,7 @@ class WILoggingPage extends WizardBasePanel implements IWizardPanel { protected final static int WEEK = 604800; protected final static int DAY = 86400; protected final static int HOUR = 3600; - + WILoggingPage() { super(PANELNAME); init(); @@ -58,8 +58,8 @@ class WILoggingPage extends WizardBasePanel implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - - return true; + + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WILogonAllTokensPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WILogonAllTokensPage.java index 9a8060b30..dbbe3a2e2 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WILogonAllTokensPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WILogonAllTokensPage.java @@ -83,9 +83,9 @@ class WILogonAllTokensPage extends WizardBasePanel implements IWizardPanel { String token = (String)tokenizer.nextElement(); loggedIn = (String)tokenizerLoggedIn.nextElement(); inits = (String)tokenizerInits.nextElement(); - - // if (loggedIn.equals("false")) { - // always logon to the token. + + // if (loggedIn.equals("false")) { + // always logon to the token. if (inits.equals("true")) { Vector v = new Vector(); v.addElement(new JLabel(token)); @@ -141,8 +141,8 @@ class WILogonAllTokensPage extends WizardBasePanel implements IWizardPanel { } else { tokenNames = tokenNames+":"+val1; pwds = pwds+":"+val2; - } - } + } + } startProgressStatus(); String rawData = ConfigConstants.PR_TOKEN_LOGONLIST+"="+tokenNames; @@ -225,7 +225,7 @@ class WILogonAllTokensPage extends WizardBasePanel implements IWizardPanel { mTable.setDefaultRenderer(JComponent.class, new ComponentCellRenderer()); mTable.setDefaultEditor(JComponent.class, new ProfileComponentCellEditor()); - + CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.fill = gbc.BOTH; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCertRequestPage.java index 37adddb98..c0ffcd964 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCertRequestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCertRequestPage.java @@ -38,7 +38,7 @@ import com.netscape.management.client.util.*; class WIManualCertRequestPage extends WBaseManualCertRequestPage implements IWizardPanel { // private static final String PANELNAME = "INSTALLMANUALCERTREQUESTWIZARD"; String mHelpIndex; - + WIManualCertRequestPage(String panelName) { super(panelName); init(); @@ -49,7 +49,7 @@ class WIManualCertRequestPage extends WBaseManualCertRequestPage implements IWiz } public boolean initializePanel(WizardInfo info) { - return super.initializePanel(info); + return super.initializePanel(info); } public boolean validatePanel() { @@ -64,7 +64,7 @@ class WIManualCertRequestPage extends WBaseManualCertRequestPage implements IWiz if (mHost != null && !mHost.equals("")) wizardInfo.setCMHost(mHost); if (mPort != null && !mPort.equals("")) - wizardInfo.setCMEEPort(mPort); + wizardInfo.setCMEEPort(mPort); if (mSSL.isSelected()) wizardInfo.setCMEEType("https"); else @@ -96,7 +96,7 @@ class WIManualCertRequestPage extends WBaseManualCertRequestPage implements IWiz } startProgressStatus(); - boolean ready = send(mHost, Integer.parseInt(mPort), + boolean ready = send(mHost, Integer.parseInt(mPort), "/ca/ee/ca/profileSubmit", rawData, wizardInfo); endProgressStatus(); @@ -145,7 +145,7 @@ class WIManualCertRequestPage extends WBaseManualCertRequestPage implements IWiz if (!ready) { String str = getErrorMessage(); - if (str.equals("")) { + if (str.equals("")) { String errorMsg = mResource.getString( mPanelName+"_ERRORMSG"); setErrorMessage(errorMsg); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIManualKRACertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualKRACertRequestPage.java index c1355b3d5..9df684ada 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIManualKRACertRequestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualKRACertRequestPage.java @@ -53,7 +53,7 @@ class WIManualKRACertRequestPage extends WIManualCertRequestPage { if (wizardInfo.isCloning() && wizardInfo.isKRACloningDone()) return false; if (wizardInfo.isKRACertLocalCA() || !wizardInfo.isKRAInstalled() || - wizardInfo.isKRALocalCertDone() || + wizardInfo.isKRALocalCertDone() || wizardInfo.isKRACertInstalledDone() || wizardInfo.isKRACertRequestSucc()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIManualOCSPCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualOCSPCertRequestPage.java index 268c6c395..b5d4c8e2a 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIManualOCSPCertRequestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualOCSPCertRequestPage.java @@ -53,7 +53,7 @@ class WIManualOCSPCertRequestPage extends WIManualCertRequestPage { if (wizardInfo.isCloning() && wizardInfo.isOCSPCloningDone()) return false; if (wizardInfo.isOCSPCertLocalCA() || !wizardInfo.isOCSPInstalled() || - wizardInfo.isOCSPLocalCertDone() || + wizardInfo.isOCSPLocalCertDone() || wizardInfo.isOCSPCertInstalledDone() || wizardInfo.isOCSPCertRequestSucc() ) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIManualRACertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualRACertRequestPage.java index 7439ed7b5..e119a723b 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIManualRACertRequestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualRACertRequestPage.java @@ -52,7 +52,7 @@ class WIManualRACertRequestPage extends WIManualCertRequestPage { if (wizardInfo.isCloning() && wizardInfo.isRACloningDone()) return false; if (wizardInfo.isRACertLocalCA() || !wizardInfo.isRAInstalled() || - wizardInfo.isRALocalCertDone() || + wizardInfo.isRALocalCertDone() || wizardInfo.isRACertInstalledDone() || wizardInfo.isRACertRequestSucc() ) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIMasterOrClone.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIMasterOrClone.java index 96c764381..e2dc64593 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIMasterOrClone.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIMasterOrClone.java @@ -40,9 +40,9 @@ class WIMasterOrClone extends WizardBasePanel implements IWizardPanel { protected JRadioButton mNo; protected JTextArea mLabel; private static final String PANELNAME = "MASTERORCLONE"; - private static final String HELPINDEX = + private static final String HELPINDEX = "install-internaldb-createdbagain-help"; - + WIMasterOrClone(JDialog parent) { super(PANELNAME); mParent = parent; @@ -97,7 +97,7 @@ class WIMasterOrClone extends WizardBasePanel implements IWizardPanel { Debug.println("WIMasterOrClone:concludePanel() 2"); boolean ready = send(rawData, wizardInfo); endProgressStatus(); - + if (!ready) { String str = getErrorMessage(wizardInfo); if (str == null) @@ -125,24 +125,24 @@ class WIMasterOrClone extends WizardBasePanel implements IWizardPanel { PANELNAME+"_TEXT_HEADING_LABEL")); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mLabel, gbc); - - + + mYes = makeJRadioButton("YES", false); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mYes, gbc); - + mNo = makeJRadioButton("NO", false); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(0,COMPONENT_SPACE, + gbc.insets = new Insets(0,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mNo, gbc); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java index ab9bcebb9..68faf10d0 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java @@ -58,7 +58,7 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe "install-ca-migration-configuration-wizard-help"; private static final String CAKRAHELPINDEX = "install-cakra-migration-configuration-wizard-help"; - + WIMigrationPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -84,19 +84,19 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe setBorder(makeTitledBorder(PANELNAME)); initializeTokenBox(mCATokenBox); - if (mSSLTokenBox.getItemCount() > 0) + if (mSSLTokenBox.getItemCount() > 0) mSSLTokenBox.removeAllItems(); for (int i=0; i<mCATokenBox.getItemCount(); i++) { String str = (String)mCATokenBox.getItemAt(i); mSSLTokenBox.addItem(str); } int index = mCATokenBox.getSelectedIndex(); - mWizardInfo.setMigrateCACertTokenName((String)mCATokenBox.getSelectedItem()); + mWizardInfo.setMigrateCACertTokenName((String)mCATokenBox.getSelectedItem()); enableFields(index, mLogonInitCATokenLbl, mCAPasswdLbl, mCAPassword, mCAPasswdAgainLbl, mCAPasswordAgain, mCASOPLbl, mCASOPPassword); index = mSSLTokenBox.getSelectedIndex(); - mWizardInfo.setMigrateSSLCertTokenName((String)mSSLTokenBox.getSelectedItem()); + mWizardInfo.setMigrateSSLCertTokenName((String)mSSLTokenBox.getSelectedItem()); enableFields(index, mLogonInitSSLTokenLbl, mSSLPasswdLbl, mSSLPassword, mSSLPasswdAgainLbl, mSSLPasswordAgain, mSSLSOPLbl, mSSLSOPPassword); @@ -104,16 +104,16 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe mSSLTokenBox.addItemListener(this); enablePasswordFields(); - if (mWizardInfo.isCAInstalled() && mWizardInfo.isKRAInstalled()) + if (mWizardInfo.isCAInstalled() && mWizardInfo.isKRAInstalled()) mHelpIndex = CAKRAHELPINDEX; else mHelpIndex = CAHELPINDEX; - return true; + return true; } private void initializeTokenBox(JComboBox tokenBox) { - if (tokenBox.getItemCount() > 0) + if (tokenBox.getItemCount() > 0) tokenBox.removeAllItems(); String tokenList = mWizardInfo.getTokensList(); @@ -278,16 +278,16 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe data.put(ConfigConstants.PR_ENABLE_MIGRATION, ConfigConstants.TRUE); else data.put(ConfigConstants.PR_ENABLE_MIGRATION, ConfigConstants.FALSE); - data.put(ConfigConstants.PR_OUTPUT_PATH, + data.put(ConfigConstants.PR_OUTPUT_PATH, mWizardInfo.getMigrationOutputPath()); if (mWizardInfo.getInternalDBPasswd() != null) - data.put(ConfigConstants.PR_DB_PWD, + data.put(ConfigConstants.PR_DB_PWD, mWizardInfo.getInternalDBPasswd()); - data.put(ConfigConstants.PR_MIGRATION_PASSWORD, + data.put(ConfigConstants.PR_MIGRATION_PASSWORD, mWizardInfo.getMigrationPasswd()); - data.put(ConfigConstants.PR_SIGNING_KEY_MIGRATION_TOKEN, + data.put(ConfigConstants.PR_SIGNING_KEY_MIGRATION_TOKEN, mWizardInfo.getSigningKeyMigrationToken()); - data.put(ConfigConstants.PR_SIGNING_KEY_MIGRATION_TOKEN_PASSWD, + data.put(ConfigConstants.PR_SIGNING_KEY_MIGRATION_TOKEN_PASSWD, mWizardInfo.getSigningKeyMigrationPasswd()); data.put(ConfigConstants.PR_SSL_KEY_MIGRATION_TOKEN, mWizardInfo.getSSLKeyMigrationToken()); @@ -299,7 +299,7 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe endProgressStatus(); mWizardInfo.put("TOKEN:"+caTokenName, mCAPassword.getText().trim()); - mWizardInfo.put("TOKEN:"+sslTokenName, + mWizardInfo.put("TOKEN:"+sslTokenName, mSSLPassword.getText().trim()); if (!ready) { @@ -320,21 +320,21 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe int index = 0; if (e.getSource().equals(mCATokenBox)) { index = mCATokenBox.getSelectedIndex(); - mWizardInfo.setMigrateCACertTokenName((String)mCATokenBox.getSelectedItem()); + mWizardInfo.setMigrateCACertTokenName((String)mCATokenBox.getSelectedItem()); enableFields(index, mLogonInitCATokenLbl, mCAPasswdLbl, mCAPassword, mCAPasswdAgainLbl, mCAPasswordAgain, mCASOPLbl, mCASOPPassword); enablePasswordFields(); } else if (e.getSource().equals(mSSLTokenBox)) { index = mSSLTokenBox.getSelectedIndex(); - mWizardInfo.setMigrateSSLCertTokenName((String)mSSLTokenBox.getSelectedItem()); + mWizardInfo.setMigrateSSLCertTokenName((String)mSSLTokenBox.getSelectedItem()); enableFields(index, mLogonInitSSLTokenLbl, mSSLPasswdLbl, mSSLPassword, mSSLPasswdAgainLbl, mSSLPasswordAgain, mSSLSOPLbl, mSSLSOPPassword); enablePasswordFields(); } } - private void enableFields(int index, JLabel logonInitLbl, JLabel passwdLbl, - JPasswordField passwd, JLabel passwdAgainLbl, JPasswordField passwdAgain, + private void enableFields(int index, JLabel logonInitLbl, JLabel passwdLbl, + JPasswordField passwd, JLabel passwdAgainLbl, JPasswordField passwdAgain, JLabel sopLbl, JPasswordField sopPasswd) { if (mTokenLogin[index].equals(ConfigConstants.TRUE)) { logonInitLbl.setText(""); @@ -367,7 +367,7 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe } } - protected void enableFields(JComponent comp1, JTextComponent comp2, + protected void enableFields(JComponent comp1, JTextComponent comp2, boolean enable, Color color) { if (comp1 != null) { comp1.setEnabled(enable); @@ -423,7 +423,7 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(mPathLbl, gbc); - + CMSAdminUtil.resetGBC(gbc); mPathText = makeJTextField(30); gbc.anchor = gbc.NORTHWEST; @@ -432,11 +432,11 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe gbc.gridwidth = gbc.REMAINDER; add(mPathText, gbc); - mTransportLbl = makeJLabel("TRANSPORTPASSWORD"); + mTransportLbl = makeJLabel("TRANSPORTPASSWORD"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHEAST; gbc.fill = gbc.NONE; - gbc.insets = new Insets(0, COMPONENT_SPACE, + gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(mTransportLbl, gbc); @@ -463,7 +463,7 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, + gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mDBPassword, gbc); */ @@ -476,7 +476,7 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(COMPONENT_SPACE, 0, COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE, 0, COMPONENT_SPACE, COMPONENT_SPACE); panel1.add(mCATokenHeading, gbc); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WINetworkPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WINetworkPage.java index 823980d56..6d9bb892d 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WINetworkPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WINetworkPage.java @@ -54,7 +54,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { private boolean mNumberError = false; private JLabel mPortLabel, mSSLPortLabel; - private static final String HELPINDEX = + private static final String HELPINDEX = "install-network-configuration-wizard-help"; private static final String PANELNAME = "NETWORKWIZARD"; private static final int MAX_PORT = 65535; @@ -83,7 +83,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { public boolean initializePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; mWizardInfo = wizardInfo; - if (wizardInfo.isNetworkDone()) + if (wizardInfo.isNetworkDone()) return false; setBorder(makeTitledBorder(PANELNAME)); boolean cloning = mWizardInfo.isCloning(); @@ -100,7 +100,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { } else { mEnable.setSelected(wizardInfo.isEEEnabled()); } - + if (wizardInfo.isRAInstalled()) mEnable.setSelected(true); mAdminSSLPortText.setText(wizardInfo.getAdminPort()); @@ -125,7 +125,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { enableFields(mSSLPortLabel, mGatewaySSLPortText, true, mActiveColor); mEnableEEPorts = true; } - + return true; } @@ -155,13 +155,13 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { return false; } - if (mEnableEEPorts) { + if (mEnableEEPorts) { if (sslEEPort.equals("") || (mEnable.isSelected() && eePort.equals(""))) { - setErrorMessage("BLANKFIELD"); + setErrorMessage("BLANKFIELD"); return false; } } - + boolean cloning = mWizardInfo.isCloning(); String selected_sub = mWizardInfo.getCloneSubsystem(); if (cloning && (selected_sub != null && selected_sub.equals("ca"))) { @@ -177,24 +177,24 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { if (num < MIN_PORT || num > MAX_PORT) { setErrorMessage("PORTRANGE"); return false; - } + } num = Integer.parseInt(agentPort); if (num < MIN_PORT || num > MAX_PORT) { setErrorMessage("PORTRANGE"); return false; - } + } if (mEnableEEPorts) { num = Integer.parseInt(sslEEPort); if (num < MIN_PORT || num > MAX_PORT) { setErrorMessage("PORTRANGE"); return false; - } + } if (mEnable.isSelected()) { num = Integer.parseInt(eePort); if (num < MIN_PORT || num > MAX_PORT) { setErrorMessage("PORTRANGE"); return false; - } + } } } if (cloning && (selected_sub != null && selected_sub.equals("ca"))) @@ -204,14 +204,14 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { return false; } - if (adminPort.equals(agentPort) || agentPort.equals(sslEEPort) || + if (adminPort.equals(agentPort) || agentPort.equals(sslEEPort) || (mEnable.isSelected() && eePort.equals(sslEEPort))) { setErrorMessage("SAMEPORT"); return false; } if (mEnableEEPorts) { - if (agentPort.equals(sslEEPort) || + if (agentPort.equals(sslEEPort) || (mEnable.isSelected() && eePort.equals(sslEEPort))) { setErrorMessage("SAMEPORT"); return false; @@ -309,7 +309,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.fill = gbc.NONE; add(adminSSLport, gbc); - + mAdminSSLPortText = makeJTextField(10); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.WEST; @@ -335,7 +335,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE,COMPONENT_SPACE); gbc.fill = gbc.NONE; add(agentPort, gbc); - + mAgentSSLPortText = makeJTextField(10); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.WEST; @@ -346,7 +346,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE); //gbc.gridwidth = gbc.REMAINDER; add(mAgentSSLPortText, gbc); - + JLabel dummy2b = new JLabel(" "); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -432,7 +432,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mAgentDesc, gbc); - + CMSAdminUtil.resetGBC(gbc); mAgentPortLbl = makeJLabel("AGENTPORT"); gbc.anchor = gbc.NORTHEAST; @@ -440,7 +440,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(mAgentPortLbl, gbc); - + CMSAdminUtil.resetGBC(gbc); mPortText = makeJTextField(30); gbc.anchor = gbc.NORTHWEST; @@ -480,7 +480,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { mWarning = true; String errormsg = mResource.getString(mPanelName+"_WARNING"); JOptionPane.showMessageDialog(mAdminFrame, errormsg, "Warning", - JOptionPane.WARNING_MESSAGE, + JOptionPane.WARNING_MESSAGE, CMSAdminUtil.getImage(CMSAdminResources.IMAGE_WARN_ICON)); } else { enableFields(false, getBackground()); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertDNPage.java index d13124de6..d01c55dd0 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertDNPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertDNPage.java @@ -22,7 +22,7 @@ import javax.swing.*; import com.netscape.management.client.util.*; /** - * Subject DN page for RA signing certificate + * Subject DN page for RA signing certificate * * @author Christine Ho * @version $Revision$, $Date$ @@ -78,6 +78,6 @@ class WIOCSPCertDNPage extends WICertDNPage { str = mCText.getText().trim(); wizardInfo.setOCSPCComp(str); } - + } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertSubmitPage.java index dd58b5f1a..d851ee323 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertSubmitPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertSubmitPage.java @@ -48,7 +48,7 @@ class WIOCSPCertSubmitPage extends WICertSubmitPage implements IWizardPanel { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; if (wizardInfo.isCloning() && wizardInfo.isOCSPCloningDone()) return false; - wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, + wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_OCSP_SIGNING_CERT); if (!wizardInfo.isOCSPInstalled() || diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java index a49b428a7..63746e448 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java @@ -39,7 +39,7 @@ import com.netscape.management.client.util.*; */ class WIOCSPKeyPage extends WIKeyPage implements IWizardPanel { private static final String PANELNAME = "INSTALLOCSPKEYWIZARD"; - private static final String OCSPHELPINDEX = + private static final String OCSPHELPINDEX = "install-ocspkey-configuration-wizard-help"; WIOCSPKeyPage(JDialog parent) { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPMessageDigestPage.java index ec250dcd1..c5f1c5613 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPMessageDigestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPMessageDigestPage.java @@ -41,7 +41,7 @@ import com.netscape.management.client.util.*; * @see com.netscape.admin.certsrv.config.install */ class WIOCSPMessageDigestPage extends WMessageDigestPage { - + private static final String PANELNAME = "INSTALLOCSPMESSAGEDIGESTWIZARD"; WIOCSPMessageDigestPage(JDialog parent) { @@ -67,12 +67,12 @@ class WIOCSPMessageDigestPage extends WMessageDigestPage { mCAKeyType = wizardInfo.getCAKeyType(); - return super.initializePanel(info); + return super.initializePanel(info); } public void getUpdateInfo(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - if (mDSAHashTypeBox.isVisible()) + if (mDSAHashTypeBox.isVisible()) wizardInfo.setHashType((String)mDSAHashTypeBox.getSelectedItem()); else wizardInfo.setHashType((String)mRSAHashTypeBox.getSelectedItem()); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCACertPage.java index 816554588..4e9ef1fa6 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCACertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCACertPage.java @@ -49,8 +49,8 @@ class WIPasteCACertPage extends WIPasteCertPage { if (wizardInfo.isCloning() && wizardInfo.isCACloningDone()) return false; - if (wizardInfo.isCACertLocalCA() || !wizardInfo.isInstallCertNow() - || !wizardInfo.isCAInstalled() || wizardInfo.isMigrationEnable() + if (wizardInfo.isCACertLocalCA() || !wizardInfo.isInstallCertNow() + || !wizardInfo.isCAInstalled() || wizardInfo.isMigrationEnable() || wizardInfo.isCACertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCertPage.java index 063382f32..7cda3bef7 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCertPage.java @@ -32,8 +32,8 @@ import com.netscape.management.client.console.*; import com.netscape.management.client.util.*; /** - * This page is to install the certificate in the internal token. The user can - * import the cert from the file, paste the Base 64 encoded blob in the + * This page is to install the certificate in the internal token. The user can + * import the cert from the file, paste the Base 64 encoded blob in the * text area or get the cert from the CMS where the request was sent. * * @author Christine Ho @@ -53,14 +53,14 @@ class WIPasteCertPage extends WizardBasePanel implements IWizardPanel { protected String mHelpIndex; protected Color mActiveColor; protected JTextArea introLbl; - + protected JTextField mHostText, mPortText, mRIDText; protected JLabel mHostLbl, mPortLbl, mRIDLbl; protected String mHost, mPort, mRID; protected JLabel mSSLText; protected JCheckBox mSSL; // ssl or not protected JLabel mQueryText; - protected JRadioButton mQueryBtn; + protected JRadioButton mQueryBtn; public static final int MAX_PORT = 65535; public static final int MIN_PORT = 1; @@ -88,7 +88,7 @@ class WIPasteCertPage extends WizardBasePanel implements IWizardPanel { String port = wizardInfo.getCMEEPort(); if (port != null && !port.equals("")) mPortText.setText(port); - + String portType = wizardInfo.getCMEEType(); if (portType != null && portType.equals("http")) mSSL.setSelected(false); @@ -98,7 +98,7 @@ class WIPasteCertPage extends WizardBasePanel implements IWizardPanel { mRIDText.setText(rid); setBorder(makeTitledBorder(mPanelName)); - return true; + return true; } public boolean validatePanel() { @@ -176,7 +176,7 @@ class WIPasteCertPage extends WizardBasePanel implements IWizardPanel { if (mHost != null && !mHost.equals("")) wizardInfo.setCMHost(mHost); if (mPort != null && !mPort.equals("")) - wizardInfo.setCMEEPort(mPort); + wizardInfo.setCMEEPort(mPort); if (mSSL.isSelected()) wizardInfo.setCMEEType("https"); else @@ -191,11 +191,11 @@ class WIPasteCertPage extends WizardBasePanel implements IWizardPanel { data1.put("importCert", "true"); data1.put("requestId", mRID); */ - + startProgressStatus(); boolean ready = send(mHost, Integer.parseInt(mPort), "/checkRequest", rawData1, wizardInfo); - + endProgressStatus(); if (!ready) { @@ -262,7 +262,7 @@ class WIPasteCertPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE, COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(introLbl, gbc); - + mFileBtn = makeJRadioButton("FILE", true); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -302,7 +302,7 @@ class WIPasteCertPage extends WizardBasePanel implements IWizardPanel { add(desc, gbc); mBase64Text = new JTextArea(null, null, 6, 10); - JScrollPane scrollPane = new JScrollPane(mBase64Text, + JScrollPane scrollPane = new JScrollPane(mBase64Text, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); scrollPane.setPreferredSize(new Dimension(30, 50)); @@ -425,7 +425,7 @@ class WIPasteCertPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(label, gbc); - + ButtonGroup buttonGrp = new ButtonGroup(); buttonGrp.add(mFileBtn); buttonGrp.add(mBase64Btn); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteOCSPCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteOCSPCertPage.java index 783d87da7..732227722 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteOCSPCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteOCSPCertPage.java @@ -50,7 +50,7 @@ class WIPasteOCSPCertPage extends WIPasteCertPage { if (wizardInfo.isCloning() && wizardInfo.isOCSPCloningDone()) return false; - if (wizardInfo.isOCSPCertLocalCA() || !wizardInfo.isInstallCertNow() + if (wizardInfo.isOCSPCertLocalCA() || !wizardInfo.isInstallCertNow() || !wizardInfo.isOCSPInstalled() || wizardInfo.isOCSPCertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteRACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteRACertPage.java index 584c375d4..2cf556b50 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteRACertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteRACertPage.java @@ -48,7 +48,7 @@ class WIPasteRACertPage extends WIPasteCertPage { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; if (wizardInfo.isCloning() && wizardInfo.isRACloningDone()) return false; - if (wizardInfo.isRACertLocalCA() || !wizardInfo.isInstallCertNow() + if (wizardInfo.isRACertLocalCA() || !wizardInfo.isInstallCertNow() || !wizardInfo.isRAInstalled() || wizardInfo.isRACertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertDNPage.java index 788fab869..ba1c8913c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertDNPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertDNPage.java @@ -21,7 +21,7 @@ import com.netscape.admin.certsrv.wizard.*; import javax.swing.*; /** - * Subject DN page for RA signing certificate + * Subject DN page for RA signing certificate * * @author Christine Ho * @version $Revision$, $Date$ @@ -81,6 +81,6 @@ class WIRACertDNPage extends WICertDNPage { str = mCText.getText().trim(); wizardInfo.setRACComp(str); } - + } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertExtensionPage.java index 85553c5c7..2f38795f2 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertExtensionPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertExtensionPage.java @@ -54,11 +54,11 @@ class WIRACertExtensionPage extends WICertExtensionPage { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; if (wizardInfo.isCloning() && wizardInfo.isRACloningDone()) return false; - if (!wizardInfo.isRAInstalled() || + if (!wizardInfo.isRAInstalled() || wizardInfo.isRALocalCertDone() || wizardInfo.isRACertRequestDone() || wizardInfo.isRACertInstalledDone()) return false; - + if (!mModified) { mAKICheckBox.setSelected(true); mExtendedKeyCheckBox.setSelected(true); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertSubmitPage.java index 771aa51b3..366b4f8e9 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertSubmitPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertSubmitPage.java @@ -49,7 +49,7 @@ class WIRACertSubmitPage extends WICertSubmitPage implements IWizardPanel { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; if (wizardInfo.isCloning() && wizardInfo.isRACloningDone()) return false; - wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, + wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_RA_SIGNING_CERT); if (!wizardInfo.isRAInstalled() || wizardInfo.isRACertRequestDone() || wizardInfo.isRACertInstalledDone() || diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertValidityPage.java index fec7619df..62a0c1a8c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertValidityPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertValidityPage.java @@ -38,7 +38,7 @@ class WIRACertValidityPage extends WICertValidityPage { private static final String PANELNAME = "INSTALLRACERTVALIDWIZARD"; private static final String RAHELPINDEX = "install-racert-validity-wizard-help"; private static final String RAKRAHELPINDEX = "install-rakracert-validity-wizard-help"; - + WIRACertValidityPage(JDialog parent) { super(PANELNAME); mParent = parent; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java index 9abb9e0ac..619f40593 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java @@ -38,9 +38,9 @@ import com.netscape.admin.certsrv.config.*; */ class WIRAKeyPage extends WIKeyPage implements IWizardPanel { private static final String PANELNAME = "INSTALLRAKEYWIZARD"; - private static final String RAHELPINDEX = + private static final String RAHELPINDEX = "install-rakey-configuration-wizard-help"; - private static final String RAKRAHELPINDEX = + private static final String RAKRAHELPINDEX = "install-rakrakey-configuration-wizard-help"; WIRAKeyPage(JDialog parent) { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRAMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRAMessageDigestPage.java index ef843ba37..af069d5f2 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRAMessageDigestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRAMessageDigestPage.java @@ -41,7 +41,7 @@ import com.netscape.management.client.util.*; * @see com.netscape.admin.certsrv.config.install */ class WIRAMessageDigestPage extends WMessageDigestPage { - + private static final String PANELNAME = "INSTALLRAMESSAGEDIGESTWIZARD"; WIRAMessageDigestPage(JDialog parent) { @@ -66,12 +66,12 @@ class WIRAMessageDigestPage extends WMessageDigestPage { mCAKeyType = wizardInfo.getCAKeyType(); - return super.initializePanel(info); + return super.initializePanel(info); } public void getUpdateInfo(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - if (mDSAHashTypeBox.isVisible()) + if (mDSAHashTypeBox.isVisible()) wizardInfo.setHashType((String)mDSAHashTypeBox.getSelectedItem()); else wizardInfo.setHashType((String)mRSAHashTypeBox.getSelectedItem()); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRecreateDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRecreateDBPage.java index f07de3134..58277732f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRecreateDBPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRecreateDBPage.java @@ -39,9 +39,9 @@ class WIRecreateDBPage extends WizardBasePanel implements IWizardPanel { protected JRadioButton mNo; protected JTextArea mLabel; private static final String PANELNAME = "INSTALLDBAGAIN"; - private static final String HELPINDEX = + private static final String HELPINDEX = "install-internaldb-createdbagain-help"; - + WIRecreateDBPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -65,9 +65,9 @@ class WIRecreateDBPage extends WizardBasePanel implements IWizardPanel { return false; if (wizardInfo.isDBCreated()) { setBorder(makeTitledBorder(PANELNAME)); - return true; + return true; } - + return false; } @@ -93,7 +93,7 @@ class WIRecreateDBPage extends WizardBasePanel implements IWizardPanel { PANELNAME+"_TEXT_HEADING_LABEL")); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mLabel, gbc); @@ -101,7 +101,7 @@ class WIRecreateDBPage extends WizardBasePanel implements IWizardPanel { mYes = makeJRadioButton("YES", false); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mYes, gbc); @@ -109,7 +109,7 @@ class WIRecreateDBPage extends WizardBasePanel implements IWizardPanel { mNo = makeJRadioButton("NO", true); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(0,COMPONENT_SPACE, + gbc.insets = new Insets(0,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mNo, gbc); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteCASubsystem.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteCASubsystem.java index 890c8ce4b..abfa468a9 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteCASubsystem.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteCASubsystem.java @@ -71,7 +71,7 @@ class WIRemoteCASubsystem extends WizardBasePanel implements IWizardPanel { return false; if (wizardInfo.isRAInstalled() && !wizardInfo.isCAInstalled()) { setBorder(makeTitledBorder(PANELNAME)); - if (wizardInfo.isKRAInstalled()) + if (wizardInfo.isKRAInstalled()) mHelpIndex = RAKRAHELPINDEX; else mHelpIndex = RAHELPINDEX; @@ -116,8 +116,8 @@ class WIRemoteCASubsystem extends WizardBasePanel implements IWizardPanel { public boolean concludePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; wizardInfo.setCMHost(mHost); - wizardInfo.setCMPort(mPort); - wizardInfo.setCMTimeout(mTimeout); + wizardInfo.setCMPort(mPort); + wizardInfo.setCMTimeout(mTimeout); if ((wizardInfo.isCAInstalled() || wizardInfo.isRAInstalled()) && !wizardInfo.isKRAInstalled()) { @@ -180,9 +180,9 @@ class WIRemoteCASubsystem extends WizardBasePanel implements IWizardPanel { startProgressStatus(); CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CONFIGDB"); - + boolean ready = configCertCgi.configCert(data); - + dlg.setVisible(false); endProgressStatus(); @@ -273,7 +273,7 @@ class WIRemoteCASubsystem extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE); add(timeunitLbl, gbc); */ - + JLabel label = new JLabel(" "); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.WEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteKRASubsystem.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteKRASubsystem.java index 29beb04af..9014a23a0 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteKRASubsystem.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteKRASubsystem.java @@ -71,7 +71,7 @@ class WIRemoteKRASubsystem extends WizardBasePanel implements IWizardPanel { mWizardInfo = wizardInfo; if (wizardInfo.isServicesDone()) return false; - if ((wizardInfo.isCAInstalled() || wizardInfo.isRAInstalled()) + if ((wizardInfo.isCAInstalled() || wizardInfo.isRAInstalled()) && !wizardInfo.isKRAInstalled()) { setBorder(makeTitledBorder(PANELNAME)); if (mYes.isSelected()) @@ -124,8 +124,8 @@ class WIRemoteKRASubsystem extends WizardBasePanel implements IWizardPanel { public boolean concludePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; wizardInfo.setDRMHost(mHost); - wizardInfo.setDRMPort(mPort); - wizardInfo.setDRMTimeout(mTimeout); + wizardInfo.setDRMPort(mPort); + wizardInfo.setDRMTimeout(mTimeout); ConsoleInfo consoleInfo = wizardInfo.getAdminConsoleInfo(); CMSConfigCert configCertCgi = new CMSConfigCert(); configCertCgi.initialize(wizardInfo); @@ -180,11 +180,11 @@ class WIRemoteKRASubsystem extends WizardBasePanel implements IWizardPanel { data.put(ConfigConstants.KRA_HOST, wizardInfo.getDRMHost()); data.put(ConfigConstants.KRA_PORT, wizardInfo.getDRMPort()); data.put(ConfigConstants.KRA_TIMEOUT, wizardInfo.getDRMTimeout()); - data.put(ConfigConstants.REMOTE_KRA_ENABLED, + data.put(ConfigConstants.REMOTE_KRA_ENABLED, ConfigConstants.TRUE); wizardInfo.enableRemoteDRM(ConfigConstants.TRUE); - } else { - data.put(ConfigConstants.REMOTE_KRA_ENABLED, + } else { + data.put(ConfigConstants.REMOTE_KRA_ENABLED, ConfigConstants.FALSE); wizardInfo.enableRemoteDRM(ConfigConstants.FALSE); } @@ -196,7 +196,7 @@ class WIRemoteKRASubsystem extends WizardBasePanel implements IWizardPanel { CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CONFIGDB"); boolean ready = configCertCgi.configCert(data); dlg.setVisible(false); - + endProgressStatus(); if (!ready) { @@ -322,7 +322,7 @@ class WIRemoteKRASubsystem extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE); add(mTimeunitLbl, gbc); */ - + JLabel label = new JLabel(" "); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.WEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIReplAgreementPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIReplAgreementPage.java index df9bb1ab0..daf48f5d8 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIReplAgreementPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIReplAgreementPage.java @@ -70,7 +70,7 @@ class WIReplAgreementPage extends WizardBasePanel implements IWizardPanel { enableAgreement(mEnable.isSelected()); } } - + private void enableAgreement(boolean e) { Color c; if (e) { @@ -108,13 +108,13 @@ class WIReplAgreementPage extends WizardBasePanel implements IWizardPanel { setBorder(makeTitledBorder(PANELNAME)); mAgreementText1.setText("masterToconsumer"); mAgreementText2.setText("consumerTomaster"); - return true; + return true; } return false; } public boolean validatePanel() { - if (!mEnable.isSelected()) + if (!mEnable.isSelected()) return true; String passwd1 = mManagerPwd1.getText().trim(); String passwdAgain1 = mManagerPwdAgain1.getText().trim(); @@ -124,7 +124,7 @@ class WIReplAgreementPage extends WizardBasePanel implements IWizardPanel { setErrorMessage("EMPTYPASSWORD"); return false; } - + if (!passwdAgain1.equals(passwd1)) { setErrorMessage("NOTSAMEPASSWORD"); return false; @@ -138,12 +138,12 @@ class WIReplAgreementPage extends WizardBasePanel implements IWizardPanel { String passwd2 = mManagerPwd2.getText().trim(); String passwdAgain2 = mManagerPwdAgain2.getText().trim(); String name2 = mAgreementText2.getText().trim(); - + if (passwd2.equals("") || passwdAgain2.equals("")) { setErrorMessage("EMPTYPASSWORD"); return false; } - + if (!passwdAgain2.equals(passwd2)) { setErrorMessage("NOTSAMEPASSWORD"); return false; @@ -177,7 +177,7 @@ class WIReplAgreementPage extends WizardBasePanel implements IWizardPanel { startProgressStatus(); /* - CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, + CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CREATEREPLICATIONAGREEMENT"); */ ready = send(rawData, wizardInfo); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRequestResultPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRequestResultPage.java index e3f9c53f3..cd3aa83eb 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRequestResultPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRequestResultPage.java @@ -46,7 +46,7 @@ public class WIRequestResultPage extends WizardBasePanel implements IWizardPanel protected String mHelpIndex = HELPINDEX; protected JTextArea mDesc; protected boolean print2RequestIDs = false; - + protected String mRequestId; WIRequestResultPage(JDialog parent) { @@ -77,7 +77,7 @@ public class WIRequestResultPage extends WizardBasePanel implements IWizardPanel String status = wizardInfo.getX509RequestStatus(); String str = wizardInfo.getX509RequestID(); String error = wizardInfo.getX509RequestError(); - + if (str != null && !str.equals("")) { if (status != null && status.equals(Constants.PR_REQUEST_REJECTED)) { // rejected @@ -92,10 +92,10 @@ public class WIRequestResultPage extends WizardBasePanel implements IWizardPanel } else if (error != null && !error.equals("")) mDesc.setText(error); else - mDesc.setText(mResource.getString(mPanelName+"_TEXT_DESC_LABEL") + + mDesc.setText(mResource.getString(mPanelName+"_TEXT_DESC_LABEL") + mResource.getString(mPanelName+"_TEXT_NOID_LABEL")); - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WISMTPPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WISMTPPage.java index 3b7ba9d00..26b7bf0c1 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WISMTPPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WISMTPPage.java @@ -36,14 +36,14 @@ class WISMTPPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "SMTPWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WISMTPPage() { super(PANELNAME); init(); } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean isLastPage() { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WISSLMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WISSLMessageDigestPage.java index 820c17646..6323127c6 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WISSLMessageDigestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WISSLMessageDigestPage.java @@ -41,7 +41,7 @@ import com.netscape.management.client.util.*; * @see com.netscape.admin.certsrv.config.install */ class WISSLMessageDigestPage extends WMessageDigestPage { - + private static final String PANELNAME = "INSTALLSSLMESSAGEDIGESTWIZARD"; WISSLMessageDigestPage(JDialog parent) { @@ -66,12 +66,12 @@ class WISSLMessageDigestPage extends WMessageDigestPage { mCAKeyType = wizardInfo.getCAKeyType(); - return super.initializePanel(info); + return super.initializePanel(info); } public void getUpdateInfo(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - if (mDSAHashTypeBox.isVisible()) + if (mDSAHashTypeBox.isVisible()) wizardInfo.setHashType((String)mDSAHashTypeBox.getSelectedItem()); else wizardInfo.setHashType((String)mRSAHashTypeBox.getSelectedItem()); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertDNPage.java index b6ee85acc..4d10dbcf6 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertDNPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertDNPage.java @@ -21,7 +21,7 @@ import com.netscape.admin.certsrv.wizard.*; import javax.swing.*; /** - * Subject DN page for SSL server certificate + * Subject DN page for SSL server certificate * * @author Christine Ho * @version $Revision$, $Date$ @@ -64,7 +64,7 @@ class WIServerCertDNPage extends WICertDNPage { CComp = wizardInfo.getRACComp(); } */ - + String OUComp = wizardInfo.getOUComponent(); String OComp = wizardInfo.getOComponent(); String LComp = wizardInfo.getLComponent(); @@ -94,7 +94,7 @@ class WIServerCertDNPage extends WICertDNPage { wizardInfo.setSSLSubjectName(str); populateDN(str); - if (wizardInfo.isSSLCertLocalCA()) + if (wizardInfo.isSSLCertLocalCA()) mHelpIndex = LOCALHELPINDEX; else mHelpIndex = REMOTEHELPINDEX; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertExtensionPage.java index f958c88a1..23f87205c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertExtensionPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertExtensionPage.java @@ -55,7 +55,7 @@ class WIServerCertExtensionPage extends WICertExtensionPage { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; if (wizardInfo.isCloning()) return false; - if (wizardInfo.isMigrationEnable() || + if (wizardInfo.isMigrationEnable() || wizardInfo.isSSLLocalCertDone() || wizardInfo.isSSLCertRequestDone() || wizardInfo.isSSLCertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertSubmitPage.java index 417e706a5..4bf8550db 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertSubmitPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertSubmitPage.java @@ -49,14 +49,14 @@ class WIServerCertSubmitPage extends WICertSubmitPage implements IWizardPanel { public boolean initializePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, + wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_SERVER_CERT); if (wizardInfo.isCloning()) return false; - if (wizardInfo.isMigrationEnable() || - wizardInfo.isSSLCertRequestDone() || wizardInfo.isSSLCertInstalledDone() || + if (wizardInfo.isMigrationEnable() || + wizardInfo.isSSLCertRequestDone() || wizardInfo.isSSLCertInstalledDone() || !wizardInfo.isCAInstalled()) { wizardInfo.setSSLCertLocalCA(Constants.FALSE); return false; @@ -68,7 +68,7 @@ class WIServerCertSubmitPage extends WICertSubmitPage implements IWizardPanel { if (wizardInfo.isCAInstalled() && wizardInfo.isKRAInstalled()) { if (wizardInfo.isSSLCertLocalCA()) { mHelpIndex = CAKRALOCALHELPINDEX; - } else + } else mHelpIndex = CAKRAREMOTEHELPINDEX; } else if (wizardInfo.isSSLCertLocalCA()) { mHelpIndex = CALOCALHELPINDEX; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertValidityPage.java index 047b9d7e8..d4513c156 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertValidityPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertValidityPage.java @@ -37,7 +37,7 @@ import com.netscape.admin.certsrv.config.*; class WIServerCertValidityPage extends WICertValidityPage { private static final String PANELNAME = "INSTALLSERVERCERTVALIDWIZARD"; private static final String HELPINDEX = "install-sslcert-validity-wizard-help"; - + WIServerCertValidityPage(JDialog parent) { super(PANELNAME); mHelpIndex = HELPINDEX; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java index c14d0d2b3..dcf93aa83 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java @@ -38,9 +38,9 @@ import com.netscape.admin.certsrv.config.*; */ class WIServerKeyPage extends WIKeyPage implements IWizardPanel { private static final String PANELNAME = "INSTALLSERVERKEYWIZARD"; - private static final String LOCALHELPINDEX = + private static final String LOCALHELPINDEX = "install-serverkeylocal-configuration-wizard-help"; - private static final String REMOTEHELPINDEX = + private static final String REMOTEHELPINDEX = "install-serverkeysub-configuration-wizard-help"; WIServerKeyPage(JDialog parent) { @@ -77,7 +77,7 @@ class WIServerKeyPage extends WIKeyPage implements IWizardPanel { if (mWizardInfo.isSSLCertLocalCA()) mHelpIndex = LOCALHELPINDEX; - else + else mHelpIndex = REMOTEHELPINDEX; enableFields(); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIServicesPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServicesPage.java index fb524e62f..a9a56cc8e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIServicesPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServicesPage.java @@ -50,7 +50,7 @@ class WIServicesPage extends WizardBasePanel implements IWizardPanel { "install-services-configuration-wizard-help"; private String mClonedSubsystem = null; - + WIServicesPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -116,19 +116,19 @@ class WIServicesPage extends WizardBasePanel implements IWizardPanel { mOCSPCheckBox.setSelected(true); } else - mOCSPCheckBox.setEnabled(false); + mOCSPCheckBox.setEnabled(false); } - + Debug.println("WIServicesPage: initializePanel."); - Debug.println("WIServicesPage: mClonedSubsystem " + mClonedSubsystem); + Debug.println("WIServicesPage: mClonedSubsystem " + mClonedSubsystem); if (wizardInfo.isServicesDone()) return false; - setBorder(makeTitledBorder(PANELNAME)); + setBorder(makeTitledBorder(PANELNAME)); String subsystemList = wizardInfo.getSubsystems(); if (subsystemList == null || subsystemList.equals("")) { if (!mRACheckBox.isSelected() && mClonedSubsystem == null) @@ -169,7 +169,7 @@ class WIServicesPage extends WizardBasePanel implements IWizardPanel { start = end+1; } while( start < subsystemList.length() ); - return true; + return true; } public boolean validatePanel() { @@ -261,7 +261,7 @@ class WIServicesPage extends WizardBasePanel implements IWizardPanel { ConfigConstants.FALSE; wizardInfo.enableRemoteDRM(ConfigConstants.FALSE); startProgressStatus(); - + //CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CREATESUB"); boolean ready = send(rawData, wizardInfo); //dlg.setVisible(false); @@ -341,7 +341,7 @@ class WIServicesPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mServiceLbl, gbc); - + mCACheckBox = makeJRadioButton("CA"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -387,7 +387,7 @@ class WIServicesPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mTKSCheckBox, gbc); - + JLabel dummy = new JLabel(" "); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -407,7 +407,7 @@ class WIServicesPage extends WizardBasePanel implements IWizardPanel { wizardInfo.setInstalledCA(ConfigConstants.FALSE); if (mRACheckBox.isSelected()) wizardInfo.setInstalledRA(ConfigConstants.TRUE); - else + else wizardInfo.setInstalledRA(ConfigConstants.FALSE); if (mKRACheckBox.isSelected()) wizardInfo.setInstalledKRA(ConfigConstants.TRUE); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WISingleSignonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WISingleSignonPage.java index 49e06ac1e..3241ca98e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WISingleSignonPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WISingleSignonPage.java @@ -69,7 +69,7 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl protected String mSection = ""; protected String mErrorMsg = ""; private ConsoleInfo _consoleInfo = null; - + WISingleSignonPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -92,7 +92,7 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl String tokenList = wizardInfo.getTokensList(); StringTokenizer st1 = new StringTokenizer(tokenList, ":"); - + mTokenBox.removeAllItems(); while (st1.hasMoreElements()) { String t1 = (String)st1.nextElement(); @@ -116,7 +116,7 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl capassword = ""; ca = false; } - + if (wizardInfo.isRAInstalled()) { tokenname = wizardInfo.getRATokenName(); password = (String)wizardInfo.get("TOKEN:"+tokenname); @@ -153,7 +153,7 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl sslpassword = password; } setBorder(makeTitledBorder(PANELNAME)); - return true; + return true; } public boolean validatePanel() { @@ -351,25 +351,25 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl rawData = rawData+"&"+tokenname+"="+capassword; tags = tags+":"+tokenname; } - + if (!rapassword.equals("")) { tokenname = wizardInfo.getRATokenName(); rawData = rawData+"&"+tokenname+"="+rapassword; tags = tags+":"+tokenname; } - + if (!krapassword.equals("")) { tokenname = wizardInfo.getKRATokenName(); rawData = rawData+"&"+tokenname+"="+krapassword; tags = tags+":"+tokenname; } - + if (!sslpassword.equals("")) { tokenname = wizardInfo.getSSLTokenName(); rawData = rawData+"&"+tokenname+"="+sslpassword; tags = tags+":"+tokenname; } - + if (mPasswordConf.isSelected()) { rawData = rawData+"&"+ConfigConstants.PR_DELETE_PASSWD_CONF+"="+ ConfigConstants.TRUE; @@ -379,17 +379,17 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl } rawData = rawData+"&"+ConfigConstants.PR_SINGLE_SIGNON_PW_TAGS+"="+tags; //data.put(ConfigConstants.PR_SINGLE_SIGNON, ConfigConstants.FALSE); - + startProgressStatus(); //CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CREATESSON"); - + // boolean ready = send(rawData, wizardInfo); boolean ready = true; if (ready) { rawData = ConfigConstants.TASKID+"="+TaskId.TASK_MISCELLANEOUS; /* - data.put(ConfigConstants.PR_ADMIN_PASSWD, + data.put(ConfigConstants.PR_ADMIN_PASSWD, (String)consoleInfo.get(ConfigConstants.PR_ADMIN_PASSWD)); */ ready = send(rawData, wizardInfo); @@ -402,7 +402,7 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl } else setErrorMessage(str); //dlg.setVisible(false); - + endProgressStatus(); return false; } @@ -410,7 +410,7 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl //startServer(wizardInfo); //dlg.setVisible(false); - + endProgressStatus(); if (!ready) { @@ -458,7 +458,7 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl gbc.weightx = 1.0; gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); - add(panel1, gbc); + add(panel1, gbc); */ JTextArea heading = createTextArea(mResource.getString( @@ -494,7 +494,7 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl gbc.weightx = 1.0; gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, 0, 0); add(dum, gbc); - + JTextArea passwordConfText = createTextArea(mResource.getString( PANELNAME+"_TEXT_PASSWDCONF_LABEL")); CMSAdminUtil.resetGBC(gbc); @@ -506,7 +506,7 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl gbc.gridwidth = gbc.REMAINDER; add(passwordConfText, gbc); - mPasswordConf = makeJCheckBox("PASSWDCONF"); + mPasswordConf = makeJCheckBox("PASSWDCONF"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WITokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WITokenLogonPage.java index b3ecdbf5a..5be9c09af 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WITokenLogonPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WITokenLogonPage.java @@ -29,7 +29,7 @@ import com.netscape.admin.certsrv.task.*; import com.netscape.management.client.console.*; /** - * This panel asks for the information of the current internal database. + * This panel asks for the information of the current internal database. * * @author Christine Ho * @version $Revision$, $Date$ @@ -78,7 +78,7 @@ class WITokenLogonPage extends WizardBasePanel implements IWizardPanel { } index++; } - + if (inits.equals(Constants.FALSE)) { mDesc.setText(mResource.getString(mPanelName+"_TEXT_INIT_LABEL")); enableFields(mPasswordAgainLabel, mPasswordAgainText, true, mActiveColor); @@ -92,7 +92,7 @@ class WITokenLogonPage extends WizardBasePanel implements IWizardPanel { mTokenText.setBackground(getBackground()); CMSAdminUtil.repaintComp(mTokenText); - return true; + return true; } public boolean validatePanel() { @@ -204,7 +204,7 @@ class WITokenLogonPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(passwordLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mPasswordText = makeJPasswordField(30); gbc.anchor = gbc.NORTHWEST; @@ -222,7 +222,7 @@ class WITokenLogonPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mPasswordAgainLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mPasswordAgainText = makeJPasswordField(30); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WITrustDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WITrustDBPage.java index cd19963ff..8f6d449b5 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WITrustDBPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WITrustDBPage.java @@ -37,7 +37,7 @@ class WITrustDBPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "TRUSTDBWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WITrustDBPage() { super(PANELNAME); init(); @@ -48,7 +48,7 @@ class WITrustDBPage extends WizardBasePanel implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { @@ -88,7 +88,7 @@ class WITrustDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(passwdLbl, gbc); - + mPassword = makeJPasswordField(20); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -104,7 +104,7 @@ class WITrustDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(dummy, gbc); - + JLabel passwdAgainLbl = makeJLabel("PASSWDAGAIN"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHEAST; diff --git a/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java b/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java index acb023132..090b16e1d 100644 --- a/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java +++ b/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java @@ -45,7 +45,7 @@ public class AdminConnection { *==========================================================*/ public static int NO_TIMEOUT = 0; public static int DEFAULT_TIMEOUT = 600000; //600 sec - + private IConnectionFactory mFactory= null; private IConnection mConn = null; private IAuthenticator mAuth = null; @@ -80,7 +80,7 @@ public class AdminConnection { IConnectionFactory factory, String host, int port, String path) { if (mPM == null) { - mPM = new FilePreferenceManager(Framework.IDENTIFIER, + mPM = new FilePreferenceManager(Framework.IDENTIFIER, Framework.VERSION); } Preferences p = mPM.getPreferences( @@ -88,7 +88,7 @@ public class AdminConnection { int timeout = p.getInt("CMSConnTimeout", 600000); setDefaultTimeout(timeout); setCurrentTimeout(timeout); - Debug.println("AdminConnection: " + timeout + " " + + Debug.println("AdminConnection: " + timeout + " " + mPM.getClass().getName()); mAuth = auth; @@ -117,7 +117,7 @@ public class AdminConnection { boolean enableKeepAlive, String host, int port, String path) { if (mPM == null) { - mPM = new FilePreferenceManager(Framework.IDENTIFIER, + mPM = new FilePreferenceManager(Framework.IDENTIFIER, Framework.VERSION); } Preferences p = mPM.getPreferences( @@ -125,7 +125,7 @@ public class AdminConnection { int timeout = p.getInt("CMSConnTimeout", 600000); setDefaultTimeout(timeout); setCurrentTimeout(timeout); - Debug.println("AdminConnection: " + timeout + " " + + Debug.println("AdminConnection: " + timeout + " " + mPM.getClass().getName()); mAuth = auth; @@ -172,14 +172,14 @@ public class AdminConnection { b64.append('\n'); return b64.toString(); - } + } /*========================================================== * public methods *==========================================================*/ /** - * Set the listener. + * Set the listener. */ public void setConnectionListener(IConnectionListener l) { mConnectionListener = l; @@ -217,7 +217,7 @@ public class AdminConnection { * @param timeout time in ms */ public void setCurrentTimeout(int timeout) { - mCurrentTimeout = timeout; + mCurrentTimeout = timeout; } @@ -514,7 +514,7 @@ public class AdminConnection { throw new EAdminException(response.getErrorMessage(), true); } - public void validate(String dest, String scope, NameValuePairs pairs) + public void validate(String dest, String scope, NameValuePairs pairs) throws EAdminException { Request request = new Request(mPath + "/" + dest); request.set(Constants.OP_TYPE, OpDef.OP_VALIDATE); @@ -577,7 +577,7 @@ public class AdminConnection { return; } else if (response.getReturnCode() == Response.RESTART) { mConnectionListener.restartCallback(); - return; + return; } throw new EAdminException(response.getErrorMessage(), true); } @@ -661,17 +661,17 @@ public class AdminConnection { } try { - return processRequest(request, useGET); + return processRequest(request, useGET); //all errors will set the connection to null //to force re-connection and avoid null ptr exception } catch (Exception e) { retryConnection(); - + try { return processRequest(request, useGET); } catch (InterruptedIOException ex) { - + //timeout occurred mConn = null; @@ -681,7 +681,7 @@ public class AdminConnection { } catch (SocketException ex) { mConn = null; throw new EAdminException(CMSAdminResources.SERVER_UNREACHABLE, false); - } catch (IOException ex) { + } catch (IOException ex) { if (Debug.isEnabled()) { ex.printStackTrace(); } @@ -736,12 +736,12 @@ public class AdminConnection { } sb.append("Content-length: " + sb1.toString().length() + "\n"); } - + sb.append("Pragma: no-cache\n"); if (mIsKeepAlive) { sb.append("Connection: Keep-Alive\n"); } - + if (mAuthType.equals("") || mAuthType.equals("pwd")) { BasicAuthenticator auth = (BasicAuthenticator)mAuth; // sun.misc.BASE64Encoder encoder = new sun.misc.BASE64Encoder(); @@ -761,7 +761,7 @@ public class AdminConnection { sb.append(sb1.toString()); } //Debug.println(sb.toString()); - + //System.out.println("AdminConnection: sendRequest() - sending"); int timeout = mDefaultTimeout; if (mCurrentTimeout > mDefaultTimeout) @@ -770,18 +770,18 @@ public class AdminConnection { mConn.sendRequest(sb.toString()); Response resp = new Response(mConn.getResponse()); - + if (!mIsKeepAlive) { mConn.disconnect(); mConn = null; } - + //set time out back to original mConn.setSoTimeout(mDefaultTimeout); mCurrentTimeout = mDefaultTimeout; return resp; } - + private void checkParams(String dest,String scope,String id) { NameValuePairs pairs = new NameValuePairs(); diff --git a/base/console/src/com/netscape/admin/certsrv/connection/BasicAuthenticator.java b/base/console/src/com/netscape/admin/certsrv/connection/BasicAuthenticator.java index 1d3796968..f0c7d5f0e 100644 --- a/base/console/src/com/netscape/admin/certsrv/connection/BasicAuthenticator.java +++ b/base/console/src/com/netscape/admin/certsrv/connection/BasicAuthenticator.java @@ -39,7 +39,7 @@ public class BasicAuthenticator implements IAuthenticator { public String getUserid() { return mUserid; } - + public String getPassword() { return mPassword; } @@ -47,7 +47,7 @@ public class BasicAuthenticator implements IAuthenticator { public void setUserId(String userid) { mUserid = userid; } - + public void setPassword(String password) { mPassword = password; } diff --git a/base/console/src/com/netscape/admin/certsrv/connection/IConnection.java b/base/console/src/com/netscape/admin/certsrv/connection/IConnection.java index 0643e50eb..3e4f76c1b 100644 --- a/base/console/src/com/netscape/admin/certsrv/connection/IConnection.java +++ b/base/console/src/com/netscape/admin/certsrv/connection/IConnection.java @@ -45,11 +45,11 @@ public interface IConnection { * Close the connection */ public void disconnect(); - + /** * SetTimeout */ public void setSoTimeout(int timeout) throws SocketException; - - + + } diff --git a/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java b/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java index 27292b3d9..e606cd5c4 100644 --- a/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java +++ b/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java @@ -48,7 +48,7 @@ import java.awt.*; * @author Christine Ho * @version $Revision$, $Date$ */ -public class JSSConnection implements IConnection, SSLCertificateApprovalCallback, +public class JSSConnection implements IConnection, SSLCertificateApprovalCallback, SSLClientCertificateSelectionCallback { /*========================================================== @@ -92,7 +92,7 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac UtilConsoleGlobals.initJSS(); cf = UtilConsoleGlobals.getX509CertificateFactory(); try { - cryptoManager = CryptoManager.getInstance(); + cryptoManager = CryptoManager.getInstance(); } catch (Exception e) { } @@ -100,19 +100,19 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac // to get the ciphers SSLSocket.enableSSL2Default(false); SSLSocket.enableSSL3Default(true); - int TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA = 0xC005; - int TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA = 0xC00A; + int TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA = 0xC005; + int TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA = 0xC00A; int ciphers[] = SSLSocket.getImplementedCipherSuites(); for (int i = 0; ciphers != null && i < ciphers.length; i++) { // make sure SSLv2 ciphers are not enabled if ((ciphers[i] & 0xfff0) !=0xff00) { - Debug.println("JSSConnection Debug: non-SSL2 NSS Cipher Supported '0x" + - Integer.toHexString(ciphers[i]) + "'"); + Debug.println("JSSConnection Debug: non-SSL2 NSS Cipher Supported '0x" + + Integer.toHexString(ciphers[i]) + "'"); SSLSocket.setCipherPreferenceDefault(ciphers[i], true); } else { - Debug.println("JSSConnection Debug: SSL2 (turned off) NSS Cipher Supported '0x" + - Integer.toHexString(ciphers[i]) + "'"); + Debug.println("JSSConnection Debug: SSL2 (turned off) NSS Cipher Supported '0x" + + Integer.toHexString(ciphers[i]) + "'"); SSLSocket.setCipherPreferenceDefault(ciphers[i], false); } @@ -192,12 +192,12 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac if (!(promptForTrustDialog.isAcceptedForOneSession())) { try { String nickname = serverCert.getNickname(); - - CryptoToken internalToken = + + CryptoToken internalToken = cryptoManager.getInternalKeyStorageToken(); if (!internalToken.passwordIsInitialized()) { - InitPasswordDialog initPasswordDialog = + InitPasswordDialog initPasswordDialog = new InitPasswordDialog(internalToken); initPasswordDialog.setVisible(true); if (initPasswordDialog.isCancel()) { @@ -223,11 +223,11 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac mCertAccepted = false; return false; } - InternalCertificate internalCert = - cryptoManager.importCertToPerm(serverCert, + InternalCertificate internalCert = + cryptoManager.importCertToPerm(serverCert, (nickname==null)?serverCert.getSubjectDN().toString():nickname); internalCert.setSSLTrust( - org.mozilla.jss.crypto.InternalCertificate.TRUSTED_PEER | + org.mozilla.jss.crypto.InternalCertificate.TRUSTED_PEER | org.mozilla.jss.crypto.InternalCertificate.VALID_PEER); } catch (Exception e) { mServerCertImported = false; @@ -236,7 +236,7 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac e.printStackTrace(); } return false; - } + } } } @@ -258,7 +258,7 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac public boolean isClientAuth() { return mClientAuth; } - + public boolean isCertAccepted() { return mCertAccepted; } @@ -271,8 +271,8 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac return mServerCertImported; } - public String select(Vector nicknames) - { + public String select(Vector nicknames) + { selectCertDialog = null; mClientAuth = true; if (nicknames == null || nicknames.size() == 0) { @@ -312,11 +312,11 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac abort = true; throw new PasswordCallback.GiveUpException(); } - + return getPasswordDialog.getPassword(); } - public Password getPasswordAgain(PasswordCallbackInfo info) + public Password getPasswordAgain(PasswordCallbackInfo info) throws GiveUpException { @@ -445,9 +445,9 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac */ public void setSoTimeout(int timeout) throws SocketException { //System.out.println("JSSConnection: setSoTimeout() - "+timeout); - s.setSoTimeout(timeout); + s.setSoTimeout(timeout); } - + /*========================================================== * private methods *==========================================================*/ @@ -465,12 +465,12 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac readBody(); } - private int readLineFromStream(InputStream is, byte line[], + private int readLineFromStream(InputStream is, byte line[], int startpos, int len) throws IOException { //return is.readLine(line, startpos, len); int pos = startpos; int count = 0; - while (len > 0) + while (len > 0) { int nRead = httpIn.read(line, pos, 1); if (nRead == -1) @@ -581,7 +581,7 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac CryptoToken mToken; boolean tokenPasswdInit = true; boolean pwdSame = true; - + public InitPasswordDialog(CryptoToken token) { super(null,"",true, OK|CANCEL); setMinimumSize(300, 150); @@ -636,7 +636,7 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac mToken.initPassword(null, getPassword()); dispose(); } catch (Exception e) { - tokenPasswdInit = false; + tokenPasswdInit = false; } } @@ -653,7 +653,7 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac pwd.grabFocus(); super.setVisible(visible); } - + public Password getPassword() { Password jssPwd = new Password(pwd.getText().toCharArray()); return jssPwd; @@ -663,7 +663,7 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac class GetPasswordDialog extends AbstractDialog { MultilineLabel enterPwdLabel = new MultilineLabel(); - protected ResourceBundle mResource = + protected ResourceBundle mResource = ResourceBundle.getBundle(CMSAdminResources.class.getName()); SingleBytePasswordField pwd; public GetPasswordDialog() { @@ -694,7 +694,7 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac pwd.grabFocus(); super.setVisible(visible); } - + public void setPasswordInfo(PasswordCallbackInfo info, boolean getPwdAgain) { if (getPwdAgain) enterPwdLabel.setText(mResource.getString( @@ -756,6 +756,6 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac return certList.getSelectedItem().toString(); } - } + } } diff --git a/base/console/src/com/netscape/admin/certsrv/connection/PromptForTrustDialog.java b/base/console/src/com/netscape/admin/certsrv/connection/PromptForTrustDialog.java index 868eccc1b..59ce0eb33 100644 --- a/base/console/src/com/netscape/admin/certsrv/connection/PromptForTrustDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/connection/PromptForTrustDialog.java @@ -273,21 +273,21 @@ public class PromptForTrustDialog extends AbstractDialog implements SuiConstants private JPanel createActionButtons() { JPanel buttonPanel = new JPanel(); buttonPanel.setLayout(new GridBagLayout()); - + accept = JButtonFactory.create( mResource.getString("SSLCLIENT_TRUST_DIALOG_ACCEPT"), buttonActionListener, "ACCEPT"); accept.registerKeyboardAction(buttonActionListener, "ACCEPT", KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), JComponent.WHEN_IN_FOCUSED_WINDOW); - + JButton reject = JButtonFactory.create( mResource.getString("SSLCLIENT_TRUST_DIALOG_REJECT"), buttonActionListener, "REJECT"); reject.registerKeyboardAction(buttonActionListener, "REJECT", KeyStroke.getKeyStroke(KeyEvent.VK_R, 0), JComponent.WHEN_IN_FOCUSED_WINDOW); - + JButton viewCert = JButtonFactory.create( mResource.getString("SSLCLIENT_TRUST_DIALOG_VIEWCERT"), buttonActionListener, "VIEWCERT"); viewCert.registerKeyboardAction(buttonActionListener, "VIEWCERT", diff --git a/base/console/src/com/netscape/admin/certsrv/connection/Request.java b/base/console/src/com/netscape/admin/certsrv/connection/Request.java index 8ed61e998..eb134b5a3 100644 --- a/base/console/src/com/netscape/admin/certsrv/connection/Request.java +++ b/base/console/src/com/netscape/admin/certsrv/connection/Request.java @@ -22,7 +22,7 @@ import java.util.*; /** * A class represents a connection to certificate server. - * + * * @author thomask * @author Jack Pan-Chen * @version $Revision$, $Date$ @@ -30,10 +30,10 @@ import java.util.*; public class Request { private String mPrefix = null; - + //internal structure is changed to vector to maintain //the ordering - + private Vector mName = new Vector(); private Vector mValue = new Vector(); @@ -55,14 +55,14 @@ public class Request { try { return (String) mValue.elementAt(i); } catch (ArrayIndexOutOfBoundsException e) { - return ""; + return ""; } } public Enumeration getElements() { return mName.elements(); } - + public void removeAll() { mName.removeAllElements(); mValue.removeAllElements(); diff --git a/base/console/src/com/netscape/admin/certsrv/connection/Response.java b/base/console/src/com/netscape/admin/certsrv/connection/Response.java index bbb511443..57958a28b 100644 --- a/base/console/src/com/netscape/admin/certsrv/connection/Response.java +++ b/base/console/src/com/netscape/admin/certsrv/connection/Response.java @@ -39,10 +39,10 @@ public class Response { private int mRetcode; private String mErrorMsg; - + //internal structure is changed to vector to maintain //the ordering - + private Vector mName = new Vector(); private Vector mValue = new Vector(); @@ -70,7 +70,7 @@ public class Response { } if (mContents != null) { String resultStr = new String(mContents); - StringTokenizer st = new StringTokenizer(resultStr, + StringTokenizer st = new StringTokenizer(resultStr, "&"); while (st.hasMoreTokens()) { String p = st.nextToken(); @@ -86,12 +86,12 @@ public class Response { } } - public int getReturnCode() { - return mRetcode; + public int getReturnCode() { + return mRetcode; } - public String getErrorMessage() { - return mErrorMsg; + public String getErrorMessage() { + return mErrorMsg; } /** @@ -126,7 +126,7 @@ public class Response { try { value = (String) mValue.elementAt(i); } catch (ArrayIndexOutOfBoundsException e) { - value = ""; + value = ""; } return value; } diff --git a/base/console/src/com/netscape/admin/certsrv/connection/SSLConnectionFactory.java b/base/console/src/com/netscape/admin/certsrv/connection/SSLConnectionFactory.java index 7c74a239d..86f7b998e 100644 --- a/base/console/src/com/netscape/admin/certsrv/connection/SSLConnectionFactory.java +++ b/base/console/src/com/netscape/admin/certsrv/connection/SSLConnectionFactory.java @@ -74,7 +74,7 @@ public class SSLConnectionFactory implements IConnectionFactory { if (mType.equals(JSS_CONNECTION)) return new JSSConnection(host, port); - return new JSSConnection(host, port); + return new JSSConnection(host, port); //return new SSLConnection(host, port); } diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java b/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java index 81ffc2d0e..66a2b2bd4 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java @@ -215,10 +215,10 @@ public class CertSetupWizardInfo extends WizardInfo { return (String)get(Constants.PR_ISSUER_NAME); } - public String getSerialNumber() { + public String getSerialNumber() { return (String)get(Constants.PR_SERIAL_NUMBER); } - + public String getNotBefore() { return (String)get(Constants.PR_BEFORE_VALIDDATE); } @@ -306,7 +306,7 @@ public class CertSetupWizardInfo extends WizardInfo { public String getHashType() { return (String)get(ConfigConstants.PR_HASH_TYPE); } - + public void setHashType(String type) { put(ConfigConstants.PR_HASH_TYPE, type); } @@ -314,7 +314,7 @@ public class CertSetupWizardInfo extends WizardInfo { public String getSignedByType() { return (String)get(ConfigConstants.PR_SIGNEDBY_TYPE); } - + public void setSignedByType(String type) { put(ConfigConstants.PR_SIGNEDBY_TYPE, type); } diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java index fe5ebd2d7..3a1b9dd23 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java @@ -45,7 +45,7 @@ class WCACertRequest1Page extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "CACERTREQUESTWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WCACertRequest1Page() { super(PANELNAME); init(); @@ -59,7 +59,7 @@ class WCACertRequest1Page extends WizardBasePanel implements IWizardPanel { if (wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT)) return true; - return false; + return false; } public boolean validatePanel() { @@ -91,7 +91,7 @@ class WCACertRequest1Page extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(caLbl, gbc); - + mCABtn = makeJRadioButton("SELFSIGN", true); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -109,7 +109,7 @@ class WCACertRequest1Page extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mSubBtn, gbc); - + ButtonGroup caGroup = new ButtonGroup(); caGroup.add(mCABtn); caGroup.add(mSubBtn); @@ -196,7 +196,7 @@ class WCACertRequest1Page extends WizardBasePanel implements IWizardPanel { public void getUpdateInfo(WizardInfo info) { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; - + if (mCABtn.isSelected()) wizardInfo.addEntry(wizardInfo.CA_TYPE, wizardInfo.SELF_SIGNED); else if (mSubBtn.isSelected()) diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java index fe06a6313..c16e3268c 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java @@ -37,7 +37,7 @@ class WCAKeyPage extends WBaseKeyPage implements IWizardPanel { private static final String PANELNAME = "CAKEYWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WCAKeyPage() { super(PANELNAME); init(); @@ -49,7 +49,7 @@ class WCAKeyPage extends WBaseKeyPage implements IWizardPanel { // (wizardInfo.isNewKey())) return false; - return true; + return true; } public boolean validatePanel() { @@ -61,7 +61,7 @@ class WCAKeyPage extends WBaseKeyPage implements IWizardPanel { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; AdminConnection connection = wizardInfo.getAdminConnection(); NameValuePairs nvps = new NameValuePairs(); - + nvps.add(Constants.PR_TOKEN_NAME, wizardInfo.getTokenName()); nvps.add(Constants.PR_KEY_LENGTH, (String)mKeyLengthBox.getSelectedItem()); nvps.add(Constants.PR_KEY_TYPE, (String)mKeyTypeBox.getSelectedItem()); @@ -69,7 +69,7 @@ class WCAKeyPage extends WBaseKeyPage implements IWizardPanel { try { NameValuePairs response = connection.process( DestDef.DEST_SERVER_ADMIN, - ScopeDef.SC_CA_SIGNINGCERT, + ScopeDef.SC_CA_SIGNINGCERT, Constants.PR_CERT_REQUEST, nvps); } catch (EAdminException e) { showErrorDialog(e.toString()); @@ -94,7 +94,7 @@ class WCAKeyPage extends WBaseKeyPage implements IWizardPanel { public void getUpdateInfo(WizardInfo info) { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; - wizardInfo.addEntry(Constants.PR_KEY_LENGTH, + wizardInfo.addEntry(Constants.PR_KEY_LENGTH, (String)mKeyLengthBox.getSelectedItem()); wizardInfo.addEntry(Constants.PR_KEY_TYPE, (String)mKeyTypeBox.getSelectedItem()); diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java index 1c2268bb2..975a09c3d 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java @@ -39,7 +39,7 @@ class WCertDNPage extends WBaseDNPage implements IWizardPanel { "configuration-keycert-wizard-subjectdn-help"; private String certType = ""; - + WCertDNPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -98,7 +98,7 @@ class WCertDNPage extends WBaseDNPage implements IWizardPanel { //enableFields(true, mActiveColor); if (subjectName != null) populateDN(subjectName); - return true; + return true; } public boolean validatePanel() { @@ -118,7 +118,7 @@ class WCertDNPage extends WBaseDNPage implements IWizardPanel { } else { str = str2; } - + if (str.equals("")) { setErrorMessage("BLANKFIELD"); return false; @@ -135,7 +135,7 @@ class WCertDNPage extends WBaseDNPage implements IWizardPanel { wizardInfo.addEntry(Constants.PR_SUBJECT_NAME, str); try { - connection.validate(DestDef.DEST_SERVER_ADMIN, + connection.validate(DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_SUBJECT_NAME, nvps); } catch (EAdminException e) { //showErrorDialog(e.toString()); diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java index d6359cf6c..9a6d17ec8 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java @@ -37,7 +37,7 @@ class WCertDNValidityPage extends WBaseDNValidityPage implements IWizardPanel { private static final String PANELNAME = "CERTDNVALIDWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WCertDNValidityPage() { super(PANELNAME); init(); @@ -53,7 +53,7 @@ class WCertDNValidityPage extends WBaseDNValidityPage implements IWizardPanel { (wizardInfo.getCAType().equals(wizardInfo.SUBORDINATE_CA))) return false; - return true; + return true; } public boolean validatePanel() { @@ -62,7 +62,7 @@ class WCertDNValidityPage extends WBaseDNValidityPage implements IWizardPanel { public boolean concludePanel(WizardInfo info) { String str = mSubjectDNText.getText().trim(); - + if (str.equals("")) { setErrorMessage("BLANKFIELD"); return false; diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java index f7505be2e..8b71f6932 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java @@ -32,12 +32,12 @@ import com.netscape.admin.certsrv.config.*; * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.config.install */ -class WCertExtensionPage extends WBaseCertExtensionPage implements +class WCertExtensionPage extends WBaseCertExtensionPage implements IWizardPanel { private static final String PANELNAME = "CERTEXTENSION1WIZARD"; private static final String HELPINDEX = "configuration-keycert-wizard-extension-help"; - + WCertExtensionPage(JDialog parent) { super(PANELNAME); mPanelName = PANELNAME; @@ -68,7 +68,7 @@ class WCertExtensionPage extends WBaseCertExtensionPage implements return false; String title = ""; - + if (!mModified) { String certType = wizardInfo.getCertType(); if (certType.equals(Constants.PR_CA_SIGNING_CERT)) { @@ -195,13 +195,13 @@ class WCertExtensionPage extends WBaseCertExtensionPage implements if (mMIMECheckBox.isSelected()) nvps.put(Constants.PR_DER_EXTENSION, mMIMEText.getText().trim()); - wizardInfo.addEntry(wizardInfo.ALL_INFO, nvps); + wizardInfo.addEntry(wizardInfo.ALL_INFO, nvps); mModified = true; return true; } - private void addValidityPeriod(CertSetupWizardInfo wizardInfo, + private void addValidityPeriod(CertSetupWizardInfo wizardInfo, NameValuePairs nvps) { nvps.put(Constants.PR_BEGIN_YEAR, wizardInfo.getBeginYear()); nvps.put(Constants.PR_BEGIN_MONTH, wizardInfo.getBeginMonth()); @@ -229,7 +229,7 @@ class WCertExtensionPage extends WBaseCertExtensionPage implements private void addExtendedKey(NameValuePairs nvps) { - if (mSSLClient.isSelected()) + if (mSSLClient.isSelected()) nvps.put(Constants.PR_SSL_CLIENT_BIT, Constants.TRUE); if (mSSLServer.isSelected()) nvps.put(Constants.PR_SSL_SERVER_BIT, Constants.TRUE); diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java index a378e91d3..bc5875589 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java @@ -39,7 +39,7 @@ import com.netscape.admin.certsrv.task.*; * @see com.netscape.admin.certsrv.config.install */ class WCertMessageDigestPage extends WMessageDigestPage { - + private static final String PANELNAME = "CERTMESSAGEDIGESTWIZARD"; private static final String HELPINDEX = "configuration-keycert-wizard-messagedigest-help"; @@ -63,9 +63,9 @@ class WCertMessageDigestPage extends WMessageDigestPage { if (wizardInfo.getOperationType().equals(wizardInfo.INSTALLTYPE)) return false; - + if ((wizardInfo.getCAType().equals(wizardInfo.SUBORDINATE_CA)) - && !(wizardInfo.isSSLCertLocalCA())) + && !(wizardInfo.isSSLCertLocalCA())) return false; if (!wizardInfo.isNewKey()) @@ -85,15 +85,15 @@ class WCertMessageDigestPage extends WMessageDigestPage { // non-signing cert, algorithm specified by CA return false; } - - return super.initializePanel(info); + + return super.initializePanel(info); } public void getUpdateInfo(WizardInfo info) { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; - if (mDSAHashTypeBox.isVisible()) + if (mDSAHashTypeBox.isVisible()) wizardInfo.setHashType((String)mDSAHashTypeBox.getSelectedItem()); - else if (mECCHashTypeBox.isVisible()) + else if (mECCHashTypeBox.isVisible()) wizardInfo.setHashType((String)mECCHashTypeBox.getSelectedItem()); else if (mRSAHashTypeBox.isVisible()) wizardInfo.setHashType((String)mRSAHashTypeBox.getSelectedItem()); diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java index 8fa126148..2099a736f 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java @@ -36,7 +36,7 @@ class WCertRequestPage extends WBaseCertRequestPage implements IWizardPanel { private static final String PANELNAME = "COPYCERTREQUESTWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WCertRequestPage() { super(PANELNAME); init(); @@ -48,7 +48,7 @@ class WCertRequestPage extends WBaseCertRequestPage implements IWizardPanel { public boolean initializePanel(WizardInfo info) { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; - + if (wizardInfo.getOperationType().equals(wizardInfo.INSTALLTYPE) || wizardInfo.getCAType().equals(wizardInfo.SELF_SIGNED)) return false; @@ -57,7 +57,7 @@ class WCertRequestPage extends WBaseCertRequestPage implements IWizardPanel { // mText.setText(CMSAdminUtil.certRequestWrapText(str, 40)); mText.setText(str); setBorder(makeTitledBorder("COPYCERTREQUESTWIZARD")); - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java index 88350fc32..71226f9d7 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java @@ -49,7 +49,7 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel, private static final String PANELNAME = "CERTTYPEWIZARD"; private static final String HELPINDEX = "configuration-keycert-wizard-certtype-help"; - + WCertTypePage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -87,10 +87,10 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel, for (String name : response.keySet()) { String type = response.get(name); - if (type.equals(Constants.PR_RA_INSTANCE)) + if (type.equals(Constants.PR_RA_INSTANCE)) mRASigningCert = mResource.getString( "CERTTYPEWIZARD_LABEL_RASIGNINGCERT_LABEL"); - else if (type.equals(Constants.PR_CA_INSTANCE)) + else if (type.equals(Constants.PR_CA_INSTANCE)) mCASigningCert = mResource.getString( "CERTTYPEWIZARD_LABEL_CASIGNINGCERT_LABEL"); else if (type.equals(Constants.PR_KRA_INSTANCE)) @@ -175,7 +175,7 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel, CMSAdminUtil.repaintComp(mCALbl); CMSAdminUtil.repaintComp(mCertType); CMSAdminUtil.repaintComp(mCertTypeText); - return true; + return true; } public boolean validatePanel() { @@ -202,23 +202,23 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel, else if (mRASigningCert != null && item.equals(mRASigningCert.trim())) wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_RA_SIGNING_CERT); - else if (mKRATransportCert != null && + else if (mKRATransportCert != null && item.equals(mKRATransportCert.trim())) wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_KRA_TRANSPORT_CERT); else if (mServerCert != null && item.equals(mServerCert.trim())) - wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, + wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_SERVER_CERT); else if (mServerCertRadm != null && item.equals(mServerCertRadm.trim())) - wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, + wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_SERVER_CERT_RADM); else if (mOCSPSigningCert != null && item.equals(mOCSPSigningCert.trim())) - wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, + wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_OCSP_SIGNING_CERT); - else if (mOtherCert != null && item.equals(mOtherCert.trim())) - wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, + else if (mOtherCert != null && item.equals(mOtherCert.trim())) + wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_OTHER_CERT); - + if (item.equals(mOtherCert.trim())) { try { NameValuePairs response = null; @@ -295,7 +295,7 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel, gbc.weightx = 1.0; gbc.gridwidth = gbc.REMAINDER; add(dummy, gbc); - + mCertType = createTextArea(mResource.getString( PANELNAME+"_LABEL_CERTTYPE_LABEL")); CMSAdminUtil.resetGBC(gbc); @@ -304,7 +304,7 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mCertType, gbc); - + /* JLabel dummy1 = new JLabel(" "); CMSAdminUtil.resetGBC(gbc); @@ -321,7 +321,7 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel, COMPONENT_SPACE,COMPONENT_SPACE); add(mCertTypeText, gbc); mActiveColor = mCertTypeText.getBackground(); - + JLabel dummy2 = new JLabel(" "); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -463,21 +463,21 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel, mResource.getString("CERTTYPEWIZARD_TEXT_CATYPE_LABEL"); b1 = mResource.getString("CERTTYPEWIZARD_RADIOBUTTON_SELFSIGN_LABEL"); - b2 = + b2 = mResource.getString("CERTTYPEWIZARD_RADIOBUTTON_SUBORDINATE_LABEL"); } else if (type.equals("server")) { label = mResource.getString("CERTTYPEWIZARD_TEXT_SERVERTYPE_LABEL"); b1 = mResource.getString("CERTTYPEWIZARD_RADIOBUTTON_SERVER_SELFSIGN_LABEL"); - b2 = + b2 = mResource.getString("CERTTYPEWIZARD_RADIOBUTTON_SERVER_SUBORDINATE_LABEL"); } else if (type.equals("ocspsigning")) { label = mResource.getString("CERTTYPEWIZARD_TEXT_OCSPTYPE_LABEL"); b1 = mResource.getString("CERTTYPEWIZARD_RADIOBUTTON_SELFSIGNOCSP_LABEL"); - b2 = + b2 = mResource.getString("CERTTYPEWIZARD_RADIOBUTTON_SUBORDINATEOCSP_LABEL"); } diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java index 8567703d4..11476e046 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java @@ -40,7 +40,7 @@ class WCertValidityPage extends WBaseValidityPage implements IWizardPanel { private String mCertType = ""; private static final String HELPINDEX = "configuration-keycert-wizard-validityperiod-help"; - + WCertValidityPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -81,7 +81,7 @@ class WCertValidityPage extends WBaseValidityPage implements IWizardPanel { title = mResource.getString("CERTVALIDWIZARD_BORDER_SERVER_LABEL"); setBorder(new TitledBorder(title)); - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java index a7fe56352..3e1f557d5 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java @@ -44,7 +44,7 @@ class WDisplayCertPage extends WizardBasePanel implements IWizardPanel { private JTextArea mTextArea; private JTextField mCertNameField; private Color mActiveColor; - + WDisplayCertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -84,7 +84,7 @@ class WDisplayCertPage extends WizardBasePanel implements IWizardPanel { mCertNameField.setText(certName); CMSAdminUtil.repaintComp(mCertNameField); - return true; + return true; } public boolean validatePanel() { @@ -94,7 +94,7 @@ class WDisplayCertPage extends WizardBasePanel implements IWizardPanel { setErrorMessage("EMPTYCERTNAME"); return false; } - } + } return true; } @@ -150,7 +150,7 @@ class WDisplayCertPage extends WizardBasePanel implements IWizardPanel { } wizardInfo.addEntry(Constants.PR_ADD_CERT, new Boolean(true)); /* - CMSAdminUtil.showMessageDialog(mResource, PANELNAME, + CMSAdminUtil.showMessageDialog(mResource, PANELNAME, "INSTALL", JOptionPane.INFORMATION_MESSAGE); */ return true; @@ -182,7 +182,7 @@ class WDisplayCertPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE, COMPONENT_SPACE); add(mCertNameField, gbc); mActiveColor = mCertNameField.getBackground(); - + mCertNameField.setEditable(false); mCertNameField.setBackground(getBackground()); mCertNameField.setEnabled(false); @@ -245,7 +245,7 @@ class WDisplayCertPage extends WizardBasePanel implements IWizardPanel { } private String[] parseStr(String dn) { - StringTokenizer tokenizer = new StringTokenizer(dn, ","); + StringTokenizer tokenizer = new StringTokenizer(dn, ","); int numTokens = tokenizer.countTokens(); String[] results = new String[numTokens]; int i=0; diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java index d13bca6e4..c505219b9 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java @@ -37,7 +37,7 @@ class WExecute1Page extends WizardBasePanel implements IWizardPanel { private static final String HELPINDEX = "configuration-keycert-wizard-certrequest-help"; private JTextArea desc; - + WExecute1Page(JDialog parent) { super(PANELNAME); mParent = parent; @@ -58,8 +58,8 @@ class WExecute1Page extends WizardBasePanel implements IWizardPanel { public boolean initializePanel(WizardInfo info) { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE) && -// !wizardInfo.isNewKey() && - wizardInfo.getCAType().equals(wizardInfo.SUBORDINATE_CA) && +// !wizardInfo.isNewKey() && + wizardInfo.getCAType().equals(wizardInfo.SUBORDINATE_CA) && !(wizardInfo.isSSLCertLocalCA())) { String title = ""; @@ -78,7 +78,7 @@ class WExecute1Page extends WizardBasePanel implements IWizardPanel { else if (certType.equals(Constants.PR_OTHER_CERT)) title = mResource.getString("EXECUTE1WIZARD_BORDER_OTHER_LABEL"); setBorder(new TitledBorder(title)); - + String str = ""; if (wizardInfo.isNewKey()) { str = mResource.getString("EXECUTE1WIZARD_TEXT_NEWKEY_LABEL"); @@ -88,8 +88,8 @@ class WExecute1Page extends WizardBasePanel implements IWizardPanel { desc.setText(str); return true; } - - return false; + + return false; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java index a3ce14257..7543b54e6 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java @@ -36,7 +36,7 @@ class WExecutePage extends WizardBasePanel implements IWizardPanel { private static final String HELPINDEX = "configuration-keycert-wizard-selfsignedcert-help"; private JTextArea desc; - + WExecutePage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -57,34 +57,34 @@ class WExecutePage extends WizardBasePanel implements IWizardPanel { public boolean initializePanel(WizardInfo info) { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE) && -// !wizardInfo.isNewKey() && +// !wizardInfo.isNewKey() && ((wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT) && wizardInfo.getCAType().equals(wizardInfo.SELF_SIGNED)) || - (wizardInfo.getCertType().equals(Constants.PR_OCSP_SIGNING_CERT) && + (wizardInfo.getCertType().equals(Constants.PR_OCSP_SIGNING_CERT) && wizardInfo.isSSLCertLocalCA()) || - (wizardInfo.getCertType().equals(Constants.PR_SERVER_CERT) && + (wizardInfo.getCertType().equals(Constants.PR_SERVER_CERT) && wizardInfo.isSSLCertLocalCA()) || - (wizardInfo.getCertType().equals(Constants.PR_SERVER_CERT_RADM) && + (wizardInfo.getCertType().equals(Constants.PR_SERVER_CERT_RADM) && wizardInfo.isSSLCertLocalCA()))) { - + setBorder(makeTitledBorder(PANELNAME)); if (wizardInfo.isNewKey()) { String str = mResource.getString( "EXECUTEWIZARD_TEXT_NEWKEY_LABEL"); desc.setText(str); - } else { + } else { String str = mResource.getString( "EXECUTEWIZARD_TEXT_OLDKEY_LABEL"); desc.setText(str); } return true; } - - return false; + + return false; } public boolean validatePanel() { @@ -98,7 +98,7 @@ class WExecutePage extends WizardBasePanel implements IWizardPanel { CMSServerInfo serverInfo = wizardInfo.getServerInfo(); String dir = ""; - if (wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT)) + if (wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT)) dir = "prevCACert.txt"; else if (wizardInfo.getCertType().equals(Constants.PR_OCSP_SIGNING_CERT)) dir = "prevOCSPCert.txt"; @@ -110,7 +110,7 @@ class WExecutePage extends WizardBasePanel implements IWizardPanel { NameValuePairs nvps = wizardInfo.getNameValuePairs(); if (wizardInfo.isNewKey()) { - if (wizardInfo.getHashType() != null) + if (wizardInfo.getHashType() != null) nvps.put(ConfigConstants.PR_HASH_TYPE, wizardInfo.getHashType()); if (wizardInfo.getSignedByType() != null) nvps.put(ConfigConstants.PR_SIGNEDBY_TYPE, wizardInfo.getSignedByType()); @@ -126,7 +126,7 @@ class WExecutePage extends WizardBasePanel implements IWizardPanel { endProgressStatus(); return false; } - + endProgressStatus(); return true; } diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java index b2a0005b6..ea8a6b191 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java @@ -34,7 +34,7 @@ class WGenerateReqPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "GENERATEREQWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WGenerateReqPage() { super(PANELNAME); init(); @@ -48,7 +48,7 @@ class WGenerateReqPage extends WizardBasePanel implements IWizardPanel { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; if (wizardInfo.getOperationType().equals(wizardInfo.INSTALLTYPE)) return false; - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java index 0ea476b6a..39edb1666 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java @@ -26,7 +26,7 @@ import com.netscape.admin.certsrv.wizard.*; import com.netscape.certsrv.common.*; /** - * This page allows the user to do such selections as the installation of + * This page allows the user to do such selections as the installation of * certificates, server certificate chain, or trusted CA. * * @author Christine Ho @@ -40,7 +40,7 @@ class WInstallCertChainPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "INSTALLCERTCHAINWIZARD"; private static final String HELPINDEX = "configuration-keycert-wizard-installcerttype-help"; - + WInstallCertChainPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -109,11 +109,11 @@ class WInstallCertChainPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(opLbl, gbc); - + mCertBox = makeJComboBox("CERTCHAINTYPE"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; - gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.weighty = 1.0; add(mCertBox, gbc); @@ -134,7 +134,7 @@ class WInstallCertChainPage extends WizardBasePanel implements IWizardPanel { String str = (String)(mCertBox.getSelectedItem()); if (str.startsWith("Trusted")) { wizardInfo.addEntry(wizardInfo.INSTALLCERTTYPE, Constants.PR_TRUSTED_CA_CERT); - } else if (str.startsWith("Untrusted")) { + } else if (str.startsWith("Untrusted")) { wizardInfo.addEntry(wizardInfo.INSTALLCERTTYPE, Constants.PR_SERVER_CERT_CHAIN); } } diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java index 5b4d2d340..1cdc6f8d5 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java @@ -26,7 +26,7 @@ import com.netscape.admin.certsrv.wizard.*; import com.netscape.certsrv.common.*; /** - * This page allows the user to do such selections as the installation of + * This page allows the user to do such selections as the installation of * certificates, server certificate chain, or trusted CA. * * @author Christine Ho @@ -45,7 +45,7 @@ class WInstallOpPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "INSTALLOPWIZARD"; private static final String HELPINDEX = "configuration-keycert-wizard-installcerttype-help"; - + WInstallOpPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -138,12 +138,12 @@ class WInstallOpPage extends WizardBasePanel implements IWizardPanel { } if (mCrossCert != null) { - mCertBox.addItem(mCrossCert); + mCertBox.addItem(mCrossCert); mCerts.addElement(Constants.PR_CROSS_CERT); } if (mOtherCert != null) { - mCertBox.addItem(mOtherCert); + mCertBox.addItem(mOtherCert); mCerts.addElement(Constants.PR_OTHER_CERT); } @@ -154,7 +154,7 @@ class WInstallOpPage extends WizardBasePanel implements IWizardPanel { } mCertBox.setSelectedIndex(0); - return true; + return true; } public boolean validatePanel() { @@ -193,11 +193,11 @@ class WInstallOpPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(opLbl, gbc); - + mCertBox = makeJComboBox("CERTTYPE"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; - gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.weighty = 1.0; add(mCertBox, gbc); diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java index 25022bbb9..86eedad78 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java @@ -36,7 +36,7 @@ class WInstallStatusPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "INSTALLSTATUSWIZARD"; private static final String HELPINDEX = "configuration-keycert-wizard-installcertstatus-help"; - + WInstallStatusPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -61,13 +61,13 @@ class WInstallStatusPage extends WizardBasePanel implements IWizardPanel { if (wizardInfo.isCertAdded().booleanValue()) mDesc.setText(mResource.getString( "INSTALLSTATUSWIZARD_TEXT_SUCCESS_LABEL")); - else + else mDesc.setText(mResource.getString( "INSTALLSTATUSWIZARD_TEXT_FAIL_LABEL")); setBorder(makeTitledBorder(PANELNAME)); - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java index 18c6ef068..549c5aa2b 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java @@ -35,7 +35,7 @@ class WIntroInstallCertPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "INTROINSTALLCERTWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WIntroInstallCertPage() { super(PANELNAME); init(); @@ -49,7 +49,7 @@ class WIntroInstallCertPage extends WizardBasePanel implements IWizardPanel { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE)) return false; - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java index abcec63f3..116f3a496 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java @@ -35,7 +35,7 @@ class WIntroPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "INTROKEYCERTWIZARD"; private static final String HELPINDEX = "configuration-keycert-wizard-introduction-help"; - + WIntroPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -51,7 +51,7 @@ class WIntroPage extends WizardBasePanel implements IWizardPanel { public boolean initializePanel(WizardInfo info) { setBorder(makeTitledBorder(PANELNAME)); - return true; + return true; } public boolean isLastPage() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java index 65e02ddd7..3807a1824 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java @@ -36,7 +36,7 @@ class WIssueImportStatusPage extends WizardBasePanel implements IWizardPanel { private static final String HELPINDEX = "configuration-keycert-wizard-selfsignedstatus-help"; private JTextArea desc; - + WIssueImportStatusPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -61,8 +61,8 @@ class WIssueImportStatusPage extends WizardBasePanel implements IWizardPanel { str = mResource.getString( "ISSUEIMPORTSTATUSWIZARD_TEXT_DESC_LABEL"); desc.setText(str); - return true; - } + return true; + } return false; } diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java index 40d601c1d..6c9038ffa 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java @@ -54,7 +54,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { private CertSetupWizardInfo wizardInfo; private static final String HELPINDEX = "configuration-keycert-wizard-key-help"; - + WKeyPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -79,7 +79,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { String title = ""; String certType = wizardInfo.getCertType(); - if (certType.equals(Constants.PR_CA_SIGNING_CERT)) + if (certType.equals(Constants.PR_CA_SIGNING_CERT)) title = mResource.getString("KEYWIZARD_BORDER_CASIGNING_LABEL"); else if (certType.equals(Constants.PR_RA_SIGNING_CERT)) title = mResource.getString("KEYWIZARD_BORDER_RASIGNING_LABEL"); @@ -92,7 +92,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { title = mResource.getString("KEYWIZARD_BORDER_SERVER_LABEL"); else if (certType.equals(Constants.PR_OTHER_CERT)) title = mResource.getString("KEYWIZARD_BORDER_OTHER_LABEL"); - + setBorder(new TitledBorder(title)); if (certType.equals(Constants.PR_OTHER_CERT)) { mNicknamePanel.setVisible(true); @@ -101,7 +101,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { if (mNicknameBox.getItemCount() <= 0) { String str = wizardInfo.getNicknames(); StringTokenizer tokenizer1 = new StringTokenizer(str, ","); - while (tokenizer1.hasMoreTokens()) { + while (tokenizer1.hasMoreTokens()) { mNicknameBox.addItem((String)tokenizer1.nextToken()); } } @@ -179,7 +179,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { CMSAdminUtil.repaintComp(mNicknameLbl); CMSAdminUtil.repaintComp(mNicknameBox); - return true; + return true; } public boolean validatePanel() { @@ -208,7 +208,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { if (str.equals("")) { setErrorMessage("BLANKCURVE"); return false; - } + } }*/ return true; @@ -232,11 +232,11 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { if (val.equals("Custom")) { if (mKeyCurveBox.isVisible()) { // ECC - wizardInfo.addEntry(Constants.PR_KEY_CURVENAME, + wizardInfo.addEntry(Constants.PR_KEY_CURVENAME, mKeyCurveText.getText().trim()); nvps.put(Constants.PR_KEY_CURVENAME, mKeyCurveText.getText().trim()); } else { - wizardInfo.addEntry(Constants.PR_KEY_LENGTH, + wizardInfo.addEntry(Constants.PR_KEY_LENGTH, mKeyLengthText.getText().trim()); nvps.put(Constants.PR_KEY_LENGTH, mKeyLengthText.getText().trim()); } @@ -249,7 +249,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { nvps.put(Constants.PR_KEY_LENGTH, val.trim()); } } - + if (mKeyTypeBox.isVisible()) { wizardInfo.addEntry(Constants.PR_KEY_TYPE, (String)mKeyTypeBox.getSelectedItem()); @@ -285,13 +285,13 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { nvps.put(Constants.PR_NICKNAME, nicknameStr); response = connection.process( DestDef.DEST_SERVER_ADMIN, - ScopeDef.SC_SUBJECT_NAME, + ScopeDef.SC_SUBJECT_NAME, wizardInfo.getCertType(), nvps); wizardInfo.addEntry(Constants.PR_NICKNAME, nicknameStr); } else { response = connection.read( DestDef.DEST_SERVER_ADMIN, - ScopeDef.SC_SUBJECT_NAME, + ScopeDef.SC_SUBJECT_NAME, wizardInfo.getCertType(), nvps); } @@ -301,13 +301,13 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { if (mNewKeyBtn.isSelected()) { String tokenName = (String)mTokenBox.getSelectedItem(); - if (tokenName.equals("internal")) + if (tokenName.equals("internal")) tokenName = Constants.PR_INTERNAL_TOKEN_NAME; nvps.clear(); nvps.put(Constants.PR_TOKEN_NAME, tokenName); response = connection.process(DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_TOKEN_STATUS, Constants.RS_ID_CONFIG, nvps); - + String value = response.get(Constants.PR_LOGGED_IN); wizardInfo.addEntry(Constants.PR_LOGGED_IN, value); wizardInfo.addEntry(Constants.PR_TOKEN_NAME, tokenName); @@ -342,7 +342,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(panel, gbc); - + JTextArea selectTokenLbl = createTextArea(mResource.getString( PANELNAME+"_LABEL_SELECTTOKEN_LABEL")); CMSAdminUtil.resetGBC(gbc); @@ -350,7 +350,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { gbc.gridwidth = gbc.REMAINDER; gbc.insets = new Insets(0, 0, COMPONENT_SPACE,0); panel.add(selectTokenLbl, gbc); - + mTokenLbl = makeJLabel("TOKEN"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.CENTER; @@ -386,7 +386,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { gbc.gridwidth = gbc.REMAINDER; add(createKeyLbl, gbc); - mExistingKeyBtn = makeJRadioButton("OLDKEY", true); + mExistingKeyBtn = makeJRadioButton("OLDKEY", true); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; @@ -403,7 +403,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { gbc.anchor = gbc.NORTHWEST; gbc.gridwidth = gbc.REMAINDER; gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, - COMPONENT_SPACE, COMPONENT_SPACE); + COMPONENT_SPACE, COMPONENT_SPACE); gbc.fill = gbc.BOTH; gbc.weightx = 1.0; add(mNicknamePanel, gbc); @@ -704,18 +704,18 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { public void itemStateChanged(ItemEvent e) { if (e.getSource().equals(mKeyLengthBox) || - e.getSource().equals(mKeyCurveBox) || + e.getSource().equals(mKeyCurveBox) || e.getSource().equals(mDSAKeyLengthBox)) { enableKeyLengthFields(); - } else if (e.getSource().equals(mKeyTypeBox) || + } else if (e.getSource().equals(mKeyTypeBox) || e.getSource().equals(mDSAKeyTypeBox)) { String type = ""; if (mKeyTypeBox.isVisible()) type = (String)mKeyTypeBox.getSelectedItem(); else if (mDSAKeyTypeBox.isVisible()) type = (String)mDSAKeyTypeBox.getSelectedItem(); - - setLengthCurveFields(type); + + setLengthCurveFields(type); enableKeyLengthFields(); CMSAdminUtil.repaintComp(this); } @@ -723,10 +723,10 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { private void enableKeyLengthFields() { String value = ""; - + if (mKeyLengthBox.isVisible()) value = (String)mKeyLengthBox.getSelectedItem(); - else if (mKeyCurveBox.isVisible()) + else if (mKeyCurveBox.isVisible()) value = (String)mKeyCurveBox.getSelectedItem(); else value = (String)mDSAKeyLengthBox.getSelectedItem(); @@ -750,7 +750,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { } } - protected void enableFields(JComponent comp1, JTextComponent comp2, + protected void enableFields(JComponent comp1, JTextComponent comp2, boolean enable, Color color) { if (comp1 != null) { comp1.setEnabled(enable); diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java index 4ad069133..ebbbd6be2 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java @@ -50,7 +50,7 @@ class WManualCertRequestPage extends WBaseManualCertRequestPage implements IWiza private static final String PANELNAME = "MANUALCERTREQUESTWIZARD"; private static final String HELPINDEX = "configuration-keycert-wizard-displaycertrequest-help"; - + WManualCertRequestPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -70,7 +70,7 @@ class WManualCertRequestPage extends WBaseManualCertRequestPage implements IWiza public boolean initializePanel(WizardInfo info) { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; - + if (wizardInfo.getOperationType().equals(wizardInfo.INSTALLTYPE) || wizardInfo.getCAType().equals(wizardInfo.SELF_SIGNED)) return false; @@ -120,7 +120,7 @@ class WManualCertRequestPage extends WBaseManualCertRequestPage implements IWiza if (port != null && !port.equals("")) mPortText.setText(port); - return true; + return true; } public boolean validatePanel() { @@ -135,7 +135,7 @@ class WManualCertRequestPage extends WBaseManualCertRequestPage implements IWiza if (mHost != null && !mHost.equals("")) wizardInfo.setCMHost(mHost); if (mPort != null && !mPort.equals("")) - wizardInfo.setCMEEPort(mPort); + wizardInfo.setCMEEPort(mPort); if (mSSL.isSelected()) wizardInfo.setCMEEType("https"); else diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java index f2cdeff3d..c9d867466 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java @@ -78,7 +78,7 @@ class WOperationSelectionPage extends WizardBasePanel implements IWizardPanel { startProgressStatus(); if (mRequestBtn.isSelected()) info.addEntry(wizardInfo.OPTYPE, wizardInfo.REQUESTTYPE); - else + else info.addEntry(wizardInfo.OPTYPE, wizardInfo.INSTALLTYPE); endProgressStatus(); return true; diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java index 1dbd614d1..aa4b32ff1 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java @@ -40,7 +40,7 @@ class WOtherCertRequest1Page extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "CACERTREQUESTWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WOtherCertRequest1Page() { super(PANELNAME); init(); @@ -59,7 +59,7 @@ class WOtherCertRequest1Page extends WizardBasePanel implements IWizardPanel { if (type.equals(Constants.PR_CA_SIGNING_CERT)) return false; - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java index 50e14a50e..65aca8241 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java @@ -27,8 +27,8 @@ import com.netscape.admin.certsrv.wizard.*; import com.netscape.certsrv.common.*; /** - * This page is to install the certificate in the internal token. The user can - * import the cert from the file or paste the Base 64 encoded blob in the + * This page is to install the certificate in the internal token. The user can + * import the cert from the file or paste the Base 64 encoded blob in the * text area. * * @author Christine Ho @@ -48,7 +48,7 @@ class WPasteCertPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "PASTECERTWIZARD"; private static final String HELPINDEX = "configuration-keycert-wizard-pastecert-help"; - + WPasteCertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -71,7 +71,7 @@ class WPasteCertPage extends WizardBasePanel implements IWizardPanel { if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE)) return false; setBorder(makeTitledBorder(PANELNAME)); - return true; + return true; } public boolean validatePanel() { @@ -114,7 +114,7 @@ class WPasteCertPage extends WizardBasePanel implements IWizardPanel { NameValuePairs response = connection.process( DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_CERTINFO, wizardInfo.getInstallCertType(), nvps); - + for (String name : response.keySet()) { String str = response.get(name); wizardInfo.addEntry(name, str); @@ -198,7 +198,7 @@ class WPasteCertPage extends WizardBasePanel implements IWizardPanel { mBase64Text = new JTextArea(null, null, 0, 0); Font f = new Font("Monospaced", Font.PLAIN, 12); if (f != null) mBase64Text.setFont(f); - JScrollPane scrollPane = new JScrollPane(mBase64Text, + JScrollPane scrollPane = new JScrollPane(mBase64Text, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); scrollPane.setPreferredSize(new Dimension(50, 20)); @@ -206,7 +206,7 @@ class WPasteCertPage extends WizardBasePanel implements IWizardPanel { gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; gbc.weighty = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, 0, + gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, 0, COMPONENT_SPACE); gbc.fill = gbc.BOTH; gbc.gridwidth = gbc.REMAINDER; diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java index 616deb74f..e18488696 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java @@ -37,7 +37,7 @@ class WRAKeyPage extends WBaseKeyPage implements IWizardPanel { private static final String PANELNAME = "RAKEYWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WRAKeyPage() { super(PANELNAME); init(); @@ -48,7 +48,7 @@ class WRAKeyPage extends WBaseKeyPage implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java index a52def44a..124a819d6 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java @@ -37,9 +37,9 @@ class WRequestStatusPage extends WizardBasePanel implements IWizardPanel { private static final String HELPINDEX = "configuration-keycert-wizard-certrequeststatus-help"; protected JTextArea mDesc; - + protected String mRequestId; - + WRequestStatusPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -78,15 +78,15 @@ class WRequestStatusPage extends WizardBasePanel implements IWizardPanel { mDesc.setText(mResource.getString("REQUESTRESULTWIZARD_TEXT_REJECT_LABEL") + error + "\n\n"+ mResource.getString("REQUESTRESULTWIZARD_TEXT_ID_LABEL") + str + mResource.getString("REQUESTRESULTWIZARD_TEXT_REJECTEND_LABEL")); } else { // success - mDesc.setText(mResource.getString("REQUESTRESULTWIZARD_TEXT_DESC_LABEL") + - mResource.getString("REQUESTRESULTWIZARD_TEXT_ID_LABEL") + str + + mDesc.setText(mResource.getString("REQUESTRESULTWIZARD_TEXT_DESC_LABEL") + + mResource.getString("REQUESTRESULTWIZARD_TEXT_ID_LABEL") + str + mResource.getString("REQUESTRESULTWIZARD_TEXT_END_LABEL")); } } else if (error != null) mDesc.setText(error); else - mDesc.setText(mResource.getString("REQUESTRESULTWIZARD_TEXT_DESC_LABEL") + + mDesc.setText(mResource.getString("REQUESTRESULTWIZARD_TEXT_DESC_LABEL") + mResource.getString("REQUESTRESULTWIZARD_TEXT_NOID_LABEL")); } return true; diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java index 7065f68b6..36c626751 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java @@ -37,7 +37,7 @@ class WSSLKeyPage extends WBaseKeyPage implements IWizardPanel { private static final String PANELNAME = "SSLKEYWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WSSLKeyPage() { super(PANELNAME); init(); @@ -48,7 +48,7 @@ class WSSLKeyPage extends WBaseKeyPage implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java index 53a623d0a..b1fd2031c 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java @@ -26,7 +26,7 @@ import com.netscape.admin.certsrv.wizard.*; import com.netscape.certsrv.common.*; /** - * This panel asks for the user to logon to the keycert token . + * This panel asks for the user to logon to the keycert token . * * @author Christine Ho * @version $Revision$, $Date$ @@ -69,7 +69,7 @@ class WTokenLogonPage extends WizardBasePanel implements IWizardPanel { mDesc.setText(mResource.getString(mPanelName+"_TEXT_HEADING_LABEL")); mTokenNameText.setText(wizardInfo.getTokenName()); - return true; + return true; } public boolean validatePanel() { @@ -154,7 +154,7 @@ class WTokenLogonPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(passwordLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mPasswordText = makeJPasswordField(30); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java index b595e1ffd..4f5f7c6de 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java @@ -67,7 +67,7 @@ class WTokenSelectionPage extends WizardBasePanel implements IWizardPanel { info.addEntry(wizardInfo.TOKENNAME, (String)mToken.getSelectedItem()); if (mRequestBtn.isSelected()) info.addEntry(wizardInfo.OPTYPE, wizardInfo.REQUESTTYPE); - else + else info.addEntry(wizardInfo.OPTYPE, wizardInfo.INSTALLTYPE); return true; } @@ -138,7 +138,7 @@ class WTokenSelectionPage extends WizardBasePanel implements IWizardPanel { gbc.weightx = 1.0; gbc.fill = gbc.NONE; gbc.weighty = 0.0; - gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(mToken, gbc); diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java index be844576c..d2e0b3c58 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java @@ -38,7 +38,7 @@ class WWarningExecute1Page extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "WARNINGEXECUTE1WIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WWarningExecute1Page() { super(PANELNAME); init(); @@ -51,12 +51,12 @@ class WWarningExecute1Page extends WizardBasePanel implements IWizardPanel { public boolean initializePanel(WizardInfo info) { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE) && - wizardInfo.isNewKey() && + wizardInfo.isNewKey() && wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT) && wizardInfo.getCAType().equals(wizardInfo.SUBORDINATE_CA)) return true; - - return false; + + return false; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java index a64f67188..a0559f6fb 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java @@ -38,7 +38,7 @@ class WWarningExecutePage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "WARNINGEXECUTEWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WWarningExecutePage() { super(PANELNAME); init(); @@ -51,12 +51,12 @@ class WWarningExecutePage extends WizardBasePanel implements IWizardPanel { public boolean initializePanel(WizardInfo info) { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE) && - wizardInfo.isNewKey() && + wizardInfo.isNewKey() && wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT) && wizardInfo.getCAType().equals(wizardInfo.SELF_SIGNED)) return true; - - return false; + + return false; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java index 7a4eabe57..c20cbb8ea 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java @@ -38,7 +38,7 @@ class WWarningPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "WARNINGWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WWarningPage() { super(PANELNAME); init(); @@ -52,11 +52,11 @@ class WWarningPage extends WizardBasePanel implements IWizardPanel { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE) && - wizardInfo.isNewKey() && + wizardInfo.isNewKey() && wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT)) return true; - - return false; + + return false; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java b/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java index 3a5c43705..f9779c5e5 100644 --- a/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java @@ -46,7 +46,7 @@ public class CertificateInfoDialog extends JDialog private String mCertName; private String mCertDate; private JButton mActionBtn; - private static final String HELPINDEX = + private static final String HELPINDEX = "configuration-managecert-wizard-trustcert-help"; JLabel changeLbl = null; @@ -61,7 +61,7 @@ public class CertificateInfoDialog extends JDialog getRootPane().setDoubleBuffered(true); setDisplay(); } - + public void showDialog(String name, String content, String trust) { mCertNameField.setText(name); mTextArea.setText(content); @@ -69,13 +69,13 @@ public class CertificateInfoDialog extends JDialog String statusStr = ""; if (trust.equals("Trust")) { //mTrust.setText(" Trust "); - actionStr = mResource.getString(PREFIX+"_BUTTON_UNTRUST_LABEL"); + actionStr = mResource.getString(PREFIX+"_BUTTON_UNTRUST_LABEL"); statusStr = mResource.getString(PREFIX+"_LABEL_TRUSTSTATUS_LABEL"); mActionBtn.setText(actionStr); mStatusLbl.setText(statusStr); } else if (trust.equals("Untrust")){ //mTrust.setText(trust); - actionStr = mResource.getString(PREFIX+"_BUTTON_TRUST_LABEL"); + actionStr = mResource.getString(PREFIX+"_BUTTON_TRUST_LABEL"); statusStr = mResource.getString(PREFIX+"_LABEL_UNTRUSTSTATUS_LABEL"); mActionBtn.setText(actionStr); mStatusLbl.setText(statusStr); @@ -89,7 +89,7 @@ public class CertificateInfoDialog extends JDialog } this.show(); } - + public void showDialog(String name, String content, String trust, String date, AdminConnection conn) { mConn = conn; @@ -117,9 +117,9 @@ public class CertificateInfoDialog extends JDialog NameValuePairs nvps = new NameValuePairs(); String value = mCertName+";"+mCertDate; nvps.put("certName0", value); - + try { - mConn.modify(DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_TRUST, + mConn.modify(DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_TRUST, trust, nvps); String actionStr = ""; String statusStr = ""; @@ -194,9 +194,9 @@ public class CertificateInfoDialog extends JDialog } private JPanel makeActionPane() { - mClose = CMSAdminUtil.makeJButton(mResource, PREFIX, "CLOSE", + mClose = CMSAdminUtil.makeJButton(mResource, PREFIX, "CLOSE", null, this); - + mHelp = CMSAdminUtil.makeJButton(mResource, PREFIX, "HELP", null, this); Dimension d = mClose.getMinimumSize(); if (d.width < CMSAdminUtil.DEFAULT_BUTTON_SIZE) { diff --git a/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java b/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java index 4fd902584..253e62a05 100644 --- a/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java @@ -29,7 +29,7 @@ import com.netscape.certsrv.common.*; /** * This class lists out all the CA certificates from the internal token. - * + * * @author chrisho * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.managecert @@ -46,7 +46,7 @@ public class ManageCertDialog extends JDialog implements ActionListener, private ManageCertModel mDataModel; private JButton mClose, mDelete, mEdit, mHelp; private AdminConnection mConn; - private static final String HELPINDEX = + private static final String HELPINDEX = "configuration-managecert-wizard-certlists-help"; public ManageCertDialog(JFrame parent) { @@ -90,7 +90,7 @@ public class ManageCertDialog extends JDialog implements ActionListener, CMSAdminUtil.bubbleSort(vals); - for (i=0; i<vals.length; i++) { + for (i=0; i<vals.length; i++) { String entry = vals[i]; String value = response.get(entry); addRows(entry, value); @@ -152,7 +152,7 @@ public class ManageCertDialog extends JDialog implements ActionListener, public JPanel makeActionPane() { JPanel panel = new JPanel(); - + mClose = new JButton(); mClose.setText(mResource.getString( "MANAGECERTDIALOG_BUTTON_CLOSE_LABEL")); @@ -180,7 +180,7 @@ public class ManageCertDialog extends JDialog implements ActionListener, public JPanel makeContentPane() { JPanel content = new JPanel(); - content.setBorder(CMSAdminUtil.makeTitledBorder(mResource, + content.setBorder(CMSAdminUtil.makeTitledBorder(mResource, "MANAGECERTDIALOG", "CERT")); GridBagLayout gb = new GridBagLayout(); GridBagConstraints gbc = new GridBagConstraints(); @@ -208,7 +208,7 @@ public class ManageCertDialog extends JDialog implements ActionListener, gbc.weighty = 1.0; gbc.fill = gbc.BOTH; gbc.gridheight = gbc.REMAINDER; - gbc.insets = new Insets(CMSAdminUtil.COMPONENT_SPACE, + gbc.insets = new Insets(CMSAdminUtil.COMPONENT_SPACE, CMSAdminUtil.COMPONENT_SPACE, CMSAdminUtil.COMPONENT_SPACE, CMSAdminUtil.COMPONENT_SPACE); gb.setConstraints(scrollPane, gbc); diff --git a/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertModel.java b/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertModel.java index 2cae90759..85cbc7dde 100644 --- a/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertModel.java +++ b/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertModel.java @@ -37,8 +37,8 @@ public class ManageCertModel extends CMSTableModel *==========================================================*/ public static final String COL1 = "CERTNAME"; public static final String COL2 = "EXPIRED"; - public static final String COL3 = "TRUST"; - + public static final String COL3 = "TRUST"; + private static String[] mColumns = {COL1, COL2, COL3}; /*========================================================== diff --git a/base/console/src/com/netscape/admin/certsrv/menu/RefreshTabPane.java b/base/console/src/com/netscape/admin/certsrv/menu/RefreshTabPane.java index f52a7f1a6..81024603d 100644 --- a/base/console/src/com/netscape/admin/certsrv/menu/RefreshTabPane.java +++ b/base/console/src/com/netscape/admin/certsrv/menu/RefreshTabPane.java @@ -51,7 +51,7 @@ public class RefreshTabPane implements IMenuAction { /*========================================================== * constructors *==========================================================*/ - + /** * Default Constructor that creates the refresh menu * call back item. @@ -63,7 +63,7 @@ public class RefreshTabPane implements IMenuAction { /*========================================================== * public methods *==========================================================*/ - + /** * perform the refresh function on the selected * tab panel, if the tab panel support the IRefreshTab @@ -80,10 +80,10 @@ public class RefreshTabPane implements IMenuAction { } } } - + /*========================================================== * EVNET HANDLER METHODS - *==========================================================*/ + *==========================================================*/ /** * Accepts the selection notification from the diff --git a/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java b/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java index c01407193..2bc3543ce 100644 --- a/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java +++ b/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java @@ -32,9 +32,9 @@ import java.awt.event.*; * @version $Revision$, $Date$ */ public class RequestCompletePanel extends CMSBaseTab implements ItemListener { - private static final String RA_HELPINDEX = + private static final String RA_HELPINDEX = "notification-ra-certissued-help"; - private static final String CA_HELPINDEX = + private static final String CA_HELPINDEX = "notification-ca-certissued-help"; private JTextField mEmailFormText; private JTextField mEmailSubjectText; @@ -75,7 +75,7 @@ public class RequestCompletePanel extends CMSBaseTab implements ItemListener { GridBagLayout gb = new GridBagLayout(); GridBagConstraints gbc = new GridBagConstraints(); mCenterPanel.setLayout(gb); - + //add the enable checkbox mEnable = makeJCheckBox("ENABLE"); mEnable.setSelected(true); @@ -84,13 +84,13 @@ public class RequestCompletePanel extends CMSBaseTab implements ItemListener { gbc.fill = gbc.NONE; gbc.gridwidth = gbc.REMAINDER; gbc.weightx = 1.0; - gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE, + gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE, DIFFERENT_COMPONENT_SPACE, 0, DIFFERENT_COMPONENT_SPACE); gb.setConstraints(mEnable, gbc); mCenterPanel.add(mEnable); - + //add the setting panel CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTH; @@ -104,7 +104,7 @@ public class RequestCompletePanel extends CMSBaseTab implements ItemListener { GridBagLayout gb1 = new GridBagLayout(); emailInfo.setLayout(gb1); emailInfo.setBorder(makeTitledBorder("EMAILINFO")); - + // add sender email label and text field CMSAdminUtil.resetGBC(gbc); mSenderEmailLabel = makeJLabel("SENDER"); diff --git a/base/console/src/com/netscape/admin/certsrv/notification/RequestInQPanel.java b/base/console/src/com/netscape/admin/certsrv/notification/RequestInQPanel.java index aa37ed149..e2b02d77e 100644 --- a/base/console/src/com/netscape/admin/certsrv/notification/RequestInQPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/notification/RequestInQPanel.java @@ -32,9 +32,9 @@ import java.awt.event.*; * @version $Revision$, $Date$ */ public class RequestInQPanel extends CMSBaseTab implements ItemListener { - private static final String RA_HELPINDEX = + private static final String RA_HELPINDEX = "notification-ra-reqinq-help"; - private static final String CA_HELPINDEX = + private static final String CA_HELPINDEX = "notification-ca-reqinq-help"; private JTextField mEmailFormText; private JTextField mEmailSubjectText; @@ -76,7 +76,7 @@ public class RequestInQPanel extends CMSBaseTab implements ItemListener { GridBagLayout gb = new GridBagLayout(); GridBagConstraints gbc = new GridBagConstraints(); mCenterPanel.setLayout(gb); - + //add the enable checkbox mEnable = makeJCheckBox("ENABLE"); mEnable.setSelected(true); @@ -85,13 +85,13 @@ public class RequestInQPanel extends CMSBaseTab implements ItemListener { gbc.fill = gbc.NONE; gbc.gridwidth = gbc.REMAINDER; gbc.weightx = 1.0; - gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE, + gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE, DIFFERENT_COMPONENT_SPACE, 0, DIFFERENT_COMPONENT_SPACE); gb.setConstraints(mEnable, gbc); mCenterPanel.add(mEnable); - + //add the setting panel CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTH; @@ -113,7 +113,7 @@ public class RequestInQPanel extends CMSBaseTab implements ItemListener { mActiveColor = mSenderEmailText.getBackground(); CMSAdminUtil.addEntryField(emailInfo, mSenderEmailLabel, mSenderEmailText, gbc); - + // add email subject label and text field CMSAdminUtil.resetGBC(gbc); mEmailSubjectLabel = makeJLabel("SUBJECT"); diff --git a/base/console/src/com/netscape/admin/certsrv/notification/RequestRevokedPanel.java b/base/console/src/com/netscape/admin/certsrv/notification/RequestRevokedPanel.java index 60b0e2949..9a22cd91c 100644 --- a/base/console/src/com/netscape/admin/certsrv/notification/RequestRevokedPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/notification/RequestRevokedPanel.java @@ -32,9 +32,9 @@ import java.awt.event.*; * @version $Revision$, $Date$ */ public class RequestRevokedPanel extends CMSBaseTab implements ItemListener { - private static final String RA_HELPINDEX = + private static final String RA_HELPINDEX = "configuration-notifications"; - private static final String CA_HELPINDEX = + private static final String CA_HELPINDEX = "configuration-notifications"; private JTextField mEmailFormText; private JTextField mEmailSubjectText; @@ -75,7 +75,7 @@ public class RequestRevokedPanel extends CMSBaseTab implements ItemListener { GridBagLayout gb = new GridBagLayout(); GridBagConstraints gbc = new GridBagConstraints(); mCenterPanel.setLayout(gb); - + //add the enable checkbox mEnable = makeJCheckBox("ENABLE"); mEnable.setSelected(true); @@ -84,13 +84,13 @@ public class RequestRevokedPanel extends CMSBaseTab implements ItemListener { gbc.fill = gbc.NONE; gbc.gridwidth = gbc.REMAINDER; gbc.weightx = 1.0; - gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE, + gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE, DIFFERENT_COMPONENT_SPACE, 0, DIFFERENT_COMPONENT_SPACE); gb.setConstraints(mEnable, gbc); mCenterPanel.add(mEnable); - + //add the setting panel CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTH; @@ -104,7 +104,7 @@ public class RequestRevokedPanel extends CMSBaseTab implements ItemListener { GridBagLayout gb1 = new GridBagLayout(); emailInfo.setLayout(gb1); emailInfo.setBorder(makeTitledBorder("EMAILINFO")); - + // add sender email label and text field CMSAdminUtil.resetGBC(gbc); mSenderEmailLabel = makeJLabel("SENDER"); @@ -238,7 +238,7 @@ public class RequestRevokedPanel extends CMSBaseTab implements ItemListener { String senderEmail = mSenderEmailText.getText().trim(); if (mEnable.isSelected() && (emailForm.equals("") || - senderEmail.equals("") || + senderEmail.equals("") || emailSubject.equals(""))) { showMessageDialog("BLANKFIELD"); return false; diff --git a/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java b/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java index 5329b1148..25511cee5 100644 --- a/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java @@ -131,7 +131,7 @@ public abstract class CMSLogPanel extends CMSBasePanel if (e.getSource().equals(mRefresh)) { Debug.println("AccessLogPanel: Refresh Log"); refresh(); - }else if (e.getSource().equals(mView)) { + }else if (e.getSource().equals(mView)) { if (mDataModel.getRowCount() == 0) { refresh(); } else { @@ -142,7 +142,7 @@ public abstract class CMSLogPanel extends CMSBasePanel } else if (e.getSource().equals(mLevel) || e.getSource().equals(mSource) || e.getSource().equals(mFile)) { Debug.println("AccessLogPanel: Changed Log Level or Source or File"); - refresh(); + refresh(); } } @@ -153,19 +153,19 @@ public abstract class CMSLogPanel extends CMSBasePanel //==== MOUSELISTENER ====================== public void mouseClicked(MouseEvent e) { //Debug.println("CertRepositoryPanel: mouseClicked() -"+e.toString()); - + //we track the double click action on the table entry - View op if(e.getClickCount() == 2) { //Debug.println("View Detail"); viewDetail(); } } - + public void mousePressed(MouseEvent e) { } public void mouseReleased(MouseEvent e) { } public void mouseEntered(MouseEvent e) { } public void mouseExited(MouseEvent e) { } - + /** * refresh the table data */ @@ -189,7 +189,7 @@ public abstract class CMSLogPanel extends CMSBasePanel /*========================================================== * protected methods *==========================================================*/ - + /** * View the log entry in a dialog box * (no assumption of validity) @@ -197,7 +197,7 @@ public abstract class CMSLogPanel extends CMSBasePanel protected void viewDetail() { //check item selected if (mTable.getSelectedRow()>= 0) { - if (mViewer == null) + if (mViewer == null) mViewer = new LogEntryViewDialog(mModel.getFrame()); mViewer.showDialog( (String)mDataModel.getValueAt(mTable.getSelectedRow(),0), @@ -258,7 +258,7 @@ public abstract class CMSLogPanel extends CMSBasePanel col.setMinWidth(400); col.setResizable( true ); } - + /** * create filter criteria panel */ @@ -285,7 +285,7 @@ public abstract class CMSLogPanel extends CMSBasePanel CMSAdminUtil.addEntryField(panel, label1, mSource, label2, mLevel, gbc); mLevel.addActionListener(this); mSource.addActionListener(this); - + //file CMSAdminUtil.resetGBC(gbc); diff --git a/base/console/src/com/netscape/admin/certsrv/status/LogDataModel.java b/base/console/src/com/netscape/admin/certsrv/status/LogDataModel.java index 61d127524..4faa7c893 100644 --- a/base/console/src/com/netscape/admin/certsrv/status/LogDataModel.java +++ b/base/console/src/com/netscape/admin/certsrv/status/LogDataModel.java @@ -28,7 +28,7 @@ import com.netscape.admin.certsrv.*; /** * LogDataModel to be displayed at the right hand side - * + * * We need the log order in REVERSE. * * @author Jack Pan-Chen @@ -54,7 +54,7 @@ public class LogDataModel extends CMSTableModel super(); init(mColumns); } - + public LogDataModel(ILogParser parser) { this(); mParser = parser; @@ -87,7 +87,7 @@ public class LogDataModel extends CMSTableModel } addRow(row); } - + /** * NEED TO OVERWRITE THE TABLE MODEL ADD FUNCTION * SINCE WE ARE PROVIDING REVERSE ORDER ENTRIES IN @@ -102,6 +102,6 @@ public class LogDataModel extends CMSTableModel row = v.size() - 1; } fireTableDataChanged(); - } + } } diff --git a/base/console/src/com/netscape/admin/certsrv/status/LogEntryViewDialog.java b/base/console/src/com/netscape/admin/certsrv/status/LogEntryViewDialog.java index c86ff02ff..3be2bf296 100644 --- a/base/console/src/com/netscape/admin/certsrv/status/LogEntryViewDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/status/LogEntryViewDialog.java @@ -186,7 +186,7 @@ public class LogEntryViewDialog extends JDialog scrollPanel.setAlignmentX(LEFT_ALIGNMENT); scrollPanel.setAlignmentY(TOP_ALIGNMENT); scrollPanel.setBackground(getBackground()); - scrollPanel.setBorder(BorderFactory.createEmptyBorder()); + scrollPanel.setBorder(BorderFactory.createEmptyBorder()); scrollPanel.setPreferredSize(new Dimension(500, 200)); //gbc.fill = gbc.VERTICAL; gbc.fill = gbc.BOTH; diff --git a/base/console/src/com/netscape/admin/certsrv/status/LogInstancePanel.java b/base/console/src/com/netscape/admin/certsrv/status/LogInstancePanel.java index dc6a8da27..139d9388a 100644 --- a/base/console/src/com/netscape/admin/certsrv/status/LogInstancePanel.java +++ b/base/console/src/com/netscape/admin/certsrv/status/LogInstancePanel.java @@ -63,7 +63,7 @@ public class LogInstancePanel extends CMSLogPanel { mHelpToken = SYSTEMHELPINDEX; else if (name.equals("error")) mHelpToken = ERRORHELPINDEX; - else + else mHelpToken = HELPINDEX; } diff --git a/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java b/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java index 431d0d61f..d0a33569a 100644 --- a/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java +++ b/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java @@ -106,9 +106,9 @@ public class StatusPanel extends CMSBasePanel } public CMSBasePanel getSelectedTab() { - return this; + return this; } - + //=== ACTIONLISTENER ===================== public void actionPerformed(ActionEvent e) { if (e.getSource().equals(mRefresh)) { @@ -174,7 +174,7 @@ public class StatusPanel extends CMSBasePanel JLabel label5 = makeJLabel("INSTALLDATE"); mInstallDate = new JLabel(); CMSAdminUtil.addEntryField(panel, label5, mInstallDate, gbc); - + CMSAdminUtil.resetGBC(gbc); JLabel label3 = makeJLabel("SERVERSTARTUP"); mServerStart = new JLabel(); @@ -228,10 +228,10 @@ public class StatusPanel extends CMSBasePanel //display error dialog CMSAdminUtil.showErrorDialog(mModel.getFrame(), mResource, e.toString(), ERROR_MESSAGE); - mModel.progressStop(); + mModel.progressStop(); return; } - + mModel.progressStop(); Debug.println("StatusPanel: refresh() "+ response.toString()); diff --git a/base/console/src/com/netscape/admin/certsrv/task/CGITask.java b/base/console/src/com/netscape/admin/certsrv/task/CGITask.java index 8406e1005..5f6871ea1 100644 --- a/base/console/src/com/netscape/admin/certsrv/task/CGITask.java +++ b/base/console/src/com/netscape/admin/certsrv/task/CGITask.java @@ -41,8 +41,8 @@ public class CGITask extends CMSTaskObject /*========================================================== * variables *==========================================================*/ - private static final String PREFIX = "CGITASK"; - + private static final String PREFIX = "CGITASK"; + protected boolean mFinished = false; protected String mCmd = null; protected String mAdminURL = null; @@ -264,7 +264,7 @@ public class CGITask extends CMSTaskObject { int code = Integer.parseInt(sValue); mSuccess = (code == 0); - Debug.println("Parse input: code=" + code + " mSuccess=" + + Debug.println("Parse input: code=" + code + " mSuccess=" + mSuccess); } else if (sName.equalsIgnoreCase("NMC_ERRINFO")) { mErrorMsg = sValue; @@ -308,7 +308,7 @@ public class CGITask extends CMSTaskObject return "bin/" + s; return null; } - + /** * pass the username to the admin server */ @@ -325,7 +325,7 @@ public class CGITask extends CMSTaskObject Debug.println( "password = " + (String)_consoleInfo.get( "AdminUserPassword" ) ); return (String)_consoleInfo.get( "AdminUserPassword" ); - } + } /* protected void showDialog( JFrame frame, String msg, String item, diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSCertRequest.java b/base/console/src/com/netscape/admin/certsrv/task/CMSCertRequest.java index bf391c4e4..fd949e97c 100644 --- a/base/console/src/com/netscape/admin/certsrv/task/CMSCertRequest.java +++ b/base/console/src/com/netscape/admin/certsrv/task/CMSCertRequest.java @@ -47,11 +47,11 @@ public class CMSCertRequest extends CGITask { /*========================================================== * variables *==========================================================*/ - private static final String PREFIX = "CGITASK"; + private static final String PREFIX = "CGITASK"; private String mCgiTask = null; // CGI task to call private CertSetupWizardInfo mWizardInfo; private String mPolicyMsg = null; - + /*========================================================== * constructors *==========================================================*/ @@ -66,18 +66,18 @@ public class CMSCertRequest extends CGITask { Debug.println("CMSRequestCert: initialize()"); _consoleInfo = info.getAdminConsoleInfo(); - // the results coming back from the daemon will be added to the + // the results coming back from the daemon will be added to the // wizard information. mWizardInfo = info; } - + /** - * Collect the data in name value pairs format and then send them to the + * Collect the data in name value pairs format and then send them to the * cgi process. */ public boolean requestCert(Hashtable data) { boolean status = false; // return value - + try { status = run(data); } catch (Exception e) { @@ -89,7 +89,7 @@ public class CMSCertRequest extends CGITask { return mSuccess; } - + /** * the operation is finished after we receive the http stream */ @@ -134,13 +134,13 @@ public class CMSCertRequest extends CGITask { } catch (Exception e) { Debug.println("RequestCert.Exception : " + e.toString()); } - + Debug.println("RequestCert.replyHandler: finished, mSuccess=" + mSuccess); finish(); } - + private void parse2(String s) { int iIndex; @@ -202,7 +202,7 @@ public class CMSCertRequest extends CGITask { + sValue + " index=" + iIndex); if (sValue != null && !sValue.equals("")) { mWizardInfo.setRequestStatus(sValue); - if (sValue.equals("2") || sValue.equals("3") + if (sValue.equals("2") || sValue.equals("3") || sValue.equals("4")) // success, pending, svcPending mSuccess = true; @@ -286,7 +286,7 @@ public class CMSCertRequest extends CGITask { mPolicyMsg = mPolicyMsg + "\n " + sValue; } } - + Debug.println("Parse finished"); } @@ -307,7 +307,7 @@ public class CMSCertRequest extends CGITask { try { mSuccess = false; mFinished = false; - + ByteArrayInputStream data = null; if (args != null && !args.isEmpty()) data = encode(args); @@ -369,11 +369,11 @@ public class CMSCertRequest extends CGITask { (detail.indexOf("Connection timed out") > -1) ) { // java.net.NoRouteToHostException: Connection timed out // double insurance - mErrorMsg = + mErrorMsg = mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE"); } else { // need to determine case by case - mErrorMsg = + mErrorMsg = mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE")+ " java.net.SocketException: " + detail; } @@ -404,7 +404,7 @@ public class CMSCertRequest extends CGITask { } else { // need to determine case by case mErrorMsg = - mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE") + mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE") + " Exception: " + detail; } Debug.println( "Command " + fullCmd + " failed: " + e ); diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSConfigCert.java b/base/console/src/com/netscape/admin/certsrv/task/CMSConfigCert.java index 7d85d161f..572c0b609 100644 --- a/base/console/src/com/netscape/admin/certsrv/task/CMSConfigCert.java +++ b/base/console/src/com/netscape/admin/certsrv/task/CMSConfigCert.java @@ -49,14 +49,14 @@ public class CMSConfigCert extends CGITask { * variables *==========================================================*/ private static final String PREFIX = "CMSCONFIGCERT"; - + public static final String CONFIG_CERT_CGI = "Tasks/Operation/config-cert"; - + //private boolean mSuccess = false; // status of last executed CGI //private Hashtable mCgiResponse = null; // holds parsed contents of CGI return private String mCgiTask = null; // CGI task to call private InstallWizardInfo mWizardInfo; - + /*========================================================== * constructors *==========================================================*/ @@ -70,15 +70,15 @@ public class CMSConfigCert extends CGITask { public void initialize(InstallWizardInfo info) { _consoleInfo = info.getAdminConsoleInfo(); - // the results coming back from the daemon will be added to the + // the results coming back from the daemon will be added to the // wizard information. mWizardInfo = info; setForceBasicAuth(true); } - + /** - * Collect the data in name value pairs format and then send them to the + * Collect the data in name value pairs format and then send them to the * cgi process. */ public boolean configCert(Hashtable data) { @@ -90,15 +90,15 @@ public class CMSConfigCert extends CGITask { if (_consoleInfo.get("AdminUserPassword") == null) _consoleInfo.put("AdminUserPassword", _consoleInfo.getAuthenticationPassword()); - Debug.println("AdminUserPassword = " + _consoleInfo.get("AdminUserPassword")); + Debug.println("AdminUserPassword = " + _consoleInfo.get("AdminUserPassword")); data.put("AdminUserPassword", _consoleInfo.getAuthenticationPassword()); _consoleInfo.put("arguments", data); - // Send Random value for RNG entropy + // Send Random value for RNG entropy data.put(ConfigConstants.PR_CMS_SEED, new Long(WizardBasePanel.mSeed).toString()); - + boolean status = false; // return value - + Cursor cursor = mActiveFrame.getCursor(); int type = cursor.getType(); cursor = new Cursor(Cursor.WAIT_CURSOR); @@ -132,7 +132,7 @@ public class CMSConfigCert extends CGITask { return mSuccess; } - + /** * the operation is finished after we receive the http stream */ @@ -142,7 +142,7 @@ public class CMSConfigCert extends CGITask { if (mCgiResponse != null) mCgiResponse.clear(); */ - + try { BufferedReader rspStream = new BufferedReader(new InputStreamReader(response, "UTF8")); @@ -164,13 +164,13 @@ public class CMSConfigCert extends CGITask { } catch (Exception e) { Debug.println("ConfigCert.Exception : " + e.toString()); } - + Debug.println("ConfigCert.replyHandler: finished, mSuccess=" + mSuccess); finish(); } - + /** * return the value for the given keyword in the reply */ diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSImportCert.java b/base/console/src/com/netscape/admin/certsrv/task/CMSImportCert.java index b285b2284..bd95041e4 100644 --- a/base/console/src/com/netscape/admin/certsrv/task/CMSImportCert.java +++ b/base/console/src/com/netscape/admin/certsrv/task/CMSImportCert.java @@ -47,15 +47,15 @@ public class CMSImportCert extends CGITask { /*========================================================== * variables *==========================================================*/ - private static final String PREFIX = "CGITASK"; + private static final String PREFIX = "CGITASK"; private String mCgiTask = null; // CGI task to call private InstallWizardInfo mWizardInfo; private String mPolicyMsg = null; - + // To support Thawte's header and footer - public static final String BEGIN_PKCS7_HEADER = + public static final String BEGIN_PKCS7_HEADER = "-----BEGIN PKCS #7 SIGNED DATA-----"; - public static final String END_PKCS7_HEADER = + public static final String END_PKCS7_HEADER = "-----END PKCS #7 SIGNED DATA-----"; public static final String BEGIN_HEADER = "-----BEGIN CERTIFICATE-----"; public static final String END_HEADER = "-----END CERTIFICATE-----"; @@ -74,13 +74,13 @@ public class CMSImportCert extends CGITask { Debug.println("CMSImportCert: initialize()"); _consoleInfo = info.getAdminConsoleInfo(); - // the results coming back from the daemon will be added to the + // the results coming back from the daemon will be added to the // wizard information. mWizardInfo = info; } - + /** - * Collect the data in name value pairs format and then send them to the + * Collect the data in name value pairs format and then send them to the * cgi process. */ public boolean importCert(Hashtable data) { @@ -97,7 +97,7 @@ public class CMSImportCert extends CGITask { return mSuccess; } - + /** * the operation is finished after we receive the http stream */ @@ -130,13 +130,13 @@ public class CMSImportCert extends CGITask { } catch (Exception e) { Debug.println("ImportCert.Exception : " + e.toString()); } - + Debug.println("ImportCert.replyHandler: finished, mSuccess=" + mSuccess); finish(); } - + /** * return the value for the given keyword in the reply */ @@ -160,8 +160,8 @@ public class CMSImportCert extends CGITask { sValue.equals(ConfigConstants.APPROVED_STRING) || sValue.equals(ConfigConstants.SVC_PENDING_STRING)) { mWizardInfo.setImportError("Request " + - mWizardInfo.getRequestID() + - " is " + sValue + + mWizardInfo.getRequestID() + + " is " + sValue + ".\nYou can contact an authorized agent or local administrator for further assistance by referring to the request ID."); mSuccess = true; } else if (sValue.equals(ConfigConstants.CANCELED_STRING) || @@ -171,8 +171,8 @@ public class CMSImportCert extends CGITask { if (stage != null) mWizardInfo.put(stage, ConfigConstants.FALSE); mWizardInfo.setImportError("Request " + - mWizardInfo.getRequestID() + - " is " + sValue + + mWizardInfo.getRequestID() + + " is " + sValue + ".\nYou can contact an authorized agent or local administrator for further assistance by referring to the request ID." + "\nYou will be able to regenerate a new request if you click back." ); mSuccess = true; } @@ -191,9 +191,9 @@ public class CMSImportCert extends CGITask { String result = normalizeCertStr(val); Debug.println("After removing all the carriage returns:"); Debug.println(result); - mWizardInfo.setPKCS10(result); + mWizardInfo.setPKCS10(result); mSuccess = true; - + } } else if ((iIndex=s.indexOf("unexpectedError = ")) != (-1)) @@ -261,7 +261,7 @@ public class CMSImportCert extends CGITask { mPolicyMsg = mPolicyMsg + "\n " + sValue; } } - + Debug.println("Parse finished"); } @@ -282,7 +282,7 @@ public class CMSImportCert extends CGITask { try { mSuccess = false; mFinished = false; - + ByteArrayInputStream data = null; if (args != null && !args.isEmpty()) data = encode(args); @@ -344,11 +344,11 @@ public class CMSImportCert extends CGITask { (detail.indexOf("Connection timed out") > -1) ) { // java.net.NoRouteToHostException: Connection timed out // double insurance - mErrorMsg = + mErrorMsg = mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE"); } else { // need to determine case by case - mErrorMsg = + mErrorMsg = mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE")+ " java.net.SocketException: " + detail; } @@ -379,7 +379,7 @@ public class CMSImportCert extends CGITask { } else { // need to determine case by case mErrorMsg = - mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE") + mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE") + " Exception: " + detail; } Debug.println( "Command " + fullCmd + " failed: " + e ); @@ -388,7 +388,7 @@ public class CMSImportCert extends CGITask { } String getStage(String reqType){ - if (reqType.equals(Constants.PR_CA_SIGNING_CERT)){ + if (reqType.equals(Constants.PR_CA_SIGNING_CERT)){ return ConfigConstants.STAGE_CA_REQ_SUCCESS; }else if (reqType.equals(Constants.PR_SERVER_CERT)){ return ConfigConstants.STAGE_SSL_REQ_SUCCESS; diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSMigrateCreate.java b/base/console/src/com/netscape/admin/certsrv/task/CMSMigrateCreate.java index c7ff02c36..bc71dd152 100644 --- a/base/console/src/com/netscape/admin/certsrv/task/CMSMigrateCreate.java +++ b/base/console/src/com/netscape/admin/certsrv/task/CMSMigrateCreate.java @@ -49,13 +49,13 @@ public class CMSMigrateCreate extends CGITask * variables *==========================================================*/ private static final String PREFIX = "CMSMIGRATECREATE"; - + private static final String CREATE_CGI_NAME = "Tasks/Operation/Create"; - + //private boolean mSuccess = false; // status of last executed CGI private Hashtable mCgiResponse = null; // holds parsed contents of CGI return private String mCgiTask = null; // CGI task to call - + /*========================================================== * constructors *==========================================================*/ @@ -70,17 +70,17 @@ public class CMSMigrateCreate extends CGITask Debug.println("CMSMigrateCreate: initialize()"); _consoleInfo = info; } - + public boolean migrate(String serverRoot, String server, String targetDN, boolean flag) { - - Debug.println("CMSMigrateCreate: migrate()"); - + + Debug.println("CMSMigrateCreate: migrate()"); + return false; - } - + } + /** * Starts the server specific creation code, providing the DN for the * target admin group. The method returns true or false depending @@ -94,7 +94,7 @@ public class CMSMigrateCreate extends CGITask public boolean createNewInstance(String targetDN) { //Debug.println("CMSMigrateCreate: createNewInstance()- "+targetDN); //targetDN: cn=Server Group, cn=cynthiar.mcom.com, ou=mcom.com, o=NetscapeRoot - + JFrame mActiveFrame = UtilConsoleGlobals.getActivatedFrame(); boolean status = false; // return value //show dialog @@ -104,54 +104,54 @@ public class CMSMigrateCreate extends CGITask if (dialog.isCancel()) { return status; } - + //construct the rest of the configuration parameters //serverName=cynthiar.mcom.com - //sieURL=ldap://laiking.mcom.com:389/o=netscapeRoot - //adminUID=admin - //adminPWD=admin - //instanceID=cert-data - //serverRoot=/u/thomask/s4 - //adminDomain=mcom.com - + //sieURL=ldap://laiking.mcom.com:389/o=netscapeRoot + //adminUID=admin + //adminPWD=admin + //instanceID=cert-data + //serverRoot=/u/thomask/s4 + //adminDomain=mcom.com + Hashtable configParams = new Hashtable(); - + configParams.put("instanceID",dialog.getInstanceName()); - + String[] entries = LDAPDN.explodeDN(targetDN, false); String DN = entries[entries.length-3] + ", " + entries[entries.length-2] + ", " + entries[entries.length-1]; - + //DN: cn=cynthiar.mcom.com, ou=mcom.com, o=NetscapeRoot configParams.put("machineName", getValue(DN, "serverHostName", LDAPConnection.SCOPE_BASE, null)); configParams.put("serverRoot", getValue(targetDN, "nsconfigroot", - LDAPConnection.SCOPE_BASE, null)); + LDAPConnection.SCOPE_BASE, null)); LDAPConnection ldc = _consoleInfo.getLDAPConnection(); String ssdn = ldc.getAuthenticationDN(); String[] avas = LDAPDN.explodeDN(ssdn, false); String uid = avas[0]; if (!uid.startsWith("uid")) { - CMSAdminUtil.showMessageDialog(mActiveFrame, - mResource, PREFIX, "RESTARTADMINERROR", + CMSAdminUtil.showMessageDialog(mActiveFrame, + mResource, PREFIX, "RESTARTADMINERROR", CMSAdminUtil.ERROR_MESSAGE); return false; } configParams.put("adminUID", uid.substring(4,uid.length())); - - configParams.put("adminPWD",ldc.getAuthenticationPassword()); - String ldapUrl = "ldap://" + ldc.getHost() + ":" + - Integer.toString(ldc.getPort()) + "/" + + + configParams.put("adminPWD",ldc.getAuthenticationPassword()); + String ldapUrl = "ldap://" + ldc.getHost() + ":" + + Integer.toString(ldc.getPort()) + "/" + (String)_consoleInfo.get("BaseDN"); configParams.put("sieURL", ldapUrl); - + String searchDN = entries[entries.length-2]; configParams.put("adminDomain", searchDN.substring(3,searchDN.length())); - + Debug.println("CMSMigrateCreate: createNewInstance()- "+configParams.toString()); - + // set the arguments for the CGI call _consoleInfo.put("arguments", configParams); _consoleInfo.put(CREATE_CGI_NAME, "cert"); @@ -162,8 +162,8 @@ public class CMSMigrateCreate extends CGITask if (_consoleInfo.get("AdminUserPassword") == null) _consoleInfo.put("AdminUserPassword", _consoleInfo.getAuthenticationPassword()); - Debug.println("AdminUserPassword = " + _consoleInfo.get("AdminUserPassword")); - + Debug.println("AdminUserPassword = " + _consoleInfo.get("AdminUserPassword")); + // call the CGI program Debug.println("CMSMigrateCreate: createNewInstance() before run task="+CREATE_CGI_NAME); mCgiTask = CREATE_CGI_NAME; @@ -191,7 +191,7 @@ public class CMSMigrateCreate extends CGITask "SYSTEMERROR", CMSAdminUtil.ERROR_MESSAGE); else JOptionPane.showMessageDialog(mActiveFrame, errorMsg, - "Error", CMSAdminUtil.ERROR_MESSAGE, + "Error", CMSAdminUtil.ERROR_MESSAGE, CMSAdminUtil.getImage(CMSAdminResources.IMAGE_ERROR_ICON)); } @@ -200,7 +200,7 @@ public class CMSMigrateCreate extends CGITask return mSuccess; } - + /** * the operation is finished after we receive the http stream */ @@ -208,7 +208,7 @@ public class CMSMigrateCreate extends CGITask mSuccess = false; if (mCgiResponse != null) mCgiResponse.clear(); - + try { BufferedReader rspStream = new BufferedReader(new InputStreamReader(response, "UTF8")); @@ -230,13 +230,13 @@ public class CMSMigrateCreate extends CGITask } catch (Exception e) { Debug.println("MigrateCreate.replyHandler: " + e.toString()); } - + Debug.println("MigrateCreate.replyHandler: finished, mSuccess=" + mSuccess); finish(); } - + /** * return the value for the given keyword in the reply */ @@ -266,7 +266,7 @@ public class CMSMigrateCreate extends CGITask Debug.println("Parse finished"); } - + /** * Get one value for one specified attribute from the given DN. * If there is more than 1 entry which matches the given criteria, the @@ -289,7 +289,7 @@ public class CMSMigrateCreate extends CGITask return null; } - + /** * Get the values for several specified attributes from the given DN. * If there is more than 1 entry which matches the given criteria, the @@ -335,6 +335,6 @@ public class CMSMigrateCreate extends CGITask } return values; - } - + } + } diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSRequestCert.java b/base/console/src/com/netscape/admin/certsrv/task/CMSRequestCert.java index 8b3cfef6b..1ef7f87de 100644 --- a/base/console/src/com/netscape/admin/certsrv/task/CMSRequestCert.java +++ b/base/console/src/com/netscape/admin/certsrv/task/CMSRequestCert.java @@ -47,11 +47,11 @@ public class CMSRequestCert extends CGITask { /*========================================================== * variables *==========================================================*/ - private static final String PREFIX = "CGITASK"; + private static final String PREFIX = "CGITASK"; private String mCgiTask = null; // CGI task to call private InstallWizardInfo mWizardInfo; private String mPolicyMsg = null; - + /*========================================================== * constructors *==========================================================*/ @@ -66,18 +66,18 @@ public class CMSRequestCert extends CGITask { Debug.println("CMSRequestCert: initialize()"); _consoleInfo = info.getAdminConsoleInfo(); - // the results coming back from the daemon will be added to the + // the results coming back from the daemon will be added to the // wizard information. mWizardInfo = info; } - + /** - * Collect the data in name value pairs format and then send them to the + * Collect the data in name value pairs format and then send them to the * cgi process. */ public boolean requestCert(Hashtable data) { boolean status = false; // return value - + try { status = run(data); } catch (Exception e) { @@ -89,7 +89,7 @@ public class CMSRequestCert extends CGITask { return mSuccess; } - + /** * the operation is finished after we receive the http stream */ @@ -134,7 +134,7 @@ public class CMSRequestCert extends CGITask { } catch (Exception e) { Debug.println("RequestCert.Exception : " + e.toString()); } - + Debug.println("RequestCert.replyHandler: finished, mSuccess=" + mSuccess); @@ -182,7 +182,7 @@ public class CMSRequestCert extends CGITask { } - + /** * return the value for the given keyword in the reply */ @@ -203,7 +203,7 @@ public class CMSRequestCert extends CGITask { + sValue + " index=" + iIndex); if (sValue != null && !sValue.equals("")) { mWizardInfo.setRequestStatus(sValue); - if (sValue.equals("2") || sValue.equals("3") + if (sValue.equals("2") || sValue.equals("3") || sValue.equals("4")){ //mSuccess = true; } @@ -289,7 +289,7 @@ public class CMSRequestCert extends CGITask { } else if ((iIndex=s.indexOf("/HTML")) != (-1)) mSuccess = true; // no need to parse further - + Debug.println("Parse finished"); } @@ -310,7 +310,7 @@ public class CMSRequestCert extends CGITask { try { mSuccess = false; mFinished = false; - + ByteArrayInputStream data = null; if (args != null && !args.isEmpty()) data = encode(args); @@ -372,11 +372,11 @@ public class CMSRequestCert extends CGITask { (detail.indexOf("Connection timed out") > -1) ) { // java.net.NoRouteToHostException: Connection timed out // double insurance - mErrorMsg = + mErrorMsg = mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE"); } else { // need to determine case by case - mErrorMsg = + mErrorMsg = mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE")+ " java.net.SocketException: " + detail; } @@ -407,7 +407,7 @@ public class CMSRequestCert extends CGITask { } else { // need to determine case by case mErrorMsg = - mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE") + mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE") + " Exception: " + detail; } Debug.println( "Command " + fullCmd + " failed: " + e ); diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSRestart.java b/base/console/src/com/netscape/admin/certsrv/task/CMSRestart.java index fa9d59ddd..9c52d80c6 100644 --- a/base/console/src/com/netscape/admin/certsrv/task/CMSRestart.java +++ b/base/console/src/com/netscape/admin/certsrv/task/CMSRestart.java @@ -74,7 +74,7 @@ public class CMSRestart extends CGITask Hashtable configParams = new Hashtable(); configParams.put("serverRoot",_consoleInfo.get("serverRoot")); - + String servid = (String)_consoleInfo.get("servid"); int index = servid.indexOf("-"); if (index != -1) { diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSStart.java b/base/console/src/com/netscape/admin/certsrv/task/CMSStart.java index 2122145c3..c47cbd164 100644 --- a/base/console/src/com/netscape/admin/certsrv/task/CMSStart.java +++ b/base/console/src/com/netscape/admin/certsrv/task/CMSStart.java @@ -145,7 +145,7 @@ public class CMSStart extends CGITask UtilConsoleGlobals.getActivatedFrame(), mResource, PREFIX, "SYSTEMERROR", CMSAdminUtil.ERROR_MESSAGE); else { - String errorMsg = + String errorMsg = mResource.getString("STARTRESULTDIALOG_FAILED_TEXT")+mErrorMsg; Icon icon = CMSAdminUtil.getImage(CMSAdminResources.IMAGE_ERROR_ICON); JOptionPane.showMessageDialog(UtilConsoleGlobals.getActivatedFrame(), diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSStartDaemon.java b/base/console/src/com/netscape/admin/certsrv/task/CMSStartDaemon.java index 510bf0661..1d8dd2ef7 100644 --- a/base/console/src/com/netscape/admin/certsrv/task/CMSStartDaemon.java +++ b/base/console/src/com/netscape/admin/certsrv/task/CMSStartDaemon.java @@ -47,13 +47,13 @@ public class CMSStartDaemon extends CGITask { * variables *==========================================================*/ private static final String PREFIX = "CMSSTARTDAEMON"; - + public static final String START_DAEMON_CGI = "Tasks/Operation/start-daemon"; - + private boolean mSuccess = false; // status of last executed CGI private Hashtable mCgiResponse = null; // holds parsed contents of CGI return private String mCgiTask = null; // CGI task to call - + /*========================================================== * constructors *==========================================================*/ @@ -68,7 +68,7 @@ public class CMSStartDaemon extends CGITask { Debug.println("CMSStartDaemon: initialize()"); _consoleInfo = info; } - + /** * Starts the server specific creation code, providing the DN for the * target admin group. The method returns true or false depending @@ -80,7 +80,7 @@ public class CMSStartDaemon extends CGITask { * or failed (false). */ public boolean runDaemon(Hashtable configParams) { - String response = null; + String response = null; /* LDAPConnection ldc = _consoleInfo.getLDAPConnection(); String ssdn = ldc.getAuthenticationDN(); @@ -101,7 +101,7 @@ public class CMSStartDaemon extends CGITask { if (_consoleInfo.get("AdminUserPassword") == null) _consoleInfo.put("AdminUserPassword", _consoleInfo.getAuthenticationPassword()); - Debug.println("AdminUserPassword = " + _consoleInfo.get("AdminUserPassword")); + Debug.println("AdminUserPassword = " + _consoleInfo.get("AdminUserPassword")); Debug.println("Current DN = "+_consoleInfo.getCurrentDN()); boolean status = false; // return value @@ -114,11 +114,11 @@ public class CMSStartDaemon extends CGITask { } Debug.println("CMSStartDaemon: startDaemon() after run status=" + status + " mSuccess=" + mSuccess); -again: +again: if (!mSuccess) { response = (String) mCgiResponse.get("NMC_ERRINFO"); if ((response != null) && response.equalsIgnoreCase("daemon found lock file")) { - int result = CMSAdminUtil.showConfirmDialog(mResource, "CMSSTARTDAEMON"/*PREFIX*/, + int result = CMSAdminUtil.showConfirmDialog(mResource, "CMSSTARTDAEMON"/*PREFIX*/, "LOCKDELETECONFIRM", CMSAdminUtil.WARNING_MESSAGE); if (result == CMSAdminUtil.OK_OPTION) { Debug.println("User wants to delete lock file."); @@ -135,10 +135,10 @@ again: "SYSTEMERROR", CMSAdminUtil.ERROR_MESSAGE); } } - + return mSuccess; } - + /** * the operation is finished after we receive the http stream */ @@ -146,7 +146,7 @@ again: mSuccess = false; if (mCgiResponse != null) mCgiResponse.clear(); - + try { BufferedReader rspStream = new BufferedReader(new InputStreamReader(response, "UTF8")); @@ -168,13 +168,13 @@ again: } catch (Exception e) { Debug.println("StartDaemon.replyHandler: " + e.toString()); } - + Debug.println("StartDaemon.replyHandler: finished, mSuccess=" + mSuccess); finish(); } - + /** * return the value for the given keyword in the reply */ @@ -203,14 +203,14 @@ again: Debug.println("Parse finished"); } - + /** * return the value for the response */ public Hashtable getResponse() { - return mCgiResponse; + return mCgiResponse; } - + /** * Get one value for one specified attribute from the given DN. * If there is more than 1 entry which matches the given criteria, the @@ -233,7 +233,7 @@ again: return null; } - + /** * Get the values for several specified attributes from the given DN. * If there is more than 1 entry which matches the given criteria, the @@ -279,6 +279,6 @@ again: } return values; - } - + } + } diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSStatus.java b/base/console/src/com/netscape/admin/certsrv/task/CMSStatus.java index edd80b5b2..e052e157e 100644 --- a/base/console/src/com/netscape/admin/certsrv/task/CMSStatus.java +++ b/base/console/src/com/netscape/admin/certsrv/task/CMSStatus.java @@ -112,7 +112,7 @@ public class CMSStatus extends CGITask configDN); } _consoleInfo.put("arguments", configParams); - + if (_consoleInfo.get("AdminUsername") == null) _consoleInfo.put("AdminUsername", _consoleInfo.getAuthenticationDN() ); @@ -132,7 +132,7 @@ public class CMSStatus extends CGITask status = false; } Debug.println("CMSStatus: status() after run status="+status); - + if (!status) { Debug.println("Status task returned false"); } else { @@ -143,10 +143,10 @@ public class CMSStatus extends CGITask /** - * Send an http request to the server. - * if the admin serever is down do + * Send an http request to the server. + * if the admin serever is down do * Return true if we're sure it - * succeeded, otherwise false. + * succeeded, otherwise false. * * @param viewInstance The calling page * @param cmd Command to execute @@ -158,22 +158,22 @@ public class CMSStatus extends CGITask Debug.println( "Could not get adminURL for " + getDN() ); return false; } - + // Allow specifying e.g. "slapd-install" for instance String instance = (String)_consoleInfo.get( cmd ); - + if ( instance == null ) instance = (String)_consoleInfo.get( "ServerInstance" ); String fullCmd = mAdminURL + instance + "/" + cmd; - + HttpManager h = new HttpManager(); // tell the http manager to use UTF8 encoding h.setSendUTF8(true); - + try { mSuccess = false; mFinished = false; - + // _consoleInfo.get("arguments") is a hashtable of key/value pairs // to use as the arguments to the CGI Hashtable args = (Hashtable)_consoleInfo.get("arguments"); @@ -199,7 +199,7 @@ public class CMSStatus extends CGITask mSuccess = cmsAdmin.getStatusFromAgentPort(); } Debug.println( "Falling back to get status by connecting to the server"); - + } return mSuccess; } diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSStop.java b/base/console/src/com/netscape/admin/certsrv/task/CMSStop.java index b2a909633..7bbf7472d 100644 --- a/base/console/src/com/netscape/admin/certsrv/task/CMSStop.java +++ b/base/console/src/com/netscape/admin/certsrv/task/CMSStop.java @@ -142,7 +142,7 @@ public class CMSStop extends CGITask UtilConsoleGlobals.getActivatedFrame(), mResource, PREFIX, "SYSTEMERROR", CMSAdminUtil.ERROR_MESSAGE); else { - String errorMsg = + String errorMsg = mResource.getString("STOPRESULTDIALOG_FAILED_TEXT")+mErrorMsg; Icon icon = CMSAdminUtil.getImage(CMSAdminResources.IMAGE_ERROR_ICON); JOptionPane.showMessageDialog(UtilConsoleGlobals.getActivatedFrame(), diff --git a/base/console/src/com/netscape/admin/certsrv/task/StatusDialog.java b/base/console/src/com/netscape/admin/certsrv/task/StatusDialog.java index 0cd11beb5..a959262f7 100644 --- a/base/console/src/com/netscape/admin/certsrv/task/StatusDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/task/StatusDialog.java @@ -30,7 +30,7 @@ import javax.swing.table.*; import com.netscape.certsrv.common.*; /** - * Policy Implementation Information viewer + * Policy Implementation Information viewer * * @author Jack Pan-Chen * @version $Revision$, $Date$ @@ -160,7 +160,7 @@ public class StatusDialog extends JDialog gbc.insets = new Insets(CMSAdminUtil.COMPONENT_SPACE,CMSAdminUtil.COMPONENT_SPACE, CMSAdminUtil.COMPONENT_SPACE,CMSAdminUtil.COMPONENT_SPACE); gb3.setConstraints(mDetails, gbc); content.add(mDetails); - + CMSAdminUtil.resetGBC(gbc); mTextArea = new JTextArea("",3,50); mTextArea.setFont(mTitle.getFont()); @@ -180,7 +180,7 @@ public class StatusDialog extends JDialog gbc.weighty=1.0; gb3.setConstraints(scrollPanel, gbc); content.add(scrollPanel); - + return content; } } diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java index 6656b3abb..fcfc0b912 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java @@ -79,9 +79,9 @@ public class AuthBaseDialog extends JDialog * @param users list of current groups */ // Changed by beomsuk - /*public void showDialog(NameValuePairs data, String name, + /*public void showDialog(NameValuePairs data, String name, boolean pinDirExist, boolean userDirExist) {*/ - public void showDialog(NameValuePairs data, String name, + public void showDialog(NameValuePairs data, String name, boolean pinDirExist, boolean userDirExist, boolean portalExist) { // Change end mDataModel.removeAllRows(); @@ -172,7 +172,7 @@ public class AuthBaseDialog extends JDialog mTable.setValueAt(str, row, col); } } - + try { if (mAuthName.isVisible()) addPolicyRule(getData(), getRuleName()); @@ -323,8 +323,8 @@ public class AuthBaseDialog extends JDialog super(x); } - public Component getTableCellRendererComponent(JTable table, - Object value, boolean isSelected, boolean hasFocus, int row, + public Component getTableCellRendererComponent(JTable table, + Object value, boolean isSelected, boolean hasFocus, int row, int column) { if(value == null) { diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java index aa756b388..6844e911c 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java @@ -84,8 +84,8 @@ public class AuthConfigDialog extends CMSBaseConfigDialog Debug.println("Returning instance name "+instanceName); return instanceName; - + } - + } diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java index 0cc964c60..8170944ee 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java @@ -56,7 +56,7 @@ public class AuthImplTab extends CMSBaseUGTab { protected AuthImplDataModel mDataModel; //table model protected AuthRegisterDialog mEditor=null; //keep single copy protected JButton mRefresh, mAdd, mDelete, mHelp; - private static final String HELPINDEX = + private static final String HELPINDEX = "authentication-certsrv-authplugin-help"; /*========================================================== @@ -111,9 +111,9 @@ public class AuthImplTab extends CMSBaseUGTab { public void mouseClicked(MouseEvent e) { setButtons(); } - + public void mouseReleased(MouseEvent e) { - setButtons(); + setButtons(); } /*========================================================== diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java index 929f99aef..d35dc1909 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java @@ -40,7 +40,7 @@ public class AuthInstanceTab extends CMSPluginInstanceTab { private static final String ADMINRULE = "adminAuth"; private static final String AGENTRULE = "agentAuth"; - private static final String HELPINDEX = + private static final String HELPINDEX = "authentication-certsrv-authrules-help"; private static final String DEST = DestDef.DEST_AUTH_ADMIN; diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java index 8721363d1..b550c4cfb 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java @@ -61,7 +61,7 @@ public class AuthPluginSelectionDialog extends PluginSelectionDialog * constructors *==========================================================*/ public AuthPluginSelectionDialog(JFrame parent, - AdminConnection conn, + AdminConnection conn, String dest, CMSPluginInstanceTab pluginType) { @@ -69,7 +69,7 @@ public class AuthPluginSelectionDialog extends PluginSelectionDialog mScope = ScopeDef.SC_AUTH_IMPLS; mInstanceScope = ScopeDef.SC_AUTH_MGR_INSTANCE; mImageName = CMSAdminResources.IMAGE_RULE_PLUGIN; - + mHelpToken = "authentication-certsrv-add-authrule-dbox-help"; setDisplay(); /**** diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java index 6f3ed575a..94216eeb4 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java @@ -44,7 +44,7 @@ public class AuthViewDialog extends AuthBaseDialog * variables *==========================================================*/ private static final String PREFIX = "AUTHVIEWDIALOG"; - private static final String HELPINDEX = + private static final String HELPINDEX = "authentication-certsrv-view-authrule-dbox-help"; /*========================================================== diff --git a/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java index 758dda109..843f12a23 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java @@ -105,12 +105,12 @@ public class CertImportDialog extends JDialog //=== ACTIONLISTENER ===================== public void actionPerformed(ActionEvent evt) { - + if (evt.getSource().equals(mPaste)) { mTextArea.paste(); return; } - + if (evt.getSource().equals(mCancel)) { this.hide(); } @@ -229,7 +229,7 @@ public class CertImportDialog extends JDialog gbc.weightx=1.0; gb3.setConstraints(mPaste, gbc); content.add(mPaste); - + CMSAdminUtil.resetGBC(gbc); mTextArea = new JTextArea("",40,70); Font f = new Font("Monospaced", Font.PLAIN, 12); @@ -241,7 +241,7 @@ public class CertImportDialog extends JDialog JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); scrollPanel.setAlignmentX(LEFT_ALIGNMENT); scrollPanel.setAlignmentY(TOP_ALIGNMENT); - scrollPanel.setBorder(BorderFactory.createLoweredBevelBorder()); + scrollPanel.setBorder(BorderFactory.createLoweredBevelBorder()); scrollPanel.setPreferredSize(new Dimension(300, 500)); gbc.fill = gbc.BOTH; gbc.gridwidth = gbc.REMAINDER; diff --git a/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java index 82083649e..0f3585591 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java @@ -33,7 +33,7 @@ import com.netscape.certsrv.common.*; * The administrator can use this dialog to management the * certificates of specific user. This allows the import of * new certificates and delete/view of existing certificates. - * + * * This dialog is launched by clicking on the certificate button * on the main user management tab. * @@ -64,7 +64,7 @@ public class CertManagementDialog extends JDialog private JList mList; private JButton mOK, mCancel, mAdd, mDelete, mView, mHelp; - private final static String HELPINDEX = + private final static String HELPINDEX = "usersgroups-certsrv-manage-usercert-dbox-help"; /*========================================================== @@ -94,7 +94,7 @@ public class CertManagementDialog extends JDialog */ public void showDialog(String uid) { mUID = uid; - + if (!refresh()) return; setButtons(); @@ -154,7 +154,7 @@ public class CertManagementDialog extends JDialog /*========================================================== * private methods *==========================================================*/ - + /** * Setup the initial UI components */ @@ -278,10 +278,10 @@ public class CertManagementDialog extends JDialog //refresh the table content private boolean refresh() { - + mDataModel.clear(); mPPData.removeAllElements(); - + NameValuePairs response; try { response = mConnection.read(DestDef.DEST_USER_ADMIN, @@ -290,19 +290,19 @@ public class CertManagementDialog extends JDialog } catch (EAdminException e) { CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.getMessage(), CMSAdminUtil.ERROR_MESSAGE); - return false; + return false; } - + //parse data String[] vals = new String[response.size()]; int i=0; - + for (String entry : response.keySet()) { vals[i++] = entry.trim(); } - + CMSAdminUtil.bubbleSort(vals); - + for (int y=0; y< vals.length ; y++) { String str = reformat(vals[y]); mDataModel.addElement(new JLabel(str, @@ -310,7 +310,7 @@ public class CertManagementDialog extends JDialog JLabel.LEFT)); mPPData.addElement(response.get(vals[y])); } - + return true; } @@ -334,7 +334,7 @@ public class CertManagementDialog extends JDialog String serial = val.substring(9, subject_pos).trim(); long num = CMSAdminUtil.hexToLong(serial); try { - return "-1;" + + return "-1;" + num + ";" + val.substring(issuer_pos+7).trim() + ";" + val.substring(subject_pos+8, issuer_pos).trim(); @@ -356,20 +356,20 @@ public class CertManagementDialog extends JDialog String issuer=null; String subject=null; - try { + try { version = st.nextToken(); serial = st.nextToken(); issuer = st.nextToken(); subject = st.nextToken(); } catch (Exception e) {} - + try { if (serial != null) { String hexserial = Integer.toHexString(Integer.parseInt(serial)); name = name + "Serial:0x"+hexserial; } } catch (Exception e) {} - + if (subject != null) { name = name + " Subject:"+subject; @@ -381,7 +381,7 @@ public class CertManagementDialog extends JDialog return name; } - + private void addCert(String B64E) { //send comment to server for the removal of user NameValuePairs config = new NameValuePairs(); @@ -397,8 +397,8 @@ public class CertManagementDialog extends JDialog e.getMessage(), CMSAdminUtil.ERROR_MESSAGE); return; } - } - + } + /** * routine to cleanup the certificate data * this removes end of line embedded in the @@ -415,15 +415,15 @@ public class CertManagementDialog extends JDialog buff.append(c); } return buff.toString(); - } - + } + private void deleteCert() { //get entry name String dn = ((JLabel)mDataModel.elementAt(mList.getSelectedIndex())).getText(); dn = toServerFormat(dn); NameValuePairs config = new NameValuePairs(); config.put(Constants.PR_USER_CERT, dn); - + //send comment to server for the removal of user try { mConnection.modify(DestDef.DEST_USER_ADMIN, diff --git a/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java b/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java index e9693b15d..5617398b7 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java @@ -58,10 +58,10 @@ public class GroupEditor extends JDialog private JButton mOK, mCancel, mHelp, mAddUser, mDelete; private JTextField mGroupNameField, mGroupDescField; private JLabel mGroupNameLabel; - - private static final String ADDHELPINDEX = + + private static final String ADDHELPINDEX = "usersgroups-certsrv-add-group-dbox-help"; - private static final String EDITHELPINDEX = + private static final String EDITHELPINDEX = "usersgroups-certsrv-edit-group-dbox-help"; private String mHelpToken; @@ -149,7 +149,7 @@ public class GroupEditor extends JDialog "NOGROUPNAME", CMSAdminUtil.ERROR_MESSAGE); return; } - + try { mGroupName = mGroupNameField.getText().trim(); addGroup(); @@ -190,13 +190,13 @@ public class GroupEditor extends JDialog if (evt.getSource().equals(mAddUser)) { //bring up the list for selection - + //create vector here Vector currentUser = new Vector(); for (int i=0; i<mDataModel.getSize(); i++) { currentUser.addElement((String)mDataModel.getElementAt(i)); } - + NameValuePairs response; try { response = mConnection.search(DestDef.DEST_USER_ADMIN, @@ -220,18 +220,18 @@ public class GroupEditor extends JDialog if (mUserDialog==null) mUserDialog = new UserListDialog(mParentFrame, mConnection); - + mUserDialog.showDialog(currentUser); //get selection if (!mUserDialog.isOK()) return; - + //create user NVP data object and add user entry Vector selectedUser = mUserDialog.getSelectedUser(); //Debug.println("Selected User = "+selectedUser.toString()); - + for(int i=0; i<selectedUser.size(); i++) { String name = ((String) selectedUser.elementAt(i)).trim(); if (!isDuplicate(name)) @@ -356,7 +356,7 @@ public class GroupEditor extends JDialog gbc. insets = new Insets(CMSAdminUtil.COMPONENT_SPACE, CMSAdminUtil.COMPONENT_SPACE,0,0); top.add(label1, gbc); - + gbc.anchor = gbc.WEST; gbc.fill = gbc.HORIZONTAL; gbc.weightx = 1.0; @@ -365,7 +365,7 @@ public class GroupEditor extends JDialog 0,CMSAdminUtil.DIFFERENT_COMPONENT_SPACE); top.add( mGroupNameLabel, gbc ); top.add( mGroupNameField, gbc ); - + JLabel dummy = new JLabel(); dummy.setVisible(false); gbc.gridwidth = gbc.REMAINDER; @@ -388,7 +388,7 @@ public class GroupEditor extends JDialog CMSAdminUtil.DIFFERENT_COMPONENT_SPACE, CMSAdminUtil.COMPONENT_SPACE,0); top.add(label3, gbc ); - + CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTH; gbc.gridwidth = gbc.REMAINDER; @@ -407,8 +407,8 @@ public class GroupEditor extends JDialog resizeButtons(); //group membership table - - + + mList = makeJList(mDataModel,9); mList.addListSelectionListener(this); mScrollPane = new JScrollPane(mList, @@ -506,7 +506,7 @@ public class GroupEditor extends JDialog String user_str = tokenizer.nextToken().trim(); mDataModel.addElement(user_str); } - + } //add new group information diff --git a/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java b/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java index e80cc7047..84e9fe0b0 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java @@ -81,14 +81,14 @@ public class GroupTab extends CMSBaseUGTab { Debug.println("Edit Groups "+mTable.getSelectedRow()); String groupName = (String) mDataModel.getObjectValueAt(mTable.getSelectedRow()); - + if (mEditor==null){ - mEditor = new GroupEditor(mModel.getFrame(), mConnection); - } + mEditor = new GroupEditor(mModel.getFrame(), mConnection); + } mEditor.showDialog(groupName, false); refresh(); - + } if (e.getSource().equals(mAdd)) { Debug.println("Show Editor"); @@ -114,7 +114,7 @@ public class GroupTab extends CMSBaseUGTab { //==== MOUSELISTENER ====================== public void mouseClicked(MouseEvent e) { setButtons(); - + /* //NEED TO DISABLE THIS DUE TO BUG THAT WILL RE-DISPLAY @@ -152,9 +152,9 @@ public class GroupTab extends CMSBaseUGTab { } public void mouseReleased(MouseEvent e) { - setButtons(); - } - + setButtons(); + } + /*========================================================== * protected methods *==========================================================*/ @@ -301,7 +301,7 @@ public class GroupTab extends CMSBaseUGTab { mEdit.setEnabled(true); } - + private void updateGroup() { //send request and parse data @@ -325,7 +325,7 @@ public class GroupTab extends CMSBaseUGTab { for (String entry : response.keySet()) { store.addElement(entry.trim()); } - + String[] vals = new String[store.size()]; store.copyInto(vals); @@ -335,10 +335,10 @@ public class GroupTab extends CMSBaseUGTab { String value = response.get(vals[y]); mDataModel.processData(vals[y],value); } - + if (mDataModel.getRowCount() >0) mTable.setRowSelectionInterval(0,0); - + mModel.progressStop(); } diff --git a/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java index c3b74ce35..6759294fa 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java @@ -53,7 +53,7 @@ public class UserDataModel extends CMSContentTableModel { v.addElement(new JLabel(uid, CMSAdminUtil.getImage(CMSAdminResources.IMAGE_USER), JLabel.LEFT)); - v.addElement(name); + v.addElement(name); addRow(v,uid); } diff --git a/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java b/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java index 75908fe6a..29d1c6c22 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.common.*; * * @author Jack Pan-Chen * @version $Revision$, $Date$ - * + * * @see com.netscape.admin.certsrv.ug.UserTab */ public class UserEditor extends JDialog @@ -66,9 +66,9 @@ public class UserEditor extends JDialog private JPasswordField mPasswordConfirm; private JLabel mUserLabel, mMembership, mGroupLbl, dummy1; private JComboBox mGroupBox; - private static final String ADDHELPINDEX = + private static final String ADDHELPINDEX = "usersgroups-certsrv-add-user-dbox-help"; - private static final String EDITHELPINDEX = + private static final String EDITHELPINDEX = "usersgroups-certsrv-edit-user-dbox-help"; /*========================================================== @@ -90,7 +90,7 @@ public class UserEditor extends JDialog setLocationRelativeTo(parent); getRootPane().setDoubleBuffered(true); setDisplay(); - + if(!mIsNewUser) { mUserNameField.setVisible(false); mUserLabel.setVisible(true); @@ -134,7 +134,7 @@ public class UserEditor extends JDialog mDataModel.clear(); //mViewCert.setEnabled(false); - + if(!mIsNewUser) { mUserLabel.setText(user); } else { @@ -142,7 +142,7 @@ public class UserEditor extends JDialog mUserLabel.setText(""); mStateField.setText("1"); } - + //retrieve the cert record from the server try { if (mIsNewUser == false) @@ -184,7 +184,7 @@ public class UserEditor extends JDialog mUserAdded = false; if (evt.getSource().equals(mOK)) { - + //check password field String pwd = mPasswordField.getText().trim(); if (!pwd.equals("")) { @@ -194,15 +194,15 @@ public class UserEditor extends JDialog return; } } - + if (mIsNewUser) { - + //check text fields if (mUserNameField.getText().trim().equals("")) { CMSAdminUtil.showMessageDialog(mParentFrame, mResource, PREFIX, "NOUSERNAME", CMSAdminUtil.ERROR_MESSAGE); return; - } + } try { addUser(); @@ -310,15 +310,15 @@ public class UserEditor extends JDialog public void insertUpdate(DocumentEvent e) { updateView(); } - + public void removeUpdate(DocumentEvent e){ updateView(); } - + public void changedUpdate(DocumentEvent e){ updateView(); } - + /*========================================================== * private methods *==========================================================*/ @@ -332,7 +332,7 @@ public class UserEditor extends JDialog mOK.setEnabled(false); return; } - } + } if (mFullNameField.getText().trim().equals("")) { mOK.setEnabled(false); return; @@ -391,7 +391,7 @@ public class UserEditor extends JDialog } private JPanel makeContentPane() { - + Insets insets = new Insets(CMSAdminUtil.COMPONENT_SPACE,0, CMSAdminUtil.COMPONENT_SPACE,0); @@ -481,7 +481,7 @@ public class UserEditor extends JDialog mList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION ); mList.addMouseListener(this); mScrollPane.setBackground(Color.white); - + mScrollPane.setBorder(BorderFactory.createLoweredBevelBorder()); //setLabelCellRenderer(mTable,0); @@ -560,7 +560,7 @@ public class UserEditor extends JDialog } } - + //add new group information private void addUser() throws EAdminException { diff --git a/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java b/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java index 78b7e5252..f74b67bfa 100644 --- a/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java +++ b/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java @@ -69,7 +69,7 @@ public class UserTab extends CMSBaseUGTab { /*========================================================== * public methods *==========================================================*/ - + /** * refresh the content of the tab * IRefreshTab menthod @@ -142,7 +142,7 @@ public class UserTab extends CMSBaseUGTab { public void mouseClicked(MouseEvent e) { //Debug.println("CertRepositoryPanel: mouseClicked() -"+e.toString()); setButtons(); - + //we track the double click action on the table entry - View op if(mTable.getSelectedRow() >= 0) { if(e.getClickCount() == 2) { @@ -151,15 +151,15 @@ public class UserTab extends CMSBaseUGTab { } } } - + public void mouseReleased(MouseEvent e) { - setButtons(); - } + setButtons(); + } /*========================================================== * protected methods *==========================================================*/ - + /** * create the user action button panel */ @@ -264,11 +264,11 @@ public class UserTab extends CMSBaseUGTab { mCert.setEnabled(true); } - + //============================================= // SEND REQUESTS TO THE SERVER SIDE //============================================= - + private void updateUser() { //send request and parse data @@ -348,10 +348,10 @@ public class UserTab extends CMSBaseUGTab { String str = e.toString(); if (str.indexOf("The user") == 0) { - int i = - JOptionPane.showConfirmDialog(new JFrame(), str, + int i = + JOptionPane.showConfirmDialog(new JFrame(), str, "Information", JOptionPane.YES_NO_OPTION, - JOptionPane.INFORMATION_MESSAGE, + JOptionPane.INFORMATION_MESSAGE, CMSAdminUtil.getImage(CMSAdminResources.IMAGE_INFO_ICON)); if (i == JOptionPane.YES_OPTION) { Debug.println("User Deleted"); diff --git a/base/console/src/com/netscape/admin/certsrv/wizard/WizardBasePanel.java b/base/console/src/com/netscape/admin/certsrv/wizard/WizardBasePanel.java index c31767d99..9b60500c3 100644 --- a/base/console/src/com/netscape/admin/certsrv/wizard/WizardBasePanel.java +++ b/base/console/src/com/netscape/admin/certsrv/wizard/WizardBasePanel.java @@ -44,7 +44,7 @@ public class WizardBasePanel extends CMSBasePanel implements MouseMotionListener protected String mTitle; protected String mErrorString; protected String mNextString = - mResource.getString("GENERALWIZARD_LABEL_NEXT_LABEL"); + mResource.getString("GENERALWIZARD_LABEL_NEXT_LABEL"); protected String mPanelName; public static long mSeed; @@ -73,7 +73,7 @@ public class WizardBasePanel extends CMSBasePanel implements MouseMotionListener /* GridBagConstraints gbc = new GridBagConstraints(); - + CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.SOUTHWEST; gbc.weightx = 1.0; @@ -143,7 +143,7 @@ public class WizardBasePanel extends CMSBasePanel implements MouseMotionListener wizardInfo.remove("NMC_ERRINFO"); wizardInfo.remove("NMC_STATUS"); } - + public String getErrorMessage(WizardInfo wizardInfo) { String value = (String)wizardInfo.get("NMC_ERRINFO"); if (value != null || value.trim().length() == 0) @@ -151,11 +151,11 @@ public class WizardBasePanel extends CMSBasePanel implements MouseMotionListener value = (String)wizardInfo.get("NMC_WARNINFO"); if (value != null || value.trim().length() == 0) return value; - + return null; } - public boolean send(String host, int port, String servlet, String rawData, + public boolean send(String host, int port, String servlet, String rawData, WizardInfo wizardInfo) { try { Socket socket = new Socket(host, port); @@ -203,7 +203,7 @@ public class WizardBasePanel extends CMSBasePanel implements MouseMotionListener } else { return false; } - } catch (Exception e) { + } catch (Exception e) { } return false; @@ -247,7 +247,7 @@ public class WizardBasePanel extends CMSBasePanel implements MouseMotionListener if (numTokens == 2) { String name = tokenizer1.nextToken().trim(); String value = tokenizer1.nextToken().trim(); - wizardInfo.put(name, value); + wizardInfo.put(name, value); } } bstream.close(); @@ -283,7 +283,7 @@ public class WizardBasePanel extends CMSBasePanel implements MouseMotionListener // Keep tracking coordinate values long x = e.getX(); long y = e.getY(); - + long top = mSeed >> 62; mSeed = ((mSeed << 2) ^ top ^ (x<<8) ^ (y)) % Long.MAX_VALUE; } diff --git a/base/console/src/com/netscape/admin/certsrv/wizard/WizardInfo.java b/base/console/src/com/netscape/admin/certsrv/wizard/WizardInfo.java index 5085d43b4..21bb656ce 100644 --- a/base/console/src/com/netscape/admin/certsrv/wizard/WizardInfo.java +++ b/base/console/src/com/netscape/admin/certsrv/wizard/WizardInfo.java @@ -47,24 +47,24 @@ public class WizardInfo extends Properties { public Object getEntry(String name) { return get(name); } - + /** * access method to NEXT-DONE function buttons */ public JButton getNextDoneButton() { - return mBNext_Done; + return mBNext_Done; } - + /** * access method to CANCEL function buttons */ public JButton getCancelButton() { return mBCancel; } - + /** * access method to BACK function buttons - */ + */ public JButton getBackButton() { return mBBack; } @@ -72,14 +72,14 @@ public class WizardInfo extends Properties { /*========================================================== * package methods *==========================================================*/ - + /** * set function buttons. Called by the WizardWidget to set the * button reference. */ void setButtons(JButton next, JButton cancel, JButton back ) { mBNext_Done = next; - mBCancel = cancel; + mBCancel = cancel; mBBack = back; } } diff --git a/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java b/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java index c98d37b51..c58723f80 100644 --- a/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java +++ b/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java @@ -165,7 +165,7 @@ public class WizardWidget extends JDialog implements ActionListener if (!validateWizardPanel()) { return; } - + if (concludeWizardPanel()) { if (mNextScreen.empty() || mBNext_Done.getText().equals("Done")) { @@ -261,7 +261,7 @@ public class WizardWidget extends JDialog implements ActionListener data.put(ConfigConstants.PR_CERT_INSTANCE_NAME, consoleInfo.get(ConfigConstants.PR_CERT_INSTANCE_NAME)); data.put(ConfigConstants.PR_SERVER_ROOT, - consoleInfo.get(ConfigConstants.PR_SERVER_ROOT)); + consoleInfo.get(ConfigConstants.PR_SERVER_ROOT)); boolean ready = configCertCgi.configCert(data); data.clear(); data = null; @@ -296,10 +296,10 @@ public class WizardWidget extends JDialog implements ActionListener //JButton[] buttons = {mBBack, mBNext_Done, mBCancel, mBHelp }; JButton[] buttons = {mBBack, mBNext_Done, mBCancel}; - + //pass the buttons reference to wizardinfo mInfo.setButtons(mBNext_Done, mBCancel, mBBack); - + return CMSAdminUtil.makeJButtonPanel( buttons, true); } diff --git a/base/console/src/com/netscape/certsrv/common/ConfigConstants.java b/base/console/src/com/netscape/certsrv/common/ConfigConstants.java index 437974f13..a963bf1a4 100644 --- a/base/console/src/com/netscape/certsrv/common/ConfigConstants.java +++ b/base/console/src/com/netscape/certsrv/common/ConfigConstants.java @@ -28,8 +28,8 @@ public interface ConfigConstants { public static final String TRUE = "true"; public static final String FALSE = "false"; public static final String OPTYPE = "opType"; - public static final String TASKID = "taskID"; - + public static final String TASKID = "taskID"; + // Stages public static final String STAGES = "stages"; public static final String STAGE_CONNECT_DB = "stageConnectDB"; @@ -189,8 +189,8 @@ public interface ConfigConstants { public static final String PR_MIGRATION_PASSWORD = "migrationPassword"; // Key and Cert - public static final String PR_HARDWARE_SPLIT = "hardwareSplit"; - public static final String PR_TOKEN_LIST = "tokenList"; + public static final String PR_HARDWARE_SPLIT = "hardwareSplit"; + public static final String PR_TOKEN_LIST = "tokenList"; public static final String PR_TOKEN_NAME = "tokenName"; public static final String PR_SUBJECT_NAME = "subjectName"; public static final String PR_CA_SUBJECT_NAME = "caSubjectName"; @@ -292,7 +292,7 @@ public interface ConfigConstants { // CA serial number public static final String PR_CA_SERIAL_NUMBER = "caSerialNumber"; public static final String PR_CA_ENDSERIAL_NUMBER = "caEndSerialNumber"; - + // KRA serial number public static final String PR_REQUEST_NUMBER = "requestNumber"; public static final String PR_ENDREQUEST_NUMBER = "endRequestNumber"; diff --git a/base/console/src/com/netscape/certsrv/common/Constants.java b/base/console/src/com/netscape/certsrv/common/Constants.java index 6f3e3acdf..cf2d57575 100644 --- a/base/console/src/com/netscape/certsrv/common/Constants.java +++ b/base/console/src/com/netscape/certsrv/common/Constants.java @@ -50,24 +50,24 @@ public interface Constants { //STATIC UI TYPE public final static String TYPE_PASSWORD = "password"; - + /********************************************************** * PROPERTY NAME LISTED BELOW **********************************************************/ - + /*======================================================== * General - *========================================================*/ + *========================================================*/ public final static String PR_PORT = "port"; public final static String PR_SSLPORT = "sslPort"; - + /*======================================================== * Tasks *========================================================*/ public final static String PR_SERVER_START = "start"; public final static String PR_SERVER_STOP = "stop"; public final static String PR_SERVER_RESTART = "restart"; - + /*======================================================== * Networks *========================================================*/ @@ -84,12 +84,12 @@ public interface Constants { "gateway.http.enable"; public final static String PR_MASTER_AGENT_PORT = "master.ca.agent.port"; public final static String PR_MASTER_AGENT_HOST = "master.ca.agent.host"; - + /*======================================================== * SMTP *========================================================*/ public final static String PR_SERVER_NAME = "server"; - + /*======================================================== * SNMP *========================================================*/ @@ -111,7 +111,7 @@ public interface Constants { /*======================================================== * Users and Groups *========================================================*/ - + //group properties public final static String PR_GROUP_DESC = "desc"; public final static String PR_GROUP_USER = "user"; @@ -196,7 +196,7 @@ public interface Constants { /*======================================================== * LDAP Publishing *========================================================*/ - + // publishing properties public final static String PR_BASIC_AUTH = "BasicAuth"; public final static String PR_SSL_AUTH = "SslClientAuth"; @@ -255,7 +255,7 @@ public interface Constants { public final static String PR_BASE_DN = "baseDN"; public final static String PR_DNCOMPS = "dnComps"; public final static String PR_FILTERCOMPS = "filterComps"; - + // ldap connection test public final static String PR_CONN_INITED = "connInited"; public final static String PR_CONN_INIT_FAIL = "connInitFail"; @@ -325,9 +325,9 @@ public interface Constants { public final static String PR_RENEWAL_ENABLED = "renewal.enabled"; public final static String PR_RENEWAL_VALIDITY = "renewal.validity"; public final static String PR_RENEWAL_EMAIL = "renewal.email"; - public final static String PR_RENEWAL_EXPIREDNOTIFIEDENABLED = + public final static String PR_RENEWAL_EXPIREDNOTIFIEDENABLED = "renewal.expired.notification.enabled"; - public final static String PR_RENEWAL_NUMNOTIFICATION = + public final static String PR_RENEWAL_NUMNOTIFICATION = "renewal.numNotification"; public final static String PR_RENEWAL_INTERVAL = "renewal.interval"; public final static String PR_SERVLET_CLASS = "class"; @@ -356,7 +356,7 @@ public interface Constants { public final static String PR_ACL_CLASS = "class"; public final static String PR_ACL_DESC = "desc"; public final static String PR_ACL_RIGHTS = "rights"; - + /*======================================================== * Key Recovery *========================================================*/ @@ -388,7 +388,7 @@ public interface Constants { public final static String PR_RA_INSTANCE = "ra"; public final static String PR_KRA_INSTANCE = "kra"; public final static String PR_TKS_INSTANCE = "tks"; - + /* * Certificate info */ @@ -469,8 +469,8 @@ public interface Constants { /*======================================================== * Security *========================================================*/ - - //functionality + + //functionality public final static String PR_CERT_SERVER = "SERVER"; public final static String PR_CERT_ADMIN = "ADMIN"; public final static String PR_CERT_AGENT = "AGENT"; @@ -479,7 +479,7 @@ public interface Constants { public final static String PR_CERT_RA = "RA"; public final static String PR_CERT_POA = "POA"; public final static String PR_CERT_TRANS = "TRANS"; - + // key and certificate management public final static String PR_OPERATION_TYPE = "operationtype"; public final static String PR_INSTALL_TYPE = "install"; @@ -488,7 +488,7 @@ public interface Constants { //public final static String PR_SERVER_CERT = "servercert"; public final static String PR_CLIENT_CERT = "clientcert"; public final static String PR_FULL_INTERNAL_TOKEN_NAME="Internal Key Storage Token"; - public final static String PR_INTERNAL_TOKEN_NAME = + public final static String PR_INTERNAL_TOKEN_NAME = "internal"; public final static String PR_TOKEN_NAME = "tokenName"; public final static String PR_TOKEN_PASSWD = "tokenPwd"; @@ -505,15 +505,15 @@ public interface Constants { public final static String PR_CSR = "csr"; //encryption - + /* Cipher Version: domestic or export */ public final static String PR_CIPHER_VERSION = "cipherversion"; public final static String PR_CIPHER_VERSION_DOMESTIC = "cipherdomestic"; public final static String PR_CIPHER_VERSION_EXPORT = "cipherexport"; - + /* Cipher Fortezza: true, false */ public final static String PR_CIPHER_FORTEZZA = "cipherfortezza"; - + /* Token and Certificates */ public final static String PR_TOKEN_LIST = "tokenlist"; public final static String PR_TOKEN_PREFIX = "token_"; @@ -524,45 +524,45 @@ public interface Constants { public final static String PR_CIPHER_PREF = "cipherpref"; /* values for SSL cipher preferences */ - public final static String + public final static String PR_SSL2_RC4_128_WITH_MD5 = "rc4"; - public final static String + public final static String PR_SSL2_RC4_128_EXPORT40_WITH_MD5 = "rc4export"; - public final static String + public final static String PR_SSL2_RC2_128_CBC_WITH_MD5 = "rc2"; - public final static String + public final static String PR_SSL2_RC2_128_CBC_EXPORT40_WITH_MD5 = "rc2export"; - public final static String + public final static String PR_SSL2_DES_64_CBC_WITH_MD5 = "des"; - public final static String + public final static String PR_SSL2_DES_192_EDE3_CBC_WITH_MD5 = "desede3"; - public final static String + public final static String PR_SSL3_RSA_WITH_NULL_MD5 = "rsa_null_md5"; - public final static String + public final static String PR_SSL3_RSA_EXPORT_WITH_RC4_40_MD5 = "rsa_rc4_40_md5"; - public final static String - PR_SSL3_RSA_WITH_RC4_128_MD5 = "rsa_rc4_128_md5"; - public final static String + public final static String + PR_SSL3_RSA_WITH_RC4_128_MD5 = "rsa_rc4_128_md5"; + public final static String PR_SSL3_RSA_EXPORT_WITH_RC2_CBC_40_MD5 = "rsa_rc2_40_md5"; - public final static String + public final static String PR_SSL3_RSA_WITH_DES_CBC_SHA = "rsa_des_sha"; - public final static String + public final static String PR_SSL3_RSA_WITH_3DES_EDE_CBC_SHA = "rsa_3des_sha"; - public final static String + public final static String PR_SSL3_FORTEZZA_DMS_WITH_FORTEZZA_CBC_SHA = "fortezza"; - public final static String + public final static String PR_SSL3_FORTEZZA_DMS_WITH_RC4_128_SHA = "fortezza_rc4_128_sha"; - public final static String + public final static String PR_SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA = "rsa_fips_3des_sha"; - public final static String + public final static String PR_SSL_RSA_FIPS_WITH_DES_CBC_SHA = "rsa_fips_des_sha"; - public final static String + public final static String PR_TLS_RSA_EXPORT1024_WITH_RC4_56_SHA = "tls_rsa_rc4_56_sha"; - public final static String + public final static String PR_TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA = "tls_rsa_des_sha"; /*======================================================== - * Watchdog and Server State Messages + * Watchdog and Server State Messages *========================================================*/ public final static String SERVER_STARTUP_WARNING_MESSAGE = "CMS Warning: "; diff --git a/base/console/src/com/netscape/certsrv/common/PrefixDef.java b/base/console/src/com/netscape/certsrv/common/PrefixDef.java index b4476a9d9..489594356 100644 --- a/base/console/src/com/netscape/certsrv/common/PrefixDef.java +++ b/base/console/src/com/netscape/certsrv/common/PrefixDef.java @@ -34,8 +34,8 @@ public interface PrefixDef { public final static String PX_SYS = "SYS_"; public final static String PX_DEF = "DEF_"; public final static String PX_PP = "CERT_PP"; - + //log content public final static String PX_LOG = "log"; - + } diff --git a/base/console/src/com/netscape/certsrv/common/ScopeDef.java b/base/console/src/com/netscape/certsrv/common/ScopeDef.java index b3e4a79a6..c500fb0ad 100644 --- a/base/console/src/com/netscape/certsrv/common/ScopeDef.java +++ b/base/console/src/com/netscape/certsrv/common/ScopeDef.java @@ -31,7 +31,7 @@ public interface ScopeDef { public final static String SC_GROUPS = "groups"; public final static String SC_USERS = "users"; public final static String SC_USER_CERTS = "certs"; - + public final static String SC_SNMP = "snmp"; public final static String SC_SMTP = "smtp"; public final static String SC_SUBSYSTEM = "subsystem"; @@ -39,7 +39,7 @@ public interface ScopeDef { public final static String SC_GATEWAY = "gateway"; public final static String SC_ADMIN = "admin"; public final static String SC_NETWORK = "network"; - + // profile public final static String SC_PROFILE_IMPLS = "profile"; public final static String SC_PROFILE_RULES = "rules"; @@ -83,7 +83,7 @@ public interface ScopeDef { public final static String SC_LOG_CONTENT = "log_content"; public final static String SC_AUDITLOG_CONTENT = "transactionsLog_content"; public final static String SC_ERRORLOG_CONTENT = "errorLog_content"; - public final static String SC_SYSTEMLOG_CONTENT = "systemLog_content"; + public final static String SC_SYSTEMLOG_CONTENT = "systemLog_content"; //LDAP publishing public final static String SC_LDAP = "ldap"; @@ -109,7 +109,7 @@ public interface ScopeDef { public final static String SC_RECOVERY = "recovery"; public final static String SC_AGENT_PWD = "agentPwd"; public final static String SC_MNSCHEME = "mnScheme"; - + //stat public final static String SC_STAT = "stat"; @@ -119,10 +119,10 @@ public interface ScopeDef { public final static String SC_PKIGW = "pkigw"; public final static String SC_SERVLET = "servlet"; public final static String SC_CONNECTOR = "connector"; - + //tasks public final static String SC_TASKS = "tasks"; - + //authentication public final static String SC_AUTH = "auths"; public final static String SC_AUTHTYPE = "authType"; @@ -139,7 +139,7 @@ public interface ScopeDef { public final static String SC_NOTIFICATION_REQ_COMP = "notificationREQC"; public final static String SC_NOTIFICATION_REV_COMP = "notificationREVC"; public final static String SC_NOTIFICATION_RIQ = "notificationRIQ"; - + // acl public final static String SC_ACL_IMPLS = "impl"; public final static String SC_ACL = "acls"; diff --git a/base/console/src/com/netscape/certsrv/common/TaskId.java b/base/console/src/com/netscape/certsrv/common/TaskId.java index 6e093d5eb..e20bb334d 100644 --- a/base/console/src/com/netscape/certsrv/common/TaskId.java +++ b/base/console/src/com/netscape/certsrv/common/TaskId.java @@ -67,7 +67,7 @@ public interface TaskId { // get master or clone setting public final static String TASK_MASTER_OR_CLONE = "SetMasterOrClone"; - + // single signon public final static String TASK_SINGLE_SIGNON = "singleSignon"; @@ -108,7 +108,7 @@ public interface TaskId { // check certificate extension public final static String TASK_CHECK_EXTENSION = "checkExtension"; - // check validity period: make sure the notAfterDate of the certificate + // check validity period: make sure the notAfterDate of the certificate // will not go beyond the notAfterDate of the CA cert which signs the certificate. public final static String TASK_VALIDITY_PERIOD = "checkValidityPeriod"; diff --git a/base/java-tools/src/com/netscape/cmstools/AtoB.java b/base/java-tools/src/com/netscape/cmstools/AtoB.java index 48301e492..fe743fc5c 100644 --- a/base/java-tools/src/com/netscape/cmstools/AtoB.java +++ b/base/java-tools/src/com/netscape/cmstools/AtoB.java @@ -34,21 +34,21 @@ import com.netscape.cmsutil.util.Utils; * and that the contents contain a blob encoded in an ASCII BASE 64 * format. Note that the data file may contain an optional "-----BEGIN" header * and/or an optional "-----END" trailer. - * + * * <P> * The program may be invoked as follows: - * + * * <PRE> - * + * * AtoB <input filename> <output filename> - * + * * NOTE: <input filename> must contain an ASCII * BASE 64 encoded blob - * + * * <output filename> contains a BINARY * BASE 64 encoded blob * </PRE> - * + * * @version $Revision$, $Date$ */ public class AtoB { diff --git a/base/java-tools/src/com/netscape/cmstools/AuditVerify.java b/base/java-tools/src/com/netscape/cmstools/AuditVerify.java index fb23e89fd..8e9be012d 100644 --- a/base/java-tools/src/com/netscape/cmstools/AuditVerify.java +++ b/base/java-tools/src/com/netscape/cmstools/AuditVerify.java @@ -40,7 +40,7 @@ import com.netscape.cmsutil.util.Utils; /** * Tool for verifying signed audit logs - * + * * @version $Revision$, $Date$ */ public class AuditVerify { @@ -202,7 +202,7 @@ public class AuditVerify { // verify signer's certificate // not checking validity because we want to allow verifying old logs - // + // if (!isSigningCert(cert_i)) { System.out.println("info: signing certificate is not a signing certificate"); System.exit(1); diff --git a/base/java-tools/src/com/netscape/cmstools/BtoA.java b/base/java-tools/src/com/netscape/cmstools/BtoA.java index 4c2e5c22a..8c240dac6 100644 --- a/base/java-tools/src/com/netscape/cmstools/BtoA.java +++ b/base/java-tools/src/com/netscape/cmstools/BtoA.java @@ -30,21 +30,21 @@ import com.netscape.cmsutil.util.Utils; * that the name of a data file is passed to the program via the command line, * and that the contents contain a blob encoded in a BINARY BASE 64 * format. - * + * * <P> * The program may be invoked as follows: - * + * * <PRE> - * + * * BtoA <input filename> <output filename> - * + * * NOTE: <input filename> must contain a BINARY * BASE 64 encoded blob - * + * * <output filename> contains an ASCII * BASE 64 encoded blob * </PRE> - * + * * @version $Revision$, $Date$ */ public class BtoA { diff --git a/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java index e2e51a29d..84b92e48c 100644 --- a/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java +++ b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java @@ -69,9 +69,9 @@ import com.netscape.cmsutil.util.Utils; /** * Tool for signing PKCS #10 , return CMC enrollment request - * + * * <P> - * + * * @version $Revision$, $Date$ */ public class CMCEnroll { @@ -124,7 +124,7 @@ public class CMCEnroll { /** * getCMCBlob create and return the enrollent request. * <P> - * + * * @param signerCert the certificate of the authorized signer of the CMC revocation request. * @param manager the crypto manger. * @param nValue the nickname of the certificate inside the token. diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java index 591361149..f77bc039d 100644 --- a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java +++ b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java @@ -86,11 +86,11 @@ import com.netscape.cmsutil.util.Utils; /** * Tool for creating CMC full request - * + * * <P> - * + * * @version $Revision$, $Date$ - * + * */ public class CMCRequest { @@ -142,7 +142,7 @@ public class CMCRequest { /** * getCMCBlob create and return the enrollent request. * <P> - * + * * @param signerCert the certificate of the authorized signer of the CMC revocation request. * @param nickname the nickname of the certificate inside the token. * @param rValue CRMF/PKCS10 request. diff --git a/base/java-tools/src/com/netscape/cmstools/CMCResponse.java b/base/java-tools/src/com/netscape/cmstools/CMCResponse.java index 4d68dd151..959f06f52 100644 --- a/base/java-tools/src/com/netscape/cmstools/CMCResponse.java +++ b/base/java-tools/src/com/netscape/cmstools/CMCResponse.java @@ -42,11 +42,11 @@ import org.mozilla.jss.pkix.cms.EncapsulatedContentInfo; /** * Tool for parsing a CMC response - * + * * <P> - * + * * @version $Revision$, $Date$ - * + * */ public class CMCResponse { diff --git a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java index c1d463cdb..1ecaa6bd5 100644 --- a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java +++ b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java @@ -72,48 +72,48 @@ import com.netscape.cmsutil.util.Utils; /** * A command-line utility used to generate a Certificate Request Message * Format (CRMF) request with proof of possesion (POP). - * + * * Usage: - * + * * <pre> * CRMFPopClient TOKEN_PWD * PROFILE_NAME HOST PORT USER_NAME REQUESTOR_NAME * POP_OPTION * SUBJECT_DN [OUTPUT_CERT_REQ] - * + * * --- or --- - * + * * CRMFPopClient TOKEN_PWD * POP_OPTION * OUTPUT_CERT_REQ SUBJECT_DN - * - * + * + * * where POP_OPTION can be [POP_SUCCESS or POP_FAIL or POP_NONE] * </pre> * <p> * Examples: - * + * * <pre> * CRMFPopClient password123 * caEncUserCert host.example.com 1026 MyUid MyUid * [POP_SUCCESS or POP_FAIL or POP_NONE] * CN=MyTest,C=US,UID=MyUid - * + * * --- or --- - * + * * CRMFPopClient password123 * caEncUserCert host.example.com 1026 joe joe * [POP_SUCCESS or POP_FAIL or POP_NONE] - * CN=MyTest,C=US,UID=MyUid OUTPUT_CERT_REQ - * + * CN=MyTest,C=US,UID=MyUid OUTPUT_CERT_REQ + * * --- or --- - * + * * CRMFPopClient password123 * [POP_SUCCESS or POP_FAIL or POP_NONE] * OUTPUT_CERT_REQ CN=MyTest,C=US,UID=MyUid * </pre> * <p> - * + * * <pre> * IMPORTANT: The file "transport.txt" needs to be created to contain the * transport certificate in its base64 encoded format. This @@ -121,7 +121,7 @@ import com.netscape.cmsutil.util.Utils; * in base64 encoded format with the header and footer removed. * </pre> * <p> - * + * * @version $Revision$, $Date$ */ public class CRMFPopClient { @@ -277,7 +277,7 @@ public class CRMFPopClient { try { CryptoManager.initialize(DB_DIR); } catch (Exception e) { - // it is ok if it is already initialized + // it is ok if it is already initialized System.out.println("INITIALIZATION ERROR: " + e.toString()); // return; } @@ -317,7 +317,7 @@ public class CRMFPopClient { KeyGenerator kg1 = token.getKeyGenerator(KeyGenAlgorithm.DES3); SymmetricKey sk = kg1.generate(); - System.out.println("."); //before KeyWrapper"); + System.out.println("."); //before KeyWrapper"); // wrap private key using session KeyWrapper wrapper1 = @@ -332,7 +332,7 @@ public class CRMFPopClient { System.out.println("."); //key wrapper wrapped"); - // wrap session using transport + // wrap session using transport KeyWrapper rsaWrap = token.getKeyWrapper( KeyWrapAlgorithm.RSA); @@ -487,7 +487,7 @@ public class CRMFPopClient { String Req = URLEncoder.encode(Req1, "UTF-8"); - // post PKCS10 + // post PKCS10 url = new URL("http://" diff --git a/base/java-tools/src/com/netscape/cmstools/DRMTool.java b/base/java-tools/src/com/netscape/cmstools/DRMTool.java index e2fd2c538..c536466c6 100644 --- a/base/java-tools/src/com/netscape/cmstools/DRMTool.java +++ b/base/java-tools/src/com/netscape/cmstools/DRMTool.java @@ -70,29 +70,29 @@ import com.netscape.cmsutil.util.Utils; /** * The DRMTool class is a utility program designed to operate on an LDIF file * to perform one or more of the following tasks: - * + * * <PRE> * (A) Use a new storage key (e. g. - a 2048-bit key to replace a * 1024-bit key) to rewrap the existing triple DES symmetric key * that was used to wrap a user's private key. - * + * * STARTING INVENTORY: - * + * * (1) a DRMTOOL configuration file containing DRM LDIF record * types and the processing status of their associated fields - * + * * (2) an LDIF file containing 'exported' DRM data * (referred to as the "source" DRM) - * + * * NOTE: If this LDIF file contains data that was originally * from a DRM instance that was prior to RHCS 8, it * must have previously undergone the appropriate * migration steps. - * + * * (3) the NSS security databases (e. g. - cert8.db, key3.db, * and secmod.db) associated with the data contained in * the source LDIF file - * + * * NOTE: If the storage key was located on an HSM, then the * HSM must be available to the machine on which the * DRMTool is being executed (since the RSA private @@ -101,302 +101,302 @@ import com.netscape.cmsutil.util.Utils; * password may be required to unlock access to * this key (e. g. - which may be located in * the source DRM's 'password.conf' file). - * + * * (4) a file containing the ASCII BASE-64 storage certificate * from the DRM instance for which the output LDIF file is * intended (referred to as the "target") - * + * * ENDING INVENTORY: - * + * * (1) all items listed in the STARTING INVENTORY (unchanged) - * + * * (2) a log file containing information suitable for audit * purposes - * + * * (3) an LDIF file containing the revised data suitable for * 'import' into a new DRM (referred to as the "target" DRM) - * + * * DRMTool PARAMETERS: - * + * * (1) the name of the DRMTOOL configuration file containing * DRM LDIF record types and the processing status of their * associated fields - * + * * (2) the name of the input LDIF file containing data which was * 'exported' from the source DRM instance - * + * * (3) the name of the output LDIF file intended to contain the * revised data suitable for 'import' to a target DRM instance - * + * * (4) the name of the log file that may be used for auditing * purposes - * + * * (5) the path to the security databases that were used by * the source DRM instance - * + * * (6) the name of the token that was used by * the source DRM instance - * + * * (7) the name of the storage certificate that was used by * the source DRM instance - * + * * (8) the name of the file containing the ASCII BASE-64 storage * certificate from the target DRM instance for which the * output LDIF file is intended - * + * * (9) OPTIONALLY, the name of a file which ONLY contains the * password needed to access the source DRM instance's * security databases - * + * * (10) OPTIONALLY, choose to change the specified source DRM naming * context to the specified target DRM naming context - * + * * (11) OPTIONALLY, choose to ONLY process CA enrollment requests, * CA recovery requests, CA key records, TPS netkeyKeygen * enrollment requests, TPS recovery requests, and * TPS key records - * + * * DATA FIELDS AFFECTED (using default config file values): - * + * * (1) CA DRM enrollment request - * + * * (a) dateOfModify * (b) extdata-requestnotes - * + * * (2) CA DRM key record - * + * * (a) dateOfModify * (b) privateKeyData - * + * * (3) CA DRM recovery request - * + * * (a) dateOfModify * (b) extdata-requestnotes (NEW) - * + * * (4) TPS DRM netkeyKeygen (enrollment) request - * + * * (a) dateOfModify * (b) extdata-requestnotes (NEW) - * + * * (5) TPS DRM key record - * + * * (a) dateOfModify * (b) privateKeyData - * + * * (6) TPS DRM recovery request - * + * * (a) dateOfModify * (b) extdata-requestnotes (NEW) - * + * * (B) Specify an ID offset to append to existing numeric data * (e. g. - to renumber data for use in DRM consolidation efforts). - * + * * STARTING INVENTORY: - * + * * (1) a DRMTOOL configuration file containing DRM LDIF record * types and the processing status of their associated fields - * + * * (2) an LDIF file containing 'exported' DRM data * (referred to as the "source" DRM) - * + * * NOTE: If this LDIF file contains data that was originally * from a DRM instance that was prior to RHCS 8, it * must have previously undergone the appropriate * migration steps. - * + * * ENDING INVENTORY: - * + * * (1) all items listed in the STARTING INVENTORY (unchanged) - * + * * (2) a log file containing information suitable for audit * purposes - * + * * (3) an LDIF file containing the revised data suitable for * 'import' into a new DRM (referred to as the "target" DRM) - * + * * DRMTool PARAMETERS: - * + * * (1) the name of the DRMTOOL configuration file containing * DRM LDIF record types and the processing status of their * associated fields - * + * * (2) the name of the input LDIF file containing data which was * 'exported' from the source DRM instance - * + * * (3) the name of the output LDIF file intended to contain the * revised data suitable for 'import' to a target DRM instance - * + * * (4) the name of the log file that may be used for auditing * purposes - * + * * (5) a large numeric ID offset (mask) to be appended to existing * numeric data in the source DRM instance's LDIF file - * + * * (6) OPTIONALLY, choose to change the specified source DRM naming * context to the specified target DRM naming context - * + * * (7) OPTIONALLY, choose to ONLY process CA enrollment requests, * CA recovery requests, CA key records, TPS netkeyKeygen * enrollment requests, TPS recovery requests, and * TPS key records - * + * * DATA FIELDS AFFECTED (using default config file values): - * + * * (1) CA DRM enrollment request - * + * * (a) cn * (b) dateOfModify * (c) extdata-keyrecord * (d) extdata-requestnotes * (e) requestId - * + * * (2) CA DRM key record - * + * * (a) cn * (b) dateOfModify * (c) serialno - * + * * (3) CA DRM recovery request - * + * * (a) cn * (b) dateOfModify * (c) extdata-requestid * (d) extdata-requestnotes (NEW) * (e) extdata-serialnumber * (f) requestId - * + * * (4) TPS DRM netkeyKeygen (enrollment) request - * + * * (a) cn * (b) dateOfModify * (c) extdata-keyrecord * (d) extdata-requestid * (e) extdata-requestnotes (NEW) * (f) requestId - * + * * (5) TPS DRM key record - * + * * (a) cn * (b) dateOfModify * (c) serialno - * + * * (6) TPS DRM recovery request - * + * * (a) cn * (b) dateOfModify * (c) extdata-requestid * (d) extdata-requestnotes (NEW) * (e) extdata-serialnumber * (f) requestId - * + * * (C) Specify an ID offset to be removed from existing numeric data * (e. g. - to undo renumbering used in DRM consolidation efforts). - * + * * STARTING INVENTORY: - * + * * (1) a DRMTOOL configuration file containing DRM LDIF record * types and the processing status of their associated fields - * + * * (2) an LDIF file containing 'exported' DRM data * (referred to as the "source" DRM) - * + * * NOTE: If this LDIF file contains data that was originally * from a DRM instance that was prior to RHCS 8, it * must have previously undergone the appropriate * migration steps. - * + * * ENDING INVENTORY: - * + * * (1) all items listed in the STARTING INVENTORY (unchanged) - * + * * (2) a log file containing information suitable for audit * purposes - * + * * (3) an LDIF file containing the revised data suitable for * 'import' into a new DRM (referred to as the "target" DRM) - * + * * DRMTool PARAMETERS: - * + * * (1) the name of the DRMTOOL configuration file containing * DRM LDIF record types and the processing status of their * associated fields - * + * * (2) the name of the input LDIF file containing data which was * 'exported' from the source DRM instance - * + * * (3) the name of the output LDIF file intended to contain the * revised data suitable for 'import' to a target DRM instance - * + * * (4) the name of the log file that may be used for auditing * purposes - * + * * (5) a large numeric ID offset (mask) to be removed from existing * numeric data in the source DRM instance's LDIF file - * + * * (6) OPTIONALLY, choose to change the specified source DRM naming * context to the specified target DRM naming context - * + * * (7) OPTIONALLY, choose to ONLY process CA enrollment requests, * CA recovery requests, CA key records, TPS netkeyKeygen * enrollment requests, TPS recovery requests, and * TPS key records - * + * * DATA FIELDS AFFECTED (using default config file values): - * + * * (1) CA DRM enrollment request - * + * * (a) cn * (b) dateOfModify * (c) extdata-keyrecord * (d) extdata-requestnotes * (e) requestId - * + * * (2) CA DRM key record - * + * * (a) cn * (b) dateOfModify * (c) serialno - * + * * (3) CA DRM recovery request - * + * * (a) cn * (b) dateOfModify * (c) extdata-requestid * (d) extdata-requestnotes (NEW) * (e) extdata-serialnumber * (f) requestId - * + * * (4) TPS DRM netkeyKeygen (enrollment) request - * + * * (a) cn * (b) dateOfModify * (c) extdata-keyrecord * (d) extdata-requestid * (e) extdata-requestnotes (NEW) * (f) requestId - * + * * (5) TPS DRM key record - * + * * (a) cn * (b) dateOfModify * (c) serialno - * + * * (6) TPS DRM recovery request - * + * * (a) cn * (b) dateOfModify * (c) extdata-requestid * (d) extdata-requestnotes (NEW) * (e) extdata-serialnumber * (f) requestId - * + * * </PRE> - * + * * <P> * DRMTool may be invoked as follows: - * + * * <PRE> - * + * * DRMTool * -drmtool_config_file <path + drmtool config file> * -source_ldif_file <path + source ldif file> @@ -412,86 +412,86 @@ import com.netscape.cmsutil.util.Utils; * [-source_drm_naming_context '<original source DRM naming context>'] * [-target_drm_naming_context '<renamed target DRM naming context>'] * [-process_requests_and_key_records_only] - * + * * where the following options are 'Mandatory': - * + * * -drmtool_config_file <path + drmtool config file> * -source_ldif_file <path + source ldif file> * -target_ldif_file <path + target ldif file> * -log_file <path + log file> - * + * * AND at least ONE of the following are a 'Mandatory' set of options: - * + * * (a) options for using a new storage key for rewrapping: - * + * * [-source_pki_security_database_path * <path to PKI source database>] * [-source_storage_token_name '<source token>'] * [-source_storage_certificate_nickname '<source nickname>'] * [-target_storage_certificate_file * <path to target certificate file>] - * + * * AND OPTIONALLY, specify the name of a file which ONLY contains * the password needed to access the source DRM instance's * security databases: - * + * * [-source_pki_security_database_pwdfile * <path to PKI password file>] - * + * * AND OPTIONALLY, rename source DRM naming context --> target * DRM naming context: - * + * * [-source_drm_naming_context '<source DRM naming context>'] * [-target_drm_naming_context '<target DRM naming context>'] - * + * * AND OPTIONALLY, process requests and key records ONLY: - * + * * [-process_requests_and_key_records_only] - * + * * (b) option for appending the specified numeric ID offset * to existing numerical data: - * + * * [-append_id_offset <numeric offset>] - * + * * AND OPTIONALLY, rename source DRM naming context --> target * DRM naming context: - * + * * [-source_drm_naming_context '<source DRM naming context>'] * [-target_drm_naming_context '<target DRM naming context>'] - * + * * AND OPTIONALLY, process requests and key records ONLY: - * + * * [-process_requests_and_key_records_only] - * + * * (c) option for removing the specified numeric ID offset * from existing numerical data: - * + * * AND OPTIONALLY, rename source DRM naming context --> target * DRM naming context: - * + * * [-source_drm_naming_context '<source DRM naming context>'] * [-target_drm_naming_context '<target DRM naming context>'] - * + * * [-remove_id_offset <numeric offset>] - * + * * AND OPTIONALLY, process requests and key records ONLY: - * + * * [-process_requests_and_key_records_only] - * + * * (d) (a) rewrap AND (b) append ID offset * [AND OPTIONALLY, rename source DRM naming context --> target * DRM naming context] * [AND OPTIONALLY process requests and key records ONLY] - * + * * (e) (a) rewrap AND (c) remove ID offset * [AND OPTIONALLY, rename source DRM naming context --> target * DRM naming context] * [AND OPTIONALLY process requests and key records ONLY] - * + * * NOTE: Options (b) and (c) are mutually exclusive! - * + * * </PRE> - * + * * @author mharmsen * @version $Revision$, $Date$ */ @@ -993,7 +993,7 @@ public class DRMTool { /** * This method is used to get the current date and time. * <P> - * + * * @param pattern string containing desired format of date and time * @return a formatted string containing the current date and time */ @@ -1322,7 +1322,7 @@ public class DRMTool { /** * This method opens a new log file for writing. * <P> - * + * * @param logfile string containing the name of the log file to be opened */ private static void open_log(String logfile) { @@ -1344,7 +1344,7 @@ public class DRMTool { /** * This method closes the specified log file. * <P> - * + * * @param logfile string containing the name of the log file to be closed */ private static void close_log(String logfile) { @@ -1355,7 +1355,7 @@ public class DRMTool { * This method writes the specified message to the log file, and also * to 'stderr' if the boolean flag is set to 'true'. * <P> - * + * * @param msg string containing the message to be written to the log file * @param stderr boolean which also writes the message to 'stderr' if 'true' */ @@ -1377,10 +1377,10 @@ public class DRMTool { /** * Helper method to determine if two arrays contain the same values. - * + * * This method is based upon code from 'com.netscape.kra.StorageKeyUnit'. * <P> - * + * * @param bytes first array of bytes * @param ints second array of bytes * @return true if the two arrays are identical @@ -1406,10 +1406,10 @@ public class DRMTool { /** * This method is used to obtain the private RSA storage key from * the "source" DRM instance's security databases. - * + * * This method is based upon code from 'com.netscape.kra.StorageKeyUnit'. * <P> - * + * * @return the private RSA storage key from the "source" DRM */ private static PrivateKey getPrivateKey() { @@ -1439,11 +1439,11 @@ public class DRMTool { * This method gets the public key from the certificate stored * in the "target" DRM storage certificate file. It also obtains * the keysize of this RSA key. - * + * * This method is based upon code from * 'com.netscape.cmstools.PrettyPrintCert'. * <P> - * + * * @return the public RSA storage key from the "target" DRM */ private static PublicKey getPublicKey() { @@ -1567,7 +1567,7 @@ public class DRMTool { * the public RSA storage key from the certificate stored in * the "target" DRM storage certificate file. * <P> - * + * * @return true if successfully able to obtain both keys */ private static boolean obtain_RSA_rewrapping_keys() { @@ -1797,16 +1797,16 @@ public class DRMTool { * "mStorageUnit.decryptInternalPrivate( byte wrappedKeyData[] )" and * "mStorageUnit.encryptInternalPrivate( byte priKey[] )", where * "wrappedKeyData" uses the following structure: - * + * * SEQUENCE { * encryptedSession OCTET STRING, * encryptedPrivate OCTET STRING * } - * + * * This method is based upon code from * 'com.netscape.kra.EncryptionUnit'. * <P> - * + * * @return a byte[] containing the rewrappedKeyData */ private static byte[] rewrap_wrapped_key_data(byte[] wrappedKeyData) @@ -1969,7 +1969,7 @@ public class DRMTool { * Helper method used to remove all EOLs ('\n' and '\r') * from the passed in string. * <P> - * + * * @param data consisting of a string containing EOLs * @return a string consisting of a string with no EOLs */ @@ -1994,7 +1994,7 @@ public class DRMTool { * into a string containing formatted data suitable as an entry for * an LDIF file. * <P> - * + * * @param length the length of the first line of data * @param data a string containing unformatted data * @return formatted data consisting of data formatted for an LDIF record @@ -2040,24 +2040,24 @@ public class DRMTool { /** * Helper method which converts an "indexed" BigInteger into * its String representation. - * + * * <PRE> - * + * * NOTE: Indexed data means that the numeric data * is stored with a prepended length * (e. g. - record '73' is stored as '0273'). - * + * * Indexed data is currently limited to '99' digits * (an index of '00' is invalid). See * 'com.netscape.cmscore.dbs.BigIntegerMapper.java' * for details. - * + * * </PRE> - * + * * This method is based upon code from * 'com.netscape.cmscore.dbs.BigIntegerMapper'. * <P> - * + * * @param i an "indexed " BigInteger * @return the string representation of the "indexed" BigInteger */ @@ -2076,22 +2076,22 @@ public class DRMTool { /** * Helper method which converts the string representation of an * "indexed" integer into a BigInteger. - * + * * <PRE> * NOTE: Indexed data means that the numeric data * is stored with a prepended length * (e. g. - record '73' is stored as '0273'). - * + * * Indexed data is currently limited to '99' digits * (an index of '00' is invalid). See * 'com.netscape.cmscore.dbs.BigIntegerMapper.java' * for details. * </PRE> - * + * * This method is based upon code from * 'com.netscape.cmscore.dbs.BigIntegerMapper'. * <P> - * + * * @param i the string representation of the "indexed" integer * @return an "indexed " BigInteger */ @@ -2106,9 +2106,9 @@ public class DRMTool { * This method accepts an "attribute", its "delimiter", a string * representation of numeric data, and a flag indicating whether * or not the string representation is "indexed". - * + * * An "attribute" consists of one of the following values: - * + * * <PRE> * DRM_LDIF_CN = "cn:"; * DRM_LDIF_DN_EMBEDDED_CN_DATA = "dn: cn"; @@ -2117,20 +2117,20 @@ public class DRMTool { * DRM_LDIF_EXTDATA_SERIAL_NUMBER = "extdata-serialnumber:"; * DRM_LDIF_REQUEST_ID = "requestId:"; * DRM_LDIF_SERIAL_NO = "serialno:"; - * - * + * + * * NOTE: Indexed data means that the numeric data * is stored with a prepended length * (e. g. - record '73' is stored as '0273'). - * + * * Indexed data is currently limited to '99' digits * (an index of '00' is invalid). See * 'com.netscape.cmscore.dbs.BigIntegerMapper.java' * for details. * </PRE> - * + * * <P> - * + * * @param attribute the string representation of the "name" * @param delimiter the separator between the attribute and its contents * @param source_line the string containing the "name" and "value" @@ -2269,7 +2269,7 @@ public class DRMTool { /** * Helper method which composes the output line for DRM_LDIF_CN. * <P> - * + * * @param record_type the string representation of the input record type * @param line the string representation of the input line * @return the composed output line @@ -2344,7 +2344,7 @@ public class DRMTool { /** * Helper method which composes the output line for DRM_LDIF_DATE_OF_MODIFY. * <P> - * + * * @param record_type the string representation of the input record type * @param line the string representation of the input line * @return the composed output line @@ -2443,7 +2443,7 @@ public class DRMTool { /** * Helper method which composes the output line for DRM_LDIF_DN. * <P> - * + * * @param record_type the string representation of the input record type * @param line the string representation of the input line * @return the composed output line @@ -2685,7 +2685,7 @@ public class DRMTool { * Helper method which composes the output line for * DRM_LDIF_EXTDATA_KEY_RECORD. * <P> - * + * * @param record_type the string representation of the input record type * @param line the string representation of the input line * @return the composed output line @@ -2728,7 +2728,7 @@ public class DRMTool { * Helper method which composes the output line for * DRM_LDIF_EXTDATA_REQUEST_ID. * <P> - * + * * @param record_type the string representation of the input record type * @param line the string representation of the input line * @return the composed output line @@ -2776,7 +2776,7 @@ public class DRMTool { * Helper method which composes the output line for * DRM_LDIF_EXTDATA_REQUEST_NOTES. * <P> - * + * * @param record_type the string representation of the input record type * @param line the string representation of the input line * @return the composed output line @@ -3315,7 +3315,7 @@ public class DRMTool { * Helper method which composes the output line for * DRM_LDIF_EXTDATA_REQUEST_NOTES. * <P> - * + * * @param record_type the string representation of the input record type * @param previous_line the string representation of the previous input line * @param writer the PrintWriter used to output this new LDIF line @@ -3629,7 +3629,7 @@ public class DRMTool { * Helper method which composes the output line for * DRM_LDIF_EXTDATA_SERIAL_NUMBER. * <P> - * + * * @param record_type the string representation of the input record type * @param line the string representation of the input line * @return the composed output line @@ -3663,7 +3663,7 @@ public class DRMTool { * Helper method which composes the output line for * DRM_LDIF_PRIVATE_KEY_DATA. * <P> - * + * * @param record_type the string representation of the input record type * @param line the string representation of the input line * @return the composed output line @@ -3849,7 +3849,7 @@ public class DRMTool { /** * Helper method which composes the output line for DRM_LDIF_REQUEST_ID. * <P> - * + * * @param record_type the string representation of the input record type * @param line the string representation of the input line * @return the composed output line @@ -3900,7 +3900,7 @@ public class DRMTool { /** * Helper method which composes the output line for DRM_LDIF_SERIAL_NO. * <P> - * + * * @param record_type the string representation of the input record type * @param line the string representation of the input line * @return the composed output line @@ -3949,7 +3949,7 @@ public class DRMTool { * Helper method which composes the output line for * DRM_LDIF_EXTDATA_AUTH_TOKEN_USER. * <P> - * + * * @param record_type the string representation of the input record type * @param line the string representation of the input line * @return the composed output line @@ -3996,7 +3996,7 @@ public class DRMTool { * Helper method which composes the output line for * DRM_LDIF_EXTDATA_AUTH_TOKEN_USER_DN. * <P> - * + * * @param record_type the string representation of the input record type * @param line the string representation of the input line * @return the composed output line @@ -4043,7 +4043,7 @@ public class DRMTool { * This method performs the actual parsing of the "source" LDIF file * and produces the "target" LDIF file. * <P> - * + * * @return true if the "target" LDIF file is successfully created */ private static boolean convert_source_ldif_to_target_ldif() { @@ -4305,7 +4305,7 @@ public class DRMTool { * This method performs the actual parsing of the DRMTOOL config file * and initializes how the DRM Record Fields should be processed. * <P> - * + * * @return true if the DRMTOOL config file is successfully processed */ private static boolean process_drmtool_config_file() { @@ -4414,7 +4414,7 @@ public class DRMTool { /** * The main DRMTool method. * <P> - * + * * @param args DRMTool options */ public static void main(String[] args) { diff --git a/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java b/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java index 48f180add..95c3162f4 100644 --- a/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java +++ b/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java @@ -30,19 +30,19 @@ import netscape.security.util.DerValue; * so that the final output can be used in configuration * wizard for specifing extra extensions in default * certificates (i.e. CA certificate, SSL certificate). - * + * * Usage: - * + * * <pre> * ExtJoiner \ * <ext_file0> <ext_file1> ... <ext_fileN> - * + * * where, - * <ext_file> is a file that has the base64 + * <ext_file> is a file that has the base64 * encoded DER encoding of an X509 Extension - * + * * ExtensionSequence ::= SEQUENCE OF Extension; - * + * * 0 30 142: SEQUENCE { * 3 30 69: SEQUENCE { * 5 06 3: OBJECT IDENTIFIER issuerAltName (2 5 29 18) @@ -62,7 +62,7 @@ import netscape.security.util.DerValue; * : } * : } * </pre> - * + * * @version $Revision$, $Date$ */ public class ExtJoiner { diff --git a/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java b/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java index 35072aae3..9476d3ee4 100644 --- a/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java +++ b/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java @@ -32,7 +32,7 @@ import netscape.security.x509.Extension; * The OIDs to be included in the extension are passed as command-line * arguments. The OIDs are described in RFC 2459. For example, * the OID for code signing is 1.3.6.1.5.5.7.3.3. - * + * * @version $Revision$, $Date$ */ public class GenExtKeyUsage { diff --git a/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java b/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java index 5c905278f..193912a88 100644 --- a/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java +++ b/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java @@ -37,16 +37,16 @@ import netscape.security.x509.X500Name; * This program generates an issuer alternative name extension * in base-64 encoding. The encoding output can be used with * the configuration wizard. - * + * * Usage: - * + * * <pre> * GenIssuerAltNameExt \ * <general_type0> <general_name0> ... <general_typeN> <general_nameN> - * + * * where, * <general_type> can be one of the following string: - * DNSName + * DNSName * EDIPartyName * IPAddressName * URIName @@ -55,7 +55,7 @@ import netscape.security.x509.X500Name; * X500Name * <general_name> is string * </pre> - * + * * @version $Revision$, $Date$ */ public class GenIssuerAltNameExt { diff --git a/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java b/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java index 35e07f772..d6cad4ce8 100644 --- a/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java +++ b/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java @@ -37,16 +37,16 @@ import netscape.security.x509.X500Name; * This program generates an subject alternative name extension * in base-64 encoding. The encoding output can be used with * the configuration wizard. - * + * * Usage: - * + * * <pre> * GenSubjectAltNameExt \ * <general_type0> <general_name0> ... <general_typeN> <general_nameN> - * + * * where, * <general_type> can be one of the following string: - * DNSName + * DNSName * EDIPartyName * IPAddressName * URIName @@ -55,7 +55,7 @@ import netscape.security.x509.X500Name; * X500Name * <general_name> is string * </pre> - * + * * @version $Revision$, $Date$ */ public class GenSubjectAltNameExt { diff --git a/base/java-tools/src/com/netscape/cmstools/HttpClient.java b/base/java-tools/src/com/netscape/cmstools/HttpClient.java index c8817b52f..2188737a3 100644 --- a/base/java-tools/src/com/netscape/cmstools/HttpClient.java +++ b/base/java-tools/src/com/netscape/cmstools/HttpClient.java @@ -45,7 +45,7 @@ import com.netscape.cmsutil.util.Utils; /** * This class implements a CMC Enroll client for testing. - * + * * @version $Revision$, $Date$ */ public class HttpClient { @@ -166,7 +166,7 @@ public class HttpClient { is = socket.getInputStream(); } - // send request + // send request if (servlet == null) { System.out.println("Missing servlet name."); printUsage(); diff --git a/base/java-tools/src/com/netscape/cmstools/OCSPClient.java b/base/java-tools/src/com/netscape/cmstools/OCSPClient.java index 5b9abe495..fc2f081e9 100644 --- a/base/java-tools/src/com/netscape/cmstools/OCSPClient.java +++ b/base/java-tools/src/com/netscape/cmstools/OCSPClient.java @@ -58,7 +58,7 @@ import com.netscape.cmsutil.util.Utils; /** * This class implements a OCSP client for testing. - * + * * @version $Revision$, $Date$ */ public class OCSPClient { @@ -92,7 +92,7 @@ public class OCSPClient { throws Exception { MessageDigest md = MessageDigest.getInstance("SHA"); - // calculate issuer key hash + // calculate issuer key hash X509CertImpl x509Cert = new X509CertImpl(caCert.getEncoded()); X509Key x509key = (X509Key) x509Cert.getPublicKey(); byte issuerKeyHash[] = md.digest(x509key.getKey()); @@ -118,7 +118,7 @@ public class OCSPClient { byte request_data[], String output) throws Exception { Socket socket = new Socket(host, port); - // send request + // send request System.out.println("URI: " + uri); DataOutputStream dos = new DataOutputStream(socket.getOutputStream()); @@ -156,12 +156,12 @@ public class OCSPClient { hack = true; } } - } // while + } // while } catch (IOException e) { } fof.close(); - // parse OCSPResponse + // parse OCSPResponse BufferedInputStream fis = new BufferedInputStream( new FileInputStream(output)); diff --git a/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java index 7cd50a37a..1e60a1c0e 100644 --- a/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java +++ b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java @@ -59,7 +59,7 @@ import com.netscape.cmsutil.util.Utils; * approved, a certificate is created for the request, and certificate attributes, such as extensions, are populated * according to certificate profiles. * <p> - * + * * @version $Revision$, $Date$ */ public class PKCS10Client { diff --git a/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java b/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java index 8d8e858f2..ad1c485c0 100644 --- a/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java +++ b/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java @@ -54,11 +54,11 @@ import org.mozilla.jss.util.Password; /** * Tool for creating PKCS12 file - * + * * <P> - * + * * @version $Revision$, $Date$ - * + * */ public class PKCS12Export { diff --git a/base/java-tools/src/com/netscape/cmstools/PasswordCache.java b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java index ba7fb72a4..cdddb5f1e 100644 --- a/base/java-tools/src/com/netscape/cmstools/PasswordCache.java +++ b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java @@ -45,17 +45,17 @@ import com.netscape.cmsutil.util.Utils; /** * Tool for interacting with the PWcache - * + * * @version $Revision$, $Date$ */ public class PasswordCache { - /* These are the tags that identify various passwords - * They should probably be converted instances of some - * class so that we can expose an API to add additional + /* These are the tags that identify various passwords + * They should probably be converted instances of some + * class so that we can expose an API to add additional * TAG's for use if I want to add a password for use - * with my own authenticaion module + * with my own authenticaion module */ public static final String PROP_PWC_NICKNAME = "sso_key"; public static final String PW_TAG_INTERNAL_LDAP_DB = "Internal LDAP Database"; @@ -89,7 +89,7 @@ public class PasswordCache { /** * clean up an argv by removing the trailing, empty arguments - * + * * This is necessary to support the script wrapper which calls the * tool with arguments in quotes such as: * "$1" "$2" @@ -342,7 +342,7 @@ public class PasswordCache { } } -/* +/* * A class for managing passwords in the SDR password cache * * @author Christina Fu diff --git a/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java index 382c4e312..88d8cb05b 100644 --- a/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java +++ b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java @@ -42,21 +42,21 @@ import netscape.security.x509.X509CertInfo; * program via the command line, and that the contents contain a certificate * encoded in an ASCII BASE 64 format. Note that the data file may contain * an optional "-----BEGIN" header and/or an optional "-----END" trailer. - * + * * <P> * The program may be invoked as follows: - * + * * <PRE> - * + * * PrettyPrintCert <input filename> [output filename] - * + * * NOTE: <input filename> must contain an ASCII * BASE 64 encoded certificate - * + * * <output filename> contains a certificate displayed * in a "pretty print" ASCII format * </PRE> - * + * * @version $Revision$, $Date$ */ diff --git a/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java index 8801b2423..6bb43aee7 100644 --- a/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java +++ b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java @@ -45,21 +45,21 @@ import netscape.security.x509.X509ExtensionException; * program via the command line, and that the contents contain a CRL * encoded in an ASCII BASE 64 format. Note that the data file may contain * an optional "-----BEGIN" header and/or an optional "-----END" trailer. - * + * * <P> * The program may be invoked as follows: - * + * * <PRE> - * + * * PrettyPrintCrl <input filename> [output filename] - * + * * NOTE: <input filename> must contain an ASCII * BASE 64 encoded CRL - * + * * <output filename> contains a CRL displayed * in a "pretty print" ASCII format * </PRE> - * + * * @version $Revision$, $Date$ */ diff --git a/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java b/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java index 369010abf..0f41e0fc7 100644 --- a/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java +++ b/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java @@ -35,9 +35,9 @@ import org.mozilla.jss.util.Password; /** * Tool used to test out signing a CRL - * + * * <p> - * + * * @version $Revision$ Date: $ */ public class TestCRLSigning { @@ -59,7 +59,7 @@ public class TestCRLSigning { CryptoManager.initialize(vals); cm = CryptoManager.getInstance(); - // Login to token + // Login to token CryptoToken token = null; if (tokenname.equals("internal")) { token = cm.getInternalKeyStorageToken(); diff --git a/base/java-tools/src/com/netscape/cmstools/TokenInfo.java b/base/java-tools/src/com/netscape/cmstools/TokenInfo.java index fc3d13b42..7efd8aa34 100644 --- a/base/java-tools/src/com/netscape/cmstools/TokenInfo.java +++ b/base/java-tools/src/com/netscape/cmstools/TokenInfo.java @@ -27,9 +27,9 @@ import org.mozilla.jss.pkcs11.PK11Module; * Tool used to determine which external hardware tokens are visible to the * Certificate System subsystem. This can be used to diagnose whether problems * using tokens are related to the Certificate System being unable to detect it. - * + * * <p> - * + * * @version $Revision$ Date: $ */ public class TokenInfo { diff --git a/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java b/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java index 604430b57..ee6668a25 100644 --- a/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java +++ b/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java @@ -40,18 +40,18 @@ import com.netscape.cmsutil.util.Utils; @SuppressWarnings("deprecation") public class GeneratePKIArchiveOptions { - + public static void usage(Options options) { HelpFormatter formatter = new HelpFormatter(); formatter.printHelp("GeneratePKIArchiveOptions", options); System.exit(1); } - + private static void log(String string) { // TODO Auto-generated method stub System.out.println(string); } - + // read in byte array // we must do this somewhere? public static byte[] read(String fname) throws IOException { @@ -79,7 +79,7 @@ public class GeneratePKIArchiveOptions { return result; } - + public static void write(byte[] aInput, String outFile) throws IOException { OutputStream output = null; try { @@ -93,7 +93,7 @@ public class GeneratePKIArchiveOptions { } } } - + private static void write_file(String data, String outFile) throws IOException { FileWriter fstream = new FileWriter(outFile); BufferedWriter out = new BufferedWriter(fstream); @@ -122,28 +122,28 @@ public class GeneratePKIArchiveOptions { options.addOption("t", true, "File with transport cert"); options.addOption("o", true, "Output file"); options.addOption("k", true, "Key file"); - + try { CommandLineParser parser = new PosixParser(); CommandLine cmd = parser.parse(options, args); - + if (cmd.hasOption("p")) { passphrase = cmd.getOptionValue("p"); passphraseMode = true; } - + if (cmd.hasOption("o")) { out_file = cmd.getOptionValue("o"); } - + if (cmd.hasOption("k")) { key_file = cmd.getOptionValue("k"); } - + if (cmd.hasOption("t")) { transport_file = cmd.getOptionValue("t"); } - + if (cmd.hasOption("w")) { token_pwd = cmd.getOptionValue("w"); } else { @@ -174,7 +174,7 @@ public class GeneratePKIArchiveOptions { try { CryptoManager.initialize(db_dir); } catch (AlreadyInitializedException e) { - // it is ok if it is already initialized + // it is ok if it is already initialized } catch (Exception e) { log("INITIALIZATION ERROR: " + e.toString()); System.exit(1); @@ -196,7 +196,7 @@ public class GeneratePKIArchiveOptions { } catch (Exception e) { log("Exception in logging into token:" + e.toString()); } - + // Data to be archived SymmetricKey vek = null; if (!passphraseMode) { @@ -206,15 +206,15 @@ public class GeneratePKIArchiveOptions { } byte[] encoded = null; - + if (passphraseMode) { - encoded = CryptoUtil.createPKIArchiveOptions(manager, token, transportCert, null, passphrase, + encoded = CryptoUtil.createPKIArchiveOptions(manager, token, transportCert, null, passphrase, KeyGenAlgorithm.DES3, ivps); } else { - encoded = CryptoUtil.createPKIArchiveOptions(manager, token, transportCert, vek, null, + encoded = CryptoUtil.createPKIArchiveOptions(manager, token, transportCert, vek, null, KeyGenAlgorithm.DES3, ivps); } - + // write encoded to file write_file(Utils.base64encode(encoded), out_file); diff --git a/base/kra/src/com/netscape/kra/EncryptionUnit.java b/base/kra/src/com/netscape/kra/EncryptionUnit.java index 1d06fd2d5..7d67a7b12 100644 --- a/base/kra/src/com/netscape/kra/EncryptionUnit.java +++ b/base/kra/src/com/netscape/kra/EncryptionUnit.java @@ -50,7 +50,7 @@ import com.netscape.cmscore.util.Debug; /** * A class represents the transport key pair. This key pair * is used to protected EE's private key in transit. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/kra/src/com/netscape/kra/EnrollmentService.java b/base/kra/src/com/netscape/kra/EnrollmentService.java index c65a6ea62..1b6ffcebd 100644 --- a/base/kra/src/com/netscape/kra/EnrollmentService.java +++ b/base/kra/src/com/netscape/kra/EnrollmentService.java @@ -87,7 +87,7 @@ import com.netscape.cmsutil.util.Utils; * Upon processing, the incoming user key is unwrapped with the transport key of KRA, and then wrapped with the storage * key. The encrypted key is stored in the internal database for long term storage. * <P> - * + * * @author thomask (original) * @author cfu (non-RSA keys; private keys secure handling); * @version $Revision$, $Date$ @@ -100,7 +100,7 @@ public class EnrollmentService implements IService { public final static String ATTR_PROOF_OF_ARCHIVAL = "proofOfArchival"; - // private + // private private IKeyRecoveryAuthority mKRA = null; private ITransportKeyUnit mTransportUnit = null; private IStorageKeyUnit mStorageUnit = null; @@ -119,7 +119,7 @@ public class EnrollmentService implements IService { /** * Constructs request processor. * <P> - * + * * @param kra key recovery authority */ public EnrollmentService(IKeyRecoveryAuthority kra) { @@ -144,7 +144,7 @@ public class EnrollmentService implements IService { /** * Services an enrollment/archival request. * <P> - * + * * @param request enrollment request * @return serving successful or not * @exception EBaseException failed to serve @@ -650,7 +650,7 @@ public class EnrollmentService implements IService { /** * Retrieves PKIArchiveOptions from CRMF request. - * + * * @param crmfBlob CRMF request * @return PKIArchiveOptions * @exception EBaseException failed to extrace option @@ -732,7 +732,7 @@ public class EnrollmentService implements IService { /** * Retrieves public key from request. - * + * * @param request CRMF request * @return JSS public key * @exception EBaseException failed to retrieve public key @@ -791,7 +791,7 @@ public class EnrollmentService implements IService { /** * Retrieves key's owner name from request. - * + * * @param request CRMF request * @return owner name (subject name) * @exception EBaseException failed to retrieve public key @@ -834,11 +834,11 @@ public class EnrollmentService implements IService { /** * Signed Audit Log Public Key - * + * * This method is called to obtain the public key from the passed in * "KeyRecord" for a signed audit log message. * <P> - * + * * @param rec a Key Record * @return key string containing the certificate's public key */ @@ -886,11 +886,11 @@ public class EnrollmentService implements IService { /** * Signed Audit Log Subject ID - * + * * This method is called to obtain the "SubjectID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message SubjectID */ @@ -923,11 +923,11 @@ public class EnrollmentService implements IService { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message RequesterID */ private String auditRequesterID() { @@ -959,10 +959,10 @@ public class EnrollmentService implements IService { /** * Signed Audit Log - * + * * This method is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ private void audit(String msg) { diff --git a/base/kra/src/com/netscape/kra/KRANotify.java b/base/kra/src/com/netscape/kra/KRANotify.java index 29eaf477a..ccf8e664f 100644 --- a/base/kra/src/com/netscape/kra/KRANotify.java +++ b/base/kra/src/com/netscape/kra/KRANotify.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.request.ARequestNotifier; * A class represents a KRA request queue notify. This * object will be invoked by the request subsystem * when a request is requested for processing. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/kra/src/com/netscape/kra/KRAPolicy.java b/base/kra/src/com/netscape/kra/KRAPolicy.java index aa2b2c2de..eac3adb8c 100644 --- a/base/kra/src/com/netscape/kra/KRAPolicy.java +++ b/base/kra/src/com/netscape/kra/KRAPolicy.java @@ -31,7 +31,7 @@ import com.netscape.cmscore.util.Debug; /** * KRA Policy. - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -55,7 +55,7 @@ public class KRAPolicy implements IPolicy { return mPolicies; } - /** + /** */ public PolicyResult apply(IRequest r) { if (Debug.ON) diff --git a/base/kra/src/com/netscape/kra/KRAService.java b/base/kra/src/com/netscape/kra/KRAService.java index 4858e286a..987d17b6b 100644 --- a/base/kra/src/com/netscape/kra/KRAService.java +++ b/base/kra/src/com/netscape/kra/KRAService.java @@ -35,7 +35,7 @@ import com.netscape.cmscore.util.Debug; * services. This service registration allows us to support * new request easier. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ @@ -70,7 +70,7 @@ public class KRAService implements IService { /** * Processes a KRA request. This method is invoked by * request subsystem. - * + * * @param r request from request subsystem * @exception EBaseException failed to serve */ diff --git a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java index 8d8cafb84..41b5fdae8 100644 --- a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java +++ b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java @@ -79,7 +79,7 @@ import com.netscape.cmscore.request.RequestSubsystem; * escrowed. It provides archive and recovery key pairs * functionalities. * <P> - * + * * @author thomask * @version $Revision$, $Date$ */ @@ -161,7 +161,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Retrieves subsystem identifier. - * + * * @return subsystem id */ public String getId() { @@ -170,7 +170,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Sets subsystem identifier. - * + * * @param id subsystem id * @exception EBaseException failed to set id */ @@ -255,7 +255,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove * necessary components. This subsystem is started by * KRASubsystem. * <P> - * + * * @param owner owner of this subsystem * @param config configuration store for this subsystem * @exception EBaseException failed to start subsystem @@ -428,7 +428,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Starts this service. When this method is called, all * service - * + * * @exception EBaseException failed to startup this subsystem */ public void startup() throws EBaseException { @@ -471,7 +471,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Retrieves the configuration store of this subsystem. * <P> - * + * * @return configuration store */ public IConfigStore getConfigStore() { @@ -480,7 +480,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Changes the auto recovery state. - * + * * @param cs list of recovery agent credentials * @param on turn of auto recovery or not * @return operation success or not @@ -501,7 +501,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Retrieves the current auto recovery state. - * + * * @return enable or not */ public boolean getAutoRecoveryState() { @@ -512,7 +512,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Returns a list of users who are in auto * recovery mode. - * + * * @return list of user IDs that are accepted in the * auto recovery mode */ @@ -522,7 +522,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Adds auto recovery mode to the given user id. - * + * * @param id new identifier to the auto recovery mode * @param creds list of credentials */ @@ -532,7 +532,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Removes auto recovery mode from the given user id. - * + * * @param id id of user to be removed from auto * recovery mode */ @@ -542,7 +542,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Retrieves logger from escrow authority. - * + * * @return logger */ public ILogger getLogger() { @@ -552,7 +552,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Retrieves number of required agents for * recovery operation. - * + * * @return number of required agents * @exception EBaseException failed to retrieve info */ @@ -572,7 +572,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Sets number of required agents for * recovery operation - * + * * @return none * @exception EBaseException invalid setting */ @@ -727,14 +727,14 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove * Archives key. This creates a key record in the key * repository. * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST used whenever a user private key archive * request is made (this is when the DRM receives the request) * <li>signed.audit LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST_PROCESSED used whenever a user private key * archive request is processed (this is when the DRM processes the request) * </ul> - * + * * @param rec key record to be archived * @return executed request * @exception EBaseException failed to archive key @@ -975,14 +975,14 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove * Recovers key for administrators. This method is * invoked by the agent operation of the key recovery servlet. * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_KEY_RECOVERY_REQUEST used whenever a user private key recovery request is * made (this is when the DRM receives the request) * <li>signed.audit LOGGING_SIGNED_AUDIT_KEY_RECOVERY_REQUEST_PROCESSED used whenever a user private key recovery * request is processed (this is when the DRM processes the request) * </ul> - * + * * @param kid key identifier * @param creds list of recovery agent credentials * @param password password of the PKCS12 package @@ -1114,14 +1114,14 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove * Async Recovers key for administrators. This method is * invoked by the agent operation of the key recovery servlet. * <P> - * + * * <ul> * <li>signed.audit LOGGING_SIGNED_AUDIT_KEY_RECOVERY_REQUEST used whenever a user private key recovery request is * made (this is when the DRM receives the request) * <li>signed.audit LOGGING_SIGNED_AUDIT_KEY_RECOVERY_REQUEST_PROCESSED used whenever a user private key recovery * request is processed (this is when the DRM processes the request) * </ul> - * + * * @param requestID request id * @param password password of the PKCS12 package * subsystem @@ -1208,7 +1208,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Constructs a recovery request and submits it * to the request subsystem for processing. - * + * * @param kid key identifier * @param creds list of recovery agent credentials * @param password password of the PKCS12 package @@ -1234,7 +1234,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Recovers key for end-entities. - * + * * @param creds list of credentials * @param encryptionChain certificate chain * @param signingCert signing cert @@ -1281,7 +1281,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove * Retrieves the storage key unit. The storage key * is used to wrap the user key for long term * storage. - * + * * @return storage key unit. */ public IStorageKeyUnit getStorageKeyUnit() { @@ -1290,7 +1290,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Retrieves the transport key unit. - * + * * @return transport key unit */ public ITransportKeyUnit getTransportKeyUnit() { @@ -1300,7 +1300,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Returns the name of this subsystem. This name is * extracted from the transport certificate. - * + * * @return KRA name */ public X500Name getX500Name() { @@ -1314,7 +1314,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Returns the nickname for the id cert of this * subsystem. - * + * * @return nickname of the transport certificate */ public String getNickname() { @@ -1347,7 +1347,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Retrieves KRA request repository. * <P> - * + * * @return request repository */ public IRequestQueue getRequestQueue() { @@ -1366,7 +1366,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Retrieves replica repository. * <P> - * + * * @return replica repository */ public IReplicaIDRepository getReplicaRepository() { @@ -1376,7 +1376,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Retrieves the DN of this escrow authority. * <P> - * + * * @return distinguished name */ protected String getDN() { @@ -1392,7 +1392,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Logs an event. - * + * * @param level log level * @param msg message to log */ @@ -1403,7 +1403,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Registers a request listener. - * + * * @param l request listener */ public void registerRequestListener(IRequestListener l) { @@ -1469,13 +1469,13 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove radn = new X500Name(raname); } } catch (IOException e) { - mLogger.log(ILogger.EV_SYSTEM, ILogger.S_KRA, - ILogger.LL_FAILURE, + mLogger.log(ILogger.EV_SYSTEM, ILogger.S_KRA, + ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_KRA_INVALID_RA_NAME", raname, e.toString())); } catch (EBaseException e) { // ignore - set to null. - mLogger.log(ILogger.EV_SYSTEM, ILogger.S_KRA, - ILogger.LL_FAILURE, + mLogger.log(ILogger.EV_SYSTEM, ILogger.S_KRA, + ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_KRA_INVALID_RA_SETUP", e.toString())); } return new X500Name[] { radn }; @@ -1513,10 +1513,10 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Signed Audit Log - * + * * This method is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ private void audit(String msg) { @@ -1536,11 +1536,11 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Signed Audit Log Subject ID - * + * * This method is called to obtain the "SubjectID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message SubjectID */ private String auditSubjectID() { @@ -1572,11 +1572,11 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message RequesterID */ private String auditRequesterID() { @@ -1608,11 +1608,11 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Signed Audit Log Recovery ID - * + * * This method is called to obtain the "RecoveryID" for * a signed audit log message. * <P> - * + * * @return id string containing the signed audit log message RecoveryID */ private String auditRecoveryID() { @@ -1644,11 +1644,11 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Signed Audit Log Public Key - * + * * This method is called to obtain the public key from the passed in * "X509Certificate" for a signed audit log message. * <P> - * + * * @param cert an X509Certificate * @return key string containing the certificate's public key */ @@ -1684,11 +1684,11 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Signed Audit Log Public Key - * + * * This method is called to obtain the public key from the passed in * "KeyRecord" for a signed audit log message. * <P> - * + * * @param rec a Key Record * @return key string containing the certificate's public key */ @@ -1741,11 +1741,11 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Signed Audit Agents - * + * * This method is called to extract agent uids from the passed in * "Credentials[]" and return a string of comma-separated agent uids. * <P> - * + * * @param creds array of credentials * @return a comma-separated string of agent uids */ diff --git a/base/kra/src/com/netscape/kra/NetkeyKeygenService.java b/base/kra/src/com/netscape/kra/NetkeyKeygenService.java index ecce2eaa9..017538bd5 100644 --- a/base/kra/src/com/netscape/kra/NetkeyKeygenService.java +++ b/base/kra/src/com/netscape/kra/NetkeyKeygenService.java @@ -76,7 +76,7 @@ import com.netscape.cmscore.util.Debug; * the caller (netkey RA) ...netkey RA should already has kek-wrapped * des key from the TKS. They are to be sent together back to * the token. - * + * * @author Christina Fu (cfu) * @version $Revision$, $Date$ */ @@ -86,7 +86,7 @@ public class NetkeyKeygenService implements IService { public final static String ATTR_PROOF_OF_ARCHIVAL = "proofOfArchival"; - // private + // private private final static String LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST = "LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST_4"; private final static String LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST_PROCESSED = @@ -110,7 +110,7 @@ public class NetkeyKeygenService implements IService { /** * Constructs request processor. * <P> - * + * * @param kra key recovery authority */ public NetkeyKeygenService(IKeyRecoveryAuthority kra) { @@ -219,7 +219,7 @@ public class NetkeyKeygenService implements IService { // 602548 NSS bug - to overcome it, we use isBadDSAKeyPair kp = kpGen.genKeyPair(); } - while (isBadDSAKeyPair(kp)); + while (isBadDSAKeyPair(kp)); */ return kp; } @@ -292,7 +292,7 @@ public class NetkeyKeygenService implements IService { /** * Services an archival request from netkey. * <P> - * + * * @param request enrollment request * @return serving successful or not * @exception EBaseException failed to serve @@ -588,7 +588,7 @@ public class NetkeyKeygenService implements IService { * y * This method is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ private void audit(String msg) { diff --git a/base/kra/src/com/netscape/kra/RecoveryService.java b/base/kra/src/com/netscape/kra/RecoveryService.java index 0cbe2009f..80f2fc711 100644 --- a/base/kra/src/com/netscape/kra/RecoveryService.java +++ b/base/kra/src/com/netscape/kra/RecoveryService.java @@ -77,7 +77,7 @@ import com.netscape.cmscore.util.Debug; * Administrator recovery will create a PKCS12 file where stores the certificate and the recovered key. * <P> * End Entity recovery will send RA or CA a response where stores the recovered key. - * + * * @author thomask (original) * @author cfu (non-RSA keys; private keys secure handling); * @version $Revision$, $Date$ @@ -122,7 +122,7 @@ public class RecoveryService implements IService { * (either Administrator or End-Entity), the method reads * the key record from the database, and tried to recover the * key with the storage key unit. - * + * * @param request recovery request * @return operation success or not * @exception EBaseException failed to serve @@ -433,7 +433,7 @@ public class RecoveryService implements IService { /** * Creates a PFX (PKCS12) file. (the unwrapping/wrapping way) * - used when allowEncDecrypt_recovery is false - * + * * @param request CRMF recovery request * @param priKey private key handle * @exception EBaseException failed to create P12 file @@ -558,7 +558,7 @@ public class RecoveryService implements IService { /** * Creates a PFX (PKCS12) file. * - used when allowEncDecrypt_recovery is true - * + * * @param request CRMF recovery request * @param priData decrypted private key (PrivateKeyInfo) * @exception EBaseException failed to create P12 file diff --git a/base/kra/src/com/netscape/kra/StorageKeyUnit.java b/base/kra/src/com/netscape/kra/StorageKeyUnit.java index c956bf8d8..510e2f328 100644 --- a/base/kra/src/com/netscape/kra/StorageKeyUnit.java +++ b/base/kra/src/com/netscape/kra/StorageKeyUnit.java @@ -66,7 +66,7 @@ import com.netscape.cmsutil.util.Utils; * A class represents a storage key unit. Currently, this * is implemented with cryptix, the final implementation * should be built on JSS/HCL. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java b/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java index 7575ea9f4..298988360 100644 --- a/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java +++ b/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java @@ -53,7 +53,7 @@ import com.netscape.cmsutil.util.Cert; /** * A class represents recovery request processor. - * + * * @author Christina Fu (cfu) * @version $Revision$, $Date$ */ @@ -99,7 +99,7 @@ public class TokenKeyRecoveryService implements IService { /** * Process the HTTP request. - * + * * @param s The URL to decode */ protected String URLdecode(String s) { @@ -189,7 +189,7 @@ public class TokenKeyRecoveryService implements IService { * - cuid may be used for additional validation check * - userid may be used for additional validation check * - wrappedDesKey is used for wrapping recovered private key - * + * * @param request recovery request * @return operation success or not * @exception EBaseException failed to serve @@ -320,7 +320,7 @@ public class TokenKeyRecoveryService implements IService { try { /* - CryptoToken internalToken = + CryptoToken internalToken = CryptoManager.getInstance().getInternalKeyStorageToken(); */ CryptoToken token = mStorageUnit.getToken(); @@ -606,7 +606,7 @@ public class TokenKeyRecoveryService implements IService { * y * This method is called to store messages to the signed audit log. * <P> - * + * * @param msg signed audit log message */ private void audit(String msg) { diff --git a/base/kra/src/com/netscape/kra/TransportKeyUnit.java b/base/kra/src/com/netscape/kra/TransportKeyUnit.java index 90ac2120f..e2077212a 100644 --- a/base/kra/src/com/netscape/kra/TransportKeyUnit.java +++ b/base/kra/src/com/netscape/kra/TransportKeyUnit.java @@ -37,7 +37,7 @@ import com.netscape.cmsutil.util.Cert; /** * A class represents the transport key pair. This key pair * is used to protected EE's private key in transit. - * + * * @author thomask * @version $Revision$, $Date$ */ @@ -113,7 +113,7 @@ public class TransportKeyUnit extends EncryptionUnit implements public CryptoToken getToken() { // 390148: returning the token that owns the private - // key. + // key. return getPrivateKey().getOwningToken(); } diff --git a/base/migrate/41ToTxt/src/Main.java b/base/migrate/41ToTxt/src/Main.java index 758d725a9..4a15ec7af 100644 --- a/base/migrate/41ToTxt/src/Main.java +++ b/base/migrate/41ToTxt/src/Main.java @@ -34,7 +34,7 @@ import netscape.security.util.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.1/4.2/4.2 (SP 2) @@ -43,15 +43,15 @@ public class Main java.security.Security.removeProvider("Netscape version 1.4"); java.security.Security.removeProvider("SunRsaSign version 1.0"); // java.security.Security.insertProviderAt( -// new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = +// new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -74,14 +74,14 @@ public class Main class CMS41LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.1/4.2/4.2 (SP 2)/4.5 use "requestattributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestattributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -101,16 +101,16 @@ class CMS41LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; StringBuffer requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -118,7 +118,7 @@ class CMS41LdifParser requestAttributes = new StringBuffer(); // System.out.println(line); requestAttributes.append( - line.substring(REQUEST_ATTRIBUTES.length(), + line.substring(REQUEST_ATTRIBUTES.length(), line.length()).trim()); continue; } @@ -134,41 +134,41 @@ class CMS41LdifParser requestAttributes = null; System.out.println(line); } - } + } } public void parseAttributes(String dn, StringBuffer attrs) throws Exception { BASE64Decoder decoder = new BASE64Decoder(); decodeHashtable(dn, decoder.decodeBuffer(attrs.toString())); - + // System.out.println(attrs); } - public Object decode(byte[] data) throws - ObjectStreamException, - IOException, - ClassNotFoundException - { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); - return is.readObject(); + public Object decode(byte[] data) throws + ObjectStreamException, + IOException, + ClassNotFoundException + { + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); + return is.readObject(); } public void decodeHashtable(String dn, byte[] data) throws Exception { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); System.out.println(BEGIN); - String key = null; - while (true) - { - key = (String)is.readObject(); - // end of table is marked with null - if (key == null) break; + String key = null; + while (true) + { + key = (String)is.readObject(); + // end of table is marked with null + if (key == null) break; try { - byte[] bytes = (byte[])is.readObject(); + byte[] bytes = (byte[])is.readObject(); Object obj = decode(bytes); output(key, obj); } catch (Exception e) { @@ -179,7 +179,7 @@ class CMS41LdifParser mErrorPrintWriter.println("Skipped " + key); } } - } + } System.out.println(END); } @@ -187,22 +187,22 @@ class CMS41LdifParser { if (obj instanceof String) { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } else if (obj instanceof netscape.security.x509.CertificateX509Key) { netscape.security.x509.CertificateX509Key o = (netscape.security.x509.CertificateX509Key)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateSubjectName) { netscape.security.x509.CertificateSubjectName o = (netscape.security.x509.CertificateSubjectName)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -212,7 +212,7 @@ class CMS41LdifParser } else if (obj instanceof netscape.security.x509.CertificateExtensions) { netscape.security.x509.CertificateExtensions o = (netscape.security.x509.CertificateExtensions)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -222,7 +222,7 @@ class CMS41LdifParser } else if (obj instanceof netscape.security.x509.X509CertInfo) { netscape.security.x509.X509CertInfo o = (netscape.security.x509.X509CertInfo)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -232,68 +232,68 @@ class CMS41LdifParser } else if (obj instanceof netscape.security.x509.X509CertImpl) { netscape.security.x509.X509CertImpl o = (netscape.security.x509.X509CertImpl)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateChain) { netscape.security.x509.CertificateChain o = (netscape.security.x509.CertificateChain)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.X509CertImpl[]) { netscape.security.x509.X509CertImpl o[] = (netscape.security.x509.X509CertImpl[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.X509CertInfo[]) { netscape.security.x509.X509CertInfo o[] = (netscape.security.x509.X509CertInfo[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + + key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + encoder.encodeBuffer(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.RevokedCertImpl[]) { netscape.security.x509.RevokedCertImpl o[] = (netscape.security.x509.RevokedCertImpl[])obj; for (int i = 0; i < o.length; i++) { - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof java.security.cert.Certificate[]) { java.security.cert.Certificate o[] = (java.security.cert.Certificate[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(o[i].getEncoded())); } } else if (obj instanceof com.netscape.certsrv.base.ArgBlock) { @@ -334,12 +334,12 @@ class CMS41LdifParser } else if (obj instanceof com.netscape.certsrv.kra.ProofOfArchival) { com.netscape.certsrv.kra.ProofOfArchival o = (com.netscape.certsrv.kra.ProofOfArchival)obj; - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof com.netscape.certsrv.request.AgentApprovals) { com.netscape.certsrv.request.AgentApprovals o = @@ -422,22 +422,22 @@ class CMS41LdifParser } else if (obj instanceof netscape.security.x509.CertificateAlgorithmId) { netscape.security.x509.CertificateAlgorithmId o = (netscape.security.x509.CertificateAlgorithmId)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateAlgorithmId="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateAlgorithmId="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateValidity) { netscape.security.x509.CertificateValidity o = (netscape.security.x509.CertificateValidity)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateValidity="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateValidity="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof java.util.Hashtable) { // Bugzilla Bug #224800 (a.k.a - Raidzilla Bug #56953) @@ -456,7 +456,7 @@ class CMS41LdifParser } } else { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } } diff --git a/base/migrate/42SP2ToTxt/src/Main.java b/base/migrate/42SP2ToTxt/src/Main.java index 1a324d8ee..b76b17b71 100644 --- a/base/migrate/42SP2ToTxt/src/Main.java +++ b/base/migrate/42SP2ToTxt/src/Main.java @@ -37,7 +37,7 @@ import netscape.security.util.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.1/4.2/4.2 (SP 2) @@ -46,15 +46,15 @@ public class Main java.security.Security.removeProvider("Netscape version 1.4"); java.security.Security.removeProvider("SunRsaSign version 1.0"); // java.security.Security.insertProviderAt( -// new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = +// new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -77,14 +77,14 @@ public class Main class CMS42SP2LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.1/4.2/4.2 (SP 2)/4.5 use "requestattributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestattributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -104,16 +104,16 @@ class CMS42SP2LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; StringBuffer requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -121,7 +121,7 @@ class CMS42SP2LdifParser requestAttributes = new StringBuffer(); // System.out.println(line); requestAttributes.append( - line.substring(REQUEST_ATTRIBUTES.length(), + line.substring(REQUEST_ATTRIBUTES.length(), line.length()).trim()); continue; } @@ -137,41 +137,41 @@ class CMS42SP2LdifParser requestAttributes = null; System.out.println(line); } - } + } } public void parseAttributes(String dn, StringBuffer attrs) throws Exception { BASE64Decoder decoder = new BASE64Decoder(); decodeHashtable(dn, decoder.decodeBuffer(attrs.toString())); - + // System.out.println(attrs); } - public Object decode(byte[] data) throws - ObjectStreamException, - IOException, - ClassNotFoundException - { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); - return is.readObject(); + public Object decode(byte[] data) throws + ObjectStreamException, + IOException, + ClassNotFoundException + { + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); + return is.readObject(); } public void decodeHashtable(String dn, byte[] data) throws Exception { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); System.out.println(BEGIN); - String key = null; - while (true) - { - key = (String)is.readObject(); - // end of table is marked with null - if (key == null) break; + String key = null; + while (true) + { + key = (String)is.readObject(); + // end of table is marked with null + if (key == null) break; try { - byte[] bytes = (byte[])is.readObject(); + byte[] bytes = (byte[])is.readObject(); Object obj = decode(bytes); output(key, obj); } catch (Exception e) { @@ -182,7 +182,7 @@ class CMS42SP2LdifParser mErrorPrintWriter.println("Skipped " + key); } } - } + } System.out.println(END); } @@ -190,22 +190,22 @@ class CMS42SP2LdifParser { if (obj instanceof String) { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } else if (obj instanceof netscape.security.x509.CertificateX509Key) { netscape.security.x509.CertificateX509Key o = (netscape.security.x509.CertificateX509Key)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateSubjectName) { netscape.security.x509.CertificateSubjectName o = (netscape.security.x509.CertificateSubjectName)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -215,7 +215,7 @@ class CMS42SP2LdifParser } else if (obj instanceof netscape.security.x509.CertificateExtensions) { netscape.security.x509.CertificateExtensions o = (netscape.security.x509.CertificateExtensions)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -225,7 +225,7 @@ class CMS42SP2LdifParser } else if (obj instanceof netscape.security.x509.X509CertInfo) { netscape.security.x509.X509CertInfo o = (netscape.security.x509.X509CertInfo)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -235,68 +235,68 @@ class CMS42SP2LdifParser } else if (obj instanceof netscape.security.x509.X509CertImpl) { netscape.security.x509.X509CertImpl o = (netscape.security.x509.X509CertImpl)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateChain) { netscape.security.x509.CertificateChain o = (netscape.security.x509.CertificateChain)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.X509CertImpl[]) { netscape.security.x509.X509CertImpl o[] = (netscape.security.x509.X509CertImpl[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.X509CertInfo[]) { netscape.security.x509.X509CertInfo o[] = (netscape.security.x509.X509CertInfo[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + + key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + encoder.encodeBuffer(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.RevokedCertImpl[]) { netscape.security.x509.RevokedCertImpl o[] = (netscape.security.x509.RevokedCertImpl[])obj; for (int i = 0; i < o.length; i++) { - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof java.security.cert.Certificate[]) { java.security.cert.Certificate o[] = (java.security.cert.Certificate[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(o[i].getEncoded())); } } else if (obj instanceof com.netscape.certsrv.base.ArgBlock) { @@ -337,12 +337,12 @@ class CMS42SP2LdifParser } else if (obj instanceof com.netscape.certsrv.kra.ProofOfArchival) { com.netscape.certsrv.kra.ProofOfArchival o = (com.netscape.certsrv.kra.ProofOfArchival)obj; - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof com.netscape.certsrv.request.AgentApprovals) { com.netscape.certsrv.request.AgentApprovals o = @@ -425,22 +425,22 @@ class CMS42SP2LdifParser } else if (obj instanceof netscape.security.x509.CertificateAlgorithmId) { netscape.security.x509.CertificateAlgorithmId o = (netscape.security.x509.CertificateAlgorithmId)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateAlgorithmId="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateAlgorithmId="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateValidity) { netscape.security.x509.CertificateValidity o = (netscape.security.x509.CertificateValidity)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateValidity="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateValidity="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof java.util.Hashtable) { // Bugzilla Bug #224800 (a.k.a - Raidzilla Bug #56953) @@ -459,7 +459,7 @@ class CMS42SP2LdifParser } } else { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } } diff --git a/base/migrate/42ToTxt/src/Main.java b/base/migrate/42ToTxt/src/Main.java index 55e64df08..76adfb16e 100644 --- a/base/migrate/42ToTxt/src/Main.java +++ b/base/migrate/42ToTxt/src/Main.java @@ -37,7 +37,7 @@ import netscape.security.util.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.1/4.2/4.2 (SP 2) @@ -46,15 +46,15 @@ public class Main java.security.Security.removeProvider("Netscape version 1.4"); java.security.Security.removeProvider("SunRsaSign version 1.0"); // java.security.Security.insertProviderAt( -// new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = +// new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -77,14 +77,14 @@ public class Main class CMS42LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.1/4.2/4.2 (SP 2)/4.5 use "requestattributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestattributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -104,16 +104,16 @@ class CMS42LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; StringBuffer requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -121,7 +121,7 @@ class CMS42LdifParser requestAttributes = new StringBuffer(); // System.out.println(line); requestAttributes.append( - line.substring(REQUEST_ATTRIBUTES.length(), + line.substring(REQUEST_ATTRIBUTES.length(), line.length()).trim()); continue; } @@ -137,41 +137,41 @@ class CMS42LdifParser requestAttributes = null; System.out.println(line); } - } + } } public void parseAttributes(String dn, StringBuffer attrs) throws Exception { BASE64Decoder decoder = new BASE64Decoder(); decodeHashtable(dn, decoder.decodeBuffer(attrs.toString())); - + // System.out.println(attrs); } - public Object decode(byte[] data) throws - ObjectStreamException, - IOException, - ClassNotFoundException - { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); - return is.readObject(); + public Object decode(byte[] data) throws + ObjectStreamException, + IOException, + ClassNotFoundException + { + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); + return is.readObject(); } public void decodeHashtable(String dn, byte[] data) throws Exception { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); System.out.println(BEGIN); - String key = null; - while (true) - { - key = (String)is.readObject(); - // end of table is marked with null - if (key == null) break; + String key = null; + while (true) + { + key = (String)is.readObject(); + // end of table is marked with null + if (key == null) break; try { - byte[] bytes = (byte[])is.readObject(); + byte[] bytes = (byte[])is.readObject(); Object obj = decode(bytes); output(key, obj); } catch (Exception e) { @@ -182,7 +182,7 @@ class CMS42LdifParser mErrorPrintWriter.println("Skipped " + key); } } - } + } System.out.println(END); } @@ -190,22 +190,22 @@ class CMS42LdifParser { if (obj instanceof String) { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } else if (obj instanceof netscape.security.x509.CertificateX509Key) { netscape.security.x509.CertificateX509Key o = (netscape.security.x509.CertificateX509Key)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateSubjectName) { netscape.security.x509.CertificateSubjectName o = (netscape.security.x509.CertificateSubjectName)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -215,7 +215,7 @@ class CMS42LdifParser } else if (obj instanceof netscape.security.x509.CertificateExtensions) { netscape.security.x509.CertificateExtensions o = (netscape.security.x509.CertificateExtensions)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -225,7 +225,7 @@ class CMS42LdifParser } else if (obj instanceof netscape.security.x509.X509CertInfo) { netscape.security.x509.X509CertInfo o = (netscape.security.x509.X509CertInfo)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -235,68 +235,68 @@ class CMS42LdifParser } else if (obj instanceof netscape.security.x509.X509CertImpl) { netscape.security.x509.X509CertImpl o = (netscape.security.x509.X509CertImpl)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateChain) { netscape.security.x509.CertificateChain o = (netscape.security.x509.CertificateChain)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.X509CertImpl[]) { netscape.security.x509.X509CertImpl o[] = (netscape.security.x509.X509CertImpl[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.X509CertInfo[]) { netscape.security.x509.X509CertInfo o[] = (netscape.security.x509.X509CertInfo[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + + key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + encoder.encodeBuffer(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.RevokedCertImpl[]) { netscape.security.x509.RevokedCertImpl o[] = (netscape.security.x509.RevokedCertImpl[])obj; for (int i = 0; i < o.length; i++) { - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof java.security.cert.Certificate[]) { java.security.cert.Certificate o[] = (java.security.cert.Certificate[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(o[i].getEncoded())); } } else if (obj instanceof com.netscape.certsrv.base.ArgBlock) { @@ -337,12 +337,12 @@ class CMS42LdifParser } else if (obj instanceof com.netscape.certsrv.kra.ProofOfArchival) { com.netscape.certsrv.kra.ProofOfArchival o = (com.netscape.certsrv.kra.ProofOfArchival)obj; - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof com.netscape.certsrv.request.AgentApprovals) { com.netscape.certsrv.request.AgentApprovals o = @@ -425,22 +425,22 @@ class CMS42LdifParser } else if (obj instanceof netscape.security.x509.CertificateAlgorithmId) { netscape.security.x509.CertificateAlgorithmId o = (netscape.security.x509.CertificateAlgorithmId)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateAlgorithmId="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateAlgorithmId="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateValidity) { netscape.security.x509.CertificateValidity o = (netscape.security.x509.CertificateValidity)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateValidity="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateValidity="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof java.util.Hashtable) { // Bugzilla Bug #224800 (a.k.a - Raidzilla Bug #56953) @@ -459,7 +459,7 @@ class CMS42LdifParser } } else { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } } diff --git a/base/migrate/45ToTxt/src/Main.java b/base/migrate/45ToTxt/src/Main.java index 916ca9cd1..13125fb43 100644 --- a/base/migrate/45ToTxt/src/Main.java +++ b/base/migrate/45ToTxt/src/Main.java @@ -38,7 +38,7 @@ import netscape.security.util.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.5 and later @@ -48,15 +48,15 @@ public class Main // The following call to "java.security.Security.insertProviderAt()" // is no longer commented out in CMS 4.5 and later java.security.Security.insertProviderAt( - new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = + new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -79,14 +79,14 @@ public class Main class CMS45LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.1/4.2/4.2 (SP 2)/4.5 use "requestattributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestattributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -106,16 +106,16 @@ class CMS45LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; StringBuffer requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -123,7 +123,7 @@ class CMS45LdifParser requestAttributes = new StringBuffer(); // System.out.println(line); requestAttributes.append( - line.substring(REQUEST_ATTRIBUTES.length(), + line.substring(REQUEST_ATTRIBUTES.length(), line.length()).trim()); continue; } @@ -139,41 +139,41 @@ class CMS45LdifParser requestAttributes = null; System.out.println(line); } - } + } } public void parseAttributes(String dn, StringBuffer attrs) throws Exception { BASE64Decoder decoder = new BASE64Decoder(); decodeHashtable(dn, decoder.decodeBuffer(attrs.toString())); - + // System.out.println(attrs); } - public Object decode(byte[] data) throws - ObjectStreamException, - IOException, - ClassNotFoundException - { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); - return is.readObject(); + public Object decode(byte[] data) throws + ObjectStreamException, + IOException, + ClassNotFoundException + { + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); + return is.readObject(); } public void decodeHashtable(String dn, byte[] data) throws Exception { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); System.out.println(BEGIN); - String key = null; - while (true) - { - key = (String)is.readObject(); - // end of table is marked with null - if (key == null) break; + String key = null; + while (true) + { + key = (String)is.readObject(); + // end of table is marked with null + if (key == null) break; try { - byte[] bytes = (byte[])is.readObject(); + byte[] bytes = (byte[])is.readObject(); Object obj = decode(bytes); output(key, obj); } catch (Exception e) { @@ -184,7 +184,7 @@ class CMS45LdifParser mErrorPrintWriter.println("Skipped " + key); } } - } + } System.out.println(END); } @@ -192,22 +192,22 @@ class CMS45LdifParser { if (obj instanceof String) { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } else if (obj instanceof netscape.security.x509.CertificateX509Key) { netscape.security.x509.CertificateX509Key o = (netscape.security.x509.CertificateX509Key)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateSubjectName) { netscape.security.x509.CertificateSubjectName o = (netscape.security.x509.CertificateSubjectName)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -217,7 +217,7 @@ class CMS45LdifParser } else if (obj instanceof netscape.security.x509.CertificateExtensions) { netscape.security.x509.CertificateExtensions o = (netscape.security.x509.CertificateExtensions)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -227,7 +227,7 @@ class CMS45LdifParser } else if (obj instanceof netscape.security.x509.X509CertInfo) { netscape.security.x509.X509CertInfo o = (netscape.security.x509.X509CertInfo)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -237,68 +237,68 @@ class CMS45LdifParser } else if (obj instanceof netscape.security.x509.X509CertImpl) { netscape.security.x509.X509CertImpl o = (netscape.security.x509.X509CertImpl)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateChain) { netscape.security.x509.CertificateChain o = (netscape.security.x509.CertificateChain)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.X509CertImpl[]) { netscape.security.x509.X509CertImpl o[] = (netscape.security.x509.X509CertImpl[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.X509CertInfo[]) { netscape.security.x509.X509CertInfo o[] = (netscape.security.x509.X509CertInfo[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + + key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + encoder.encodeBuffer(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.RevokedCertImpl[]) { netscape.security.x509.RevokedCertImpl o[] = (netscape.security.x509.RevokedCertImpl[])obj; for (int i = 0; i < o.length; i++) { - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof java.security.cert.Certificate[]) { java.security.cert.Certificate o[] = (java.security.cert.Certificate[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(o[i].getEncoded())); } } else if (obj instanceof com.netscape.certsrv.base.ArgBlock) { @@ -339,12 +339,12 @@ class CMS45LdifParser } else if (obj instanceof com.netscape.certsrv.kra.ProofOfArchival) { com.netscape.certsrv.kra.ProofOfArchival o = (com.netscape.certsrv.kra.ProofOfArchival)obj; - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof com.netscape.certsrv.request.AgentApprovals) { com.netscape.certsrv.request.AgentApprovals o = @@ -427,22 +427,22 @@ class CMS45LdifParser } else if (obj instanceof netscape.security.x509.CertificateAlgorithmId) { netscape.security.x509.CertificateAlgorithmId o = (netscape.security.x509.CertificateAlgorithmId)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateAlgorithmId="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateAlgorithmId="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateValidity) { netscape.security.x509.CertificateValidity o = (netscape.security.x509.CertificateValidity)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateValidity="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateValidity="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof java.util.Hashtable) { // Bugzilla Bug #224800 (a.k.a - Raidzilla Bug #56953) @@ -461,7 +461,7 @@ class CMS45LdifParser } } else { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } } diff --git a/base/migrate/47ToTxt/src/Main.java b/base/migrate/47ToTxt/src/Main.java index 194c277f1..ebed784fb 100644 --- a/base/migrate/47ToTxt/src/Main.java +++ b/base/migrate/47ToTxt/src/Main.java @@ -45,7 +45,7 @@ import iplanet.security.util.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.5 and later @@ -55,15 +55,15 @@ public class Main // The following call to "java.security.Security.insertProviderAt()" // is no longer commented out in CMS 4.5 and later java.security.Security.insertProviderAt( - new iplanet.security.provider.CMS(), 0); - java.security.Provider ps[] = + new iplanet.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -86,14 +86,14 @@ public class Main class CMS47LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.7 and later use "requestAttributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestAttributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -113,16 +113,16 @@ class CMS47LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; StringBuffer requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -130,7 +130,7 @@ class CMS47LdifParser requestAttributes = new StringBuffer(); // System.out.println(line); requestAttributes.append( - line.substring(REQUEST_ATTRIBUTES.length(), + line.substring(REQUEST_ATTRIBUTES.length(), line.length()).trim()); continue; } @@ -146,41 +146,41 @@ class CMS47LdifParser requestAttributes = null; System.out.println(line); } - } + } } public void parseAttributes(String dn, StringBuffer attrs) throws Exception { BASE64Decoder decoder = new BASE64Decoder(); decodeHashtable(dn, decoder.decodeBuffer(attrs.toString())); - + // System.out.println(attrs); } - public Object decode(byte[] data) throws - ObjectStreamException, - IOException, - ClassNotFoundException - { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); - return is.readObject(); + public Object decode(byte[] data) throws + ObjectStreamException, + IOException, + ClassNotFoundException + { + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); + return is.readObject(); } public void decodeHashtable(String dn, byte[] data) throws Exception { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); System.out.println(BEGIN); - String key = null; - while (true) - { - key = (String)is.readObject(); - // end of table is marked with null - if (key == null) break; + String key = null; + while (true) + { + key = (String)is.readObject(); + // end of table is marked with null + if (key == null) break; try { - byte[] bytes = (byte[])is.readObject(); + byte[] bytes = (byte[])is.readObject(); Object obj = decode(bytes); output(key, obj); } catch (Exception e) { @@ -191,7 +191,7 @@ class CMS47LdifParser mErrorPrintWriter.println("Skipped " + key); } } - } + } System.out.println(END); } @@ -211,22 +211,22 @@ class CMS47LdifParser translation = data_type; } System.out.println(" " + - key + ":" + translation + "=" + + key + ":" + translation + "=" + obj); } else if (obj instanceof iplanet.security.x509.CertificateX509Key) { iplanet.security.x509.CertificateX509Key o = (iplanet.security.x509.CertificateX509Key)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + "netscape.security.x509.CertificateX509Key" + "=" + + key + ":" + "netscape.security.x509.CertificateX509Key" + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof iplanet.security.x509.CertificateSubjectName) { iplanet.security.x509.CertificateSubjectName o = (iplanet.security.x509.CertificateSubjectName)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -236,7 +236,7 @@ class CMS47LdifParser } else if (obj instanceof iplanet.security.x509.CertificateExtensions) { iplanet.security.x509.CertificateExtensions o = (iplanet.security.x509.CertificateExtensions)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -246,7 +246,7 @@ class CMS47LdifParser } else if (obj instanceof iplanet.security.x509.X509CertInfo) { iplanet.security.x509.X509CertInfo o = (iplanet.security.x509.X509CertInfo)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -256,57 +256,57 @@ class CMS47LdifParser } else if (obj instanceof iplanet.security.x509.X509CertImpl) { iplanet.security.x509.X509CertImpl o = (iplanet.security.x509.X509CertImpl)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + "netscape.security.x509.X509CertImpl" + "=" + + key + ":" + "netscape.security.x509.X509CertImpl" + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof iplanet.security.x509.CertificateChain) { iplanet.security.x509.CertificateChain o = (iplanet.security.x509.CertificateChain)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + "netscape.security.x509.CertificateChain" + "=" + + key + ":" + "netscape.security.x509.CertificateChain" + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof iplanet.security.x509.X509CertImpl[]) { iplanet.security.x509.X509CertImpl o[] = (iplanet.security.x509.X509CertImpl[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + "netscape.security.x509.X509CertImpl" +"["+o.length+","+i+"]" + "=" + + key + ":" + "netscape.security.x509.X509CertImpl" +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof iplanet.security.x509.X509CertInfo[]) { iplanet.security.x509.X509CertInfo o[] = (iplanet.security.x509.X509CertInfo[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + "netscape.security.x509.X509CertInfo" + "["+o.length + "," + i+"]"+"=" + + key + ":" + "netscape.security.x509.X509CertInfo" + "["+o.length + "," + i+"]"+"=" + encoder.encodeBuffer(bos.toByteArray())); } } else if (obj instanceof iplanet.security.x509.RevokedCertImpl[]) { iplanet.security.x509.RevokedCertImpl o[] = (iplanet.security.x509.RevokedCertImpl[])obj; for (int i = 0; i < o.length; i++) { - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + "netscape.security.x509.RevokedCertImpl" +"["+o.length+","+i+"]" + "=" + + key + ":" + "netscape.security.x509.RevokedCertImpl" +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof java.security.cert.Certificate[]) { @@ -323,11 +323,11 @@ class CMS47LdifParser } else { translation = data_type; } - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + translation +"["+o.length+","+i+"]" + "=" + + key + ":" + translation +"["+o.length+","+i+"]" + "=" + encoder.encode(o[i].getEncoded())); } } else if (obj instanceof com.iplanet.certsrv.base.ArgBlock) { @@ -398,12 +398,12 @@ class CMS47LdifParser } else if (obj instanceof com.iplanet.certsrv.kra.ProofOfArchival) { com.iplanet.certsrv.kra.ProofOfArchival o = (com.iplanet.certsrv.kra.ProofOfArchival)obj; - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + "com.netscape.certsrv.kra.ProofOfArchival" + "=" + + key + ":" + "com.netscape.certsrv.kra.ProofOfArchival" + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof com.iplanet.certsrv.request.AgentApprovals) { com.iplanet.certsrv.request.AgentApprovals o = @@ -516,22 +516,22 @@ class CMS47LdifParser } else if (obj instanceof iplanet.security.x509.CertificateAlgorithmId) { iplanet.security.x509.CertificateAlgorithmId o = (iplanet.security.x509.CertificateAlgorithmId)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateAlgorithmId="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateAlgorithmId="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof iplanet.security.x509.CertificateValidity) { iplanet.security.x509.CertificateValidity o = (iplanet.security.x509.CertificateValidity)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateValidity="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateValidity="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof java.util.Hashtable) { // Bugzilla Bug #224800 (a.k.a - Raidzilla Bug #56953) @@ -570,7 +570,7 @@ class CMS47LdifParser translation = data_type; } System.out.println(" " + - key + ":" + translation + "=" + + key + ":" + translation + "=" + obj); } } diff --git a/base/migrate/60ToTxt/src/Main.java b/base/migrate/60ToTxt/src/Main.java index 72de924c4..3eb3c8150 100644 --- a/base/migrate/60ToTxt/src/Main.java +++ b/base/migrate/60ToTxt/src/Main.java @@ -40,7 +40,7 @@ import netscape.security.util.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.5 and later @@ -50,15 +50,15 @@ public class Main // The following call to "java.security.Security.insertProviderAt()" // is no longer commented out in CMS 4.5 and later java.security.Security.insertProviderAt( - new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = + new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -81,14 +81,14 @@ public class Main class CMS60LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.7 and later use "requestAttributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestAttributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -108,16 +108,16 @@ class CMS60LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; StringBuffer requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -125,7 +125,7 @@ class CMS60LdifParser requestAttributes = new StringBuffer(); // System.out.println(line); requestAttributes.append( - line.substring(REQUEST_ATTRIBUTES.length(), + line.substring(REQUEST_ATTRIBUTES.length(), line.length()).trim()); continue; } @@ -141,41 +141,41 @@ class CMS60LdifParser requestAttributes = null; System.out.println(line); } - } + } } public void parseAttributes(String dn, StringBuffer attrs) throws Exception { BASE64Decoder decoder = new BASE64Decoder(); decodeHashtable(dn, decoder.decodeBuffer(attrs.toString())); - + // System.out.println(attrs); } - public Object decode(byte[] data) throws - ObjectStreamException, - IOException, - ClassNotFoundException - { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); - return is.readObject(); + public Object decode(byte[] data) throws + ObjectStreamException, + IOException, + ClassNotFoundException + { + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); + return is.readObject(); } public void decodeHashtable(String dn, byte[] data) throws Exception { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); System.out.println(BEGIN); - String key = null; - while (true) - { - key = (String)is.readObject(); - // end of table is marked with null - if (key == null) break; + String key = null; + while (true) + { + key = (String)is.readObject(); + // end of table is marked with null + if (key == null) break; try { - byte[] bytes = (byte[])is.readObject(); + byte[] bytes = (byte[])is.readObject(); Object obj = decode(bytes); output(key, obj); } catch (Exception e) { @@ -186,7 +186,7 @@ class CMS60LdifParser mErrorPrintWriter.println("Skipped " + key); } } - } + } System.out.println(END); } @@ -194,22 +194,22 @@ class CMS60LdifParser { if (obj instanceof String) { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } else if (obj instanceof netscape.security.x509.CertificateX509Key) { netscape.security.x509.CertificateX509Key o = (netscape.security.x509.CertificateX509Key)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateSubjectName) { netscape.security.x509.CertificateSubjectName o = (netscape.security.x509.CertificateSubjectName)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -219,7 +219,7 @@ class CMS60LdifParser } else if (obj instanceof netscape.security.x509.CertificateExtensions) { netscape.security.x509.CertificateExtensions o = (netscape.security.x509.CertificateExtensions)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -229,7 +229,7 @@ class CMS60LdifParser } else if (obj instanceof netscape.security.x509.X509CertInfo) { netscape.security.x509.X509CertInfo o = (netscape.security.x509.X509CertInfo)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -239,68 +239,68 @@ class CMS60LdifParser } else if (obj instanceof netscape.security.x509.X509CertImpl) { netscape.security.x509.X509CertImpl o = (netscape.security.x509.X509CertImpl)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateChain) { netscape.security.x509.CertificateChain o = (netscape.security.x509.CertificateChain)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.X509CertImpl[]) { netscape.security.x509.X509CertImpl o[] = (netscape.security.x509.X509CertImpl[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.X509CertInfo[]) { netscape.security.x509.X509CertInfo o[] = (netscape.security.x509.X509CertInfo[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + + key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + encoder.encodeBuffer(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.RevokedCertImpl[]) { netscape.security.x509.RevokedCertImpl o[] = (netscape.security.x509.RevokedCertImpl[])obj; for (int i = 0; i < o.length; i++) { - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof java.security.cert.Certificate[]) { java.security.cert.Certificate o[] = (java.security.cert.Certificate[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(o[i].getEncoded())); } } else if (obj instanceof com.netscape.certsrv.base.ArgBlock) { @@ -345,12 +345,12 @@ class CMS60LdifParser // to "com.netscape.cmscore.kra.ProofOfArchival" com.netscape.cmscore.kra.ProofOfArchival o = (com.netscape.cmscore.kra.ProofOfArchival)obj; - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof com.netscape.certsrv.request.AgentApprovals) { com.netscape.certsrv.request.AgentApprovals o = @@ -433,22 +433,22 @@ class CMS60LdifParser } else if (obj instanceof netscape.security.x509.CertificateAlgorithmId) { netscape.security.x509.CertificateAlgorithmId o = (netscape.security.x509.CertificateAlgorithmId)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateAlgorithmId="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateAlgorithmId="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateValidity) { netscape.security.x509.CertificateValidity o = (netscape.security.x509.CertificateValidity)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateValidity="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateValidity="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof java.util.Hashtable) { // Bugzilla Bug #224800 (a.k.a - Raidzilla Bug #56953) @@ -467,7 +467,7 @@ class CMS60LdifParser } } else { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } } diff --git a/base/migrate/61ToTxt/src/Main.java b/base/migrate/61ToTxt/src/Main.java index cd235f73f..b99c35eb4 100644 --- a/base/migrate/61ToTxt/src/Main.java +++ b/base/migrate/61ToTxt/src/Main.java @@ -38,7 +38,7 @@ import netscape.security.util.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.5 and later @@ -48,15 +48,15 @@ public class Main // The following call to "java.security.Security.insertProviderAt()" // is no longer commented out in CMS 4.5 and later java.security.Security.insertProviderAt( - new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = + new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -79,14 +79,14 @@ public class Main class CMS61LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.7 and later use "requestAttributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestAttributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -106,16 +106,16 @@ class CMS61LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; StringBuffer requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -123,7 +123,7 @@ class CMS61LdifParser requestAttributes = new StringBuffer(); // System.out.println(line); requestAttributes.append( - line.substring(REQUEST_ATTRIBUTES.length(), + line.substring(REQUEST_ATTRIBUTES.length(), line.length()).trim()); continue; } @@ -139,41 +139,41 @@ class CMS61LdifParser requestAttributes = null; System.out.println(line); } - } + } } public void parseAttributes(String dn, StringBuffer attrs) throws Exception { BASE64Decoder decoder = new BASE64Decoder(); decodeHashtable(dn, decoder.decodeBuffer(attrs.toString())); - + // System.out.println(attrs); } - public Object decode(byte[] data) throws - ObjectStreamException, - IOException, - ClassNotFoundException - { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); - return is.readObject(); + public Object decode(byte[] data) throws + ObjectStreamException, + IOException, + ClassNotFoundException + { + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); + return is.readObject(); } public void decodeHashtable(String dn, byte[] data) throws Exception { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); System.out.println(BEGIN); - String key = null; - while (true) - { - key = (String)is.readObject(); - // end of table is marked with null - if (key == null) break; + String key = null; + while (true) + { + key = (String)is.readObject(); + // end of table is marked with null + if (key == null) break; try { - byte[] bytes = (byte[])is.readObject(); + byte[] bytes = (byte[])is.readObject(); Object obj = decode(bytes); output(key, obj); } catch (Exception e) { @@ -184,7 +184,7 @@ class CMS61LdifParser mErrorPrintWriter.println("Skipped " + key); } } - } + } System.out.println(END); } @@ -192,22 +192,22 @@ class CMS61LdifParser { if (obj instanceof String) { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } else if (obj instanceof netscape.security.x509.CertificateX509Key) { netscape.security.x509.CertificateX509Key o = (netscape.security.x509.CertificateX509Key)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateSubjectName) { netscape.security.x509.CertificateSubjectName o = (netscape.security.x509.CertificateSubjectName)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -217,7 +217,7 @@ class CMS61LdifParser } else if (obj instanceof netscape.security.x509.CertificateExtensions) { netscape.security.x509.CertificateExtensions o = (netscape.security.x509.CertificateExtensions)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -227,7 +227,7 @@ class CMS61LdifParser } else if (obj instanceof netscape.security.x509.X509CertInfo) { netscape.security.x509.X509CertInfo o = (netscape.security.x509.X509CertInfo)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -237,68 +237,68 @@ class CMS61LdifParser } else if (obj instanceof netscape.security.x509.X509CertImpl) { netscape.security.x509.X509CertImpl o = (netscape.security.x509.X509CertImpl)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateChain) { netscape.security.x509.CertificateChain o = (netscape.security.x509.CertificateChain)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.X509CertImpl[]) { netscape.security.x509.X509CertImpl o[] = (netscape.security.x509.X509CertImpl[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.X509CertInfo[]) { netscape.security.x509.X509CertInfo o[] = (netscape.security.x509.X509CertInfo[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + + key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + encoder.encodeBuffer(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.RevokedCertImpl[]) { netscape.security.x509.RevokedCertImpl o[] = (netscape.security.x509.RevokedCertImpl[])obj; for (int i = 0; i < o.length; i++) { - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof java.security.cert.Certificate[]) { java.security.cert.Certificate o[] = (java.security.cert.Certificate[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(o[i].getEncoded())); } } else if (obj instanceof com.netscape.cmscore.base.ArgBlock) { @@ -346,12 +346,12 @@ class CMS61LdifParser // to "com.netscape.cmscore.kra.ProofOfArchival" com.netscape.cmscore.kra.ProofOfArchival o = (com.netscape.cmscore.kra.ProofOfArchival)obj; - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof com.netscape.certsrv.request.AgentApprovals) { com.netscape.certsrv.request.AgentApprovals o = @@ -434,22 +434,22 @@ class CMS61LdifParser } else if (obj instanceof netscape.security.x509.CertificateAlgorithmId) { netscape.security.x509.CertificateAlgorithmId o = (netscape.security.x509.CertificateAlgorithmId)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateAlgorithmId="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateAlgorithmId="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateValidity) { netscape.security.x509.CertificateValidity o = (netscape.security.x509.CertificateValidity)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateValidity="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateValidity="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof byte[]) { // Since 6.1's profile framework, @@ -475,7 +475,7 @@ class CMS61LdifParser } } else { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } } diff --git a/base/migrate/62ToTxt/src/Main.java b/base/migrate/62ToTxt/src/Main.java index 109162475..72b9c3838 100644 --- a/base/migrate/62ToTxt/src/Main.java +++ b/base/migrate/62ToTxt/src/Main.java @@ -38,7 +38,7 @@ import netscape.security.util.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.5 and later @@ -48,15 +48,15 @@ public class Main // The following call to "java.security.Security.insertProviderAt()" // is no longer commented out in CMS 4.5 and later java.security.Security.insertProviderAt( - new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = + new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -79,14 +79,14 @@ public class Main class CMS62LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.7 and later use "requestAttributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestAttributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -106,16 +106,16 @@ class CMS62LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; StringBuffer requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -123,7 +123,7 @@ class CMS62LdifParser requestAttributes = new StringBuffer(); // System.out.println(line); requestAttributes.append( - line.substring(REQUEST_ATTRIBUTES.length(), + line.substring(REQUEST_ATTRIBUTES.length(), line.length()).trim()); continue; } @@ -139,41 +139,41 @@ class CMS62LdifParser requestAttributes = null; System.out.println(line); } - } + } } public void parseAttributes(String dn, StringBuffer attrs) throws Exception { BASE64Decoder decoder = new BASE64Decoder(); decodeHashtable(dn, decoder.decodeBuffer(attrs.toString())); - + // System.out.println(attrs); } - public Object decode(byte[] data) throws - ObjectStreamException, - IOException, - ClassNotFoundException - { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); - return is.readObject(); + public Object decode(byte[] data) throws + ObjectStreamException, + IOException, + ClassNotFoundException + { + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); + return is.readObject(); } public void decodeHashtable(String dn, byte[] data) throws Exception { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); System.out.println(BEGIN); - String key = null; - while (true) - { - key = (String)is.readObject(); - // end of table is marked with null - if (key == null) break; + String key = null; + while (true) + { + key = (String)is.readObject(); + // end of table is marked with null + if (key == null) break; try { - byte[] bytes = (byte[])is.readObject(); + byte[] bytes = (byte[])is.readObject(); Object obj = decode(bytes); output(key, obj); } catch (Exception e) { @@ -184,7 +184,7 @@ class CMS62LdifParser mErrorPrintWriter.println("Skipped " + key); } } - } + } System.out.println(END); } @@ -192,22 +192,22 @@ class CMS62LdifParser { if (obj instanceof String) { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } else if (obj instanceof netscape.security.x509.CertificateX509Key) { netscape.security.x509.CertificateX509Key o = (netscape.security.x509.CertificateX509Key)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateSubjectName) { netscape.security.x509.CertificateSubjectName o = (netscape.security.x509.CertificateSubjectName)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -217,7 +217,7 @@ class CMS62LdifParser } else if (obj instanceof netscape.security.x509.CertificateExtensions) { netscape.security.x509.CertificateExtensions o = (netscape.security.x509.CertificateExtensions)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -227,7 +227,7 @@ class CMS62LdifParser } else if (obj instanceof netscape.security.x509.X509CertInfo) { netscape.security.x509.X509CertInfo o = (netscape.security.x509.X509CertInfo)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -237,68 +237,68 @@ class CMS62LdifParser } else if (obj instanceof netscape.security.x509.X509CertImpl) { netscape.security.x509.X509CertImpl o = (netscape.security.x509.X509CertImpl)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateChain) { netscape.security.x509.CertificateChain o = (netscape.security.x509.CertificateChain)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.X509CertImpl[]) { netscape.security.x509.X509CertImpl o[] = (netscape.security.x509.X509CertImpl[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.X509CertInfo[]) { netscape.security.x509.X509CertInfo o[] = (netscape.security.x509.X509CertInfo[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + + key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + encoder.encodeBuffer(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.RevokedCertImpl[]) { netscape.security.x509.RevokedCertImpl o[] = (netscape.security.x509.RevokedCertImpl[])obj; for (int i = 0; i < o.length; i++) { - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof java.security.cert.Certificate[]) { java.security.cert.Certificate o[] = (java.security.cert.Certificate[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(o[i].getEncoded())); } } else if (obj instanceof com.netscape.cmscore.base.ArgBlock) { @@ -346,12 +346,12 @@ class CMS62LdifParser // to "com.netscape.cmscore.kra.ProofOfArchival" com.netscape.cmscore.kra.ProofOfArchival o = (com.netscape.cmscore.kra.ProofOfArchival)obj; - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof com.netscape.certsrv.request.AgentApprovals) { com.netscape.certsrv.request.AgentApprovals o = @@ -434,24 +434,24 @@ class CMS62LdifParser } else if (obj instanceof netscape.security.x509.CertificateAlgorithmId) { netscape.security.x509.CertificateAlgorithmId o = (netscape.security.x509.CertificateAlgorithmId)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateAlgorithmId="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateAlgorithmId="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateValidity) { netscape.security.x509.CertificateValidity o = (netscape.security.x509.CertificateValidity)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateValidity="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateValidity="+ encoder.encode(bos.toByteArray())); - } else if (obj instanceof byte[]) { + } else if (obj instanceof byte[]) { // Since 6.1's profile framework, // req_archive_options is a byte array BASE64Encoder encoder = new BASE64Encoder(); @@ -475,7 +475,7 @@ class CMS62LdifParser } } else { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } } diff --git a/base/migrate/63ToTxt/src/Main.java b/base/migrate/63ToTxt/src/Main.java index 6066801e2..efd3337d0 100644 --- a/base/migrate/63ToTxt/src/Main.java +++ b/base/migrate/63ToTxt/src/Main.java @@ -38,7 +38,7 @@ import netscape.security.util.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.5 and later @@ -48,15 +48,15 @@ public class Main // The following call to "java.security.Security.insertProviderAt()" // is no longer commented out in CMS 4.5 and later java.security.Security.insertProviderAt( - new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = + new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -79,14 +79,14 @@ public class Main class CMS63LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.7 and later use "requestAttributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestAttributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -106,16 +106,16 @@ class CMS63LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; StringBuffer requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -123,7 +123,7 @@ class CMS63LdifParser requestAttributes = new StringBuffer(); // System.out.println(line); requestAttributes.append( - line.substring(REQUEST_ATTRIBUTES.length(), + line.substring(REQUEST_ATTRIBUTES.length(), line.length()).trim()); continue; } @@ -139,41 +139,41 @@ class CMS63LdifParser requestAttributes = null; System.out.println(line); } - } + } } public void parseAttributes(String dn, StringBuffer attrs) throws Exception { BASE64Decoder decoder = new BASE64Decoder(); decodeHashtable(dn, decoder.decodeBuffer(attrs.toString())); - + // System.out.println(attrs); } - public Object decode(byte[] data) throws - ObjectStreamException, - IOException, - ClassNotFoundException - { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); - return is.readObject(); + public Object decode(byte[] data) throws + ObjectStreamException, + IOException, + ClassNotFoundException + { + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); + return is.readObject(); } public void decodeHashtable(String dn, byte[] data) throws Exception { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); System.out.println(BEGIN); - String key = null; - while (true) - { - key = (String)is.readObject(); - // end of table is marked with null - if (key == null) break; + String key = null; + while (true) + { + key = (String)is.readObject(); + // end of table is marked with null + if (key == null) break; try { - byte[] bytes = (byte[])is.readObject(); + byte[] bytes = (byte[])is.readObject(); Object obj = decode(bytes); output(key, obj); } catch (Exception e) { @@ -184,7 +184,7 @@ class CMS63LdifParser mErrorPrintWriter.println("Skipped " + key); } } - } + } System.out.println(END); } @@ -192,22 +192,22 @@ class CMS63LdifParser { if (obj instanceof String) { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } else if (obj instanceof netscape.security.x509.CertificateX509Key) { netscape.security.x509.CertificateX509Key o = (netscape.security.x509.CertificateX509Key)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateSubjectName) { netscape.security.x509.CertificateSubjectName o = (netscape.security.x509.CertificateSubjectName)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -217,7 +217,7 @@ class CMS63LdifParser } else if (obj instanceof netscape.security.x509.CertificateExtensions) { netscape.security.x509.CertificateExtensions o = (netscape.security.x509.CertificateExtensions)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -227,7 +227,7 @@ class CMS63LdifParser } else if (obj instanceof netscape.security.x509.X509CertInfo) { netscape.security.x509.X509CertInfo o = (netscape.security.x509.X509CertInfo)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -237,68 +237,68 @@ class CMS63LdifParser } else if (obj instanceof netscape.security.x509.X509CertImpl) { netscape.security.x509.X509CertImpl o = (netscape.security.x509.X509CertImpl)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateChain) { netscape.security.x509.CertificateChain o = (netscape.security.x509.CertificateChain)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.X509CertImpl[]) { netscape.security.x509.X509CertImpl o[] = (netscape.security.x509.X509CertImpl[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.X509CertInfo[]) { netscape.security.x509.X509CertInfo o[] = (netscape.security.x509.X509CertInfo[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + + key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + encoder.encodeBuffer(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.RevokedCertImpl[]) { netscape.security.x509.RevokedCertImpl o[] = (netscape.security.x509.RevokedCertImpl[])obj; for (int i = 0; i < o.length; i++) { - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof java.security.cert.Certificate[]) { java.security.cert.Certificate o[] = (java.security.cert.Certificate[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(o[i].getEncoded())); } } else if (obj instanceof com.netscape.cmscore.base.ArgBlock) { @@ -346,12 +346,12 @@ class CMS63LdifParser // to "com.netscape.cmscore.kra.ProofOfArchival" com.netscape.cmscore.kra.ProofOfArchival o = (com.netscape.cmscore.kra.ProofOfArchival)obj; - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof com.netscape.certsrv.request.AgentApprovals) { com.netscape.certsrv.request.AgentApprovals o = @@ -434,22 +434,22 @@ class CMS63LdifParser } else if (obj instanceof netscape.security.x509.CertificateAlgorithmId) { netscape.security.x509.CertificateAlgorithmId o = (netscape.security.x509.CertificateAlgorithmId)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateAlgorithmId="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateAlgorithmId="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateValidity) { netscape.security.x509.CertificateValidity o = (netscape.security.x509.CertificateValidity)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateValidity="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateValidity="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof byte[]) { // Since 6.1's profile framework, @@ -475,7 +475,7 @@ class CMS63LdifParser } } else { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } } diff --git a/base/migrate/70ToTxt/src/Main.java b/base/migrate/70ToTxt/src/Main.java index 133671267..8c5d3811e 100644 --- a/base/migrate/70ToTxt/src/Main.java +++ b/base/migrate/70ToTxt/src/Main.java @@ -38,7 +38,7 @@ import netscape.security.util.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.5 and later @@ -48,15 +48,15 @@ public class Main // The following call to "java.security.Security.insertProviderAt()" // is no longer commented out in CMS 4.5 and later java.security.Security.insertProviderAt( - new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = + new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -79,14 +79,14 @@ public class Main class CMS70LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.7 and later use "requestAttributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestAttributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -106,16 +106,16 @@ class CMS70LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; StringBuffer requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -123,7 +123,7 @@ class CMS70LdifParser requestAttributes = new StringBuffer(); // System.out.println(line); requestAttributes.append( - line.substring(REQUEST_ATTRIBUTES.length(), + line.substring(REQUEST_ATTRIBUTES.length(), line.length()).trim()); continue; } @@ -139,41 +139,41 @@ class CMS70LdifParser requestAttributes = null; System.out.println(line); } - } + } } public void parseAttributes(String dn, StringBuffer attrs) throws Exception { BASE64Decoder decoder = new BASE64Decoder(); decodeHashtable(dn, decoder.decodeBuffer(attrs.toString())); - + // System.out.println(attrs); } - public Object decode(byte[] data) throws - ObjectStreamException, - IOException, - ClassNotFoundException - { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); - return is.readObject(); + public Object decode(byte[] data) throws + ObjectStreamException, + IOException, + ClassNotFoundException + { + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); + return is.readObject(); } public void decodeHashtable(String dn, byte[] data) throws Exception { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); System.out.println(BEGIN); - String key = null; - while (true) - { - key = (String)is.readObject(); - // end of table is marked with null - if (key == null) break; + String key = null; + while (true) + { + key = (String)is.readObject(); + // end of table is marked with null + if (key == null) break; try { - byte[] bytes = (byte[])is.readObject(); + byte[] bytes = (byte[])is.readObject(); Object obj = decode(bytes); output(key, obj); } catch (Exception e) { @@ -184,7 +184,7 @@ class CMS70LdifParser mErrorPrintWriter.println("Skipped " + key); } } - } + } System.out.println(END); } @@ -192,22 +192,22 @@ class CMS70LdifParser { if (obj instanceof String) { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } else if (obj instanceof netscape.security.x509.CertificateX509Key) { netscape.security.x509.CertificateX509Key o = (netscape.security.x509.CertificateX509Key)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateSubjectName) { netscape.security.x509.CertificateSubjectName o = (netscape.security.x509.CertificateSubjectName)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -217,7 +217,7 @@ class CMS70LdifParser } else if (obj instanceof netscape.security.x509.CertificateExtensions) { netscape.security.x509.CertificateExtensions o = (netscape.security.x509.CertificateExtensions)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -227,7 +227,7 @@ class CMS70LdifParser } else if (obj instanceof netscape.security.x509.X509CertInfo) { netscape.security.x509.X509CertInfo o = (netscape.security.x509.X509CertInfo)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -237,68 +237,68 @@ class CMS70LdifParser } else if (obj instanceof netscape.security.x509.X509CertImpl) { netscape.security.x509.X509CertImpl o = (netscape.security.x509.X509CertImpl)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateChain) { netscape.security.x509.CertificateChain o = (netscape.security.x509.CertificateChain)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.X509CertImpl[]) { netscape.security.x509.X509CertImpl o[] = (netscape.security.x509.X509CertImpl[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.X509CertInfo[]) { netscape.security.x509.X509CertInfo o[] = (netscape.security.x509.X509CertInfo[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + + key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + encoder.encodeBuffer(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.RevokedCertImpl[]) { netscape.security.x509.RevokedCertImpl o[] = (netscape.security.x509.RevokedCertImpl[])obj; for (int i = 0; i < o.length; i++) { - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof java.security.cert.Certificate[]) { java.security.cert.Certificate o[] = (java.security.cert.Certificate[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(o[i].getEncoded())); } } else if (obj instanceof com.netscape.cmscore.base.ArgBlock) { @@ -346,12 +346,12 @@ class CMS70LdifParser // to "com.netscape.cmscore.kra.ProofOfArchival" com.netscape.cmscore.kra.ProofOfArchival o = (com.netscape.cmscore.kra.ProofOfArchival)obj; - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof com.netscape.certsrv.request.AgentApprovals) { com.netscape.certsrv.request.AgentApprovals o = @@ -434,22 +434,22 @@ class CMS70LdifParser } else if (obj instanceof netscape.security.x509.CertificateAlgorithmId) { netscape.security.x509.CertificateAlgorithmId o = (netscape.security.x509.CertificateAlgorithmId)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateAlgorithmId="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateAlgorithmId="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateValidity) { netscape.security.x509.CertificateValidity o = (netscape.security.x509.CertificateValidity)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateValidity="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateValidity="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof byte[]) { // Since 6.1's profile framework, @@ -475,7 +475,7 @@ class CMS70LdifParser } } else { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } } diff --git a/base/migrate/71ToTxt/src/Main.java b/base/migrate/71ToTxt/src/Main.java index f7f3a5b95..796653370 100644 --- a/base/migrate/71ToTxt/src/Main.java +++ b/base/migrate/71ToTxt/src/Main.java @@ -38,7 +38,7 @@ import netscape.security.util.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.5 and later @@ -48,15 +48,15 @@ public class Main // The following call to "java.security.Security.insertProviderAt()" // is no longer commented out in CMS 4.5 and later java.security.Security.insertProviderAt( - new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = + new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -79,14 +79,14 @@ public class Main class CMS71LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.7 and later use "requestAttributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestAttributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -106,16 +106,16 @@ class CMS71LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; StringBuffer requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -123,7 +123,7 @@ class CMS71LdifParser requestAttributes = new StringBuffer(); // System.out.println(line); requestAttributes.append( - line.substring(REQUEST_ATTRIBUTES.length(), + line.substring(REQUEST_ATTRIBUTES.length(), line.length()).trim()); continue; } @@ -139,41 +139,41 @@ class CMS71LdifParser requestAttributes = null; System.out.println(line); } - } + } } public void parseAttributes(String dn, StringBuffer attrs) throws Exception { BASE64Decoder decoder = new BASE64Decoder(); decodeHashtable(dn, decoder.decodeBuffer(attrs.toString())); - + // System.out.println(attrs); } - public Object decode(byte[] data) throws - ObjectStreamException, - IOException, - ClassNotFoundException - { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); - return is.readObject(); + public Object decode(byte[] data) throws + ObjectStreamException, + IOException, + ClassNotFoundException + { + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); + return is.readObject(); } public void decodeHashtable(String dn, byte[] data) throws Exception { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); System.out.println(BEGIN); - String key = null; - while (true) - { - key = (String)is.readObject(); - // end of table is marked with null - if (key == null) break; + String key = null; + while (true) + { + key = (String)is.readObject(); + // end of table is marked with null + if (key == null) break; try { - byte[] bytes = (byte[])is.readObject(); + byte[] bytes = (byte[])is.readObject(); Object obj = decode(bytes); output(key, obj); } catch (Exception e) { @@ -184,7 +184,7 @@ class CMS71LdifParser mErrorPrintWriter.println("Skipped " + key); } } - } + } System.out.println(END); } @@ -192,22 +192,22 @@ class CMS71LdifParser { if (obj instanceof String) { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } else if (obj instanceof netscape.security.x509.CertificateX509Key) { netscape.security.x509.CertificateX509Key o = (netscape.security.x509.CertificateX509Key)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateSubjectName) { netscape.security.x509.CertificateSubjectName o = (netscape.security.x509.CertificateSubjectName)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -217,7 +217,7 @@ class CMS71LdifParser } else if (obj instanceof netscape.security.x509.CertificateExtensions) { netscape.security.x509.CertificateExtensions o = (netscape.security.x509.CertificateExtensions)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -227,7 +227,7 @@ class CMS71LdifParser } else if (obj instanceof netscape.security.x509.X509CertInfo) { netscape.security.x509.X509CertInfo o = (netscape.security.x509.X509CertInfo)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -237,68 +237,68 @@ class CMS71LdifParser } else if (obj instanceof netscape.security.x509.X509CertImpl) { netscape.security.x509.X509CertImpl o = (netscape.security.x509.X509CertImpl)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateChain) { netscape.security.x509.CertificateChain o = (netscape.security.x509.CertificateChain)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.X509CertImpl[]) { netscape.security.x509.X509CertImpl o[] = (netscape.security.x509.X509CertImpl[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.X509CertInfo[]) { netscape.security.x509.X509CertInfo o[] = (netscape.security.x509.X509CertInfo[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + + key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + encoder.encodeBuffer(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.RevokedCertImpl[]) { netscape.security.x509.RevokedCertImpl o[] = (netscape.security.x509.RevokedCertImpl[])obj; for (int i = 0; i < o.length; i++) { - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof java.security.cert.Certificate[]) { java.security.cert.Certificate o[] = (java.security.cert.Certificate[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(o[i].getEncoded())); } } else if (obj instanceof com.netscape.cmscore.base.ArgBlock) { @@ -346,12 +346,12 @@ class CMS71LdifParser // to "com.netscape.cmscore.kra.ProofOfArchival" com.netscape.cmscore.kra.ProofOfArchival o = (com.netscape.cmscore.kra.ProofOfArchival)obj; - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof com.netscape.certsrv.request.AgentApprovals) { com.netscape.certsrv.request.AgentApprovals o = @@ -434,22 +434,22 @@ class CMS71LdifParser } else if (obj instanceof netscape.security.x509.CertificateAlgorithmId) { netscape.security.x509.CertificateAlgorithmId o = (netscape.security.x509.CertificateAlgorithmId)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateAlgorithmId="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateAlgorithmId="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateValidity) { netscape.security.x509.CertificateValidity o = (netscape.security.x509.CertificateValidity)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateValidity="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateValidity="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof byte[]) { // Since 6.1's profile framework, @@ -475,7 +475,7 @@ class CMS71LdifParser } } else { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } } diff --git a/base/migrate/72ToTxt/src/Main.java b/base/migrate/72ToTxt/src/Main.java index 0a0dc812e..3b1a3693d 100644 --- a/base/migrate/72ToTxt/src/Main.java +++ b/base/migrate/72ToTxt/src/Main.java @@ -38,7 +38,7 @@ import netscape.security.util.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.5 and later @@ -48,15 +48,15 @@ public class Main // The following call to "java.security.Security.insertProviderAt()" // is no longer commented out in CMS 4.5 and later java.security.Security.insertProviderAt( - new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = + new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -79,14 +79,14 @@ public class Main class CMS72LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.7 and later use "requestAttributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestAttributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -106,16 +106,16 @@ class CMS72LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; StringBuffer requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -123,7 +123,7 @@ class CMS72LdifParser requestAttributes = new StringBuffer(); // System.out.println(line); requestAttributes.append( - line.substring(REQUEST_ATTRIBUTES.length(), + line.substring(REQUEST_ATTRIBUTES.length(), line.length()).trim()); continue; } @@ -139,41 +139,41 @@ class CMS72LdifParser requestAttributes = null; System.out.println(line); } - } + } } public void parseAttributes(String dn, StringBuffer attrs) throws Exception { BASE64Decoder decoder = new BASE64Decoder(); decodeHashtable(dn, decoder.decodeBuffer(attrs.toString())); - + // System.out.println(attrs); } - public Object decode(byte[] data) throws - ObjectStreamException, - IOException, - ClassNotFoundException - { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); - return is.readObject(); + public Object decode(byte[] data) throws + ObjectStreamException, + IOException, + ClassNotFoundException + { + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); + return is.readObject(); } public void decodeHashtable(String dn, byte[] data) throws Exception { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); System.out.println(BEGIN); - String key = null; - while (true) - { - key = (String)is.readObject(); - // end of table is marked with null - if (key == null) break; + String key = null; + while (true) + { + key = (String)is.readObject(); + // end of table is marked with null + if (key == null) break; try { - byte[] bytes = (byte[])is.readObject(); + byte[] bytes = (byte[])is.readObject(); Object obj = decode(bytes); output(key, obj); } catch (Exception e) { @@ -184,7 +184,7 @@ class CMS72LdifParser mErrorPrintWriter.println("Skipped " + key); } } - } + } System.out.println(END); } @@ -192,22 +192,22 @@ class CMS72LdifParser { if (obj instanceof String) { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } else if (obj instanceof netscape.security.x509.CertificateX509Key) { netscape.security.x509.CertificateX509Key o = (netscape.security.x509.CertificateX509Key)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateSubjectName) { netscape.security.x509.CertificateSubjectName o = (netscape.security.x509.CertificateSubjectName)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -217,7 +217,7 @@ class CMS72LdifParser } else if (obj instanceof netscape.security.x509.CertificateExtensions) { netscape.security.x509.CertificateExtensions o = (netscape.security.x509.CertificateExtensions)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -227,7 +227,7 @@ class CMS72LdifParser } else if (obj instanceof netscape.security.x509.X509CertInfo) { netscape.security.x509.X509CertInfo o = (netscape.security.x509.X509CertInfo)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -237,68 +237,68 @@ class CMS72LdifParser } else if (obj instanceof netscape.security.x509.X509CertImpl) { netscape.security.x509.X509CertImpl o = (netscape.security.x509.X509CertImpl)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateChain) { netscape.security.x509.CertificateChain o = (netscape.security.x509.CertificateChain)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.X509CertImpl[]) { netscape.security.x509.X509CertImpl o[] = (netscape.security.x509.X509CertImpl[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.X509CertInfo[]) { netscape.security.x509.X509CertInfo o[] = (netscape.security.x509.X509CertInfo[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + + key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + encoder.encodeBuffer(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.RevokedCertImpl[]) { netscape.security.x509.RevokedCertImpl o[] = (netscape.security.x509.RevokedCertImpl[])obj; for (int i = 0; i < o.length; i++) { - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof java.security.cert.Certificate[]) { java.security.cert.Certificate o[] = (java.security.cert.Certificate[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(o[i].getEncoded())); } } else if (obj instanceof com.netscape.cmscore.base.ArgBlock) { @@ -348,12 +348,12 @@ class CMS72LdifParser // to "com.netscape.cmscore.kra.ProofOfArchival" com.netscape.certsrv.kra.ProofOfArchival o = (com.netscape.certsrv.kra.ProofOfArchival)obj; - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof com.netscape.certsrv.request.AgentApprovals) { com.netscape.certsrv.request.AgentApprovals o = @@ -436,22 +436,22 @@ class CMS72LdifParser } else if (obj instanceof netscape.security.x509.CertificateAlgorithmId) { netscape.security.x509.CertificateAlgorithmId o = (netscape.security.x509.CertificateAlgorithmId)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateAlgorithmId="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateAlgorithmId="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateValidity) { netscape.security.x509.CertificateValidity o = (netscape.security.x509.CertificateValidity)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateValidity="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateValidity="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof byte[]) { // Since 6.1's profile framework, @@ -477,7 +477,7 @@ class CMS72LdifParser } } else { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } } diff --git a/base/migrate/73ToTxt/src/Main.java b/base/migrate/73ToTxt/src/Main.java index be26e9858..e6526b6c1 100644 --- a/base/migrate/73ToTxt/src/Main.java +++ b/base/migrate/73ToTxt/src/Main.java @@ -38,7 +38,7 @@ import netscape.security.util.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.5 and later @@ -48,15 +48,15 @@ public class Main // The following call to "java.security.Security.insertProviderAt()" // is no longer commented out in CMS 4.5 and later java.security.Security.insertProviderAt( - new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = + new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -79,14 +79,14 @@ public class Main class CMS73LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.7 and later use "requestAttributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestAttributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -106,16 +106,16 @@ class CMS73LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; StringBuffer requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -123,7 +123,7 @@ class CMS73LdifParser requestAttributes = new StringBuffer(); // System.out.println(line); requestAttributes.append( - line.substring(REQUEST_ATTRIBUTES.length(), + line.substring(REQUEST_ATTRIBUTES.length(), line.length()).trim()); continue; } @@ -139,41 +139,41 @@ class CMS73LdifParser requestAttributes = null; System.out.println(line); } - } + } } public void parseAttributes(String dn, StringBuffer attrs) throws Exception { BASE64Decoder decoder = new BASE64Decoder(); decodeHashtable(dn, decoder.decodeBuffer(attrs.toString())); - + // System.out.println(attrs); } - public Object decode(byte[] data) throws - ObjectStreamException, - IOException, - ClassNotFoundException - { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); - return is.readObject(); + public Object decode(byte[] data) throws + ObjectStreamException, + IOException, + ClassNotFoundException + { + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); + return is.readObject(); } public void decodeHashtable(String dn, byte[] data) throws Exception { - ByteArrayInputStream bis = new ByteArrayInputStream(data); - ObjectInputStream is = new ObjectInputStream(bis); + ByteArrayInputStream bis = new ByteArrayInputStream(data); + ObjectInputStream is = new ObjectInputStream(bis); System.out.println(BEGIN); - String key = null; - while (true) - { - key = (String)is.readObject(); - // end of table is marked with null - if (key == null) break; + String key = null; + while (true) + { + key = (String)is.readObject(); + // end of table is marked with null + if (key == null) break; try { - byte[] bytes = (byte[])is.readObject(); + byte[] bytes = (byte[])is.readObject(); Object obj = decode(bytes); output(key, obj); } catch (Exception e) { @@ -184,7 +184,7 @@ class CMS73LdifParser mErrorPrintWriter.println("Skipped " + key); } } - } + } System.out.println(END); } @@ -192,22 +192,22 @@ class CMS73LdifParser { if (obj instanceof String) { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } else if (obj instanceof netscape.security.x509.CertificateX509Key) { netscape.security.x509.CertificateX509Key o = (netscape.security.x509.CertificateX509Key)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateSubjectName) { netscape.security.x509.CertificateSubjectName o = (netscape.security.x509.CertificateSubjectName)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -217,7 +217,7 @@ class CMS73LdifParser } else if (obj instanceof netscape.security.x509.CertificateExtensions) { netscape.security.x509.CertificateExtensions o = (netscape.security.x509.CertificateExtensions)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -227,7 +227,7 @@ class CMS73LdifParser } else if (obj instanceof netscape.security.x509.X509CertInfo) { netscape.security.x509.X509CertInfo o = (netscape.security.x509.X509CertInfo)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); @@ -237,68 +237,68 @@ class CMS73LdifParser } else if (obj instanceof netscape.security.x509.X509CertImpl) { netscape.security.x509.X509CertImpl o = (netscape.security.x509.X509CertImpl)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateChain) { netscape.security.x509.CertificateChain o = (netscape.security.x509.CertificateChain)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.X509CertImpl[]) { netscape.security.x509.X509CertImpl o[] = (netscape.security.x509.X509CertImpl[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.X509CertInfo[]) { netscape.security.x509.X509CertInfo o[] = (netscape.security.x509.X509CertInfo[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + + key + ":" + o[i].getClass().getName() + "["+o.length + "," + i+"]"+"=" + encoder.encodeBuffer(bos.toByteArray())); } } else if (obj instanceof netscape.security.x509.RevokedCertImpl[]) { netscape.security.x509.RevokedCertImpl o[] = (netscape.security.x509.RevokedCertImpl[])obj; for (int i = 0; i < o.length; i++) { - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o[i].encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(bos.toByteArray())); } } else if (obj instanceof java.security.cert.Certificate[]) { java.security.cert.Certificate o[] = (java.security.cert.Certificate[])obj; for (int i = 0; i < o.length; i++) { - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + + key + ":" + o[i].getClass().getName() +"["+o.length+","+i+"]" + "=" + encoder.encode(o[i].getEncoded())); } } else if (obj instanceof com.netscape.cmscore.base.ArgBlock) { @@ -348,12 +348,12 @@ class CMS73LdifParser // to "com.netscape.cmscore.kra.ProofOfArchival" com.netscape.certsrv.kra.ProofOfArchival o = (com.netscape.certsrv.kra.ProofOfArchival)obj; - DerOutputStream bos = + DerOutputStream bos = new DerOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); System.out.println(" " + - key + ":" + o.getClass().getName() + "=" + + key + ":" + o.getClass().getName() + "=" + encoder.encode(bos.toByteArray())); } else if (obj instanceof com.netscape.certsrv.request.AgentApprovals) { com.netscape.certsrv.request.AgentApprovals o = @@ -436,22 +436,22 @@ class CMS73LdifParser } else if (obj instanceof netscape.security.x509.CertificateAlgorithmId) { netscape.security.x509.CertificateAlgorithmId o = (netscape.security.x509.CertificateAlgorithmId)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateAlgorithmId="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateAlgorithmId="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof netscape.security.x509.CertificateValidity) { netscape.security.x509.CertificateValidity o = (netscape.security.x509.CertificateValidity)obj; - ByteArrayOutputStream bos = + ByteArrayOutputStream bos = new ByteArrayOutputStream(); o.encode(bos); BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(" " + key + - ":netscape.security.x509.CertificateValidity="+ + System.out.println(" " + key + + ":netscape.security.x509.CertificateValidity="+ encoder.encode(bos.toByteArray())); } else if (obj instanceof byte[]) { // Since 6.1's profile framework, @@ -477,7 +477,7 @@ class CMS73LdifParser } } else { System.out.println(" " + - key + ":" + obj.getClass().getName() + "=" + + key + ":" + obj.getClass().getName() + "=" + obj); } } diff --git a/base/migrate/80/MigrateSecurityDomain.java b/base/migrate/80/MigrateSecurityDomain.java index 4624f1259..32dca511d 100644 --- a/base/migrate/80/MigrateSecurityDomain.java +++ b/base/migrate/80/MigrateSecurityDomain.java @@ -179,7 +179,7 @@ public class MigrateSecurityDomain { } } - // create system entries + // create system entries String tlist[] = { "CA", "OCSP", "KRA", "RA", "TKS", "TPS" }; Document doc = parser.getDocument(); for (int j = 0; j < 6; j++) { diff --git a/base/migrate/TxtTo60/src/Main.java b/base/migrate/TxtTo60/src/Main.java index 3c47d8ad7..a2f8fbd48 100644 --- a/base/migrate/TxtTo60/src/Main.java +++ b/base/migrate/TxtTo60/src/Main.java @@ -37,7 +37,7 @@ import java.lang.reflect.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.5 and later @@ -47,15 +47,15 @@ public class Main // The following call to "java.security.Security.insertProviderAt()" // is no longer commented out in CMS 4.5 and later java.security.Security.insertProviderAt( - new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = + new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -78,14 +78,14 @@ public class Main class CMS60LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.7 and later use "requestAttributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestAttributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -105,16 +105,16 @@ class CMS60LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; Vector requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -137,33 +137,33 @@ class CMS60LdifParser } else { requestAttributes.setElementAt( (String) - requestAttributes.lastElement() + - "\n" + + requestAttributes.lastElement() + + "\n" + line, requestAttributes.size() - 1); } - } + } } - private byte[] encode(Object value) throws Exception - { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + private byte[] encode(Object value) throws Exception + { + ByteArrayOutputStream bos = new ByteArrayOutputStream(); ObjectOutputStream os = new ObjectOutputStream(bos); - os.writeObject(value); - os.close(); - return bos.toByteArray(); + os.writeObject(value); + os.close(); + return bos.toByteArray(); } public void parseAttributes(String dn, Vector attrs) throws Exception - { + { Hashtable hashtable = new Hashtable(); for (int i = 0; i < attrs.size(); i++) { String attr = (String)attrs.elementAt(i); buildHashtable(dn, hashtable, attr); } - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); ObjectOutputStream os = new ObjectOutputStream(bos); Enumeration e = hashtable.keys(); while (e.hasMoreElements()) { @@ -172,8 +172,8 @@ class CMS60LdifParser try { byte data[] = null; - data = encode(value); - os.writeObject(key); + data = encode(value); + os.writeObject(key); os.writeObject(data); } catch (Exception ex) { if (mErrorPrintWriter != null) { @@ -184,12 +184,12 @@ class CMS60LdifParser } } } // while - os.writeObject(null); + os.writeObject(null); os.close(); // print the BASE64 encoding of the Hashtable BASE64Encoder encoder = new BASE64Encoder(); - String attrsStr = encoder.encodeBuffer(bos.toByteArray()); + String attrsStr = encoder.encodeBuffer(bos.toByteArray()); // trim the last "\n" StringBuffer buffer = null; attrsStr = attrsStr.trim(); @@ -203,14 +203,14 @@ class CMS60LdifParser } } - System.out.println(REQUEST_ATTRIBUTES + " " + buffer); + System.out.println(REQUEST_ATTRIBUTES + " " + buffer); } - public void buildHashtable(String dn, Hashtable table, String attr) + public void buildHashtable(String dn, Hashtable table, String attr) throws Exception - { + { // attribute format [name]:[type]=[value] - + int colon = attr.indexOf(':'); if (colon == -1) { if (mErrorPrintWriter != null) { @@ -308,7 +308,7 @@ class CMS60LdifParser com.netscape.certsrv.authentication.AuthToken obj = (com.netscape.certsrv.authentication.AuthToken)table.get(name); if (obj == null) { - com.netscape.certsrv.authentication.IAuthManager mgr = + com.netscape.certsrv.authentication.IAuthManager mgr = new DummyAuthManager(); obj = new com.netscape.certsrv.authentication.AuthToken(mgr); table.put(name, obj); @@ -318,14 +318,14 @@ class CMS60LdifParser String valuevalue = value.substring(value.indexOf('=')+1); if (valuetype.equals("java.lang.String")) { // Processes 'java.math.BigInteger[]': - // + // // Bugzilla Bug #225031 (a.k.a - Raidzilla Bug #58356) - // + // // Processes 'java.lang.String[]': - // + // // Bugzilla Bug #224763 (a.k.a - Raidzilla Bug #57949) // Bugzilla Bug #252240 - // + // obj.set(valuekey, valuevalue); } else if (valuetype.equals("java.util.Date")) { obj.set(valuekey, new Date(Long.parseLong(valuevalue))); @@ -354,45 +354,45 @@ class CMS60LdifParser table.put(name, decoder.decodeBuffer(value)); } else if (type.startsWith("netscape.security.x509.CertificateAlgorithmId")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateAlgorithmId obj = + netscape.security.x509.CertificateAlgorithmId obj = new netscape.security.x509.CertificateAlgorithmId(new ByteArrayInputStream(decoder.decodeBuffer(value))); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateChain")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateChain obj = + netscape.security.x509.CertificateChain obj = new netscape.security.x509.CertificateChain(); ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); obj.decode(bis); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateExtensions")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateExtensions obj = + netscape.security.x509.CertificateExtensions obj = new netscape.security.x509.CertificateExtensions( new DerInputStream(decoder.decodeBuffer(value))); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateSubjectName")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateSubjectName obj = + netscape.security.x509.CertificateSubjectName obj = new netscape.security.x509.CertificateSubjectName( new ByteArrayInputStream(decoder.decodeBuffer(value))); table.put(name, obj); } else if (type.startsWith("netscape.security.x509.CertificateValidity")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateValidity obj = + netscape.security.x509.CertificateValidity obj = new netscape.security.x509.CertificateValidity(); ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); obj.decode(bis); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateX509Key")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateX509Key obj = + netscape.security.x509.CertificateX509Key obj = new netscape.security.x509.CertificateX509Key( new ByteArrayInputStream(decoder.decodeBuffer(value))); table.put(name, obj); } else if (type.startsWith("com.netscape.certsrv.cert.CertInfo")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.extensions.CertInfo objs[] = (netscape.security.extensions.CertInfo[])table.get(name); + netscape.security.extensions.CertInfo objs[] = (netscape.security.extensions.CertInfo[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.extensions.CertInfo[size]; @@ -414,7 +414,7 @@ class CMS60LdifParser } else if (type.startsWith("Integer[")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - Integer objs[] = (Integer[])table.get(name); + Integer objs[] = (Integer[])table.get(name); if (objs == null) { objs = new Integer[size]; table.put(name, objs); @@ -445,7 +445,7 @@ class CMS60LdifParser obj.set(valuekey, com.netscape.certsrv.dbs.keydb.KeyState.toKeyState(valuevalue)); } else if (valuetype.equals("[B")) { // byte array - + BASE64Decoder decoder = new BASE64Decoder(); obj.set(valuekey, decoder.decodeBuffer(valuevalue)); } else { @@ -455,15 +455,15 @@ class CMS60LdifParser } else if (type.startsWith("com.netscape.certsrv.kra.ProofOfArchival") || type.startsWith("com.netscape.cmscore.kra.ProofOfArchival")) { BASE64Decoder decoder = new BASE64Decoder(); - + ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); - com.netscape.cmscore.kra.ProofOfArchival obj = + com.netscape.cmscore.kra.ProofOfArchival obj = buildPOA(decoder.decodeBuffer(value)); table.put(name, obj); } else if (type.startsWith("netscape.security.x509.RevokedCertImpl")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.RevokedCertImpl objs[] = (netscape.security.x509.RevokedCertImpl[])table.get(name); + netscape.security.x509.RevokedCertImpl objs[] = (netscape.security.x509.RevokedCertImpl[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.RevokedCertImpl[size]; @@ -493,7 +493,7 @@ class CMS60LdifParser } else if (type.startsWith("netscape.security.x509.X509CertImpl[")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.X509CertImpl objs[] = (netscape.security.x509.X509CertImpl[])table.get(name); + netscape.security.x509.X509CertImpl objs[] = (netscape.security.x509.X509CertImpl[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.X509CertImpl[size]; @@ -502,14 +502,14 @@ class CMS60LdifParser objs[index] = new netscape.security.x509.X509CertImpl(decoder.decodeBuffer(value)); } else if (type.equals("netscape.security.x509.X509CertImpl")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.X509CertImpl obj = + netscape.security.x509.X509CertImpl obj = new netscape.security.x509.X509CertImpl( decoder.decodeBuffer(value)); table.put(name, obj); } else if (type.startsWith("netscape.security.x509.X509CertInfo")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.X509CertInfo objs[] = (netscape.security.x509.X509CertInfo[])table.get(name); + netscape.security.x509.X509CertInfo objs[] = (netscape.security.x509.X509CertInfo[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.X509CertInfo[size]; @@ -519,7 +519,7 @@ class CMS60LdifParser objs[index].decode(new ByteArrayInputStream(decoder.decodeBuffer(value))); } else if (type.equals("netscape.security.x509.X509CertInfo")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.X509CertInfo obj = + netscape.security.x509.X509CertInfo obj = new netscape.security.x509.X509CertInfo( decoder.decodeBuffer(value)); table.put(name, obj); @@ -538,26 +538,26 @@ class CMS60LdifParser public com.netscape.cmscore.kra.ProofOfArchival buildPOA(byte data[]) throws Exception - { - DerInputStream dis = new DerInputStream(data); + { + DerInputStream dis = new DerInputStream(data); DerValue seq[] = dis.getSequence(0); BigInteger mSerialNo = seq[0].getInteger().toBigInteger(); // subject DerValue subject = seq[1]; - netscape.security.x509.X500Name mSubject = + netscape.security.x509.X500Name mSubject = new netscape.security.x509.X500Name(subject.toByteArray()); // issuer DerValue issuer = seq[2]; - netscape.security.x509.X500Name mIssuer = + netscape.security.x509.X500Name mIssuer = new netscape.security.x509.X500Name(issuer.toByteArray()); // date of archival DerInputStream dateOfArchival = new DerInputStream(seq[3].toByteArray()); Date mDateOfArchival = dateOfArchival.getUTCTime(); - com.netscape.cmscore.kra.ProofOfArchival obj = + com.netscape.cmscore.kra.ProofOfArchival obj = new com.netscape.cmscore.kra.ProofOfArchival(mSerialNo, mSubject.toString(), mIssuer.toString(), mDateOfArchival); return obj; @@ -623,7 +623,7 @@ class DummyAuthManager implements com.netscape.certsrv.authentication.IAuthManag * @return The configuration store of this authentication manager. */ public IConfigStore getConfigStore() - { + { return null; } } diff --git a/base/migrate/TxtTo61/src/Main.java b/base/migrate/TxtTo61/src/Main.java index 8b95ccc97..7f4725f6f 100644 --- a/base/migrate/TxtTo61/src/Main.java +++ b/base/migrate/TxtTo61/src/Main.java @@ -41,7 +41,7 @@ import java.lang.reflect.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.5 and later @@ -51,15 +51,15 @@ public class Main // The following call to "java.security.Security.insertProviderAt()" // is no longer commented out in CMS 4.5 and later java.security.Security.insertProviderAt( - new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = + new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -82,14 +82,14 @@ public class Main class CMS61LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.7 and later use "requestAttributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestAttributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -109,16 +109,16 @@ class CMS61LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; Vector requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -141,33 +141,33 @@ class CMS61LdifParser } else { requestAttributes.setElementAt( (String) - requestAttributes.lastElement() + - "\n" + + requestAttributes.lastElement() + + "\n" + line, requestAttributes.size() - 1); } - } + } } - private byte[] encode(Object value) throws Exception - { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + private byte[] encode(Object value) throws Exception + { + ByteArrayOutputStream bos = new ByteArrayOutputStream(); ObjectOutputStream os = new ObjectOutputStream(bos); - os.writeObject(value); - os.close(); - return bos.toByteArray(); + os.writeObject(value); + os.close(); + return bos.toByteArray(); } public void parseAttributes(String dn, Vector attrs) throws Exception - { + { Hashtable hashtable = new Hashtable(); for (int i = 0; i < attrs.size(); i++) { String attr = (String)attrs.elementAt(i); buildHashtable(dn, hashtable, attr); } - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); ObjectOutputStream os = new ObjectOutputStream(bos); Enumeration e = hashtable.keys(); while (e.hasMoreElements()) { @@ -176,8 +176,8 @@ class CMS61LdifParser try { byte data[] = null; - data = encode(value); - os.writeObject(key); + data = encode(value); + os.writeObject(key); os.writeObject(data); } catch (Exception ex) { if (mErrorPrintWriter != null) { @@ -188,12 +188,12 @@ class CMS61LdifParser } } } // while - os.writeObject(null); + os.writeObject(null); os.close(); // print the BASE64 encoding of the Hashtable BASE64Encoder encoder = new BASE64Encoder(); - String attrsStr = encoder.encodeBuffer(bos.toByteArray()); + String attrsStr = encoder.encodeBuffer(bos.toByteArray()); // trim the last "\n" StringBuffer buffer = null; attrsStr = attrsStr.trim(); @@ -207,14 +207,14 @@ class CMS61LdifParser } } - System.out.println(REQUEST_ATTRIBUTES + " " + buffer); + System.out.println(REQUEST_ATTRIBUTES + " " + buffer); } - public void buildHashtable(String dn, Hashtable table, String attr) + public void buildHashtable(String dn, Hashtable table, String attr) throws Exception - { + { // attribute format [name]:[type]=[value] - + int colon = attr.indexOf(':'); if (colon == -1) { if (mErrorPrintWriter != null) { @@ -319,7 +319,7 @@ class CMS61LdifParser com.netscape.certsrv.authentication.AuthToken obj = (com.netscape.certsrv.authentication.AuthToken)table.get(name); if (obj == null) { - com.netscape.certsrv.authentication.IAuthManager mgr = + com.netscape.certsrv.authentication.IAuthManager mgr = new DummyAuthManager(); obj = new com.netscape.certsrv.authentication.AuthToken(mgr); table.put(name, obj); @@ -329,14 +329,14 @@ class CMS61LdifParser String valuevalue = value.substring(value.indexOf('=')+1); if (valuetype.equals("java.lang.String")) { // Processes 'java.math.BigInteger[]': - // + // // Bugzilla Bug #225031 (a.k.a - Raidzilla Bug #58356) - // + // // Processes 'java.lang.String[]': - // + // // Bugzilla Bug #224763 (a.k.a - Raidzilla Bug #57949) // Bugzilla Bug #252240 - // + // obj.set(valuekey, valuevalue); } else if (valuetype.equals("java.util.Date")) { obj.set(valuekey, new Date(Long.parseLong(valuevalue))); @@ -365,45 +365,45 @@ class CMS61LdifParser table.put(name, decoder.decodeBuffer(value)); } else if (type.startsWith("netscape.security.x509.CertificateAlgorithmId")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateAlgorithmId obj = + netscape.security.x509.CertificateAlgorithmId obj = new netscape.security.x509.CertificateAlgorithmId(new ByteArrayInputStream(decoder.decodeBuffer(value))); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateChain")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateChain obj = + netscape.security.x509.CertificateChain obj = new netscape.security.x509.CertificateChain(); ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); obj.decode(bis); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateExtensions")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateExtensions obj = + netscape.security.x509.CertificateExtensions obj = new netscape.security.x509.CertificateExtensions( new DerInputStream(decoder.decodeBuffer(value))); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateSubjectName")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateSubjectName obj = + netscape.security.x509.CertificateSubjectName obj = new netscape.security.x509.CertificateSubjectName( new ByteArrayInputStream(decoder.decodeBuffer(value))); table.put(name, obj); } else if (type.startsWith("netscape.security.x509.CertificateValidity")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateValidity obj = + netscape.security.x509.CertificateValidity obj = new netscape.security.x509.CertificateValidity(); ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); obj.decode(bis); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateX509Key")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateX509Key obj = + netscape.security.x509.CertificateX509Key obj = new netscape.security.x509.CertificateX509Key( new ByteArrayInputStream(decoder.decodeBuffer(value))); table.put(name, obj); } else if (type.startsWith("com.netscape.certsrv.cert.CertInfo")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.extensions.CertInfo objs[] = (netscape.security.extensions.CertInfo[])table.get(name); + netscape.security.extensions.CertInfo objs[] = (netscape.security.extensions.CertInfo[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.extensions.CertInfo[size]; @@ -425,7 +425,7 @@ class CMS61LdifParser } else if (type.startsWith("Integer[")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - Integer objs[] = (Integer[])table.get(name); + Integer objs[] = (Integer[])table.get(name); if (objs == null) { objs = new Integer[size]; table.put(name, objs); @@ -456,7 +456,7 @@ class CMS61LdifParser obj.set(valuekey, com.netscape.certsrv.dbs.keydb.KeyState.toKeyState(valuevalue)); } else if (valuetype.equals("[B")) { // byte array - + BASE64Decoder decoder = new BASE64Decoder(); obj.set(valuekey, decoder.decodeBuffer(valuevalue)); } else { @@ -466,15 +466,15 @@ class CMS61LdifParser } else if (type.startsWith("com.netscape.certsrv.kra.ProofOfArchival") || type.startsWith("com.netscape.cmscore.kra.ProofOfArchival")) { BASE64Decoder decoder = new BASE64Decoder(); - + ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); - com.netscape.cmscore.kra.ProofOfArchival obj = + com.netscape.cmscore.kra.ProofOfArchival obj = buildPOA(decoder.decodeBuffer(value)); table.put(name, obj); } else if (type.startsWith("netscape.security.x509.RevokedCertImpl")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.RevokedCertImpl objs[] = (netscape.security.x509.RevokedCertImpl[])table.get(name); + netscape.security.x509.RevokedCertImpl objs[] = (netscape.security.x509.RevokedCertImpl[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.RevokedCertImpl[size]; @@ -504,7 +504,7 @@ class CMS61LdifParser } else if (type.startsWith("netscape.security.x509.X509CertImpl[")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.X509CertImpl objs[] = (netscape.security.x509.X509CertImpl[])table.get(name); + netscape.security.x509.X509CertImpl objs[] = (netscape.security.x509.X509CertImpl[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.X509CertImpl[size]; @@ -513,7 +513,7 @@ class CMS61LdifParser objs[index] = new netscape.security.x509.X509CertImpl(decoder.decodeBuffer(value)); } else if (type.equals("netscape.security.x509.X509CertImpl")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.X509CertImpl obj = + netscape.security.x509.X509CertImpl obj = new netscape.security.x509.X509CertImpl( decoder.decodeBuffer(value)); table.put(name, obj); @@ -523,7 +523,7 @@ class CMS61LdifParser // "netscape.security.x509.X509CertInfo[" int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.X509CertInfo objs[] = (netscape.security.x509.X509CertInfo[])table.get(name); + netscape.security.x509.X509CertInfo objs[] = (netscape.security.x509.X509CertInfo[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.X509CertInfo[size]; @@ -533,7 +533,7 @@ class CMS61LdifParser objs[index].decode(new ByteArrayInputStream(decoder.decodeBuffer(value))); } else if (type.equals("netscape.security.x509.X509CertInfo")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.X509CertInfo obj = + netscape.security.x509.X509CertInfo obj = new netscape.security.x509.X509CertInfo( decoder.decodeBuffer(value)); table.put(name, obj); @@ -552,26 +552,26 @@ class CMS61LdifParser public com.netscape.cmscore.kra.ProofOfArchival buildPOA(byte data[]) throws Exception - { - DerInputStream dis = new DerInputStream(data); + { + DerInputStream dis = new DerInputStream(data); DerValue seq[] = dis.getSequence(0); BigInteger mSerialNo = seq[0].getInteger().toBigInteger(); // subject DerValue subject = seq[1]; - netscape.security.x509.X500Name mSubject = + netscape.security.x509.X500Name mSubject = new netscape.security.x509.X500Name(subject.toByteArray()); // issuer DerValue issuer = seq[2]; - netscape.security.x509.X500Name mIssuer = + netscape.security.x509.X500Name mIssuer = new netscape.security.x509.X500Name(issuer.toByteArray()); // date of archival DerInputStream dateOfArchival = new DerInputStream(seq[3].toByteArray()); Date mDateOfArchival = dateOfArchival.getUTCTime(); - com.netscape.cmscore.kra.ProofOfArchival obj = + com.netscape.cmscore.kra.ProofOfArchival obj = new com.netscape.cmscore.kra.ProofOfArchival(mSerialNo, mSubject.toString(), mIssuer.toString(), mDateOfArchival); return obj; @@ -637,7 +637,7 @@ class DummyAuthManager implements com.netscape.certsrv.authentication.IAuthManag * @return The configuration store of this authentication manager. */ public IConfigStore getConfigStore() - { + { return null; } } diff --git a/base/migrate/TxtTo62/src/Main.java b/base/migrate/TxtTo62/src/Main.java index da48981b7..4af432442 100644 --- a/base/migrate/TxtTo62/src/Main.java +++ b/base/migrate/TxtTo62/src/Main.java @@ -41,7 +41,7 @@ import java.lang.reflect.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.5 and later @@ -51,15 +51,15 @@ public class Main // The following call to "java.security.Security.insertProviderAt()" // is no longer commented out in CMS 4.5 and later java.security.Security.insertProviderAt( - new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = + new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -82,14 +82,14 @@ public class Main class CMS62LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.7 and later use "requestAttributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestAttributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -109,16 +109,16 @@ class CMS62LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; Vector requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -141,33 +141,33 @@ class CMS62LdifParser } else { requestAttributes.setElementAt( (String) - requestAttributes.lastElement() + - "\n" + + requestAttributes.lastElement() + + "\n" + line, requestAttributes.size() - 1); } - } + } } - private byte[] encode(Object value) throws Exception - { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + private byte[] encode(Object value) throws Exception + { + ByteArrayOutputStream bos = new ByteArrayOutputStream(); ObjectOutputStream os = new ObjectOutputStream(bos); - os.writeObject(value); - os.close(); - return bos.toByteArray(); + os.writeObject(value); + os.close(); + return bos.toByteArray(); } public void parseAttributes(String dn, Vector attrs) throws Exception - { + { Hashtable hashtable = new Hashtable(); for (int i = 0; i < attrs.size(); i++) { String attr = (String)attrs.elementAt(i); buildHashtable(dn, hashtable, attr); } - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); ObjectOutputStream os = new ObjectOutputStream(bos); Enumeration e = hashtable.keys(); while (e.hasMoreElements()) { @@ -176,8 +176,8 @@ class CMS62LdifParser try { byte data[] = null; - data = encode(value); - os.writeObject(key); + data = encode(value); + os.writeObject(key); os.writeObject(data); } catch (Exception ex) { if (mErrorPrintWriter != null) { @@ -188,12 +188,12 @@ class CMS62LdifParser } } } // while - os.writeObject(null); + os.writeObject(null); os.close(); // print the BASE64 encoding of the Hashtable BASE64Encoder encoder = new BASE64Encoder(); - String attrsStr = encoder.encodeBuffer(bos.toByteArray()); + String attrsStr = encoder.encodeBuffer(bos.toByteArray()); // trim the last "\n" StringBuffer buffer = null; attrsStr = attrsStr.trim(); @@ -207,14 +207,14 @@ class CMS62LdifParser } } - System.out.println(REQUEST_ATTRIBUTES + " " + buffer); + System.out.println(REQUEST_ATTRIBUTES + " " + buffer); } - public void buildHashtable(String dn, Hashtable table, String attr) + public void buildHashtable(String dn, Hashtable table, String attr) throws Exception - { + { // attribute format [name]:[type]=[value] - + int colon = attr.indexOf(':'); if (colon == -1) { if (mErrorPrintWriter != null) { @@ -319,7 +319,7 @@ class CMS62LdifParser com.netscape.certsrv.authentication.AuthToken obj = (com.netscape.certsrv.authentication.AuthToken)table.get(name); if (obj == null) { - com.netscape.certsrv.authentication.IAuthManager mgr = + com.netscape.certsrv.authentication.IAuthManager mgr = new DummyAuthManager(); obj = new com.netscape.certsrv.authentication.AuthToken(mgr); table.put(name, obj); @@ -329,14 +329,14 @@ class CMS62LdifParser String valuevalue = value.substring(value.indexOf('=')+1); if (valuetype.equals("java.lang.String")) { // Processes 'java.math.BigInteger[]': - // + // // Bugzilla Bug #225031 (a.k.a - Raidzilla Bug #58356) - // + // // Processes 'java.lang.String[]': - // + // // Bugzilla Bug #224763 (a.k.a - Raidzilla Bug #57949) // Bugzilla Bug #252240 - // + // obj.set(valuekey, valuevalue); } else if (valuetype.equals("java.util.Date")) { obj.set(valuekey, new Date(Long.parseLong(valuevalue))); @@ -365,19 +365,19 @@ class CMS62LdifParser table.put(name, decoder.decodeBuffer(value)); } else if (type.startsWith("netscape.security.x509.CertificateAlgorithmId")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateAlgorithmId obj = + netscape.security.x509.CertificateAlgorithmId obj = new netscape.security.x509.CertificateAlgorithmId(new ByteArrayInputStream(decoder.decodeBuffer(value))); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateChain")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateChain obj = + netscape.security.x509.CertificateChain obj = new netscape.security.x509.CertificateChain(); ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); obj.decode(bis); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateExtensions")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateExtensions obj = + netscape.security.x509.CertificateExtensions obj = new netscape.security.x509.CertificateExtensions(); obj.decodeEx(new ByteArrayInputStream(decoder.decodeBuffer(value))); // CMS 6.2: revised method of decoding objects of type @@ -385,28 +385,28 @@ class CMS62LdifParser table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateSubjectName")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateSubjectName obj = + netscape.security.x509.CertificateSubjectName obj = new netscape.security.x509.CertificateSubjectName(new DerInputStream(decoder.decodeBuffer(value))); // CMS 6.2: revised method of decoding objects of type // "netscape.security.x509.CertificateSubjectName" table.put(name, obj); } else if (type.startsWith("netscape.security.x509.CertificateValidity")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateValidity obj = + netscape.security.x509.CertificateValidity obj = new netscape.security.x509.CertificateValidity(); ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); obj.decode(bis); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateX509Key")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateX509Key obj = + netscape.security.x509.CertificateX509Key obj = new netscape.security.x509.CertificateX509Key( new ByteArrayInputStream(decoder.decodeBuffer(value))); table.put(name, obj); } else if (type.startsWith("com.netscape.certsrv.cert.CertInfo")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.extensions.CertInfo objs[] = (netscape.security.extensions.CertInfo[])table.get(name); + netscape.security.extensions.CertInfo objs[] = (netscape.security.extensions.CertInfo[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.extensions.CertInfo[size]; @@ -428,7 +428,7 @@ class CMS62LdifParser } else if (type.startsWith("Integer[")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - Integer objs[] = (Integer[])table.get(name); + Integer objs[] = (Integer[])table.get(name); if (objs == null) { objs = new Integer[size]; table.put(name, objs); @@ -459,7 +459,7 @@ class CMS62LdifParser obj.set(valuekey, com.netscape.certsrv.dbs.keydb.KeyState.toKeyState(valuevalue)); } else if (valuetype.equals("[B")) { // byte array - + BASE64Decoder decoder = new BASE64Decoder(); obj.set(valuekey, decoder.decodeBuffer(valuevalue)); } else { @@ -469,15 +469,15 @@ class CMS62LdifParser } else if (type.startsWith("com.netscape.certsrv.kra.ProofOfArchival") || type.startsWith("com.netscape.cmscore.kra.ProofOfArchival")) { BASE64Decoder decoder = new BASE64Decoder(); - + ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); - com.netscape.cmscore.kra.ProofOfArchival obj = + com.netscape.cmscore.kra.ProofOfArchival obj = buildPOA(decoder.decodeBuffer(value)); table.put(name, obj); } else if (type.startsWith("netscape.security.x509.RevokedCertImpl")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.RevokedCertImpl objs[] = (netscape.security.x509.RevokedCertImpl[])table.get(name); + netscape.security.x509.RevokedCertImpl objs[] = (netscape.security.x509.RevokedCertImpl[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.RevokedCertImpl[size]; @@ -511,7 +511,7 @@ class CMS62LdifParser } else if (type.startsWith("netscape.security.x509.X509CertImpl[")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.X509CertImpl objs[] = (netscape.security.x509.X509CertImpl[])table.get(name); + netscape.security.x509.X509CertImpl objs[] = (netscape.security.x509.X509CertImpl[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.X509CertImpl[size]; @@ -520,7 +520,7 @@ class CMS62LdifParser objs[index] = new netscape.security.x509.X509CertImpl(decoder.decodeBuffer(value)); } else if (type.equals("netscape.security.x509.X509CertImpl")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.X509CertImpl obj = + netscape.security.x509.X509CertImpl obj = new netscape.security.x509.X509CertImpl( decoder.decodeBuffer(value)); table.put(name, obj); @@ -534,7 +534,7 @@ class CMS62LdifParser // "netscape.security.x509.X509CertInfo[" int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.X509CertInfo objs[] = (netscape.security.x509.X509CertInfo[])table.get(name); + netscape.security.x509.X509CertInfo objs[] = (netscape.security.x509.X509CertInfo[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.X509CertInfo[size]; @@ -544,7 +544,7 @@ class CMS62LdifParser objs[index].decode(new ByteArrayInputStream(decoder.decodeBuffer(value))); } else if (type.equals("netscape.security.x509.X509CertInfo")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.X509CertInfo obj = + netscape.security.x509.X509CertInfo obj = new netscape.security.x509.X509CertInfo( decoder.decodeBuffer(value)); table.put(name, obj); @@ -563,26 +563,26 @@ class CMS62LdifParser public com.netscape.cmscore.kra.ProofOfArchival buildPOA(byte data[]) throws Exception - { - DerInputStream dis = new DerInputStream(data); + { + DerInputStream dis = new DerInputStream(data); DerValue seq[] = dis.getSequence(0); BigInteger mSerialNo = seq[0].getInteger().toBigInteger(); // subject DerValue subject = seq[1]; - netscape.security.x509.X500Name mSubject = + netscape.security.x509.X500Name mSubject = new netscape.security.x509.X500Name(subject.toByteArray()); // issuer DerValue issuer = seq[2]; - netscape.security.x509.X500Name mIssuer = + netscape.security.x509.X500Name mIssuer = new netscape.security.x509.X500Name(issuer.toByteArray()); // date of archival DerInputStream dateOfArchival = new DerInputStream(seq[3].toByteArray()); Date mDateOfArchival = dateOfArchival.getUTCTime(); - com.netscape.cmscore.kra.ProofOfArchival obj = + com.netscape.cmscore.kra.ProofOfArchival obj = new com.netscape.cmscore.kra.ProofOfArchival(mSerialNo, mSubject.toString(), mIssuer.toString(), mDateOfArchival); return obj; @@ -648,7 +648,7 @@ class DummyAuthManager implements com.netscape.certsrv.authentication.IAuthManag * @return The configuration store of this authentication manager. */ public IConfigStore getConfigStore() - { + { return null; } } diff --git a/base/migrate/TxtTo70/src/Main.java b/base/migrate/TxtTo70/src/Main.java index bcb1b5a15..967bb5d63 100644 --- a/base/migrate/TxtTo70/src/Main.java +++ b/base/migrate/TxtTo70/src/Main.java @@ -41,7 +41,7 @@ import java.lang.reflect.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.5 and later @@ -51,15 +51,15 @@ public class Main // The following call to "java.security.Security.insertProviderAt()" // is no longer commented out in CMS 4.5 and later java.security.Security.insertProviderAt( - new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = + new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -82,14 +82,14 @@ public class Main class CMS70LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.7 and later use "requestAttributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestAttributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -109,16 +109,16 @@ class CMS70LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; Vector requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -141,33 +141,33 @@ class CMS70LdifParser } else { requestAttributes.setElementAt( (String) - requestAttributes.lastElement() + - "\n" + + requestAttributes.lastElement() + + "\n" + line, requestAttributes.size() - 1); } - } + } } - private byte[] encode(Object value) throws Exception - { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + private byte[] encode(Object value) throws Exception + { + ByteArrayOutputStream bos = new ByteArrayOutputStream(); ObjectOutputStream os = new ObjectOutputStream(bos); - os.writeObject(value); - os.close(); - return bos.toByteArray(); + os.writeObject(value); + os.close(); + return bos.toByteArray(); } public void parseAttributes(String dn, Vector attrs) throws Exception - { + { Hashtable hashtable = new Hashtable(); for (int i = 0; i < attrs.size(); i++) { String attr = (String)attrs.elementAt(i); buildHashtable(dn, hashtable, attr); } - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); ObjectOutputStream os = new ObjectOutputStream(bos); Enumeration e = hashtable.keys(); while (e.hasMoreElements()) { @@ -176,8 +176,8 @@ class CMS70LdifParser try { byte data[] = null; - data = encode(value); - os.writeObject(key); + data = encode(value); + os.writeObject(key); os.writeObject(data); } catch (Exception ex) { if (mErrorPrintWriter != null) { @@ -188,12 +188,12 @@ class CMS70LdifParser } } } // while - os.writeObject(null); + os.writeObject(null); os.close(); // print the BASE64 encoding of the Hashtable BASE64Encoder encoder = new BASE64Encoder(); - String attrsStr = encoder.encodeBuffer(bos.toByteArray()); + String attrsStr = encoder.encodeBuffer(bos.toByteArray()); // trim the last "\n" StringBuffer buffer = null; attrsStr = attrsStr.trim(); @@ -207,14 +207,14 @@ class CMS70LdifParser } } - System.out.println(REQUEST_ATTRIBUTES + " " + buffer); + System.out.println(REQUEST_ATTRIBUTES + " " + buffer); } - public void buildHashtable(String dn, Hashtable table, String attr) + public void buildHashtable(String dn, Hashtable table, String attr) throws Exception - { + { // attribute format [name]:[type]=[value] - + int colon = attr.indexOf(':'); if (colon == -1) { if (mErrorPrintWriter != null) { @@ -319,7 +319,7 @@ class CMS70LdifParser com.netscape.certsrv.authentication.AuthToken obj = (com.netscape.certsrv.authentication.AuthToken)table.get(name); if (obj == null) { - com.netscape.certsrv.authentication.IAuthManager mgr = + com.netscape.certsrv.authentication.IAuthManager mgr = new DummyAuthManager(); obj = new com.netscape.certsrv.authentication.AuthToken(mgr); table.put(name, obj); @@ -329,14 +329,14 @@ class CMS70LdifParser String valuevalue = value.substring(value.indexOf('=')+1); if (valuetype.equals("java.lang.String")) { // Processes 'java.math.BigInteger[]': - // + // // Bugzilla Bug #225031 (a.k.a - Raidzilla Bug #58356) - // + // // Processes 'java.lang.String[]': - // + // // Bugzilla Bug #224763 (a.k.a - Raidzilla Bug #57949) // Bugzilla Bug #252240 - // + // obj.set(valuekey, valuevalue); } else if (valuetype.equals("java.util.Date")) { obj.set(valuekey, new Date(Long.parseLong(valuevalue))); @@ -365,19 +365,19 @@ class CMS70LdifParser table.put(name, decoder.decodeBuffer(value)); } else if (type.startsWith("netscape.security.x509.CertificateAlgorithmId")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateAlgorithmId obj = + netscape.security.x509.CertificateAlgorithmId obj = new netscape.security.x509.CertificateAlgorithmId(new ByteArrayInputStream(decoder.decodeBuffer(value))); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateChain")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateChain obj = + netscape.security.x509.CertificateChain obj = new netscape.security.x509.CertificateChain(); ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); obj.decode(bis); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateExtensions")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateExtensions obj = + netscape.security.x509.CertificateExtensions obj = new netscape.security.x509.CertificateExtensions(); obj.decodeEx(new ByteArrayInputStream(decoder.decodeBuffer(value))); // CMS 6.2: revised method of decoding objects of type @@ -385,28 +385,28 @@ class CMS70LdifParser table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateSubjectName")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateSubjectName obj = + netscape.security.x509.CertificateSubjectName obj = new netscape.security.x509.CertificateSubjectName(new DerInputStream(decoder.decodeBuffer(value))); // CMS 6.2: revised method of decoding objects of type // "netscape.security.x509.CertificateSubjectName" table.put(name, obj); } else if (type.startsWith("netscape.security.x509.CertificateValidity")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateValidity obj = + netscape.security.x509.CertificateValidity obj = new netscape.security.x509.CertificateValidity(); ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); obj.decode(bis); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateX509Key")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateX509Key obj = + netscape.security.x509.CertificateX509Key obj = new netscape.security.x509.CertificateX509Key( new ByteArrayInputStream(decoder.decodeBuffer(value))); table.put(name, obj); } else if (type.startsWith("com.netscape.certsrv.cert.CertInfo")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.extensions.CertInfo objs[] = (netscape.security.extensions.CertInfo[])table.get(name); + netscape.security.extensions.CertInfo objs[] = (netscape.security.extensions.CertInfo[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.extensions.CertInfo[size]; @@ -428,7 +428,7 @@ class CMS70LdifParser } else if (type.startsWith("Integer[")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - Integer objs[] = (Integer[])table.get(name); + Integer objs[] = (Integer[])table.get(name); if (objs == null) { objs = new Integer[size]; table.put(name, objs); @@ -459,7 +459,7 @@ class CMS70LdifParser obj.set(valuekey, com.netscape.certsrv.dbs.keydb.KeyState.toKeyState(valuevalue)); } else if (valuetype.equals("[B")) { // byte array - + BASE64Decoder decoder = new BASE64Decoder(); obj.set(valuekey, decoder.decodeBuffer(valuevalue)); } else { @@ -473,15 +473,15 @@ class CMS70LdifParser } else if (type.startsWith("com.netscape.certsrv.kra.ProofOfArchival") || type.startsWith("com.netscape.cmscore.kra.ProofOfArchival")) { BASE64Decoder decoder = new BASE64Decoder(); - + ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); - com.netscape.cmscore.kra.ProofOfArchival obj = + com.netscape.cmscore.kra.ProofOfArchival obj = buildPOA(decoder.decodeBuffer(value)); table.put(name, obj); } else if (type.startsWith("netscape.security.x509.RevokedCertImpl")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.RevokedCertImpl objs[] = (netscape.security.x509.RevokedCertImpl[])table.get(name); + netscape.security.x509.RevokedCertImpl objs[] = (netscape.security.x509.RevokedCertImpl[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.RevokedCertImpl[size]; @@ -511,7 +511,7 @@ class CMS70LdifParser } else if (type.startsWith("netscape.security.x509.X509CertImpl[")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.X509CertImpl objs[] = (netscape.security.x509.X509CertImpl[])table.get(name); + netscape.security.x509.X509CertImpl objs[] = (netscape.security.x509.X509CertImpl[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.X509CertImpl[size]; @@ -520,7 +520,7 @@ class CMS70LdifParser objs[index] = new netscape.security.x509.X509CertImpl(decoder.decodeBuffer(value)); } else if (type.equals("netscape.security.x509.X509CertImpl")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.X509CertImpl obj = + netscape.security.x509.X509CertImpl obj = new netscape.security.x509.X509CertImpl( decoder.decodeBuffer(value)); table.put(name, obj); @@ -534,7 +534,7 @@ class CMS70LdifParser // "netscape.security.x509.X509CertInfo[" int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.X509CertInfo objs[] = (netscape.security.x509.X509CertInfo[])table.get(name); + netscape.security.x509.X509CertInfo objs[] = (netscape.security.x509.X509CertInfo[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.X509CertInfo[size]; @@ -544,7 +544,7 @@ class CMS70LdifParser objs[index].decode(new ByteArrayInputStream(decoder.decodeBuffer(value))); } else if (type.equals("netscape.security.x509.X509CertInfo")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.X509CertInfo obj = + netscape.security.x509.X509CertInfo obj = new netscape.security.x509.X509CertInfo( decoder.decodeBuffer(value)); table.put(name, obj); @@ -563,26 +563,26 @@ class CMS70LdifParser public com.netscape.cmscore.kra.ProofOfArchival buildPOA(byte data[]) throws Exception - { - DerInputStream dis = new DerInputStream(data); + { + DerInputStream dis = new DerInputStream(data); DerValue seq[] = dis.getSequence(0); BigInteger mSerialNo = seq[0].getInteger().toBigInteger(); // subject DerValue subject = seq[1]; - netscape.security.x509.X500Name mSubject = + netscape.security.x509.X500Name mSubject = new netscape.security.x509.X500Name(subject.toByteArray()); // issuer DerValue issuer = seq[2]; - netscape.security.x509.X500Name mIssuer = + netscape.security.x509.X500Name mIssuer = new netscape.security.x509.X500Name(issuer.toByteArray()); // date of archival DerInputStream dateOfArchival = new DerInputStream(seq[3].toByteArray()); Date mDateOfArchival = dateOfArchival.getUTCTime(); - com.netscape.cmscore.kra.ProofOfArchival obj = + com.netscape.cmscore.kra.ProofOfArchival obj = new com.netscape.cmscore.kra.ProofOfArchival(mSerialNo, mSubject.toString(), mIssuer.toString(), mDateOfArchival); return obj; @@ -648,7 +648,7 @@ class DummyAuthManager implements com.netscape.certsrv.authentication.IAuthManag * @return The configuration store of this authentication manager. */ public IConfigStore getConfigStore() - { + { return null; } } diff --git a/base/migrate/TxtTo71/src/Main.java b/base/migrate/TxtTo71/src/Main.java index 7dcb13943..a9421ebdc 100644 --- a/base/migrate/TxtTo71/src/Main.java +++ b/base/migrate/TxtTo71/src/Main.java @@ -41,7 +41,7 @@ import java.lang.reflect.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.5 and later @@ -51,15 +51,15 @@ public class Main // The following call to "java.security.Security.insertProviderAt()" // is no longer commented out in CMS 4.5 and later java.security.Security.insertProviderAt( - new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = + new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -82,14 +82,14 @@ public class Main class CMS71LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.7 and later use "requestAttributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestAttributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -109,16 +109,16 @@ class CMS71LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; Vector requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -141,33 +141,33 @@ class CMS71LdifParser } else { requestAttributes.setElementAt( (String) - requestAttributes.lastElement() + - "\n" + + requestAttributes.lastElement() + + "\n" + line, requestAttributes.size() - 1); } - } + } } - private byte[] encode(Object value) throws Exception - { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + private byte[] encode(Object value) throws Exception + { + ByteArrayOutputStream bos = new ByteArrayOutputStream(); ObjectOutputStream os = new ObjectOutputStream(bos); - os.writeObject(value); - os.close(); - return bos.toByteArray(); + os.writeObject(value); + os.close(); + return bos.toByteArray(); } public void parseAttributes(String dn, Vector attrs) throws Exception - { + { Hashtable hashtable = new Hashtable(); for (int i = 0; i < attrs.size(); i++) { String attr = (String)attrs.elementAt(i); buildHashtable(dn, hashtable, attr); } - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); ObjectOutputStream os = new ObjectOutputStream(bos); Enumeration e = hashtable.keys(); while (e.hasMoreElements()) { @@ -176,8 +176,8 @@ class CMS71LdifParser try { byte data[] = null; - data = encode(value); - os.writeObject(key); + data = encode(value); + os.writeObject(key); os.writeObject(data); } catch (Exception ex) { if (mErrorPrintWriter != null) { @@ -188,12 +188,12 @@ class CMS71LdifParser } } } // while - os.writeObject(null); + os.writeObject(null); os.close(); // print the BASE64 encoding of the Hashtable BASE64Encoder encoder = new BASE64Encoder(); - String attrsStr = encoder.encodeBuffer(bos.toByteArray()); + String attrsStr = encoder.encodeBuffer(bos.toByteArray()); // trim the last "\n" StringBuffer buffer = null; attrsStr = attrsStr.trim(); @@ -207,14 +207,14 @@ class CMS71LdifParser } } - System.out.println(REQUEST_ATTRIBUTES + " " + buffer); + System.out.println(REQUEST_ATTRIBUTES + " " + buffer); } - public void buildHashtable(String dn, Hashtable table, String attr) + public void buildHashtable(String dn, Hashtable table, String attr) throws Exception - { + { // attribute format [name]:[type]=[value] - + int colon = attr.indexOf(':'); if (colon == -1) { if (mErrorPrintWriter != null) { @@ -319,7 +319,7 @@ class CMS71LdifParser com.netscape.certsrv.authentication.AuthToken obj = (com.netscape.certsrv.authentication.AuthToken)table.get(name); if (obj == null) { - com.netscape.certsrv.authentication.IAuthManager mgr = + com.netscape.certsrv.authentication.IAuthManager mgr = new DummyAuthManager(); obj = new com.netscape.certsrv.authentication.AuthToken(mgr); table.put(name, obj); @@ -329,14 +329,14 @@ class CMS71LdifParser String valuevalue = value.substring(value.indexOf('=')+1); if (valuetype.equals("java.lang.String")) { // Processes 'java.math.BigInteger[]': - // + // // Bugzilla Bug #225031 (a.k.a - Raidzilla Bug #58356) - // + // // Processes 'java.lang.String[]': - // + // // Bugzilla Bug #224763 (a.k.a - Raidzilla Bug #57949) // Bugzilla Bug #252240 - // + // obj.set(valuekey, valuevalue); } else if (valuetype.equals("java.util.Date")) { obj.set(valuekey, new Date(Long.parseLong(valuevalue))); @@ -365,19 +365,19 @@ class CMS71LdifParser table.put(name, decoder.decodeBuffer(value)); } else if (type.startsWith("netscape.security.x509.CertificateAlgorithmId")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateAlgorithmId obj = + netscape.security.x509.CertificateAlgorithmId obj = new netscape.security.x509.CertificateAlgorithmId(new ByteArrayInputStream(decoder.decodeBuffer(value))); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateChain")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateChain obj = + netscape.security.x509.CertificateChain obj = new netscape.security.x509.CertificateChain(); ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); obj.decode(bis); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateExtensions")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateExtensions obj = + netscape.security.x509.CertificateExtensions obj = new netscape.security.x509.CertificateExtensions(); obj.decodeEx(new ByteArrayInputStream(decoder.decodeBuffer(value))); // CMS 6.2: revised method of decoding objects of type @@ -385,28 +385,28 @@ class CMS71LdifParser table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateSubjectName")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateSubjectName obj = + netscape.security.x509.CertificateSubjectName obj = new netscape.security.x509.CertificateSubjectName(new DerInputStream(decoder.decodeBuffer(value))); // CMS 6.2: revised method of decoding objects of type // "netscape.security.x509.CertificateSubjectName" table.put(name, obj); } else if (type.startsWith("netscape.security.x509.CertificateValidity")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateValidity obj = + netscape.security.x509.CertificateValidity obj = new netscape.security.x509.CertificateValidity(); ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); obj.decode(bis); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateX509Key")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateX509Key obj = + netscape.security.x509.CertificateX509Key obj = new netscape.security.x509.CertificateX509Key( new ByteArrayInputStream(decoder.decodeBuffer(value))); table.put(name, obj); } else if (type.startsWith("com.netscape.certsrv.cert.CertInfo")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.extensions.CertInfo objs[] = (netscape.security.extensions.CertInfo[])table.get(name); + netscape.security.extensions.CertInfo objs[] = (netscape.security.extensions.CertInfo[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.extensions.CertInfo[size]; @@ -428,7 +428,7 @@ class CMS71LdifParser } else if (type.startsWith("Integer[")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - Integer objs[] = (Integer[])table.get(name); + Integer objs[] = (Integer[])table.get(name); if (objs == null) { objs = new Integer[size]; table.put(name, objs); @@ -459,7 +459,7 @@ class CMS71LdifParser obj.set(valuekey, com.netscape.certsrv.dbs.keydb.KeyState.toKeyState(valuevalue)); } else if (valuetype.equals("[B")) { // byte array - + BASE64Decoder decoder = new BASE64Decoder(); obj.set(valuekey, decoder.decodeBuffer(valuevalue)); } else { @@ -473,15 +473,15 @@ class CMS71LdifParser } else if (type.startsWith("com.netscape.certsrv.kra.ProofOfArchival") || type.startsWith("com.netscape.cmscore.kra.ProofOfArchival")) { BASE64Decoder decoder = new BASE64Decoder(); - + ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); - com.netscape.cmscore.kra.ProofOfArchival obj = + com.netscape.cmscore.kra.ProofOfArchival obj = buildPOA(decoder.decodeBuffer(value)); table.put(name, obj); } else if (type.startsWith("netscape.security.x509.RevokedCertImpl")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.RevokedCertImpl objs[] = (netscape.security.x509.RevokedCertImpl[])table.get(name); + netscape.security.x509.RevokedCertImpl objs[] = (netscape.security.x509.RevokedCertImpl[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.RevokedCertImpl[size]; @@ -511,7 +511,7 @@ class CMS71LdifParser } else if (type.startsWith("netscape.security.x509.X509CertImpl[")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.X509CertImpl objs[] = (netscape.security.x509.X509CertImpl[])table.get(name); + netscape.security.x509.X509CertImpl objs[] = (netscape.security.x509.X509CertImpl[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.X509CertImpl[size]; @@ -520,7 +520,7 @@ class CMS71LdifParser objs[index] = new netscape.security.x509.X509CertImpl(decoder.decodeBuffer(value)); } else if (type.equals("netscape.security.x509.X509CertImpl")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.X509CertImpl obj = + netscape.security.x509.X509CertImpl obj = new netscape.security.x509.X509CertImpl( decoder.decodeBuffer(value)); table.put(name, obj); @@ -534,7 +534,7 @@ class CMS71LdifParser // "netscape.security.x509.X509CertInfo[" int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.X509CertInfo objs[] = (netscape.security.x509.X509CertInfo[])table.get(name); + netscape.security.x509.X509CertInfo objs[] = (netscape.security.x509.X509CertInfo[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.X509CertInfo[size]; @@ -544,7 +544,7 @@ class CMS71LdifParser objs[index].decode(new ByteArrayInputStream(decoder.decodeBuffer(value))); } else if (type.equals("netscape.security.x509.X509CertInfo")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.X509CertInfo obj = + netscape.security.x509.X509CertInfo obj = new netscape.security.x509.X509CertInfo( decoder.decodeBuffer(value)); table.put(name, obj); @@ -563,26 +563,26 @@ class CMS71LdifParser public com.netscape.cmscore.kra.ProofOfArchival buildPOA(byte data[]) throws Exception - { - DerInputStream dis = new DerInputStream(data); + { + DerInputStream dis = new DerInputStream(data); DerValue seq[] = dis.getSequence(0); BigInteger mSerialNo = seq[0].getInteger().toBigInteger(); // subject DerValue subject = seq[1]; - netscape.security.x509.X500Name mSubject = + netscape.security.x509.X500Name mSubject = new netscape.security.x509.X500Name(subject.toByteArray()); // issuer DerValue issuer = seq[2]; - netscape.security.x509.X500Name mIssuer = + netscape.security.x509.X500Name mIssuer = new netscape.security.x509.X500Name(issuer.toByteArray()); // date of archival DerInputStream dateOfArchival = new DerInputStream(seq[3].toByteArray()); Date mDateOfArchival = dateOfArchival.getUTCTime(); - com.netscape.cmscore.kra.ProofOfArchival obj = + com.netscape.cmscore.kra.ProofOfArchival obj = new com.netscape.cmscore.kra.ProofOfArchival(mSerialNo, mSubject.toString(), mIssuer.toString(), mDateOfArchival); return obj; @@ -648,7 +648,7 @@ class DummyAuthManager implements com.netscape.certsrv.authentication.IAuthManag * @return The configuration store of this authentication manager. */ public IConfigStore getConfigStore() - { + { return null; } } diff --git a/base/migrate/TxtTo72/src/Main.java b/base/migrate/TxtTo72/src/Main.java index 9b22cd84d..002485055 100644 --- a/base/migrate/TxtTo72/src/Main.java +++ b/base/migrate/TxtTo72/src/Main.java @@ -41,7 +41,7 @@ import java.lang.reflect.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.5 and later @@ -51,15 +51,15 @@ public class Main // The following call to "java.security.Security.insertProviderAt()" // is no longer commented out in CMS 4.5 and later java.security.Security.insertProviderAt( - new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = + new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -82,14 +82,14 @@ public class Main class CMS72LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.7 and later use "requestAttributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestAttributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -109,16 +109,16 @@ class CMS72LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; Vector requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -141,33 +141,33 @@ class CMS72LdifParser } else { requestAttributes.setElementAt( (String) - requestAttributes.lastElement() + - "\n" + + requestAttributes.lastElement() + + "\n" + line, requestAttributes.size() - 1); } - } + } } - private byte[] encode(Object value) throws Exception - { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + private byte[] encode(Object value) throws Exception + { + ByteArrayOutputStream bos = new ByteArrayOutputStream(); ObjectOutputStream os = new ObjectOutputStream(bos); - os.writeObject(value); - os.close(); - return bos.toByteArray(); + os.writeObject(value); + os.close(); + return bos.toByteArray(); } public void parseAttributes(String dn, Vector attrs) throws Exception - { + { Hashtable hashtable = new Hashtable(); for (int i = 0; i < attrs.size(); i++) { String attr = (String)attrs.elementAt(i); buildHashtable(dn, hashtable, attr); } - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); ObjectOutputStream os = new ObjectOutputStream(bos); Enumeration e = hashtable.keys(); while (e.hasMoreElements()) { @@ -176,8 +176,8 @@ class CMS72LdifParser try { byte data[] = null; - data = encode(value); - os.writeObject(key); + data = encode(value); + os.writeObject(key); os.writeObject(data); } catch (Exception ex) { if (mErrorPrintWriter != null) { @@ -188,12 +188,12 @@ class CMS72LdifParser } } } // while - os.writeObject(null); + os.writeObject(null); os.close(); // print the BASE64 encoding of the Hashtable BASE64Encoder encoder = new BASE64Encoder(); - String attrsStr = encoder.encodeBuffer(bos.toByteArray()); + String attrsStr = encoder.encodeBuffer(bos.toByteArray()); // trim the last "\n" StringBuffer buffer = null; attrsStr = attrsStr.trim(); @@ -207,14 +207,14 @@ class CMS72LdifParser } } - System.out.println(REQUEST_ATTRIBUTES + " " + buffer); + System.out.println(REQUEST_ATTRIBUTES + " " + buffer); } - public void buildHashtable(String dn, Hashtable table, String attr) + public void buildHashtable(String dn, Hashtable table, String attr) throws Exception - { + { // attribute format [name]:[type]=[value] - + int colon = attr.indexOf(':'); if (colon == -1) { if (mErrorPrintWriter != null) { @@ -319,7 +319,7 @@ class CMS72LdifParser com.netscape.certsrv.authentication.AuthToken obj = (com.netscape.certsrv.authentication.AuthToken)table.get(name); if (obj == null) { - com.netscape.certsrv.authentication.IAuthManager mgr = + com.netscape.certsrv.authentication.IAuthManager mgr = new DummyAuthManager(); obj = new com.netscape.certsrv.authentication.AuthToken(mgr); table.put(name, obj); @@ -329,14 +329,14 @@ class CMS72LdifParser String valuevalue = value.substring(value.indexOf('=')+1); if (valuetype.equals("java.lang.String")) { // Processes 'java.math.BigInteger[]': - // + // // Bugzilla Bug #225031 (a.k.a - Raidzilla Bug #58356) - // + // // Processes 'java.lang.String[]': - // + // // Bugzilla Bug #224763 (a.k.a - Raidzilla Bug #57949) // Bugzilla Bug #252240 - // + // obj.set(valuekey, valuevalue); } else if (valuetype.equals("java.util.Date")) { obj.set(valuekey, new Date(Long.parseLong(valuevalue))); @@ -365,19 +365,19 @@ class CMS72LdifParser table.put(name, decoder.decodeBuffer(value)); } else if (type.startsWith("netscape.security.x509.CertificateAlgorithmId")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateAlgorithmId obj = + netscape.security.x509.CertificateAlgorithmId obj = new netscape.security.x509.CertificateAlgorithmId(new ByteArrayInputStream(decoder.decodeBuffer(value))); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateChain")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateChain obj = + netscape.security.x509.CertificateChain obj = new netscape.security.x509.CertificateChain(); ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); obj.decode(bis); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateExtensions")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateExtensions obj = + netscape.security.x509.CertificateExtensions obj = new netscape.security.x509.CertificateExtensions(); obj.decodeEx(new ByteArrayInputStream(decoder.decodeBuffer(value))); // CMS 6.2: revised method of decoding objects of type @@ -385,28 +385,28 @@ class CMS72LdifParser table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateSubjectName")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateSubjectName obj = + netscape.security.x509.CertificateSubjectName obj = new netscape.security.x509.CertificateSubjectName(new DerInputStream(decoder.decodeBuffer(value))); // CMS 6.2: revised method of decoding objects of type // "netscape.security.x509.CertificateSubjectName" table.put(name, obj); } else if (type.startsWith("netscape.security.x509.CertificateValidity")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateValidity obj = + netscape.security.x509.CertificateValidity obj = new netscape.security.x509.CertificateValidity(); ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); obj.decode(bis); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateX509Key")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateX509Key obj = + netscape.security.x509.CertificateX509Key obj = new netscape.security.x509.CertificateX509Key( new ByteArrayInputStream(decoder.decodeBuffer(value))); table.put(name, obj); } else if (type.startsWith("com.netscape.certsrv.cert.CertInfo")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.extensions.CertInfo objs[] = (netscape.security.extensions.CertInfo[])table.get(name); + netscape.security.extensions.CertInfo objs[] = (netscape.security.extensions.CertInfo[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.extensions.CertInfo[size]; @@ -428,7 +428,7 @@ class CMS72LdifParser } else if (type.startsWith("Integer[")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - Integer objs[] = (Integer[])table.get(name); + Integer objs[] = (Integer[])table.get(name); if (objs == null) { objs = new Integer[size]; table.put(name, objs); @@ -463,7 +463,7 @@ class CMS72LdifParser obj.set(valuekey, com.netscape.certsrv.dbs.keydb.KeyState.toKeyState(valuevalue)); } else if (valuetype.equals("[B")) { // byte array - + BASE64Decoder decoder = new BASE64Decoder(); obj.set(valuekey, decoder.decodeBuffer(valuevalue)); } else { @@ -477,15 +477,15 @@ class CMS72LdifParser } else if (type.startsWith("com.netscape.certsrv.kra.ProofOfArchival") || type.startsWith("com.netscape.cmscore.kra.ProofOfArchival")) { BASE64Decoder decoder = new BASE64Decoder(); - + ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); - com.netscape.certsrv.kra.ProofOfArchival obj = + com.netscape.certsrv.kra.ProofOfArchival obj = buildPOA(decoder.decodeBuffer(value)); table.put(name, obj); } else if (type.startsWith("netscape.security.x509.RevokedCertImpl")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.RevokedCertImpl objs[] = (netscape.security.x509.RevokedCertImpl[])table.get(name); + netscape.security.x509.RevokedCertImpl objs[] = (netscape.security.x509.RevokedCertImpl[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.RevokedCertImpl[size]; @@ -515,7 +515,7 @@ class CMS72LdifParser } else if (type.startsWith("netscape.security.x509.X509CertImpl[")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.X509CertImpl objs[] = (netscape.security.x509.X509CertImpl[])table.get(name); + netscape.security.x509.X509CertImpl objs[] = (netscape.security.x509.X509CertImpl[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.X509CertImpl[size]; @@ -524,7 +524,7 @@ class CMS72LdifParser objs[index] = new netscape.security.x509.X509CertImpl(decoder.decodeBuffer(value)); } else if (type.equals("netscape.security.x509.X509CertImpl")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.X509CertImpl obj = + netscape.security.x509.X509CertImpl obj = new netscape.security.x509.X509CertImpl( decoder.decodeBuffer(value)); table.put(name, obj); @@ -538,7 +538,7 @@ class CMS72LdifParser // "netscape.security.x509.X509CertInfo[" int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.X509CertInfo objs[] = (netscape.security.x509.X509CertInfo[])table.get(name); + netscape.security.x509.X509CertInfo objs[] = (netscape.security.x509.X509CertInfo[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.X509CertInfo[size]; @@ -548,7 +548,7 @@ class CMS72LdifParser objs[index].decode(new ByteArrayInputStream(decoder.decodeBuffer(value))); } else if (type.equals("netscape.security.x509.X509CertInfo")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.X509CertInfo obj = + netscape.security.x509.X509CertInfo obj = new netscape.security.x509.X509CertInfo( decoder.decodeBuffer(value)); table.put(name, obj); @@ -567,26 +567,26 @@ class CMS72LdifParser public com.netscape.certsrv.kra.ProofOfArchival buildPOA(byte data[]) throws Exception - { - DerInputStream dis = new DerInputStream(data); + { + DerInputStream dis = new DerInputStream(data); DerValue seq[] = dis.getSequence(0); BigInteger mSerialNo = seq[0].getInteger().toBigInteger(); // subject DerValue subject = seq[1]; - netscape.security.x509.X500Name mSubject = + netscape.security.x509.X500Name mSubject = new netscape.security.x509.X500Name(subject.toByteArray()); // issuer DerValue issuer = seq[2]; - netscape.security.x509.X500Name mIssuer = + netscape.security.x509.X500Name mIssuer = new netscape.security.x509.X500Name(issuer.toByteArray()); // date of archival DerInputStream dateOfArchival = new DerInputStream(seq[3].toByteArray()); Date mDateOfArchival = dateOfArchival.getUTCTime(); - com.netscape.certsrv.kra.ProofOfArchival obj = + com.netscape.certsrv.kra.ProofOfArchival obj = new com.netscape.certsrv.kra.ProofOfArchival(mSerialNo, mSubject.toString(), mIssuer.toString(), mDateOfArchival); return obj; @@ -652,7 +652,7 @@ class DummyAuthManager implements com.netscape.certsrv.authentication.IAuthManag * @return The configuration store of this authentication manager. */ public IConfigStore getConfigStore() - { + { return null; } } diff --git a/base/migrate/TxtTo73/src/Main.java b/base/migrate/TxtTo73/src/Main.java index 4ffe0c120..6272b33a4 100644 --- a/base/migrate/TxtTo73/src/Main.java +++ b/base/migrate/TxtTo73/src/Main.java @@ -41,7 +41,7 @@ import java.lang.reflect.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.5 and later @@ -51,15 +51,15 @@ public class Main // The following call to "java.security.Security.insertProviderAt()" // is no longer commented out in CMS 4.5 and later java.security.Security.insertProviderAt( - new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = + new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -82,14 +82,14 @@ public class Main class CMS73LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CMS 4.7 and later use "requestAttributes" - private static final String REQUEST_ATTRIBUTES = + private static final String REQUEST_ATTRIBUTES = "requestAttributes::"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -109,16 +109,16 @@ class CMS73LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; Vector requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -141,33 +141,33 @@ class CMS73LdifParser } else { requestAttributes.setElementAt( (String) - requestAttributes.lastElement() + - "\n" + + requestAttributes.lastElement() + + "\n" + line, requestAttributes.size() - 1); } - } + } } - private byte[] encode(Object value) throws Exception - { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + private byte[] encode(Object value) throws Exception + { + ByteArrayOutputStream bos = new ByteArrayOutputStream(); ObjectOutputStream os = new ObjectOutputStream(bos); - os.writeObject(value); - os.close(); - return bos.toByteArray(); + os.writeObject(value); + os.close(); + return bos.toByteArray(); } public void parseAttributes(String dn, Vector attrs) throws Exception - { + { Hashtable hashtable = new Hashtable(); for (int i = 0; i < attrs.size(); i++) { String attr = (String)attrs.elementAt(i); buildHashtable(dn, hashtable, attr); } - ByteArrayOutputStream bos = new ByteArrayOutputStream(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); ObjectOutputStream os = new ObjectOutputStream(bos); Enumeration e = hashtable.keys(); while (e.hasMoreElements()) { @@ -176,8 +176,8 @@ class CMS73LdifParser try { byte data[] = null; - data = encode(value); - os.writeObject(key); + data = encode(value); + os.writeObject(key); os.writeObject(data); } catch (Exception ex) { if (mErrorPrintWriter != null) { @@ -188,12 +188,12 @@ class CMS73LdifParser } } } // while - os.writeObject(null); + os.writeObject(null); os.close(); // print the BASE64 encoding of the Hashtable BASE64Encoder encoder = new BASE64Encoder(); - String attrsStr = encoder.encodeBuffer(bos.toByteArray()); + String attrsStr = encoder.encodeBuffer(bos.toByteArray()); // trim the last "\n" StringBuffer buffer = null; attrsStr = attrsStr.trim(); @@ -207,14 +207,14 @@ class CMS73LdifParser } } - System.out.println(REQUEST_ATTRIBUTES + " " + buffer); + System.out.println(REQUEST_ATTRIBUTES + " " + buffer); } - public void buildHashtable(String dn, Hashtable table, String attr) + public void buildHashtable(String dn, Hashtable table, String attr) throws Exception - { + { // attribute format [name]:[type]=[value] - + int colon = attr.indexOf(':'); if (colon == -1) { if (mErrorPrintWriter != null) { @@ -319,7 +319,7 @@ class CMS73LdifParser com.netscape.certsrv.authentication.AuthToken obj = (com.netscape.certsrv.authentication.AuthToken)table.get(name); if (obj == null) { - com.netscape.certsrv.authentication.IAuthManager mgr = + com.netscape.certsrv.authentication.IAuthManager mgr = new DummyAuthManager(); obj = new com.netscape.certsrv.authentication.AuthToken(mgr); table.put(name, obj); @@ -329,14 +329,14 @@ class CMS73LdifParser String valuevalue = value.substring(value.indexOf('=')+1); if (valuetype.equals("java.lang.String")) { // Processes 'java.math.BigInteger[]': - // + // // Bugzilla Bug #225031 (a.k.a - Raidzilla Bug #58356) - // + // // Processes 'java.lang.String[]': - // + // // Bugzilla Bug #224763 (a.k.a - Raidzilla Bug #57949) // Bugzilla Bug #252240 - // + // obj.set(valuekey, valuevalue); } else if (valuetype.equals("java.util.Date")) { obj.set(valuekey, new Date(Long.parseLong(valuevalue))); @@ -365,19 +365,19 @@ class CMS73LdifParser table.put(name, decoder.decodeBuffer(value)); } else if (type.startsWith("netscape.security.x509.CertificateAlgorithmId")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateAlgorithmId obj = + netscape.security.x509.CertificateAlgorithmId obj = new netscape.security.x509.CertificateAlgorithmId(new ByteArrayInputStream(decoder.decodeBuffer(value))); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateChain")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateChain obj = + netscape.security.x509.CertificateChain obj = new netscape.security.x509.CertificateChain(); ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); obj.decode(bis); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateExtensions")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateExtensions obj = + netscape.security.x509.CertificateExtensions obj = new netscape.security.x509.CertificateExtensions(); obj.decodeEx(new ByteArrayInputStream(decoder.decodeBuffer(value))); // CMS 6.2: revised method of decoding objects of type @@ -385,28 +385,28 @@ class CMS73LdifParser table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateSubjectName")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateSubjectName obj = + netscape.security.x509.CertificateSubjectName obj = new netscape.security.x509.CertificateSubjectName(new DerInputStream(decoder.decodeBuffer(value))); // CMS 6.2: revised method of decoding objects of type // "netscape.security.x509.CertificateSubjectName" table.put(name, obj); } else if (type.startsWith("netscape.security.x509.CertificateValidity")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateValidity obj = + netscape.security.x509.CertificateValidity obj = new netscape.security.x509.CertificateValidity(); ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); obj.decode(bis); table.put(name, obj); } else if (type.equals("netscape.security.x509.CertificateX509Key")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.CertificateX509Key obj = + netscape.security.x509.CertificateX509Key obj = new netscape.security.x509.CertificateX509Key( new ByteArrayInputStream(decoder.decodeBuffer(value))); table.put(name, obj); } else if (type.startsWith("com.netscape.certsrv.cert.CertInfo")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.extensions.CertInfo objs[] = (netscape.security.extensions.CertInfo[])table.get(name); + netscape.security.extensions.CertInfo objs[] = (netscape.security.extensions.CertInfo[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.extensions.CertInfo[size]; @@ -428,7 +428,7 @@ class CMS73LdifParser } else if (type.startsWith("Integer[")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - Integer objs[] = (Integer[])table.get(name); + Integer objs[] = (Integer[])table.get(name); if (objs == null) { objs = new Integer[size]; table.put(name, objs); @@ -463,7 +463,7 @@ class CMS73LdifParser obj.set(valuekey, com.netscape.certsrv.dbs.keydb.KeyState.toKeyState(valuevalue)); } else if (valuetype.equals("[B")) { // byte array - + BASE64Decoder decoder = new BASE64Decoder(); obj.set(valuekey, decoder.decodeBuffer(valuevalue)); } else { @@ -477,15 +477,15 @@ class CMS73LdifParser } else if (type.startsWith("com.netscape.certsrv.kra.ProofOfArchival") || type.startsWith("com.netscape.cmscore.kra.ProofOfArchival")) { BASE64Decoder decoder = new BASE64Decoder(); - + ByteArrayInputStream bis = new ByteArrayInputStream(decoder.decodeBuffer(value)); - com.netscape.certsrv.kra.ProofOfArchival obj = + com.netscape.certsrv.kra.ProofOfArchival obj = buildPOA(decoder.decodeBuffer(value)); table.put(name, obj); } else if (type.startsWith("netscape.security.x509.RevokedCertImpl")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.RevokedCertImpl objs[] = (netscape.security.x509.RevokedCertImpl[])table.get(name); + netscape.security.x509.RevokedCertImpl objs[] = (netscape.security.x509.RevokedCertImpl[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.RevokedCertImpl[size]; @@ -515,7 +515,7 @@ class CMS73LdifParser } else if (type.startsWith("netscape.security.x509.X509CertImpl[")) { int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.X509CertImpl objs[] = (netscape.security.x509.X509CertImpl[])table.get(name); + netscape.security.x509.X509CertImpl objs[] = (netscape.security.x509.X509CertImpl[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.X509CertImpl[size]; @@ -524,7 +524,7 @@ class CMS73LdifParser objs[index] = new netscape.security.x509.X509CertImpl(decoder.decodeBuffer(value)); } else if (type.equals("netscape.security.x509.X509CertImpl")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.X509CertImpl obj = + netscape.security.x509.X509CertImpl obj = new netscape.security.x509.X509CertImpl( decoder.decodeBuffer(value)); table.put(name, obj); @@ -538,7 +538,7 @@ class CMS73LdifParser // "netscape.security.x509.X509CertInfo[" int size = Integer.parseInt(type.substring(type.indexOf('[')+ 1, type.indexOf(','))); int index = Integer.parseInt(type.substring(type.indexOf(',')+1, type.indexOf(']'))); - netscape.security.x509.X509CertInfo objs[] = (netscape.security.x509.X509CertInfo[])table.get(name); + netscape.security.x509.X509CertInfo objs[] = (netscape.security.x509.X509CertInfo[])table.get(name); BASE64Decoder decoder = new BASE64Decoder(); if (objs == null) { objs = new netscape.security.x509.X509CertInfo[size]; @@ -548,7 +548,7 @@ class CMS73LdifParser objs[index].decode(new ByteArrayInputStream(decoder.decodeBuffer(value))); } else if (type.equals("netscape.security.x509.X509CertInfo")) { BASE64Decoder decoder = new BASE64Decoder(); - netscape.security.x509.X509CertInfo obj = + netscape.security.x509.X509CertInfo obj = new netscape.security.x509.X509CertInfo( decoder.decodeBuffer(value)); table.put(name, obj); @@ -567,26 +567,26 @@ class CMS73LdifParser public com.netscape.certsrv.kra.ProofOfArchival buildPOA(byte data[]) throws Exception - { - DerInputStream dis = new DerInputStream(data); + { + DerInputStream dis = new DerInputStream(data); DerValue seq[] = dis.getSequence(0); BigInteger mSerialNo = seq[0].getInteger().toBigInteger(); // subject DerValue subject = seq[1]; - netscape.security.x509.X500Name mSubject = + netscape.security.x509.X500Name mSubject = new netscape.security.x509.X500Name(subject.toByteArray()); // issuer DerValue issuer = seq[2]; - netscape.security.x509.X500Name mIssuer = + netscape.security.x509.X500Name mIssuer = new netscape.security.x509.X500Name(issuer.toByteArray()); // date of archival DerInputStream dateOfArchival = new DerInputStream(seq[3].toByteArray()); Date mDateOfArchival = dateOfArchival.getUTCTime(); - com.netscape.certsrv.kra.ProofOfArchival obj = + com.netscape.certsrv.kra.ProofOfArchival obj = new com.netscape.certsrv.kra.ProofOfArchival(mSerialNo, mSubject.toString(), mIssuer.toString(), mDateOfArchival); return obj; @@ -652,7 +652,7 @@ class DummyAuthManager implements com.netscape.certsrv.authentication.IAuthManag * @return The configuration store of this authentication manager. */ public IConfigStore getConfigStore() - { + { return null; } } diff --git a/base/migrate/TxtTo80/src/Main.java b/base/migrate/TxtTo80/src/Main.java index ad9eb6b18..320ea8507 100644 --- a/base/migrate/TxtTo80/src/Main.java +++ b/base/migrate/TxtTo80/src/Main.java @@ -40,7 +40,7 @@ import java.lang.reflect.*; public class Main { - public static void main(String args[]) + public static void main(String args[]) { try { // initialize CryptoManager in CMS 4.5 and later @@ -50,15 +50,15 @@ public class Main // The following call to "java.security.Security.insertProviderAt()" // is no longer commented out in CMS 4.5 and later java.security.Security.insertProviderAt( - new netscape.security.provider.CMS(), 0); - java.security.Provider ps[] = + new netscape.security.provider.CMS(), 0); + java.security.Provider ps[] = java.security.Security.getProviders(); - if (ps == null || ps.length <= 0) { - System.err.println("Java Security Provider NONE"); - } else { - for (int x = 0; x < ps.length; x++) { - System.err.println("Java Security Provider " + x + " class=" + ps[x]); - } + if (ps == null || ps.length <= 0) { + System.err.println("Java Security Provider NONE"); + } else { + for (int x = 0; x < ps.length; x++) { + System.err.println("Java Security Provider " + x + " class=" + ps[x]); + } } // Parse the File @@ -81,14 +81,14 @@ public class Main class CS80LdifParser { // constants - private static final String DN = + private static final String DN = "dn:"; // Directory Servers in CS 8.0 and later use "extdata-" private static final String extAttrPrefix = "extdata-"; - private static final String BEGIN = + private static final String BEGIN = "--- BEGIN ATTRIBUTES ---"; - private static final String END = + private static final String END = "--- END ATTRIBUTES ---"; // variables @@ -108,16 +108,16 @@ class CS80LdifParser } public void parse() throws Exception - { + { if (mErrorFilename != null) { mErrorPrintWriter = new PrintWriter(new FileOutputStream(mErrorFilename)); } BufferedReader reader = new BufferedReader( - new FileReader(mFilename)); - String line = null; - String dn = null; + new FileReader(mFilename)); + String line = null; + String dn = null; Vector requestAttributes = null; - while ((line = reader.readLine()) != null) { + while ((line = reader.readLine()) != null) { if (line.startsWith(DN)) { dn = line; } @@ -154,12 +154,12 @@ class CS80LdifParser if (line.trim().length() == 0) continue; requestAttributes.setElementAt( (String) - requestAttributes.lastElement() + - "\n" + + requestAttributes.lastElement() + + "\n" + line, requestAttributes.size() - 1); } - } + } } public String getKey( String dn, String attr ) @@ -188,10 +188,10 @@ class CS80LdifParser } return key; - } + } public void parseAttributes(String dn, Vector attrs) throws Exception - { + { for( int i = 0; i < attrs.size(); i++ ) { String attr = ( String ) attrs.elementAt( i ); try { @@ -317,7 +317,7 @@ class CS80LdifParser // character sequence contained in the string buffer does not exceed // the capacity, it is not necessary to allocate a new internal buffer // array. If the internal buffer overflows, it is automatically made - // larger. + // larger. // // Start out with an output buffer at least as big as the input buffer. output = new StringBuffer( input.length ); @@ -341,11 +341,11 @@ class CS80LdifParser return( output.toString() ); } - public void translateAttributes( String dn, String attr ) + public void translateAttributes( String dn, String attr ) throws Exception { // attribute format [key]:[type]=[data] - + int colon = attr.indexOf( ':' ); if( colon == -1 ) { if( mErrorPrintWriter != null ) { @@ -436,14 +436,14 @@ class CS80LdifParser subKey + ": " + formatData( subKeyData ) ); } else if( type.startsWith( "com.netscape.certsrv.authentication.AuthToken" ) ) { // Processes 'java.math.BigInteger[]': - // + // // Bugzilla Bug #225031 (a.k.a - Raidzilla Bug #58356) - // + // // Processes 'java.lang.String[]': - // + // // Bugzilla Bug #224763 (a.k.a - Raidzilla Bug #57949) // Bugzilla Bug #252240 - // + // // Bugzilla Bug #737217 - adding proper "ext-data" array format int secondColon = data.indexOf(':'); @@ -526,7 +526,7 @@ class CS80LdifParser // since KRA requests only need to refer // to the actual "keyRecord" referenced // by the "keySerialNumber" data, - // all other "KeyRecord" request data is + // all other "KeyRecord" request data is // ignored, since it is already stored // in the actual "keyRecord". if( data.startsWith( "keySerialNumber" ) ) { diff --git a/base/migrate/kra/RecoverKey.java b/base/migrate/kra/RecoverKey.java index 06e5fc55f..6a663ea97 100755 --- a/base/migrate/kra/RecoverKey.java +++ b/base/migrate/kra/RecoverKey.java @@ -43,7 +43,7 @@ import java.util.*; import com.netscape.cmscore.shares.*; public class RecoverKey { - + public static void main(String args[]) throws Exception { if (args.length != 6) { @@ -58,7 +58,7 @@ public class RecoverKey { String nickname = args[4]; String db_path = args[5]; - CryptoManager.InitializationValues vals = + CryptoManager.InitializationValues vals = new CryptoManager.InitializationValues(alias, prefix, prefix, "secmod.db"); diff --git a/base/migrate/kra/RecoverPin.java b/base/migrate/kra/RecoverPin.java index 2ad268c37..921143154 100755 --- a/base/migrate/kra/RecoverPin.java +++ b/base/migrate/kra/RecoverPin.java @@ -43,7 +43,7 @@ import java.util.*; import com.netscape.cmscore.shares.*; public class RecoverPin { - + public static String getPassword(Hashtable shares) throws Exception { System.out.println("Share size '" + shares.size() + "'"); @@ -86,7 +86,7 @@ System.out.println("Add share " + (int)(Integer.parseInt(next) + 1)); BASE64Decoder decoder = new BASE64Decoder(); byte share[] = decoder.decodeBuffer(encrypted); - System.out.println("Got encrypted share length '" + + System.out.println("Got encrypted share length '" + share.length + "'"); System.out.println("Please input password for " + uid + ":"); @@ -127,7 +127,7 @@ System.out.println("Add share " + (int)(Integer.parseInt(next) + 1)); String password = args[2]; String path_kra_mn = args[3]; - CryptoManager.InitializationValues vals = + CryptoManager.InitializationValues vals = new CryptoManager.InitializationValues(alias, prefix, prefix, "secmod.db"); diff --git a/base/ocsp/src/com/netscape/ocsp/EOCSPException.java b/base/ocsp/src/com/netscape/ocsp/EOCSPException.java index 231ab2867..1c878ad75 100644 --- a/base/ocsp/src/com/netscape/ocsp/EOCSPException.java +++ b/base/ocsp/src/com/netscape/ocsp/EOCSPException.java @@ -22,7 +22,7 @@ import com.netscape.certsrv.base.EBaseException; /** * A class represents a OCSP exception. * <P> - * + * * @version $Revision$, $Date$ */ public class EOCSPException extends EBaseException { diff --git a/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java b/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java index f009bd56f..8d2176c83 100644 --- a/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java +++ b/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java @@ -70,7 +70,7 @@ import com.netscape.cmsutil.ocsp.ResponseData; * A class represents a Certificate Authority that is * responsible for certificate specific operations. * <P> - * + * * @author lhsiao * @version $Revision$, $Date$ */ @@ -118,7 +118,7 @@ public class OCSPAuthority implements IOCSPAuthority, IOCSPService, ISubsystem, * Initializes this subsystem with the given configuration * store. * <P> - * + * * @param owner owner of this subsystem * @param config configuration store * @exception EBaseException failed to initialize @@ -273,7 +273,7 @@ public class OCSPAuthority implements IOCSPAuthority, IOCSPService, ISubsystem, } else if (alg.getOID().equals(MD5)) { return "MD5"; } else if (alg.getOID().equals(SHA1)) { - return "SHA1"; // 1.3.14.3.2.26 + return "SHA1"; // 1.3.14.3.2.26 } else { return null; } @@ -394,7 +394,7 @@ public class OCSPAuthority implements IOCSPAuthority, IOCSPService, ISubsystem, /** * Returns the root configuration storage of this system. * <P> - * + * * @return configuration store of this subsystem */ public IConfigStore getConfigStore() { @@ -407,7 +407,7 @@ public class OCSPAuthority implements IOCSPAuthority, IOCSPService, ISubsystem, /** * logs a message in the CA area. - * + * * @param level the debug level. * @param msg the message to debug. */ @@ -478,7 +478,7 @@ public class OCSPAuthority implements IOCSPAuthority, IOCSPService, ISubsystem, /** * Returns default signing unit used by this CA * <P> - * + * * @return request identifier */ public ISigningUnit getSigningUnit() { @@ -488,7 +488,7 @@ public class OCSPAuthority implements IOCSPAuthority, IOCSPService, ISubsystem, /** * Retrieves the request queue for the Authority. * <P> - * + * * @return the request queue. */ public IRequestQueue getRequestQueue() { @@ -544,7 +544,7 @@ public class OCSPAuthority implements IOCSPAuthority, IOCSPService, ISubsystem, * try { * log(ILogger.LL_INFO, "start OCSP request"); * TBSRequest tbsReq = request.getTBSRequest(); - * + * * Vector singleResponses = new Vector(); * for (int i = 0; i < tbsReq.getRequestCount(); i++) * { @@ -554,25 +554,25 @@ public class OCSPAuthority implements IOCSPAuthority, IOCSPService, ISubsystem, * SingleResponse sr = p.process(cid); * singleResponses.addElement(sr); * } - * - * + * + * * SingleResponse res[] = new SingleResponse[singleResponses.size()]; * singleResponses.copyInto(res); - * + * * X500Name name = getName(); * Name.Template nameTemplate = new Name.Template(); * NameID rid = new NameID((Name)nameTemplate.decode( * new ByteArrayInputStream(name.getEncoded()))); * ResponseData rd = new ResponseData(rid, new GeneralizedTime( * CMS.getCurrentDate()), res); - * + * * BasicOCSPResponse basicRes = sign(rd); - * + * * OCSPResponse response = new OCSPResponse( * OCSPResponseStatus.SUCCESSFUL, * new ResponseBytes(ResponseBytes.OCSP_BASIC, * new OCTET_STRING(ASN1Util.encode(basicRes)))); - * + * * log(ILogger.LL_INFO, "done OCSP request"); * return response; * } catch (Exception e) { @@ -584,7 +584,7 @@ public class OCSPAuthority implements IOCSPAuthority, IOCSPService, ISubsystem, /** * Returns the in-memory count of the processed OCSP requests. - * + * * @return number of processed OCSP requests in memory */ public long getNumOCSPRequest() { @@ -594,7 +594,7 @@ public class OCSPAuthority implements IOCSPAuthority, IOCSPService, ISubsystem, /** * Returns the in-memory time (in mini-second) of * the processed time for OCSP requests. - * + * * @return processed times for OCSP requests */ public long getOCSPRequestTotalTime() { @@ -604,7 +604,7 @@ public class OCSPAuthority implements IOCSPAuthority, IOCSPService, ISubsystem, /** * Returns the in-memory time (in mini-second) of * the signing time for OCSP requests. - * + * * @return processed times for OCSP requests */ public long getOCSPTotalSignTime() { @@ -618,7 +618,7 @@ public class OCSPAuthority implements IOCSPAuthority, IOCSPService, ISubsystem, /** * Returns the total data signed * for OCSP requests. - * + * * @return processed times for OCSP requests */ public long getOCSPTotalData() { diff --git a/base/ocsp/src/com/netscape/ocsp/OCSPResources.java b/base/ocsp/src/com/netscape/ocsp/OCSPResources.java index 7fb1e5a86..fcca5c4a7 100644 --- a/base/ocsp/src/com/netscape/ocsp/OCSPResources.java +++ b/base/ocsp/src/com/netscape/ocsp/OCSPResources.java @@ -22,7 +22,7 @@ import java.util.ListResourceBundle; /** * A class represents a resource bundle for OCSP subsystem. * <P> - * + * * @version $Revision$ $Date$ */ public class OCSPResources extends ListResourceBundle { diff --git a/base/ocsp/src/com/netscape/ocsp/SigningUnit.java b/base/ocsp/src/com/netscape/ocsp/SigningUnit.java index 27d4e5c9b..4b6e7da75 100644 --- a/base/ocsp/src/com/netscape/ocsp/SigningUnit.java +++ b/base/ocsp/src/com/netscape/ocsp/SigningUnit.java @@ -50,7 +50,7 @@ import com.netscape.cmsutil.util.Cert; /** * OCSP signing unit based on JSS. - * + * * $Revision$ $Date$ */ @@ -198,10 +198,10 @@ public final class SigningUnit implements ISigningUnit { /** * Check if the signing algorithm name is supported and valid for this * signing unit's token and key. - * + * * @param algname a signing algorithm name from JCA. * @return the mapped JSS signature algorithm object. - * + * * @exception EBaseException if signing algorithm is not supported. */ public SignatureAlgorithm checkSigningAlgorithmFromName(String algname) @@ -252,7 +252,7 @@ public final class SigningUnit implements ISigningUnit { signAlg = checkSigningAlgorithmFromName(algname); } - // XXX use a pool of signers based on alg ? + // XXX use a pool of signers based on alg ? // XXX Map algor. name to id. hack: use hardcoded define for now. CMS.debug( "Getting algorithm context for " + algname + " " + signAlg); diff --git a/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java b/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java index 7d548ddf3..6d2516399 100644 --- a/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java +++ b/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java @@ -78,7 +78,7 @@ public class ConfigureDRM { public static String client_certdb_dir = null; public static String client_certdb_pwd = null; - // Login Panel + // Login Panel public static String pin = null; public static String domain_name = null; @@ -159,7 +159,7 @@ public class ConfigureDRM { public static String backup_pwd = null; public static String backup_fname = null; - // cert subject names + // cert subject names public static String drm_transport_cert_subject_name = null; public static String drm_subsystem_cert_subject_name = null; public static String drm_storage_cert_subject_name = null; @@ -777,7 +777,7 @@ public class ConfigureDRM { hr = hc.sslConnect(sd_hostname, sd_admin_port, admin_uri, query_string); // get response data - // String cert_to_import = + // String cert_to_import = // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); String cert_to_import = Utils.base64encode(hr.getResponseData()); @@ -1013,7 +1013,7 @@ public class ConfigureDRM { StringHolder x_admin_email = new StringHolder(); StringHolder x_admin_password = new StringHolder(); - // ldap + // ldap StringHolder x_ldap_host = new StringHolder(); StringHolder x_ldap_port = new StringHolder(); StringHolder x_bind_dn = new StringHolder(); diff --git a/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java b/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java index 53c014b74..d6caddbcb 100644 --- a/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java +++ b/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java @@ -76,7 +76,7 @@ public class ConfigureOCSP { public static String client_certdb_dir = null; public static String client_certdb_pwd = null; - // Login Panel + // Login Panel public static String pin = null; public static String domain_name = null; @@ -148,7 +148,7 @@ public class ConfigureOCSP { public static String backup_pwd = null; public static String backup_fname = null; - // cert subject names + // cert subject names public static String ocsp_sign_cert_subject_name = null; public static String ocsp_subsystem_cert_subject_name = null; public static String ocsp_server_cert_subject_name = null; @@ -661,7 +661,7 @@ public class ConfigureOCSP { hr = hc.sslConnect(sd_hostname, sd_admin_port, admin_uri, query_string); // get response data - // String cert_to_import = + // String cert_to_import = // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); String cert_to_import = Utils.base64encode(hr.getResponseData()); @@ -882,7 +882,7 @@ public class ConfigureOCSP { StringHolder x_admin_email = new StringHolder(); StringHolder x_admin_password = new StringHolder(); - // ldap + // ldap StringHolder x_ldap_host = new StringHolder(); StringHolder x_ldap_port = new StringHolder(); StringHolder x_bind_dn = new StringHolder(); diff --git a/base/silent/src/com/netscape/pkisilent/ConfigureRA.java b/base/silent/src/com/netscape/pkisilent/ConfigureRA.java index 3de70a067..0188a126a 100644 --- a/base/silent/src/com/netscape/pkisilent/ConfigureRA.java +++ b/base/silent/src/com/netscape/pkisilent/ConfigureRA.java @@ -64,7 +64,7 @@ public class ConfigureRA { public static String client_certdb_dir = null; public static String client_certdb_pwd = null; - // Login Panel + // Login Panel public static String pin = null; public static String domain_name = null; @@ -94,7 +94,7 @@ public class ConfigureRA { public static String ra_subsystem_cert_pp = null; public static String ra_subsystem_cert_cert = null; - // names + // names public static String ra_server_cert_subject_name = null; public static String ra_server_cert_nickname = null; public static String ra_subsystem_cert_subject_name = null; @@ -514,7 +514,7 @@ public class ConfigureRA { hr = hc.sslConnect(ca_hostname, ca_admin_port, admin_uri, query_string); try { - // cert_to_import = + // cert_to_import = // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); cert_to_import = Utils.base64encode(hr.getResponseData()); diff --git a/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java b/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java index 706827c74..85b4ab53e 100644 --- a/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java +++ b/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java @@ -69,7 +69,7 @@ public class ConfigureSubCA { public static String client_certdb_dir = null; public static String client_certdb_pwd = null; - // Login Panel + // Login Panel public static String pin = null; public static String domain_name = null; @@ -153,7 +153,7 @@ public class ConfigureSubCA { public static String subsystem_name = null; - // names + // names public static String subca_sign_cert_subject_name = null; public static String subca_subsystem_cert_subject_name = null; public static String subca_ocsp_cert_subject_name = null; @@ -695,7 +695,7 @@ public class ConfigureSubCA { HTTPResponse hr = hc.sslConnect(cs_hostname, cs_port, admin_uri, query_string); // get response data - // String cert_to_import = + // String cert_to_import = // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); String cert_to_import = Utils.base64encode(hr.getResponseData()); @@ -928,7 +928,7 @@ public class ConfigureSubCA { StringHolder x_admin_email = new StringHolder(); StringHolder x_admin_password = new StringHolder(); - // ldap + // ldap StringHolder x_ldap_host = new StringHolder(); StringHolder x_ldap_port = new StringHolder(); StringHolder x_bind_dn = new StringHolder(); diff --git a/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java b/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java index 760690888..77f8ae0bc 100644 --- a/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java +++ b/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java @@ -75,7 +75,7 @@ public class ConfigureTKS { public static String client_certdb_dir = null; public static String client_certdb_pwd = null; - // Login Panel + // Login Panel public static String pin = null; public static String domain_name = null; @@ -136,7 +136,7 @@ public class ConfigureTKS { public static String backup_pwd = null; public static String backup_fname = null; - // names + // names public static String tks_subsystem_cert_subject_name = null; public static String tks_server_cert_subject_name = null; public static String subsystem_name = null; @@ -632,7 +632,7 @@ public class ConfigureTKS { HTTPResponse hr = hc.sslConnect(sd_hostname, sd_admin_port, admin_uri, query_string); // get response data - // String cert_to_import = + // String cert_to_import = // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); String cert_to_import = Utils.base64encode(hr.getResponseData()); @@ -855,7 +855,7 @@ public class ConfigureTKS { StringHolder x_admin_email = new StringHolder(); StringHolder x_admin_password = new StringHolder(); - // ldap + // ldap StringHolder x_ldap_host = new StringHolder(); StringHolder x_ldap_port = new StringHolder(); StringHolder x_bind_dn = new StringHolder(); diff --git a/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java b/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java index 366fb57b6..f3522d75d 100644 --- a/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java +++ b/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java @@ -69,7 +69,7 @@ public class ConfigureTPS { public static String client_certdb_dir = null; public static String client_certdb_pwd = null; - // Login Panel + // Login Panel public static String pin = null; public static String domain_name = null; @@ -127,7 +127,7 @@ public class ConfigureTPS { public static String ss_keygen = null; - // names + // names public static String tps_server_cert_subject_name = null; public static String tps_server_cert_nickname = null; public static String tps_subsystem_cert_subject_name = null; @@ -627,7 +627,7 @@ public class ConfigureTPS { hr = hc.sslConnect(ca_hostname, ca_admin_port, admin_uri, query_string); try { - // cert_to_import = + // cert_to_import = // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); cert_to_import = Utils.base64encode(hr.getResponseData()); @@ -834,7 +834,7 @@ public class ConfigureTPS { StringHolder x_admin_email = new StringHolder(); StringHolder x_admin_password = new StringHolder(); - // ldap + // ldap StringHolder x_ldap_host = new StringHolder(); StringHolder x_ldap_port = new StringHolder(); diff --git a/base/silent/src/com/netscape/pkisilent/argparser/ArgParseException.java b/base/silent/src/com/netscape/pkisilent/argparser/ArgParseException.java index de3c58bd4..710f57db1 100644 --- a/base/silent/src/com/netscape/pkisilent/argparser/ArgParseException.java +++ b/base/silent/src/com/netscape/pkisilent/argparser/ArgParseException.java @@ -22,7 +22,7 @@ import java.io.IOException; /** * Exception class used by <code>ArgParser</code> when * command line arguments contain an error. - * + * * @author John E. Lloyd, Fall 2004 * @see ArgParser */ @@ -34,7 +34,7 @@ public class ArgParseException extends IOException { /** * Creates a new ArgParseException with the given message. - * + * * @param msg Exception message */ public ArgParseException(String msg) { @@ -44,7 +44,7 @@ public class ArgParseException extends IOException { /** * Creates a new ArgParseException from the given * argument and message. - * + * * @param arg Offending argument * @param msg Error message */ diff --git a/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java b/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java index ed5f98b1d..ecb6038df 100755 --- a/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java +++ b/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java @@ -23,7 +23,7 @@ package com.netscape.pkisilent.argparser; * copy, modify and redistribute is granted, provided that this copyright * notice is retained and the author is given credit whenever appropriate. * - * This software is distributed "as is", without any warranty, including + * This software is distributed "as is", without any warranty, including * any implied warranty of merchantability or fitness for a particular * use. The author assumes no responsibility for, and shall not be liable * for, any special, indirect, or consequential damages, or any damages @@ -54,36 +54,36 @@ import java.util.Vector; * <a href=#argsFromAFile>reading arguments from a file</a>. The * last feature is particularly useful and makes it * easy to create ad-hoc configuration files for an application. - * + * * <h3><a name="example">Basic Example</a></h3> - * + * * <p> * Here is a simple example in which an application has three command line options: <code>-theta</code> (followed by a * floating point value), <code>-file</code> (followed by a string value), and <code>-debug</code>, which causes a * boolean value to be set. - * + * * <pre> - * + * * static public void main(String[] args) { * // create holder objects for storing results ... - * + * * DoubleHolder theta = new DoubleHolder(); * StringHolder fileName = new StringHolder(); * BooleanHolder debug = new BooleanHolder(); - * + * * // create the parser and specify the allowed options ... - * + * * ArgParser parser = new ArgParser("java argparser.SimpleExample"); * parser.addOption("-theta %f #theta value (in degrees)", theta); * parser.addOption("-file %s #name of the operating file", fileName); * parser.addOption("-debug %v #enables display of debugging info", debug); - * + * * // match the arguments ... - * + * * parser.matchAllArgs(args); - * + * * // and print out the values - * + * * System.out.println("theta=" + theta.value); * System.out.println("fileName=" + fileName.value); * System.out.println("debug=" + debug.value); @@ -91,18 +91,18 @@ import java.util.Vector; * </pre> * <p> * A command line specifying all three options might look like this: - * + * * <pre> * java argparser.SimpleExample -theta 7.8 -debug -file /ai/lloyd/bar * </pre> - * + * * <p> * The application creates an instance of ArgParser and then adds descriptions of the allowed options using * {@link #addOption addOption}. The method {@link #matchAllArgs(String[]) matchAllArgs} is then used to match these * options against the command line arguments. Values associated with each option are returned in the <code>value</code> * field of special ``holder'' classes (e.g., {@link argparser.DoubleHolder DoubleHolder}, * {@link argparser.StringHolder StringHolder}, etc.). - * + * * <p> * The first argument to {@link #addOption addOption} is a string that specifies (1) the option's name, (2) a conversion * code for its associated value (e.g., <code>%f</code> for floating point, <code>%s</code> for a string, @@ -112,15 +112,15 @@ import java.util.Vector; * {@link argparser.StringHolder * StringHolder}), an array of the appropriate type, or <a href=#multipleOptionInvocation> an instance of * <code>java.util.Vector</code></a>. - * + * * <p> * By default, arguments that don't match the specified options, are <a href=#rangespec>out of range</a>, or are * otherwise formatted incorrectly, will cause <code>matchAllArgs</code> to print a message and exit the program. * Alternatively, an application can use {@link #matchAllArgs(String[],int,int) matchAllArgs(args,idx,exitFlags)} to * obtain an array of unmatched arguments which can then be <a href=#customArgParsing>processed separately</a> - * + * * <h3><a name="rangespec">Range Specification</a></h3> - * + * * The values associated with options can also be given range specifications. A range specification appears in curly * braces immediately following the conversion code. In the code fragment below, we show how to specify an option * <code>-name</code> that expects to be provided with one of three string values (<code>john</code>, <code>mary</code>, @@ -128,129 +128,129 @@ import java.util.Vector; * to 256, an option <code>-size</code> that expects to be supplied with integer values of either 1, 2, 4, 8, or 16, and * an option <code>-foo</code> that expects to be supplied with floating point values in the ranges -99 < foo <= -50, or * 50 <= foo < 99. - * + * * <pre> * StringHolder name = new StringHolder(); * IntHolder index = new IntHolder(); * IntHolder size = new IntHolder(); * DoubleHolder foo = new DoubleHolder(); - * + * * parser.addOption("-name %s {john,mary,jane}", name); * parser.addOption("-index %d {[1,256]}", index); * parser.addOption("-size %d {1,2,4,8,16}", size); * parser.addOption("-foo %f {(-99,-50],[50,99)}", foo); * </pre> - * + * * If an argument value does not lie within a specified range, an error is generated. - * + * * <h3><a name="multipleOptionNames">Multiple Option Names</a></h3> - * + * * An option may be given several names, or aliases, in the form of a comma seperated list: - * + * * <pre> * parser.addOption("-v,--verbose %v #print lots of info"); * parser.addOption("-of,-outfile,-outputFile %s #output file"); * </pre> - * + * * <h3><a name="singleWordOptions">Single Word Options</a></h3> - * + * * Normally, options are assumed to be "multi-word", meaning that any associated value must follow the option as a * separate argument string. For example, - * + * * <pre> * parser.addOption("-file %s #file name"); * </pre> - * + * * will cause the parser to look for two strings in the argument list of the form - * + * * <pre> * -file someFileName * </pre> - * + * * However, if there is no white space separting the option's name from it's conversion code, then values associated * with that option will be assumed to be part of the same argument string as the option itself. For example, - * + * * <pre> * parser.addOption("-file=%s #file name"); * </pre> - * + * * will cause the parser to look for a single string in the argument list of the form - * + * * <pre> * -file=someFileName * </pre> - * + * * Such an option is called a "single word" option. - * + * * <p> * In cases where an option has multiple names, then this single word behavior is invoked if there is no white space * between the last indicated name and the conversion code. However, previous names in the list will still be given * multi-word behavior if there is white space between the name and the following comma. For example, - * + * * <pre> * parser.addOption("-nb=,-number ,-n%d #number of blocks"); * </pre> - * + * * will cause the parser to look for one, two, and one word constructions of the forms - * + * * <pre> * -nb=N * -number N * -nN * </pre> - * + * * <h3><a name="multipleOptionValues">Multiple Option Values</a></h3> - * + * * If may be useful for an option to be followed by several values. For instance, we might have an option * <code>-velocity</code> which should be followed by three numbers denoting the x, y, and z components of a velocity * vector. We can require multiple values for an option by placing a <i>multiplier</i> specification, of the form * <code>X</code>N, where N is an integer, after the conversion code (or range specification, if present). For example, - * + * * <pre> * double[] pos = new double[3]; - * + * * addOption("-position %fX3 #position of the object", pos); * </pre> - * + * * will cause the parser to look for - * + * * <pre> * -position xx yy zz * </pre> - * + * * in the argument list, where <code>xx</code>, <code>yy</code>, and <code>zz</code> are numbers. The values are stored * in the array <code>pos</code>. - * + * * Options requiring multiple values must use arrays to return their values, and cannot be used in single word format. - * + * * <h3><a name="multipleOptionInvocation">Multiple Option Invocation</a></h3> - * + * * Normally, if an option appears twice in the command list, the value associated with the second instance simply * overwrites the value associated with the first instance. - * + * * However, the application can instead arrange for the storage of <i>all</i> values associated with multiple option * invocation, by supplying a instance of <code>java.util.Vector</code> to serve as the value holder. Then every time * the option appears in the argument list, the parser will create a value holder of appropriate type, set it to the * current value, and store the holder in the vector. For example, the construction - * + * * <pre> * Vector vec = new Vector(10); - * + * * parser.addOption("-foo %f", vec); * parser.matchAllArgs(args); * </pre> - * + * * when supplied with an argument list that contains - * + * * <pre> * -foo 1.2 -foo 1000 -foo -78 * </pre> - * + * * will create three instances of {@link argparser.DoubleHolder DoubleHolder}, initialized to <code>1.2</code>, * <code>1000</code>, and <code>-78</code>, and store them in <code>vec</code>. - * + * * <h3><a name="helpInfo">Generating help information</a></h3> - * + * * ArgParser automatically generates help information for the options, and this information may be printed in response * to a <i>help</i> option, or may be queried by the application using {@link #getHelpMessage getHelpMessage}. The * information for each option consists of the option's name(s), it's required value(s), and an application-supplied @@ -258,55 +258,55 @@ import java.util.Vector; * specifications (although this can be overriden, as <a href=#valueInfo>described below</a>). The application-supplied * description is whatever appears in the specification string after the optional <code>#</code> character. The string * returned by {@link #getHelpMessage getHelpMessage} for the <a href=#example>first example above</a> would be - * + * * <pre> * Usage: java argparser.SimpleExample * Options include: - * + * * -help,-? displays help information * -theta <float> theta value (in degrees) * -file <string> name of the operating file * -debug enables display of debugging info * </pre> - * + * * The options <code>-help</code> and <code>-?</code> are including in the parser by default as help options, and they * automatically cause the help message to be printed. To exclude these options, one should use the constructor * {@link #ArgParser(String,boolean) * ArgParser(synopsis,false)}. Help options can also be specified by the application using {@link #addOption addOption} * and the conversion code <code>%h</code>. Help options can be disabled using {@link #setHelpOptionsEnabled * setHelpOptionsEnabled(false)}. - * + * * <p> * <a name=valueInfo> A description of the required values for an option can be specified explicitly by placing a second * <code>#</code> character in the specification string. Everything between the first and second <code>#</code> * characters then becomes the value description, and everything after the second <code>#</code> character becomes the * option description. For example, if the <code>-theta</code> option above was specified with - * + * * <pre> * parser.addOption("-theta %f #NUMBER#theta value (in degrees)", theta); * </pre> - * + * * instead of - * + * * <pre> * parser.addOption("-theta %f #theta value (in degrees)", theta); * </pre> - * + * * then the corresponding entry in the help message would look like - * + * * <pre> * -theta NUMBER theta value (in degrees) * </pre> - * + * * <h3><a name="customArgParsing">Custom Argument Parsing</a></h3> - * + * * An application may find it necessary to handle arguments that don't fit into the framework of this class. There are a * couple of ways to do this. - * + * * <p> * First, the method {@link #matchAllArgs(String[],int,int) * matchAllArgs(args,idx,exitFlags)} returns an array of all unmatched arguments, which can then be handled specially: - * + * * <pre> * String[] unmatched = * parser.matchAllArgs (args, 0, parser.EXIT_ON_ERROR); @@ -314,13 +314,13 @@ import java.util.Vector; * { ... handle unmatched arguments ... * } * </pre> - * + * * For instance, this would be useful for an applicatoon that accepts an arbitrary number of input file names. The * options can be parsed using <code>matchAllArgs</code>, and the remaining unmatched arguments give the file names. - * + * * <p> * If we need more control over the parsing, we can parse arguments one at a time using {@link #matchArg matchArg}: - * + * * <pre> * int idx = 0; * while (idx < args.length) @@ -331,34 +331,34 @@ import java.util.Vector; * ... handle this unmatched argument ourselves ... * } * } - * catch (ArgParserException e) + * catch (ArgParserException e) * { // malformed or erroneous argument * parser.printErrorAndExit (e.getMessage()); * } * } * </pre> - * + * * {@link #matchArg matchArg(args,idx)} matches one option at location <code>idx</code> in the argument list, and then * returns the location value that should be used for the next match. If an argument does not match any option, * {@link #getUnmatchedArgument getUnmatchedArgument} will return a copy of the unmatched argument. - * + * * <h3><a name="argsFromAFile">Reading Arguments From a File</a></h3> - * + * * The method {@link #prependArgs prependArgs} can be used to automatically read in a set of arguments from a file and * prepend them onto an existing argument list. Argument words correspond to white-space-delimited strings, and the file * may contain the comment character <code>#</code> (which comments out everything to the end of the current line). A * typical usage looks like this: - * + * * <pre> * ... create parser and add options ... - * + * * args = parser.prependArgs (new File(".configFile"), args); - * + * * parser.matchAllArgs (args); * </pre> - * + * * This makes it easy to generate simple configuration files for an application. - * + * * @author John E. Lloyd, Fall 2004 */ public class ArgParser { @@ -391,7 +391,7 @@ public class ArgParser { * Returns a string containing the valid conversion codes. These * are the characters which may follow the <code>%</code> character in * the specification string of {@link #addOption addOption}. - * + * * @return Valid conversion codes * @see #addOption */ @@ -891,7 +891,7 @@ public class ArgParser { /** * Creates an <code>ArgParser</code> with a synopsis * string, and the default help options <code>-help</code> and <code>-?</code>. - * + * * @param synopsisString string that briefly describes program usage, * for use by {@link #getHelpMessage getHelpMessage}. * @see ArgParser#getSynopsisString @@ -904,7 +904,7 @@ public class ArgParser { /** * Creates an <code>ArgParser</code> with a synopsis * string. The help options <code>-help</code> and <code>-?</code> are added if <code>defaultHelp</code> is true. - * + * * @param synopsisString string that briefly describes program usage, * for use by {@link #getHelpMessage getHelpMessage}. * @param defaultHelp if true, adds the default help options @@ -926,10 +926,10 @@ public class ArgParser { * the program, and usually looks something like * <p> * <prec> "java somepackage.SomeClass [options] files ..." </prec> - * + * * <p> * It is used in help and error messages. - * + * * @return synopsis string * @see ArgParser#setSynopsisString * @see ArgParser#getHelpMessage @@ -940,7 +940,7 @@ public class ArgParser { /** * Sets the synopsis string used by the parser. - * + * * @param s new synopsis string * @see ArgParser#getSynopsisString * @see ArgParser#getHelpMessage @@ -951,7 +951,7 @@ public class ArgParser { /** * Indicates whether or not help options are enabled. - * + * * @return true if help options are enabled * @see ArgParser#setHelpOptionsEnabled * @see ArgParser#addOption @@ -968,7 +968,7 @@ public class ArgParser { * program * exits with code 0. Otherwise, arguments which match help * options are ignored. - * + * * @param enable enables help options if <code>true</code>. * @see ArgParser#getHelpOptionsEnabled * @see ArgParser#addOption @@ -981,7 +981,7 @@ public class ArgParser { /** * Returns the default print stream used for outputting help * and error information. - * + * * @return default print stream * @see ArgParser#setDefaultPrintStream */ @@ -992,7 +992,7 @@ public class ArgParser { /** * Sets the default print stream used for outputting help * and error information. - * + * * @param stream new default print stream * @see ArgParser#getDefaultPrintStream */ @@ -1003,7 +1003,7 @@ public class ArgParser { /** * Gets the indentation used by {@link #getHelpMessage * getHelpMessage}. - * + * * @return number of indentation columns * @see ArgParser#setHelpIndentation * @see ArgParser#getHelpMessage @@ -1019,7 +1019,7 @@ public class ArgParser { * can fit within this number of columns, then all information about * the option is placed on one line. Otherwise, the indented help * information is placed on a separate line. - * + * * @param indent number of indentation columns * @see ArgParser#getHelpIndentation * @see ArgParser#getHelpMessage @@ -1119,25 +1119,25 @@ public class ArgParser { * Adds a new option description to the parser. The method takes two * arguments: a specification string, and a result holder in which to * store the associated value. - * + * * <p> * The specification string has the general form - * + * * <p> * <var>optionNames</var> <code>%</code><var>conversionCode</var> [<code>{</code><var>rangeSpec</var><code>}</code>] * [<code>X</code><var>multiplier</var>] [<code>#</code><var>valueDescription</var>] [<code>#</code> * <var>optionDescription</var>] </code> - * + * * <p> * where * <ul> * <p> * <li><var>optionNames</var> is a comma-separated list of names for the option (such as <code>-f, --file</code>). - * + * * <p> * <li><var>conversionCode</var> is a single letter, following a <code>%</code> character, specifying information * about what value the option requires: - * + * * <table> * <tr> * <td><code>%f</code></td> @@ -1172,7 +1172,7 @@ public class ArgParser { * instead, then the <code>%v</code> should be followed by a "range spec" containing <code>false</code>, as in * <code>%v{false}</code>. * </table> - * + * * <p> * <li><var>rangeSpec</var> is an optional range specification, placed inside curly braces, consisting of a * comma-separated list of range items each specifying permissible values for the option. A range item may be an @@ -1180,45 +1180,45 @@ public class ArgParser { * enclosed in square or round brackets. Square and round brackets denote closed and open endpoints of a subrange, * indicating that the associated endpoint value is included or excluded from the subrange. The values specified in * the range spec need to be consistent with the type of value expected by the option. - * + * * <p> * <b>Examples:</b> - * + * * <p> * A range spec of <code>{2,4,8,16}</code> for an integer value will allow the integers 2, 4, 8, or 16. - * + * * <p> * A range spec of <code>{[-1.0,1.0]}</code> for a floating point value will allow any floating point number in the * range -1.0 to 1.0. - * + * * <p> * A range spec of <code>{(-88,100],1000}</code> for an integer value will allow values > -88 and <= 100, as well as * 1000. - * + * * <p> * A range spec of <code>{"foo", "bar", ["aaa","zzz")} </code> for a string value will allow strings equal to * <code>"foo"</code> or <code>"bar"</code>, plus any string lexically greater than or equal to <code>"aaa"</code> * but less then <code>"zzz"</code>. - * + * * <p> * <li><var>multiplier</var> is an optional integer, following a <code>X</code> character, indicating the number of * values which the option expects. If the multiplier is not specified, it is assumed to be 1. If the multiplier * value is greater than 1, then the result holder should be either an array (of appropriate type) with a length * greater than or equal to the multiplier value, or a <code>java.util.Vector</code> <a href=#vectorHolder>as * discussed below</a>. - * + * * <p> * <li><var>valueDescription</var> is an optional description of the option's value requirements, and consists of * all characters between two <code>#</code> characters. The final <code>#</code> character initiates the <i>option * description</i>, which may be empty. The value description is used in <a href=#helpInfo>generating help * messages</a>. - * + * * <p> * <li><var>optionDescription</var> is an optional description of the option itself, consisting of all characters * between a <code>#</code> character and the end of the specification string. The option description is used in <a * href=#helpInfo>generating help messages</a>. * </ul> - * + * * <p> * The result holder must be an object capable of holding a value compatible with the conversion code, or it must be * a <code>java.util.Vector</code>. When the option is matched, its associated value is placed in the result holder. @@ -1226,78 +1226,78 @@ public class ArgParser { * is a <code>java.util.Vector</code>, in which case new holder objects for each match will be allocated and added * to the vector. Thus if multiple instances of an option are desired by the program, the result holder should be a * <code>java.util.Vector</code>. - * + * * <p> * If the result holder is not a <code>Vector</code>, then it must correspond as follows to the conversion code: - * + * * <table> * <tr valign=top> * <td><code>%i</code>, <code>%d</code>, <code>%x</code>, <code>%o</code></td> * <td>{@link argparser.IntHolder IntHolder}, {@link argparser.LongHolder LongHolder}, <code>int[]</code>, or * <code>long[]</code></td> * </tr> - * + * * <tr valign=top> * <td><code>%f</code></td> * <td>{@link argparser.FloatHolder FloatHolder}, {@link argparser.DoubleHolder DoubleHolder}, <code>float[]</code>, * or <code>double[]</code></td> * </tr> - * + * * <tr valign=top> * <td><code>%b</code>, <code>%v</code></td> * <td>{@link argparser.BooleanHolder BooleanHolder} or <code>boolean[]</code></td> * </tr> - * + * * <tr valign=top> * <td><code>%s</code></td> * <td>{@link argparser.StringHolder StringHolder} or <code>String[]</code></td> * </tr> - * + * * <tr valign=top> * <td><code>%c</code></td> * <td>{@link argparser.CharHolder CharHolder} or <code>char[]</code></td> * </tr> * </table> - * + * * <p> * In addition, if the multiplier is greater than 1, then only the array type indicated above may be used, and the * array must be at least as long as the multiplier. - * + * * <p> * <a name=vectorHolder>If the result holder is a <code>Vector</code>, then the system will create an appropriate * result holder object and add it to the vector. Multiple occurances of the option will cause multiple results to * be added to the vector. - * + * * <p> * The object allocated by the system to store the result will correspond to the conversion code as follows: - * + * * <table> * <tr valign=top> * <td><code>%i</code>, <code>%d</code>, <code>%x</code>, <code>%o</code></td> * <td>{@link argparser.LongHolder LongHolder}, or <code>long[]</code> if the multiplier value exceeds 1</td> * </tr> - * + * * <tr valign=top> * <td><code>%f</code></td> * <td>{@link argparser.DoubleHolder DoubleHolder}, or <code>double[]</code> if the multiplier value exceeds 1</td> * </tr> - * + * * <tr valign=top> * <td><code>%b</code>, <code>%v</code></td> * <td>{@link argparser.BooleanHolder BooleanHolder}, or <code>boolean[]</code> if the multiplier value exceeds 1</td> * </tr> - * + * * <tr valign=top> * <td><code>%s</code></td> * <td>{@link argparser.StringHolder StringHolder}, or <code>String[]</code> if the multiplier value exceeds 1</td> * </tr> - * + * * <tr valign=top> * <td><code>%c</code></td> * <td>{@link argparser.CharHolder CharHolder}, or <code>char[]</code> if the multiplier value exceeds 1</td> * </tr> * </table> - * + * * @param spec the specification string * @param resHolder object in which to store the associated * value @@ -1475,7 +1475,7 @@ public class ArgParser { rec.vval = rec.rangeList.low.bval; } } - // check for value multiplicity information, if any + // check for value multiplicity information, if any if (scanner.peekc() == 'X') { if (rec.convertCode == 'h') { throw new IllegalArgumentException("Multipliers not supported for %h"); @@ -1537,7 +1537,7 @@ public class ArgParser { } // parse helpMsg for required/optional information if present - // default to required + // default to required if (rec.helpMsg.indexOf("(optional") != -1) { rec.required = false; } @@ -1672,7 +1672,7 @@ public class ArgParser { * double quotes <code>"</code>. The character <code>#</code> acts as * a comment character, causing input to the end of the current line to * be ignored. - * + * * @param reader Reader from which to read the strings * @param args Initial set of argument values. Can be * specified as <code>null</code>. @@ -1716,7 +1716,7 @@ public class ArgParser { * quotes <code>"</code>. The character <code>#</code> acts as a * comment character, causing input to the end of the current line to * be ignored. - * + * * @param file File to be read * @param args Initial set of argument values. Can be * specified as <code>null</code>. @@ -1740,7 +1740,7 @@ public class ArgParser { /** * Sets the parser's error message. - * + * * @param s Error message */ protected void setError(String msg) { @@ -1763,17 +1763,17 @@ public class ArgParser { /** * Matches arguments within an argument list. - * + * * <p> * In the event of an erroneous or unmatched argument, the method prints a message and exits the program with code * 1. - * + * * <p> * If help options are enabled and one of the arguments matches a help option, then the result of * {@link #getHelpMessage * getHelpMessage} is printed to the default print stream and the program exits with code 0. If help options are not * enabled, they are ignored. - * + * * @param args argument list * @see ArgParser#getDefaultPrintStream */ @@ -1786,23 +1786,23 @@ public class ArgParser { * those which were not matched. The matching starts at a location * in <code>args</code> specified by <code>idx</code>, and * unmatched arguments are returned in a String array. - * + * * <p> * In the event of an erroneous argument, the method either prints a message and exits the program (if * {@link #EXIT_ON_ERROR} is set in <code>exitFlags</code>) or terminates the matching and creates a error message * that can be retrieved by {@link #getErrorMessage}. - * + * * <p> * In the event of an umatched argument, the method will print a message and exit if {@link #EXIT_ON_UNMATCHED} is * set in <code>errorFlags</code>. Otherwise, the unmatched argument will be appended to the returned array of * unmatched values, and the matching will continue at the next location. - * + * * <p> * If help options are enabled and one of the arguments matches a help option, then the result of * {@link #getHelpMessage * getHelpMessage} is printed to the the default print stream and the program exits with code 0. If help options are * not enabled, then they will not be matched. - * + * * @param args argument list * @param idx starting location in list * @param exitFlags conditions causing the program to exit. Should be @@ -1842,22 +1842,22 @@ public class ArgParser { * Matches one option starting at a specified location in an argument * list. The method returns the location in the list where the next * match should begin. - * + * * <p> * In the event of an erroneous argument, the method throws an {@link argparser.ArgParseException ArgParseException} * with an appropriate error message. This error message can also be retrieved using {@link #getErrorMessage * getErrorMessage}. - * + * * <p> * In the event of an umatched argument, the method will return idx + 1, and {@link #getUnmatchedArgument * getUnmatchedArgument} will return a copy of the unmatched argument. If an argument is matched, * {@link #getUnmatchedArgument getUnmatchedArgument} will return <code>null</code>. - * + * * <p> * If help options are enabled and the argument matches a help option, then the result of {@link #getHelpMessage * getHelpMessage} is printed to the the default print stream and the program exits with code 0. If help options are * not enabled, then they are ignored. - * + * * @param args argument list * @param idx location in list where match should start * @return location in list where next match should start @@ -1945,7 +1945,7 @@ public class ArgParser { // int col = initialIndent; // if (maxcols <= 0) - // { maxcols = 80; + // { maxcols = 80; // } // if (matchList.size() > 0) // { ps.print (spaceString(initialIndent)); @@ -1964,7 +1964,7 @@ public class ArgParser { // } // if (rec.convertCode != 'v' && rec.convertCode != 'h') // { if (rec.valueDesc != null) - // { s += rec.valueDesc; + // { s += rec.valueDesc; // } // else // { s = s + "<" + rec.valTypeName() + ">"; @@ -1974,13 +1974,13 @@ public class ArgParser { // } // } // s = s + "]"; - // /* - // (col+=s.length()) > (maxcols-1) => we will spill over edge. + // /* + // (col+=s.length()) > (maxcols-1) => we will spill over edge. // we use (maxcols-1) because if we go right to the edge // (maxcols), we get wrap new line inserted "for us". // i != 0 means we print the first entry, no matter // how long it is. Subsequent entries are printed - // full length anyway. */ + // full length anyway. */ // if ((col+=s.length()) > (maxcols-1) && i != 0) // { col = initialIndent+s.length(); @@ -1997,7 +1997,7 @@ public class ArgParser { /** * Returns a string describing the allowed options * in detail. - * + * * @return help information string. */ public String getHelpMessage() { @@ -2065,7 +2065,7 @@ public class ArgParser { * Returns the parser's error message. This is automatically * set whenever an error is encountered in <code>matchArg</code> or <code>matchAllArgs</code>, and is automatically * set to <code>null</code> at the beginning of these methods. - * + * * @return error message */ public String getErrorMessage() { @@ -2076,7 +2076,7 @@ public class ArgParser { * Returns the value of an unmatched argument discovered {@link #matchArg matchArg} or * {@link #matchAllArgs(String[],int,int) * matchAllArgs}. If there was no unmatched argument, <code>null</code> is returned. - * + * * @return unmatched argument */ public String getUnmatchedArgument() { diff --git a/base/silent/src/com/netscape/pkisilent/argparser/ArgParserTest.java b/base/silent/src/com/netscape/pkisilent/argparser/ArgParserTest.java index 9ddb80778..89ebcc48a 100644 --- a/base/silent/src/com/netscape/pkisilent/argparser/ArgParserTest.java +++ b/base/silent/src/com/netscape/pkisilent/argparser/ArgParserTest.java @@ -23,7 +23,7 @@ package com.netscape.pkisilent.argparser; * copy, modify and redistribute is granted, provided that this copyright * notice is retained and the author is given credit whenever appropriate. * - * This software is distributed "as is", without any warranty, including + * This software is distributed "as is", without any warranty, including * any implied warranty of merchantability or fitness for a particular * use. The author assumes no responsibility for, and shall not be liable * for, any special, indirect, or consequential damages, or any damages @@ -40,7 +40,7 @@ import java.util.Vector; * Testing class for the class ArgParser. Executing the <code>main</code> method of this class will perform a suite of * tests to help verify correct * operation of the parser class. - * + * * @author John E. Lloyd, Fall 2004 * @see ArgParser */ @@ -218,7 +218,7 @@ public class ArgParserTest { // ByteArrayOutputStream buf = new ByteArrayOutputStream(0x10000); // PrintStream ps = new PrintStream(buf); // parser.printSynopsis (ps, 80); - // System.out.print (buf.toString()); + // System.out.print (buf.toString()); // } void checkAdd(String s, Object resHolder, String errmsg) { diff --git a/base/silent/src/com/netscape/pkisilent/argparser/BooleanHolder.java b/base/silent/src/com/netscape/pkisilent/argparser/BooleanHolder.java index ba10022b5..8c98e8ab8 100644 --- a/base/silent/src/com/netscape/pkisilent/argparser/BooleanHolder.java +++ b/base/silent/src/com/netscape/pkisilent/argparser/BooleanHolder.java @@ -45,7 +45,7 @@ public class BooleanHolder implements java.io.Serializable { /** * Constructs a new <code>BooleanHolder</code> with a * specific initial value. - * + * * @param b Initial boolean value. */ public BooleanHolder(boolean b) { diff --git a/base/silent/src/com/netscape/pkisilent/argparser/CharHolder.java b/base/silent/src/com/netscape/pkisilent/argparser/CharHolder.java index 453cac8b2..ed0ecb215 100644 --- a/base/silent/src/com/netscape/pkisilent/argparser/CharHolder.java +++ b/base/silent/src/com/netscape/pkisilent/argparser/CharHolder.java @@ -45,7 +45,7 @@ public class CharHolder implements java.io.Serializable { /** * Constructs a new <code>CharHolder</code> with a * specific initial value. - * + * * @param c Initial character value. */ public CharHolder(char c) { diff --git a/base/silent/src/com/netscape/pkisilent/argparser/DoubleHolder.java b/base/silent/src/com/netscape/pkisilent/argparser/DoubleHolder.java index 13012a641..a1e4388b4 100644 --- a/base/silent/src/com/netscape/pkisilent/argparser/DoubleHolder.java +++ b/base/silent/src/com/netscape/pkisilent/argparser/DoubleHolder.java @@ -45,7 +45,7 @@ public class DoubleHolder implements java.io.Serializable { /** * Constructs a new <code>DoubleHolder</code> with a * specific initial value. - * + * * @param d Initial double value. */ public DoubleHolder(double d) { diff --git a/base/silent/src/com/netscape/pkisilent/argparser/FloatHolder.java b/base/silent/src/com/netscape/pkisilent/argparser/FloatHolder.java index b8474b535..9fd938d29 100644 --- a/base/silent/src/com/netscape/pkisilent/argparser/FloatHolder.java +++ b/base/silent/src/com/netscape/pkisilent/argparser/FloatHolder.java @@ -45,7 +45,7 @@ public class FloatHolder implements java.io.Serializable { /** * Constructs a new <code>FloatHolder</code> with a * specific initial value. - * + * * @param f Initial float value. */ public FloatHolder(float f) { diff --git a/base/silent/src/com/netscape/pkisilent/argparser/IntHolder.java b/base/silent/src/com/netscape/pkisilent/argparser/IntHolder.java index a94ceea1e..c8672dba6 100644 --- a/base/silent/src/com/netscape/pkisilent/argparser/IntHolder.java +++ b/base/silent/src/com/netscape/pkisilent/argparser/IntHolder.java @@ -45,7 +45,7 @@ public class IntHolder implements java.io.Serializable { /** * Constructs a new <code>IntHolder</code> with a * specific initial value. - * + * * @param i Initial integer value. */ public IntHolder(int i) { diff --git a/base/silent/src/com/netscape/pkisilent/argparser/LongHolder.java b/base/silent/src/com/netscape/pkisilent/argparser/LongHolder.java index 5656d8b86..7647b2c1d 100644 --- a/base/silent/src/com/netscape/pkisilent/argparser/LongHolder.java +++ b/base/silent/src/com/netscape/pkisilent/argparser/LongHolder.java @@ -45,7 +45,7 @@ public class LongHolder implements java.io.Serializable { /** * Constructs a new <code>LongHolder</code> with a * specific initial value. - * + * * @param l Initial long value. */ public LongHolder(long l) { diff --git a/base/silent/src/com/netscape/pkisilent/argparser/ObjectHolder.java b/base/silent/src/com/netscape/pkisilent/argparser/ObjectHolder.java index 70e050fde..cce555984 100644 --- a/base/silent/src/com/netscape/pkisilent/argparser/ObjectHolder.java +++ b/base/silent/src/com/netscape/pkisilent/argparser/ObjectHolder.java @@ -45,7 +45,7 @@ public class ObjectHolder implements java.io.Serializable { /** * Constructs a new <code>ObjectHolder</code> with a * specific initial value. - * + * * @param o Initial Object reference. */ public ObjectHolder(Object o) { diff --git a/base/silent/src/com/netscape/pkisilent/argparser/StringHolder.java b/base/silent/src/com/netscape/pkisilent/argparser/StringHolder.java index 937360346..00d7b6e77 100644 --- a/base/silent/src/com/netscape/pkisilent/argparser/StringHolder.java +++ b/base/silent/src/com/netscape/pkisilent/argparser/StringHolder.java @@ -45,7 +45,7 @@ public class StringHolder implements java.io.Serializable { /** * Constructs a new <code>StringHolder</code> with a * specific initial value. - * + * * @param s Initial String reference. */ public StringHolder(String s) { diff --git a/base/silent/src/com/netscape/pkisilent/argparser/StringScanException.java b/base/silent/src/com/netscape/pkisilent/argparser/StringScanException.java index bf3ea6dc3..f44899625 100644 --- a/base/silent/src/com/netscape/pkisilent/argparser/StringScanException.java +++ b/base/silent/src/com/netscape/pkisilent/argparser/StringScanException.java @@ -23,7 +23,7 @@ import java.io.IOException; /** * Exception class used by <code>StringScanner</code> when * command line arguments do not parse correctly. - * + * * @author John E. Lloyd, Winter 2001 * @see StringScanner */ @@ -36,7 +36,7 @@ class StringScanException extends IOException { /** * Creates a new StringScanException with the given message. - * + * * @param msg Error message * @see StringScanner */ diff --git a/base/silent/src/com/netscape/pkisilent/argparser/StringScanner.java b/base/silent/src/com/netscape/pkisilent/argparser/StringScanner.java index 271dd0c62..d562a3b19 100644 --- a/base/silent/src/com/netscape/pkisilent/argparser/StringScanner.java +++ b/base/silent/src/com/netscape/pkisilent/argparser/StringScanner.java @@ -22,7 +22,7 @@ package com.netscape.pkisilent.argparser; * Copyright John E. Lloyd, 2004. All rights reserved. Permission to use, * copy, modify and redistribute is granted, provided that this copyright * notice is retained and the author is given credit whenever appropriate. - * + * * This software is distributed "as is", without any warranty, including * any implied warranty of merchantability or fitness for a particular * use. The author assumes no responsibility for, and shall not be liable @@ -420,7 +420,7 @@ class StringScanner { } if (exception == null) { // if (Character.isLetterOrDigit(c=buf[idx]) || c == '_') - // { exception = new StringScanException (idx, + // { exception = new StringScanException (idx, //"malformed floating number"); // } // else diff --git a/base/silent/src/com/netscape/pkisilent/common/BaseState.java b/base/silent/src/com/netscape/pkisilent/common/BaseState.java index 0d5e9cfc6..c668e0f80 100644 --- a/base/silent/src/com/netscape/pkisilent/common/BaseState.java +++ b/base/silent/src/com/netscape/pkisilent/common/BaseState.java @@ -31,14 +31,14 @@ public class BaseState { private String ldapbase, ldaphost, ldapport, ldapdn, ldapdnpw; private boolean ldapsecConn = false; - // Constructor + // Constructor public BaseState() { } /** * Constructor . Takes the parameter CMSConfigfilename ( with fullpath) - * + * * @param CMSConfigfile. */ diff --git a/base/silent/src/com/netscape/pkisilent/common/CMSConfig.java b/base/silent/src/com/netscape/pkisilent/common/CMSConfig.java index 3e4f0bfa2..7aeaaa829 100644 --- a/base/silent/src/com/netscape/pkisilent/common/CMSConfig.java +++ b/base/silent/src/com/netscape/pkisilent/common/CMSConfig.java @@ -81,7 +81,7 @@ public class CMSConfig extends ServerInfo { } - // Authentication + // Authentication // Enable DirectoryBased Authentication /** @@ -207,7 +207,7 @@ public class CMSConfig extends ServerInfo { } - // Publishing + // Publishing /** * Takes parameters : secureConnection( true/false), ldapbinddn, ldapbindnpassword,ldaphostname, lapdaportnumber ( * in case of secured connection give ldap secured port) @@ -414,7 +414,7 @@ public class CMSConfig extends ServerInfo { } public void CreateOCSPPublisher(String OCSPHost, String OCSPPort, String OCSPEEPort) { - // Set host nmae with fully qualified hostname + // Set host nmae with fully qualified hostname String location = "http://" + OCSPHost + ":" + OCSPEEPort + "/ocsp"; CMSprops.setProperty("ca.crl.MasterCRL.alwaysUpdate", "true"); @@ -505,7 +505,7 @@ public class CMSConfig extends ServerInfo { CMSprops.setProperty("cardcryptogram.validate.enable", "false"); } - // Policies + // Policies public void DefaultValidityRule(String SubsystemType, String lagtime, String leadtime, String maxValidity) { if (SubsystemType.equals("ca")) { CMSprops.setProperty("ca.Policy.rule.DefaultValidityRule.enable", @@ -560,10 +560,10 @@ public class CMSConfig extends ServerInfo { CMSConfig s = new CMSConfig(args[0]); // boolean secureC = false; - // s.EnableDirEnrollment(secureC); + // s.EnableDirEnrollment(secureC); s.saveCMSConfig(); }// end of function main -} // end of class +} // end of class diff --git a/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java b/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java index 91a273df6..c74cd94c6 100644 --- a/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java +++ b/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java @@ -426,7 +426,7 @@ public class CMSLDAP { LDAPAttribute cfile = new LDAPAttribute("nscertfile", "alias/"); LDAPAttribute cauth = new LDAPAttribute("nssslclientauth", "allowed"); - // conn.delete("cn=RSA,cn=encryption,cn=config"); + // conn.delete("cn=RSA,cn=encryption,cn=config"); mods.add(LDAPModification.REPLACE, ssl3); mods.add(LDAPModification.DELETE, ssl3ciphers); @@ -503,7 +503,7 @@ public class CMSLDAP { i--; } - // conn.delete("cn=RSA,cn=encryption,cn=config"); + // conn.delete("cn=RSA,cn=encryption,cn=config"); try { conn.search( "cn=RSA,cn=encryption,cn=config", searchScope, null, @@ -573,7 +573,7 @@ public class CMSLDAP { DataInputStream dis = new DataInputStream(fis); byte[] bytes = new byte[dis.available()]; - dis.readFully(bytes); + dis.readFully(bytes); // bytes=s.getBytes(); */ diff --git a/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java b/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java index a4ba55d29..e0f2d4516 100644 --- a/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java +++ b/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java @@ -22,10 +22,10 @@ package com.netscape.pkisilent.common; * @(#)Properties.java 1.60 00/02/02 * * Copyright 1995-2000 Sun Microsystems, Inc. All Rights Reserved. - * - * This software is the proprietary information of Sun Microsystems, Inc. + * + * This software is the proprietary information of Sun Microsystems, Inc. * Use is subject to license terms. - * + * */ import java.io.BufferedReader; @@ -61,10 +61,10 @@ import java.util.Hashtable; * href="http://java.sun.com/docs/books/jls/html/3.doc.html#100850">Unicode escapes</a> are used; however, only a single * 'u' character is allowed in an escape sequence. The native2ascii tool can be used to convert property files to and * from other character encodings. - * + * * @see <a href="../../../tooldocs/solaris/native2ascii.html">native2ascii tool for Solaris</a> * @see <a href="../../../tooldocs/win32/native2ascii.html">native2ascii tool for Windows</a> - * + * * @author Arthur van Hoff * @author Michael McCloskey * @version 1.60, 02/02/00 @@ -81,7 +81,7 @@ class CMSProperties extends Hashtable<String, String> { /** * A property list that contains default values for any keys not * found in this property list. - * + * * @serial */ protected CMSProperties defaults; @@ -95,7 +95,7 @@ class CMSProperties extends Hashtable<String, String> { /** * Creates an empty property list with the specified defaults. - * + * * @param defaults the defaults. */ public CMSProperties(CMSProperties defaults) { @@ -106,7 +106,7 @@ class CMSProperties extends Hashtable<String, String> { * Calls the hashtable method <code>put</code>. Provided for * parallelism with the <tt>getProperty</tt> method. Enforces use of * strings for property keys and values. - * + * * @param key the key to be placed into this property list. * @param value the value corresponding to <tt>key</tt>. * @see #getProperty @@ -152,43 +152,43 @@ class CMSProperties 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 inStream the input stream. * @exception IOException if an error occurred when reading from the * input stream. @@ -456,12 +456,12 @@ class CMSProperties 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 the Java 2 platform v1.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 @@ -503,7 +503,7 @@ class CMSProperties 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 IOException if writing this property list to the specified @@ -545,7 +545,7 @@ class CMSProperties 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 #setProperty @@ -565,10 +565,10 @@ class CMSProperties 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 #setProperty * @see #defaults @@ -582,7 +582,7 @@ class CMSProperties 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 @@ -598,7 +598,7 @@ class CMSProperties 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) { @@ -620,7 +620,7 @@ class CMSProperties 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 */ @@ -648,7 +648,7 @@ class CMSProperties 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) { @@ -664,7 +664,7 @@ class CMSProperties extends Hashtable<String, String> { /** * Convert a nibble to a hex character - * + * * @param nibble the nibble to convert. */ private static char toHex(int nibble) { diff --git a/base/silent/src/com/netscape/pkisilent/common/CMSTask.java b/base/silent/src/com/netscape/pkisilent/common/CMSTask.java index 4b6c75ba3..948076fd6 100644 --- a/base/silent/src/com/netscape/pkisilent/common/CMSTask.java +++ b/base/silent/src/com/netscape/pkisilent/common/CMSTask.java @@ -186,5 +186,5 @@ public class CMSTask { } // end of function main -} // end of class +} // end of class diff --git a/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java b/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java index d629030f2..482e2ffab 100644 --- a/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java +++ b/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java @@ -98,7 +98,7 @@ public class ComCrypto { /** * Constructor . Takes the parameter certificatedbdirectory , passwordfor cert database, * certificatenickname,keysize, keytype(RSA/DSA) - * + * * @param certdbdirectory. * @param certdbpassword * @param certnickname @@ -114,7 +114,7 @@ public class ComCrypto { keytype = kt; } - // Set and Get functions + // Set and Get functions public void setCertDir(String cd) { cdir = cd; @@ -496,12 +496,12 @@ public class ComCrypto { try { CryptoManager.initialize(cdir); } catch (Exception e) { - // it is ok if it is already initialized + // it is ok if it is already initialized System.out.println("INITIALIZATION ERROR: " + e.toString()); System.out.println("cdir = " + cdir); } - // Step 2 log into database + // Step 2 log into database try { System.out.println("Debug : before getInstance"); @@ -527,7 +527,7 @@ public class ComCrypto { } } - // Generating CRMF request + // Generating CRMF request KeyPairGenerator kg = token.getKeyPairGenerator(KeyPairAlgorithm.RSA); @@ -565,7 +565,7 @@ public class ComCrypto { SEQUENCE s1 = new SEQUENCE(); - // 1st : Encryption key + // 1st : Encryption key s1.addElement(crmfMsg); @@ -583,11 +583,11 @@ public class ComCrypto { byte encoded[] = ASN1Util.encode(s1); - // BASE64Encoder encoder = new BASE64Encoder(); + // BASE64Encoder encoder = new BASE64Encoder(); // String Req1 = encoder.encodeBuffer(encoded); String Req1 = Utils.base64encode(encoded); - // Set CRMF_REQUEST variable + // Set CRMF_REQUEST variable CRMF_REQUEST = Req1; System.out.println("CRMF_REQUEST = " + CRMF_REQUEST); @@ -602,7 +602,7 @@ public class ComCrypto { } /* - * This function is used to Generated CRMF requests wrapped with the + * This function is used to Generated CRMF requests wrapped with the * transport cert so that we can do key archival with the drm. * This function expects transportcert variable to be set in this class. * Use setTransportCert() to do the same. @@ -617,12 +617,12 @@ public class ComCrypto { try { CryptoManager.initialize(cdir); } catch (Exception e) { - // it is ok if it is already initialized + // it is ok if it is already initialized System.out.println("INITIALIZATION ERROR: " + e.toString()); System.out.println("cdir = " + cdir); } - // Step 2 log into database + // Step 2 log into database try { System.out.println("Debug : before getInstance"); @@ -728,7 +728,7 @@ public class ComCrypto { SEQUENCE s1 = new SEQUENCE(); - // 1st : Encryption key + // 1st : Encryption key s1.addElement(crmfMsg); // 2nd : Signing Key @@ -763,5 +763,5 @@ public class ComCrypto { return CRMF_REQUEST; } -} // end of class +} // end of class diff --git a/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java b/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java index 61305305e..bc419fb02 100644 --- a/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java +++ b/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java @@ -55,7 +55,7 @@ public class Con2Agent implements SSLClientCertificateSelectionCallback, /** * Constructor. Takes hostname , portnumber , certificate nickname, token password ,client certdb directory - * + * * @param hostname * @param portnumber * @param agent cert nickname @@ -88,10 +88,10 @@ public class Con2Agent implements SSLClientCertificateSelectionCallback, } - // Get and Set methods + // Get and Set methods /* - * Get the page returned by the server + * Get the page returned by the server */ public StringBuffer getPage() { @@ -99,7 +99,7 @@ public class Con2Agent implements SSLClientCertificateSelectionCallback, } /* - * Set the query string to be submitted to the server + * Set the query string to be submitted to the server */ public void setQueryString(String qu) { @@ -107,7 +107,7 @@ public class Con2Agent implements SSLClientCertificateSelectionCallback, } /* - *Set token password + *Set token password */ public void setTokenPassword(String pwd) { @@ -131,7 +131,7 @@ public class Con2Agent implements SSLClientCertificateSelectionCallback, } /* - * set Agent port number + * set Agent port number */ public void setPort(int p) { @@ -139,7 +139,7 @@ public class Con2Agent implements SSLClientCertificateSelectionCallback, } /* - * Set Agent cert nickname + * Set Agent cert nickname */ public void setCertNickName(String cname) { @@ -147,14 +147,14 @@ public class Con2Agent implements SSLClientCertificateSelectionCallback, } /* - * Set action URL + * Set action URL */ public void setActionURL(String url) { ACTIONURL = url; } - // Submit requests + // Submit requests public boolean Send() { try { @@ -196,7 +196,7 @@ public class Con2Agent implements SSLClientCertificateSelectionCallback, System.out.println(line); } - // Send Connection: close to let the server close the connection. + // Send Connection: close to let the server close the connection. // Else the socket on the server side continues to remain in TIME_WAIT state ps.println("Connection: close"); @@ -315,4 +315,4 @@ public class Con2Agent implements SSLClientCertificateSelectionCallback, } -} // end of class +} // end of class diff --git a/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java b/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java index 019b75825..de331989b 100644 --- a/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java +++ b/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java @@ -51,7 +51,7 @@ public class DirEnroll extends TestClient { /** * Constructor . Takes the parameter for Properties file name * <p> - * + * * @param propfilename name of the parameter file */ @@ -62,7 +62,7 @@ public class DirEnroll extends TestClient { /** * Constructor. Takes hostname , EESSLportnumber as parameter * <p> - * + * * @param hostname * @param portnumber */ @@ -76,7 +76,7 @@ public class DirEnroll extends TestClient { * Constructor. Takes * hostname,EESSLportnumber,uid,password,certdbdirectorypath,certdbpassword,certificatenickname,keysize,teytype * <p> - * + * * @param hostname * @param portnumber * @param subjectdn @@ -98,7 +98,7 @@ public class DirEnroll extends TestClient { keytype = "RSA"; } - // Set and Get functions + // Set and Get functions /** * Use this method to set User Info @@ -214,7 +214,7 @@ public class DirEnroll extends TestClient { return true; } - // Private functions + // Private functions private boolean importCert(String certpack) { @@ -466,5 +466,5 @@ public class DirEnroll extends TestClient { } }// end of function main -} // end of class +} // end of class diff --git a/base/silent/src/com/netscape/pkisilent/common/PostQuery.java b/base/silent/src/com/netscape/pkisilent/common/PostQuery.java index 31fb07b3e..27c9209e8 100644 --- a/base/silent/src/com/netscape/pkisilent/common/PostQuery.java +++ b/base/silent/src/com/netscape/pkisilent/common/PostQuery.java @@ -76,7 +76,7 @@ public class PostQuery { } public boolean Send() { - // / This functions connects to the URL and POST HTTP Request . + // / This functions connects to the URL and POST HTTP Request . // It compares with NMC_STATUS and return the status. System.out.println(URLString); st = false; @@ -127,7 +127,7 @@ public class PostQuery { } } URLCon.disconnect(); - } // try + } // try catch (MalformedURLException e) { System.out.println(URLString + " is not a valid URL."); diff --git a/base/silent/src/com/netscape/pkisilent/common/Request.java b/base/silent/src/com/netscape/pkisilent/common/Request.java index 3dffc929c..7ee443f16 100644 --- a/base/silent/src/com/netscape/pkisilent/common/Request.java +++ b/base/silent/src/com/netscape/pkisilent/common/Request.java @@ -36,7 +36,7 @@ public class Request extends TestClient { private String approveseqnum, type, reqType, reqState, agenttype; private int i; - // Program variables + // Program variables private String ACTION_PROCESS_CERT_REQUEST = null; private String ACTION_LISTREQUEST = "/queryReq"; private int reqtype = 1; @@ -50,7 +50,7 @@ public class Request extends TestClient { private Vector<String> seqNum = new Vector<String>(); private String AUTH_ID = null; - // Cert Detail variables + // Cert Detail variables private String csrRequestorName, csrRequestorPhone, csrRequestorEmail, subject, subjectdn, reqStatus, certType; private String requestType, requestID, sslclient, clientcert, servercert, emailcert, objectsigningcert, sslcacert, @@ -58,11 +58,11 @@ public class Request extends TestClient { private int totalNumApproved = 0; - // Constructors + // Constructors /** * Constructor . Takes the parameter for Properties file name - * + * * @param propfileName name of the parameter file. */ @@ -72,7 +72,7 @@ public class Request extends TestClient { /** * Constructor . Takes the parameter host , port and "angent type - ca/ra" - * + * * @param hostname. * @param port * @param agenttype Whether ca or ra agent @@ -86,7 +86,7 @@ public class Request extends TestClient { /** * Constructor . Takes the following parmaters - * + * * @param hostName . * @param port * @param adminuid @@ -151,7 +151,7 @@ public class Request extends TestClient { /** * List all pending enrollment request. Takes parameters fromRequestNumber,toRequestNumber - * + * * @param fromrequest number * @param endrequestnumber. * @throws UnsupportedEncodingException @@ -168,7 +168,7 @@ public class Request extends TestClient { /** * List all pending request. Takes parameters fromRequestNumber,toRequestNumber - * + * * @param fromrequest number * @param endrequestnumber. * @throws UnsupportedEncodingException @@ -185,7 +185,7 @@ public class Request extends TestClient { /** * Approve pending enrollment request. Takes parameters RequestNumber - * + * * @param request number * @throws UnsupportedEncodingException */ @@ -207,7 +207,7 @@ public class Request extends TestClient { /** * Approve profile based pending enrollment request. Takes parameters RequestNumber - * + * * @param request number * @throws UnsupportedEncodingException */ @@ -236,7 +236,7 @@ public class Request extends TestClient { cadualcert_name = name; - // reqtype = 7 means cadualcert profile request + // reqtype = 7 means cadualcert profile request // this is just a convention that we follow within this file to distinguish // bet'n the different requests @@ -255,7 +255,7 @@ public class Request extends TestClient { /** * Reject profile based pending enrollment request. Takes parameters RequestNumber - * + * * @param request number * @throws UnsupportedEncodingException */ @@ -278,7 +278,7 @@ public class Request extends TestClient { /** * Cancel profile based pending enrollment request. Takes parameters RequestNumber - * + * * @param request number * @throws UnsupportedEncodingException */ @@ -471,9 +471,9 @@ public class Request extends TestClient { res.indexOf(";", ret) - 1); } - } // end of for loop + } // end of for loop - // System.out.println("Debug : Retrieving cert details"); + // System.out.println("Debug : Retrieving cert details"); ret = res.indexOf("header.subject ="); if (ret > 0) { @@ -585,7 +585,7 @@ public class Request extends TestClient { System.out.println(res); } - // Find th Server_ATTRS paramteter value of reqStatus + // Find th Server_ATTRS paramteter value of reqStatus int i = 1; int ret; @@ -881,15 +881,15 @@ public class Request extends TestClient { + "&keyUsageKeyAgreement=false" + "&keyUsageKeyCertSign=false" + "&keyUsageCrlSign=false" + "&keyUsageEncipherOnly=false" - + "&keyUsageDecipherOnly=false" + /* -- For Older CMS 6.x servers use these - "&nsCertCritical=false" + - "&nsCertSSLClient=true" + - "&nsCertSSLServer=false" + - "&nsCertEmail=true" + - "&nsCertObjectSigning=false" + - "&nsCertSSLCA=false" + - "&nsCertEmailCA=false" + - "&nsCertObjectSigningCA=false" + + + "&keyUsageDecipherOnly=false" + /* -- For Older CMS 6.x servers use these + "&nsCertCritical=false" + + "&nsCertSSLClient=true" + + "&nsCertSSLServer=false" + + "&nsCertEmail=true" + + "&nsCertObjectSigning=false" + + "&nsCertSSLCA=false" + + "&nsCertEmailCA=false" + + "&nsCertObjectSigningCA=false" + "&subjAltNameExtCritical=false" + "&subjAltNames=RFC822Name: null" + "&signingAlg=MD5withRSA" + @@ -1024,7 +1024,7 @@ public class Request extends TestClient { while (i < seqNum.size()) { approveseqnum = (seqNum.elementAt(i)).toString(); - // Get request details + // Get request details reqtype = 2; buildquery(); if (!Send()) { @@ -1134,5 +1134,5 @@ public class Request extends TestClient { }// end of function main -} // end of class +} // end of class diff --git a/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java b/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java index f63456b4d..5eccb1601 100644 --- a/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java +++ b/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java @@ -41,7 +41,7 @@ public class ServerInfo { public static CMSProperties props = null; public static CMSProperties CMSprops = null; - // Private variables + // Private variables private int i; public String CMSConfigFile, AdminConfigFile; @@ -150,7 +150,7 @@ public class ServerInfo { readCMSConfig(); } - // Private functions + // Private functions private void SystemInfo() { try { domain = InetAddress.getLocalHost().getHostName(); @@ -351,5 +351,5 @@ public class ServerInfo { }// end of function main -} // end of class +} // end of class diff --git a/base/silent/src/com/netscape/pkisilent/common/TestClient.java b/base/silent/src/com/netscape/pkisilent/common/TestClient.java index 0e4ed9cdd..a58e88bd1 100644 --- a/base/silent/src/com/netscape/pkisilent/common/TestClient.java +++ b/base/silent/src/com/netscape/pkisilent/common/TestClient.java @@ -47,7 +47,7 @@ public class TestClient implements SSLCertificateApprovalCallback { public String ACTION_STRING; public String query; public boolean debug = false; - // Certificate nicknames to be used by Test Clients + // Certificate nicknames to be used by Test Clients private int i; private String testConfigFile; @@ -71,7 +71,7 @@ public class TestClient implements SSLCertificateApprovalCallback { public String UID, OU, O, DN, E, CN, C, GN, SN, L, MAIL; // Enroll protected String PWD; - // CRypto + // CRypto public ComCrypto cCrypt = new ComCrypto(); public String pkcs10request = null; @@ -90,7 +90,7 @@ public class TestClient implements SSLCertificateApprovalCallback { return true; } - // Constructor + // Constructor public TestClient() { keysize = "1024"; @@ -102,7 +102,7 @@ public class TestClient implements SSLCertificateApprovalCallback { * Before creating a new instance of this class make sure you have set TEST_CONFIG_FILE variable in your * environnemt. * Reads the TEST_CONFIG_FILE . Initializes the certificate database. See engage.cfg file for example. - * + * * @param keysize * @param keytype */ @@ -420,7 +420,7 @@ public class TestClient implements SSLCertificateApprovalCallback { } ldaprootDN = props.getProperty("LDAPROOTDN"); - // Strip of th e quotes "cn=directory manager" string + // Strip of th e quotes "cn=directory manager" string if (ldaprootDN.indexOf("\"") > -1) { ldaprootDN = ldaprootDN.substring(1, ldaprootDN.length() - 1); } @@ -485,7 +485,7 @@ public class TestClient implements SSLCertificateApprovalCallback { return (getString(p)); } - // This following method doesn't Always get a free port. + // This following method doesn't Always get a free port. // while (st) { // if(isSocketUnused(host,p) ) // st=false; @@ -524,13 +524,13 @@ public class TestClient implements SSLCertificateApprovalCallback { /* ******************************************************************* - * Sample programs to initialze calsses + * Sample programs to initialze calsses ******************************************************************* */ /* ******************************************************************** - * To Test AutoInstaller + * To Test AutoInstaller ******************************************************************* */ @@ -549,12 +549,12 @@ public class TestClient implements SSLCertificateApprovalCallback { a.setAdminInfo(s.GetHostName(),s.GetAdminPort(),"mcom.com","admin","admin"); // setCAInfo - a.setCAInfo(s.GetHostName(),"1027","8100","admin","secret12"); + a.setCAInfo(s.GetHostName(),"1027","8100","admin","secret12"); //setInternalDB info - String dp = t.getFreePort("38900"); + String dp = t.getFreePort("38900"); a.setInternalDBInfo(s.GetHostName(),"38907","ca-db","cn=directory manager","secret12" ); - // set tokenInfo + // set tokenInfo a.setTokenInfo("Internal","secret12"); @@ -578,7 +578,7 @@ public class TestClient implements SSLCertificateApprovalCallback { /* ****************************************************** - * Example to Get Server Details + * Example to Get Server Details ****************************************************** */ @@ -617,8 +617,8 @@ public class TestClient implements SSLCertificateApprovalCallback { Profiles pr = new Profiles(s.GetHostName(),s.GetEESSLPort()); pr.setProfileType("caCMCUserCert"); pr.setCertAuthority("ca"); - - String request = t.readRequest(requestfile+".out"); + + String request = t.readRequest(requestfile+".out"); String bstr = "-----BEGIN NEW CERTIFICATE REQUEST-----"; String estr="-----END NEW CERTIFICATE REQUEST-----"; String Blob1 = request.substring(bstr.length() + 1); @@ -672,7 +672,7 @@ public class TestClient implements SSLCertificateApprovalCallback { /* *************************************************************** - Submit Profile based request + Submit Profile based request ********************************************************* */ @@ -687,7 +687,7 @@ public class TestClient implements SSLCertificateApprovalCallback { pr.clientCertEnroll(); System.out.println("Request ID is " + pr.getRequestID()); - + Request re = new Request (s.GetHostName(),s.GetAgentPort(),"ca"); re.setAgentCertName(t.GetAdminCertName()); re.ApproveProfileRequests(pr.getRequestID()); @@ -706,7 +706,7 @@ public class TestClient implements SSLCertificateApprovalCallback { if(!CrmfClient.Enroll()) {System.out.println("CRMFClient : could not submit request");} - + checkRequest cr = new checkRequest(s.GetHostName(),s.GetEESSLPort(),t.getString(CrmfClient.getRequestId()),"false"); cr.checkRequestStatus(); @@ -732,7 +732,7 @@ public class TestClient implements SSLCertificateApprovalCallback { /* ************************************************************* - * Example to Connect oto Config Directory port + * Example to Connect oto Config Directory port ************************************************************* */ @@ -740,9 +740,9 @@ public class TestClient implements SSLCertificateApprovalCallback { CMSLDAP cmsldap = new CMSLDAP(s.GetHostName(),s.GetConfigLDAPPort(),t.GetLDAPDN(),t.GetLDAPDNPW()); if(cmsldap.connect()) System.out.println("LDAP Connection successful"); - else + else System.out.println("Error Connecting to LDAPSERVER"); - + // Add user to config directoory if (cmsldap.userAdd("ou=people,"+t.GetLDAPBASE(),"t2","t2","t2","netscape")) System.out.println("Added user to Config directory"); @@ -751,7 +751,7 @@ public class TestClient implements SSLCertificateApprovalCallback { /* ************************************************************* - * Example to Submit a CRMFCleint request to CA + * Example to Submit a CRMFCleint request to CA ************************************************************* */ @@ -778,10 +778,10 @@ public class TestClient implements SSLCertificateApprovalCallback { /* System.out.println("KRAAgent "); KraAgent kraAgent = new KraAgent(s.GetHostName(),s.GetAgentPort()); - kraAgent.setAgentCertName(t.GetKRAAgentCertName()); + kraAgent.setAgentCertName(t.GetKRAAgentCertName()); System.out.println("KRAAgent List archival"); - - Vector aReq= kraAgent.ListArchivalRequests(); + + Vector aReq= kraAgent.ListArchivalRequests(); int i=0; while(i < aReq.size() ) { @@ -795,10 +795,10 @@ public class TestClient implements SSLCertificateApprovalCallback { /* ************************************************************* - * Example to submit manual user enrollment request + * Example to submit manual user enrollment request ************************************************************* /* - + /* UserEnroll ue = new UserEnroll(s.GetHostName(),"1029"); @@ -811,7 +811,7 @@ public class TestClient implements SSLCertificateApprovalCallback { /* ************************************************************* - * Example to submit Directory based enroolemt request + * Example to submit Directory based enroolemt request ************************************************************* /* @@ -821,8 +821,8 @@ public class TestClient implements SSLCertificateApprovalCallback { System.out.println("Success "); if(cmsldap.TurnOnSSL("slapd-jupiter2","Server-Cert cert-jupiter2","7000")) - System.out.println("Turned on ssl"); - else + System.out.println("Turned on ssl"); + else return; cmsldap.TurnOffSSL(); @@ -837,7 +837,7 @@ public class TestClient implements SSLCertificateApprovalCallback { /* ************************************************************* - * Example to submit Admin Enrollment request + * Example to submit Admin Enrollment request ************************************************************* /* @@ -851,13 +851,13 @@ public class TestClient implements SSLCertificateApprovalCallback { /* ************************************************************* - * Example gent List Pending request + * Example gent List Pending request ************************************************************* /* /* - // Agent List and Approve Request + // Agent List and Approve Request Request re = new Request (s.GetHostName(),s.GetAgentPort(),s.GetCertAuthority()); re.setAgentCertName(t.GetAdminCertName()); re.ListPendingRequests("2","70"); @@ -866,11 +866,11 @@ public class TestClient implements SSLCertificateApprovalCallback { /* ************************************************************* - * Example for CheckRequest Status and add the certificate to internal db + * Example for CheckRequest Status and add the certificate to internal db ************************************************************* /* - /* + /* // check request status and Revoke cert checkRequest cr = new checkRequest(s.GetHostName(),s.GetEESSLPort(),t.getString(ue.getRequestId()),"false"); checkRequest cr = new checkRequest(s.GetHostName(),s.GetEESSLPort(),"1","false"); @@ -888,7 +888,7 @@ public class TestClient implements SSLCertificateApprovalCallback { /* ************************************************************* - * Example agent ro revoke request + * Example agent ro revoke request ************************************************************* /* @@ -904,7 +904,7 @@ public class TestClient implements SSLCertificateApprovalCallback { /* /* - // Update CRLand DISPLAY it + // Update CRLand DISPLAY it System.out.println("Displayin CRL"); CRL crl = new CRL (s.GetHostName(),s.GetAgentPort(),"/tmp/crlfile"); @@ -920,7 +920,7 @@ public class TestClient implements SSLCertificateApprovalCallback { /* ************************************************************* - * Example for stopping and starting servers + * Example for stopping and starting servers ************************************************************* */ @@ -929,8 +929,8 @@ public class TestClient implements SSLCertificateApprovalCallback { if (idb.ldapStop()) System.out.println("IDB stopped"); if(idb.ldapStart()) System.out.println("IDB Started"); - System.out.println("------------------------------------------"); - System.out.println(" CMS Test:"); + System.out.println("------------------------------------------"); + System.out.println(" CMS Test:"); CMSTask task = new CMSTask(t.GetInstanceRoot()); task.CMSStop(); task.CMSStart(); diff --git a/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java b/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java index c55088bc6..123054503 100644 --- a/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java +++ b/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java @@ -60,7 +60,7 @@ public class UserEnroll extends TestClient { /** * Constructor . Takes the parameter for Properties file name * <p> - * + * * @param propfilename name of the parameter file */ @@ -73,7 +73,7 @@ public class UserEnroll extends TestClient { * CertdbDirecrory(fullpath) , certdbPassword, keysize, keytype, requestorName,requestorEmail and Certtype. * valid values for Certtype - "ca","ra","ocsp" * <p> - * + * * @param propfilename name of the parameter file */ @@ -515,22 +515,22 @@ public class UserEnroll extends TestClient { { System.out.println("Usage : propertiesfile"); System.exit(0); - } + } UserEnroll t = new UserEnroll(args[0]); st=t.enroll(); - if (st){ + if (st){ System.out.println("User Enrolled successfully . RequestId is "+t.getrequestId()); System.exit(t.getRequestId()); - } + } else{ - System.out.println("Error: " + t.getErrorDetail()); + System.out.println("Error: " + t.getErrorDetail()); System.exit(0); } */ }// end of function main -} // end of class +} // end of class diff --git a/base/silent/src/com/netscape/pkisilent/common/checkRequest.java b/base/silent/src/com/netscape/pkisilent/common/checkRequest.java index c4599ffde..8acbf1ca7 100644 --- a/base/silent/src/com/netscape/pkisilent/common/checkRequest.java +++ b/base/silent/src/com/netscape/pkisilent/common/checkRequest.java @@ -55,12 +55,12 @@ public class checkRequest extends TestClient { private String tokenpwd; private String cdir; - // public methods + // public methods /** * Constructor . Takes the parameter for Properties file name * <p> - * + * * @param propfilename name of the parameter file */ @@ -232,7 +232,7 @@ public class checkRequest extends TestClient { return false; } - // Private functions + // Private functions private void setElapsedTime(long dif) { elapsedTime = dif; @@ -613,5 +613,5 @@ public class checkRequest extends TestClient { } }// end of function main -} // end of class +} // end of class diff --git a/base/silent/src/com/netscape/pkisilent/http/HTMLDocument.java b/base/silent/src/com/netscape/pkisilent/http/HTMLDocument.java index e8de29081..75610c15b 100644 --- a/base/silent/src/com/netscape/pkisilent/http/HTMLDocument.java +++ b/base/silent/src/com/netscape/pkisilent/http/HTMLDocument.java @@ -103,7 +103,7 @@ public class HTMLDocument { /** * Creates a new HTML document using the provided data. - * + * * @param documentURL The URL for this document. * @param htmlData The actual data contained in the HTML document. */ @@ -169,7 +169,7 @@ public class HTMLDocument { /** * Actually parses the HTML document and extracts useful elements from it. - * + * * @return <CODE>true</CODE> if the page could be parsed successfully, or <CODE>false</CODE> if not. */ public boolean parse() { @@ -456,9 +456,9 @@ public class HTMLDocument { * Converts the provided URI to a URL. The provided URI may be a URL already, * or it may also be an absolute path on the server or a path relative to the * base URL. - * + * * @param uri The URI to convert to a URL. - * + * * @return The URL based on the provided URI. */ private String uriToURL(String uri) { @@ -479,7 +479,7 @@ public class HTMLDocument { /** * Retrieves the URL of this HTML document. - * + * * @return The URL of this HTML document. */ public String getDocumentURL() { @@ -488,7 +488,7 @@ public class HTMLDocument { /** * Retrieves the original HTML data used to create this document. - * + * * @return The orginal HTML data used to create this document. */ public String getHTMLData() { @@ -497,7 +497,7 @@ public class HTMLDocument { /** * Retrieves the contents of the HTML document with all tags removed. - * + * * @return The contents of the HTML document with all tags removed, or <CODE>null</CODE> if a problem occurs while * trying to parse the * HTML. @@ -517,7 +517,7 @@ public class HTMLDocument { * that reference files that would normally be downloaded as part of * retrieving a page in a browser. This includes images and external style * sheets. - * + * * @return An array containing a set of URLs to files associated with the * HTML document, or <CODE>null</CODE> if a problem occurs while * trying to parse the HTML. @@ -537,7 +537,7 @@ public class HTMLDocument { /** * Retrieves an array containing a set of URLs parsed from the HTML document * that are in the form of links to other content. - * + * * @return An array containing a set of URLs parsed from the HTML document * that are in the form of links to other content, or <CODE>null</CODE> if a problem occurs while trying to * parse the @@ -558,7 +558,7 @@ public class HTMLDocument { /** * Retrieves an array containing a set of URLs parsed from the HTML document * that reference images used in the document. - * + * * @return An array containing a set of URLs parsed from the HTML document * that reference images used in the document. */ @@ -577,7 +577,7 @@ public class HTMLDocument { /** * Retrieves an array containing a set of URLs parsed from the HTML document * that reference frames used in the document. - * + * * @return An array containing a set of URLs parsed from the HTML document * that reference frames used in the document. */ diff --git a/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java b/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java index f3980c0ed..6331783b8 100644 --- a/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java +++ b/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java @@ -138,7 +138,7 @@ public class HTTPClient implements SSLCertificateApprovalCallback { public boolean approve(X509Certificate cert, SSLCertificateApprovalCallback.ValidityStatus status) { - // when this method is called by SSLSocket we get the server cert + // when this method is called by SSLSocket we get the server cert // we can capture this for future use. server_cert = cert; return true; @@ -794,7 +794,7 @@ public class HTTPClient implements SSLCertificateApprovalCallback { /** * Reads the actual data of the response based on the content length provided * by the server in the response header. - * + * * @param response The response with which the data is associated. * @param inputStream The input stream from which to read the response. * @param contentLength The number of bytes that the server said are in the @@ -808,7 +808,7 @@ public class HTTPClient implements SSLCertificateApprovalCallback { * array that should be considered part of the * response (the number of header bytes is included in * this count). - * + * * @throws IOException If a problem occurs while reading data from the * server. */ @@ -853,7 +853,7 @@ public class HTTPClient implements SSLCertificateApprovalCallback { * Reads the actual data of the response using chunked encoding, which is a * way for the server to provide the data in several chunks rather than all at * once. - * + * * @param response The response with which the data is associated. * @param inputStream The input stream from which to read the response. * @param dataRead The data that we have already read. This includes @@ -865,7 +865,7 @@ public class HTTPClient implements SSLCertificateApprovalCallback { * array that should be considered part of the * response (the number of header bytes is included in * this count). - * + * * @throws IOException If a problem occurs while reading data from the * server. */ @@ -1166,13 +1166,13 @@ public class HTTPClient implements SSLCertificateApprovalCallback { if (auth_type != null && auth_type.equalsIgnoreCase("BASIC")) { // BASE64Encoder encoder = new BASE64Encoder(); - // String temp = encoder.encodeBuffer((user_id + + // String temp = encoder.encodeBuffer((user_id + // ":" + user_password).getBytes()); String temp = Utils.base64encode((user_id + ":" + user_password).getBytes()); - // note: temp already contains \r and \n. - // remove \r and \n from the base64 encoded string. + // note: temp already contains \r and \n. + // remove \r and \n from the base64 encoded string. // causes problems when sending http post requests // using PrintStream.println() diff --git a/base/silent/src/com/netscape/pkisilent/http/HTTPResponse.java b/base/silent/src/com/netscape/pkisilent/http/HTTPResponse.java index 9ade1c133..f8073f7bc 100644 --- a/base/silent/src/com/netscape/pkisilent/http/HTTPResponse.java +++ b/base/silent/src/com/netscape/pkisilent/http/HTTPResponse.java @@ -60,7 +60,7 @@ public class HTTPResponse { /** * Creates a new HTTP response with the provided status code. - * + * * @param statusCode The HTTP status code for this response. * @param protocolVersion The protocol and version for this response. * @param responseMessage The message associated with this response. @@ -84,7 +84,7 @@ public class HTTPResponse { /** * Retrieves the status code for this HTTP response. - * + * * @return The status code for this HTTP response. */ public int getStatusCode() { @@ -93,7 +93,7 @@ public class HTTPResponse { /** * Retrieves the protocol version for this HTTP response. - * + * * @return The protocol version for this HTTP response. */ public String getProtocolVersion() { @@ -102,7 +102,7 @@ public class HTTPResponse { /** * Retrieves the response message for this HTTP response. - * + * * @return The response message for this HTTP response. */ public String getResponseMessage() { @@ -113,7 +113,7 @@ public class HTTPResponse { * Retrieves the value of the header with the specified name. If the * specified header has more than one value, then only the first will be * retrieved. - * + * * @return The value of the header with the specified name, or <CODE>null</CODE> if no such header is available. */ public String getHeader(String headerName) { @@ -130,7 +130,7 @@ public class HTTPResponse { /** * Retrieves the set of values for the specified header. - * + * * @return The set of values for the specified header. */ public String[] getHeaderValues(String headerName) { @@ -150,7 +150,7 @@ public class HTTPResponse { /** * Adds a header with the given name and value to this response. - * + * * @param headerName The name of the header to add to this response. * @param headerValue The value of the header to add to this response. */ @@ -174,7 +174,7 @@ public class HTTPResponse { /** * Retrieves a two-dimensional array containing the header data for this * response, with each element being an array containing a name/value pair. - * + * * @return A two-dimensional array containing the header data for this * response. */ @@ -191,7 +191,7 @@ public class HTTPResponse { /** * Retrieves the raw data included in this HTTP response. If the response did * not include any data, an empty array will be returned. - * + * * @return The raw data included in this HTTP response. */ public byte[] getResponseData() { @@ -255,7 +255,7 @@ public class HTTPResponse { /** * Sets the actual data associated with this response. - * + * * @param responseData The actual data associated with this response. */ public void setResponseData(byte[] responseData) { @@ -268,7 +268,7 @@ public class HTTPResponse { /** * Retrieves the content length associated with this response. - * + * * @return The content length associated with this response, or -1 if no * content length is available. */ @@ -278,7 +278,7 @@ public class HTTPResponse { /** * Retrieves the content type associated with this response. - * + * * @return The content type associated with this response, or <CODE>null</CODE> if no content type is available. */ public String getContentType() { @@ -288,7 +288,7 @@ public class HTTPResponse { /** * Retrieves an array containing the values of the cookies that should be set * based on the information in this response. - * + * * @return An array containing the values of the cookies that should be set * based on the information in this response. */ diff --git a/base/tks/src/com/netscape/tks/TKSAuthority.java b/base/tks/src/com/netscape/tks/TKSAuthority.java index 1987659c4..836dc7959 100644 --- a/base/tks/src/com/netscape/tks/TKSAuthority.java +++ b/base/tks/src/com/netscape/tks/TKSAuthority.java @@ -37,7 +37,7 @@ public class TKSAuthority implements IAuthority, ISubsystem { /** * Retrieves the request queue for the Authority. * <P> - * + * * @return the request queue. */ public IRequestQueue getRequestQueue() { @@ -83,7 +83,7 @@ public class TKSAuthority implements IAuthority, ISubsystem { /** * Initializes this subsystem. * <P> - * + * * @param owner owner of this subsystem * @param config configuration of this subsystem * @exception EBaseException failed to initialize this RA @@ -101,7 +101,7 @@ public class TKSAuthority implements IAuthority, ISubsystem { /** * Notifies this subsystem if owner is in running mode. - * + * * @exception EBaseException failed to start up */ public void startup() throws EBaseException { @@ -127,7 +127,7 @@ public class TKSAuthority implements IAuthority, ISubsystem { /** * Returns the root configuration storage of this system. * <P> - * + * * @return configuration store of this subsystem */ public IConfigStore getConfigStore() { @@ -140,7 +140,7 @@ public class TKSAuthority implements IAuthority, ISubsystem { /** * Sets subsystem identifier. - * + * * @param id subsystem id * @exception EBaseException failed to set id */ @@ -150,7 +150,7 @@ public class TKSAuthority implements IAuthority, ISubsystem { /** * Retrieves logger from escrow authority. - * + * * @return logger */ public ILogger getLogger() { diff --git a/base/util/src/com/netscape/cmsutil/http/HttpResponse.java b/base/util/src/com/netscape/cmsutil/http/HttpResponse.java index 7ac7e2f69..3f9be5429 100644 --- a/base/util/src/com/netscape/cmsutil/http/HttpResponse.java +++ b/base/util/src/com/netscape/cmsutil/http/HttpResponse.java @@ -74,7 +74,7 @@ public class HttpResponse extends HttpMessage { if (mStatusCode == null) { throw new HttpProtocolException("status code not set in response"); } - // write status-line + // write status-line mLine = Http.HttpVers + " " + mStatusCode + " "; if (mReasonPhrase != null) mLine += mReasonPhrase; diff --git a/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java b/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java index c2013a5d2..aca93b2f0 100644 --- a/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java +++ b/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java @@ -33,7 +33,7 @@ import com.netscape.cmsutil.net.ISocketFactory; /** * Uses NSS ssl socket. - * + * * @version $Revision$ $Date$ */ public class JssSSLSocketFactory implements ISocketFactory { diff --git a/base/util/src/com/netscape/cmsutil/ocsp/BasicOCSPResponse.java b/base/util/src/com/netscape/cmsutil/ocsp/BasicOCSPResponse.java index 11ae7f152..52535d3d0 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/BasicOCSPResponse.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/BasicOCSPResponse.java @@ -35,7 +35,7 @@ import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; /** * RFC 2560: - * + * * <pre> * BasicOCSPResponse ::= SEQUENCE { * tbsResponseData ResponseData, @@ -43,7 +43,7 @@ import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; * signature BIT STRING, * certs [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL } * </pre> - * + * * @version $Revision$ $Date$ */ public class BasicOCSPResponse implements Response { diff --git a/base/util/src/com/netscape/cmsutil/ocsp/CertID.java b/base/util/src/com/netscape/cmsutil/ocsp/CertID.java index b6979c784..23668f194 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/CertID.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/CertID.java @@ -32,7 +32,7 @@ import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; /** * RFC 2560: - * + * * <pre> * CertID ::= SEQUENCE { * hashAlgorithm AlgorithmIdentifier, @@ -40,7 +40,7 @@ import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; * issuerKeyHash OCTET STRING, -- Hash of Issuers public key * serialNumber CertificateSerialNumber } * </pre> - * + * * @version $Revision$ $Date$ */ diff --git a/base/util/src/com/netscape/cmsutil/ocsp/CertStatus.java b/base/util/src/com/netscape/cmsutil/ocsp/CertStatus.java index a90eb215f..11e89ef01 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/CertStatus.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/CertStatus.java @@ -21,14 +21,14 @@ import org.mozilla.jss.asn1.ASN1Value; /** * RFC 2560: - * + * * <pre> * CertStatus ::= CHOICE { * good [0] IMPLICIT NULL, * revoked [1] IMPLICIT RevokedInfo, * unknown [2] IMPLICIT UnknownInfo } * </pre> - * + * * @version $Revision$ $Date$ */ public interface CertStatus extends ASN1Value { diff --git a/base/util/src/com/netscape/cmsutil/ocsp/GoodInfo.java b/base/util/src/com/netscape/cmsutil/ocsp/GoodInfo.java index fa7387260..122054108 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/GoodInfo.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/GoodInfo.java @@ -30,14 +30,14 @@ import org.mozilla.jss.asn1.Tag; /** * RFC 2560: - * + * * <pre> * CertStatus ::= CHOICE { * good [0] IMPLICIT NULL, * revoked [1] IMPLICIT RevokedInfo, * unknown [2] IMPLICIT UnknownInfo } * </pre> - * + * * @version $Revision$ $Date$ */ public class GoodInfo implements CertStatus { diff --git a/base/util/src/com/netscape/cmsutil/ocsp/KeyHashID.java b/base/util/src/com/netscape/cmsutil/ocsp/KeyHashID.java index 358fb0ebd..8b9c33bfe 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/KeyHashID.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/KeyHashID.java @@ -30,13 +30,13 @@ import org.mozilla.jss.asn1.Tag; /** * RFC 2560: - * + * * <pre> * ResponderID ::= CHOICE { * byName [1] EXPLICIT Name, * byKey [2] EXPLICIT KeyHash } * </pre> - * + * * @version $Revision$ $Date$ */ public class KeyHashID implements ResponderID { diff --git a/base/util/src/com/netscape/cmsutil/ocsp/NameID.java b/base/util/src/com/netscape/cmsutil/ocsp/NameID.java index 529ededbb..436c85369 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/NameID.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/NameID.java @@ -30,13 +30,13 @@ import org.mozilla.jss.pkix.primitive.Name; /** * RFC 2560: - * + * * <pre> * ResponderID ::= CHOICE { * byName [1] EXPLICIT Name, * byKey [2] EXPLICIT KeyHash } * </pre> - * + * * @version $Revision$ $Date$ */ public class NameID implements ResponderID { diff --git a/base/util/src/com/netscape/cmsutil/ocsp/OCSPRequest.java b/base/util/src/com/netscape/cmsutil/ocsp/OCSPRequest.java index 963bdc832..35146e90b 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/OCSPRequest.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/OCSPRequest.java @@ -30,13 +30,13 @@ import org.mozilla.jss.asn1.Tag; /** * RFC 2560: - * + * * <pre> * OCSPRequest ::= SEQUENCE { * tbsRequest TBSRequest, * optionalSignature [0] EXPLICIT Signature OPTIONAL } * </pre> - * + * * @version $Revision$ $Date$ */ diff --git a/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponse.java b/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponse.java index 6696cd9dc..4c50b4357 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponse.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponse.java @@ -30,13 +30,13 @@ import org.mozilla.jss.asn1.Tag; /** * RFC 2560: - * + * * <pre> * OCSPResponse ::= SEQUENCE { * responseStatus OCSPResponseStatus, * responseBytes [0] EXPLICIT ResponseBytes OPTIONAL } * </pre> - * + * * @version $Revision$ $Date$ */ public class OCSPResponse implements ASN1Value { diff --git a/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponseStatus.java b/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponseStatus.java index 38ca881c2..375c61e33 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponseStatus.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponseStatus.java @@ -29,7 +29,7 @@ import org.mozilla.jss.asn1.Tag; /** * RFC 2560: - * + * * <pre> * OCSPResponseStatus ::= ENUMERATED { * successful (0), --Response has valid confirmations @@ -41,7 +41,7 @@ import org.mozilla.jss.asn1.Tag; * unauthorized (6) --Request unauthorized * } * </pre> - * + * * @version $Revision$ $Date$ */ public class OCSPResponseStatus implements ASN1Value { diff --git a/base/util/src/com/netscape/cmsutil/ocsp/Request.java b/base/util/src/com/netscape/cmsutil/ocsp/Request.java index 85c97de22..c43ac347e 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/Request.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/Request.java @@ -31,13 +31,13 @@ import org.mozilla.jss.pkix.cert.Extension; /** * RFC 2560: - * + * * <pre> * Request ::= SEQUENCE { * reqCert CertID, * singleRequestExtensions [0] EXPLICIT Extensions OPTIONAL } * </pre> - * + * * @version $Revision$ $Date$ */ diff --git a/base/util/src/com/netscape/cmsutil/ocsp/ResponderID.java b/base/util/src/com/netscape/cmsutil/ocsp/ResponderID.java index 02e30de05..68ff040f8 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/ResponderID.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/ResponderID.java @@ -21,13 +21,13 @@ import org.mozilla.jss.asn1.ASN1Value; /** * RFC 2560: - * + * * <pre> * ResponderID ::= CHOICE { * byName [1] EXPLICIT Name, * byKey [2] EXPLICIT KeyHash } * </pre> - * + * * @version $Revision$ $Date$ */ public interface ResponderID extends ASN1Value { diff --git a/base/util/src/com/netscape/cmsutil/ocsp/Response.java b/base/util/src/com/netscape/cmsutil/ocsp/Response.java index 0d363e811..e2b59adb7 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/Response.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/Response.java @@ -22,11 +22,11 @@ import org.mozilla.jss.asn1.OCTET_STRING; /** * RFC 2560: - * + * * <pre> * response OCTET STRING * </pre> - * + * * @version $Revision$ $Date$ */ public interface Response extends ASN1Value { diff --git a/base/util/src/com/netscape/cmsutil/ocsp/ResponseBytes.java b/base/util/src/com/netscape/cmsutil/ocsp/ResponseBytes.java index c5d461148..54739d4de 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/ResponseBytes.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/ResponseBytes.java @@ -31,13 +31,13 @@ import org.mozilla.jss.asn1.Tag; /** * RFC 2560: - * + * * <pre> * ResponseBytes ::= SEQUENCE { * responseType OBJECT IDENTIFIER, * response OCTET STRING } * </pre> - * + * * @version $Revision$ $Date$ */ public class ResponseBytes implements ASN1Value { diff --git a/base/util/src/com/netscape/cmsutil/ocsp/ResponseData.java b/base/util/src/com/netscape/cmsutil/ocsp/ResponseData.java index 1b28cf134..8c02a5c27 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/ResponseData.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/ResponseData.java @@ -35,7 +35,7 @@ import org.mozilla.jss.pkix.cert.Extension; /** * RFC 2560: - * + * * <pre> * ResponseData ::= SEQUENCE { * version [0] EXPLICIT Version DEFAULT v1, @@ -44,7 +44,7 @@ import org.mozilla.jss.pkix.cert.Extension; * responses SEQUENCE OF SingleResponse, * responseExtensions [1] EXPLICIT Extensions OPTIONAL } * </pre> - * + * * @version $Revision$ $Date$ */ public class ResponseData implements ASN1Value { diff --git a/base/util/src/com/netscape/cmsutil/ocsp/RevokedInfo.java b/base/util/src/com/netscape/cmsutil/ocsp/RevokedInfo.java index 9b0b2d186..339a1b655 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/RevokedInfo.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/RevokedInfo.java @@ -32,13 +32,13 @@ import org.mozilla.jss.asn1.Tag; /** * RFC 2560: - * + * * <pre> * RevokedInfo ::= SEQUENCE { * revocationTime GeneralizedTime, * revocationReason [0] EXPLICIT CRLReason OPTIONAL } * </pre> - * + * * @version $Revision$ $Date$ */ public class RevokedInfo implements CertStatus { diff --git a/base/util/src/com/netscape/cmsutil/ocsp/Signature.java b/base/util/src/com/netscape/cmsutil/ocsp/Signature.java index b9b192aee..8edc66b2a 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/Signature.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/Signature.java @@ -33,14 +33,14 @@ import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; /** * RFC 2560: - * + * * <pre> * Signature ::= SEQUENCE { * signatureAlgorithm AlgorithmIdentifier, * signature BIT STRING, * certs [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL } * </pre> - * + * * @version $Revision$ $Date$ */ diff --git a/base/util/src/com/netscape/cmsutil/ocsp/SingleResponse.java b/base/util/src/com/netscape/cmsutil/ocsp/SingleResponse.java index ab54e5019..d56e4109d 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/SingleResponse.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/SingleResponse.java @@ -34,7 +34,7 @@ import org.mozilla.jss.pkix.cert.Extension; /** * RFC 2560: - * + * * <pre> * SingleResponse ::= SEQUENCE { * certID CertID, @@ -43,7 +43,7 @@ import org.mozilla.jss.pkix.cert.Extension; * nextUpdate [0] EXPLICIT GeneralizedTime OPTIONAL, * singleExtensions [1] EXPLICIT Extensions OPTIONAL } * </pre> - * + * * @version $Revision$ $Date$ */ public class SingleResponse implements ASN1Value { diff --git a/base/util/src/com/netscape/cmsutil/ocsp/TBSRequest.java b/base/util/src/com/netscape/cmsutil/ocsp/TBSRequest.java index b7f706edb..97d5e4244 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/TBSRequest.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/TBSRequest.java @@ -33,7 +33,7 @@ import org.mozilla.jss.pkix.cert.Extension; /** * RFC 2560: - * + * * <pre> * TBSRequest ::= SEQUENCE { * version [0] EXPLICIT Version DEFAULT v1, @@ -41,7 +41,7 @@ import org.mozilla.jss.pkix.cert.Extension; * requestList SEQUENCE OF Request, * requestExtensions [2] EXPLICIT Extensions OPTIONAL } * </pre> - * + * * @version $Revision$ $Date$ */ diff --git a/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java b/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java index 1fe4ea743..6343fd805 100644 --- a/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java +++ b/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java @@ -30,11 +30,11 @@ import org.mozilla.jss.asn1.Tag; /** * RFC 2560: - * + * * <pre> * UnknownInfo ::= NULL -- this can be replaced with an enumeration * </pre> - * + * * @version $Revision$ $Date$ */ public class UnknownInfo implements CertStatus { diff --git a/base/util/src/com/netscape/cmsutil/radius/AttributeFactory.java b/base/util/src/com/netscape/cmsutil/radius/AttributeFactory.java index 021c06720..ec7fefaf0 100644 --- a/base/util/src/com/netscape/cmsutil/radius/AttributeFactory.java +++ b/base/util/src/com/netscape/cmsutil/radius/AttributeFactory.java @@ -50,13 +50,13 @@ public class AttributeFactory { case Attribute.FRAMED_IP_NETMASK: // 9 return new FramedIPNetmaskAttribute(data); - case Attribute.FRAMED_ROUTING: // 10 + case Attribute.FRAMED_ROUTING: // 10 return new FramedRoutingAttribute(data); - case Attribute.FILTER_ID: // 11 + case Attribute.FILTER_ID: // 11 return new FilterIdAttribute(data); - case Attribute.FRAMED_MTU: // 12 + case Attribute.FRAMED_MTU: // 12 return new FramedMTUAttribute(data); case Attribute.FRAMED_COMPRESSION: // 13 @@ -77,73 +77,73 @@ public class AttributeFactory { case Attribute.CALLBACK_NUMBER: // 19 return new CallbackNumberAttribute(data); - case Attribute.CALLBACK_ID: // 20 + case Attribute.CALLBACK_ID: // 20 return new CallbackIdAttribute(data); - case Attribute.FRAMED_ROUTE: // 22 + case Attribute.FRAMED_ROUTE: // 22 return new FramedRouteAttribute(data); - case Attribute.FRAMED_IPX_NETWORK: // 23 + case Attribute.FRAMED_IPX_NETWORK: // 23 return new FramedIPXNetworkAttribute(data); - case Attribute.STATE: // 24 + case Attribute.STATE: // 24 return new StateAttribute(data); - case Attribute.NAS_CLASS: // 25 + case Attribute.NAS_CLASS: // 25 return new NASClassAttribute(data); - case Attribute.VENDOR_SPECIFIC: // 26 + case Attribute.VENDOR_SPECIFIC: // 26 return new VendorSpecificAttribute(data); - case Attribute.SESSION_TIMEOUT: // 27 + case Attribute.SESSION_TIMEOUT: // 27 return new SessionTimeoutAttribute(data); - case Attribute.IDLE_TIMEOUT: // 28 + case Attribute.IDLE_TIMEOUT: // 28 return new IdleTimeoutAttribute(data); - case Attribute.TERMINATION_ACTION: // 29 + case Attribute.TERMINATION_ACTION: // 29 return new TerminationActionAttribute(data); - case Attribute.CALLER_STATION_ID: // 30 + case Attribute.CALLER_STATION_ID: // 30 return new CallerStationIdAttribute(data); - case Attribute.CALLING_STATION_ID: // 31 + case Attribute.CALLING_STATION_ID: // 31 return new CallingStationIdAttribute(data); - case Attribute.NAS_IDENTIFIER: // 32 + case Attribute.NAS_IDENTIFIER: // 32 return new NASIdentifierAttribute(data); - case Attribute.PROXY_STATE: // 33 + case Attribute.PROXY_STATE: // 33 return new ProxyStateAttribute(data); - case Attribute.LOGIN_LAT_SERVICE: // 34 + case Attribute.LOGIN_LAT_SERVICE: // 34 return new LoginLATServiceAttribute(data); - case Attribute.LOGIN_LAT_NODE: // 35 + case Attribute.LOGIN_LAT_NODE: // 35 return new LoginLATNodeAttribute(data); - case Attribute.LOGIN_LAT_GROUP: // 36 + case Attribute.LOGIN_LAT_GROUP: // 36 return new LoginLATGroupAttribute(data); - case Attribute.FRAMED_APPLETALK_LINK: // 37 + case Attribute.FRAMED_APPLETALK_LINK: // 37 return new FramedAppleTalkLinkAttribute(data); - case Attribute.FRAMED_APPLETALK_NETWORK: // 38 + case Attribute.FRAMED_APPLETALK_NETWORK: // 38 return new FramedAppleTalkNetworkAttribute(data); - case Attribute.FRAMED_APPLETALK_ZONE: // 39 + case Attribute.FRAMED_APPLETALK_ZONE: // 39 return new FramedAppleTalkZoneAttribute(data); - case Attribute.CHAP_CHALLENGE: // 60 + case Attribute.CHAP_CHALLENGE: // 60 return new CHAPChallengeAttribute(data); - case Attribute.NAS_PORT_TYPE: // 61 + case Attribute.NAS_PORT_TYPE: // 61 return new NASPortTypeAttribute(data); - case Attribute.PORT_LIMIT: // 62 + case Attribute.PORT_LIMIT: // 62 return new PortLimitAttribute(data); - case Attribute.LOGIN_LAT_PORT: // 63 + case Attribute.LOGIN_LAT_PORT: // 63 return new LoginLATPortAttribute(data); default: diff --git a/base/util/src/com/netscape/cmsutil/radius/Packet.java b/base/util/src/com/netscape/cmsutil/radius/Packet.java index 4fad0ba79..902da857d 100644 --- a/base/util/src/com/netscape/cmsutil/radius/Packet.java +++ b/base/util/src/com/netscape/cmsutil/radius/Packet.java @@ -21,8 +21,8 @@ public abstract class Packet { public static final int ACCESS_REQUEST = 1; public static final int ACCESS_ACCEPT = 2; public static final int ACCESS_REJECT = 3; - // public static final int ACCOUNTING_REQUEST = 4; - // public static final int ACCOUNTING_RESPONSE = 5; + // public static final int ACCOUNTING_REQUEST = 4; + // public static final int ACCOUNTING_RESPONSE = 5; public static final int ACCESS_CHALLENGE = 11; public static final int RESERVED = 255; diff --git a/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java b/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java index 03bc68723..aef8de0b7 100644 --- a/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java +++ b/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java @@ -300,7 +300,7 @@ public class CRSPKIMessage { public void makeSignerInfo_old(int version, // issuer and serialnumber byte[] digest) { - + si = new SignerInfo(new INTEGER(version), sgnIASN, // issuer and serialnum new AlgorithmIdentifier(MD5_DIGEST, new NULL()), // digest algorithm @@ -308,7 +308,7 @@ public class CRSPKIMessage { new AlgorithmIdentifier(RSA_ENCRYPTION,new NULL()), // digest encryption algorithm new OCTET_STRING(digest), // digest null); // unauthenticated attributes - + } */ @@ -813,7 +813,7 @@ public class CRSPKIMessage { * The PKCS10 request is encrypt with a symmetric key. * This key in turn is encrypted with the RSA key in the * CA certificate. - * + * * riAlgid is the algorithm the symm key is encrypted with. It had * better be RSA * riKey is the encrypted symmetric key diff --git a/base/util/src/com/netscape/cmsutil/util/Fmt.java b/base/util/src/com/netscape/cmsutil/util/Fmt.java index a24b8d090..c167c6cc3 100644 --- a/base/util/src/com/netscape/cmsutil/util/Fmt.java +++ b/base/util/src/com/netscape/cmsutil/util/Fmt.java @@ -595,7 +595,7 @@ public class Fmt { * show( Fmt.fmt( 1.0D / 8.0D ) ); * System.out.println( "Done with tests." ); * } - * + * * private static void show( String str ) * { * System.out.println( "#" + str + "#" ); diff --git a/base/util/src/com/netscape/cmsutil/util/HMACDigest.java b/base/util/src/com/netscape/cmsutil/util/HMACDigest.java index 09bf53bbf..c0d86184c 100644 --- a/base/util/src/com/netscape/cmsutil/util/HMACDigest.java +++ b/base/util/src/com/netscape/cmsutil/util/HMACDigest.java @@ -22,7 +22,7 @@ import java.security.MessageDigest; /** * This class implements the HMAC algorithm specified in RFC 2104 using * any MessageDigest. - * + * * @author mikep * @version $Revision$, $Date$ * @see java.security.MessageDigest @@ -49,7 +49,7 @@ public class HMACDigest implements Cloneable { /** * Creates an HMACDigest - * + * * @param md The MessageDigest to be used for the HMAC calculation. It * must be clonable. */ @@ -60,7 +60,7 @@ public class HMACDigest implements Cloneable { /** * Creates an HMACDigest and initializes the HMAC function * with the given key. - * + * * @param md The MessageDigest to be used for the HMAC calculation. It * must be clonable. * @param key The key value to be used in the HMAC calculation @@ -79,18 +79,18 @@ public class HMACDigest implements Cloneable { /** * Initialize the HMAC function - * + * * The HMAC transform looks like: - * + * * hash(key XOR opad, hash(key XOR ipad, text)) - * + * * where key is an n byte key * ipad is the byte 0x36 repeated 64 times * opad is the byte 0x5c repeated 64 times * and text is the data being protected - * + * * This routine must be called after every reset. - * + * * @param key The password used to protect the hash value */ public void init(byte[] key) { @@ -131,7 +131,7 @@ public class HMACDigest implements Cloneable { /** * Updates the digest using the specified array of bytes. - * + * * @param input the array of bytes. */ public void update(byte[] input) { @@ -141,7 +141,7 @@ public class HMACDigest implements Cloneable { /** * Completes the HMAC computation with the outer pad * The digest is reset after this call is made. - * + * * @return the array of bytes for the resulting hash value. */ public byte[] digest() { @@ -173,7 +173,7 @@ public class HMACDigest implements Cloneable { /** * Clone the HMACDigest - * + * * @return a clone if the implementation is cloneable. * @exception CloneNotSupportedException if this is called on a * MessageDigest implementation that does not support <code>Cloneable</code>. diff --git a/base/util/src/com/netscape/cmsutil/util/Utils.java b/base/util/src/com/netscape/cmsutil/util/Utils.java index 303566416..bfd1e5297 100644 --- a/base/util/src/com/netscape/cmsutil/util/Utils.java +++ b/base/util/src/com/netscape/cmsutil/util/Utils.java @@ -236,7 +236,7 @@ public class Utils { /** * strips out double quotes around String parameter - * + * * @param s the string potentially bracketed with double quotes * @return string stripped of surrounding double quotes */ diff --git a/base/util/src/netscape/net/NetworkClient.java b/base/util/src/netscape/net/NetworkClient.java index ae8cdfcf4..f54ef7698 100644 --- a/base/util/src/netscape/net/NetworkClient.java +++ b/base/util/src/netscape/net/NetworkClient.java @@ -27,7 +27,7 @@ import java.net.UnknownHostException; /** * This is the base class for network clients. - * + * * @version 1.21, 08/07/97 * @author Jonathan Payne */ diff --git a/base/util/src/netscape/net/TransferProtocolClient.java b/base/util/src/netscape/net/TransferProtocolClient.java index 76e3a9c21..587ec85a1 100644 --- a/base/util/src/netscape/net/TransferProtocolClient.java +++ b/base/util/src/netscape/net/TransferProtocolClient.java @@ -23,7 +23,7 @@ import java.util.Vector; /** * This class implements that basic intefaces of transfer protocols. * It is used by subclasses implementing specific protocols. - * + * * @version 1.25, 08/07/97 * @author Jonathan Payne */ diff --git a/base/util/src/netscape/net/smtp/SmtpClient.java b/base/util/src/netscape/net/smtp/SmtpClient.java index 40b927b8f..bebeded3d 100644 --- a/base/util/src/netscape/net/smtp/SmtpClient.java +++ b/base/util/src/netscape/net/smtp/SmtpClient.java @@ -31,7 +31,7 @@ import netscape.net.TransferProtocolClient; * sender, calling startMessage to return a stream to which you write * the message (with RFC733 headers) and then you finally close the Smtp * Client. - * + * * @version 1.17, 12 Dec 1994 * @author James Gosling */ diff --git a/base/util/src/netscape/security/acl/AclEntryImpl.java b/base/util/src/netscape/security/acl/AclEntryImpl.java index 46365f5d8..878eacb68 100644 --- a/base/util/src/netscape/security/acl/AclEntryImpl.java +++ b/base/util/src/netscape/security/acl/AclEntryImpl.java @@ -28,7 +28,7 @@ import java.util.Vector; * This is a class that describes one entry that associates users * or groups with permissions in the ACL. * The entry may be used as a way of granting or denying permissions. - * + * * @author Satish Dharmaraj */ public class AclEntryImpl implements AclEntry { @@ -39,7 +39,7 @@ public class AclEntryImpl implements AclEntry { /** * Construct an ACL entry that associates a user with permissions * in the ACL. - * + * * @param user The user that is associated with this entry. */ public AclEntryImpl(Principal user) { @@ -56,7 +56,7 @@ public class AclEntryImpl implements AclEntry { * Sets the principal in the entity. If a group or a * principal had already been set, a false value is * returned, otherwise a true value is returned. - * + * * @param user The user that is associated with this entry. * @return true if the principal is set, false if there is * one already. @@ -87,7 +87,7 @@ public class AclEntryImpl implements AclEntry { /** * A principal or a group can be associated with multiple * permissions. This method adds a permission to the ACL entry. - * + * * @param permission The permission to be associated with * the principal or the group in the entry. * @return true if the permission was added, false if the @@ -106,7 +106,7 @@ public class AclEntryImpl implements AclEntry { /** * The method disassociates the permission from the Principal * or the Group in this ACL entry. - * + * * @param permission The permission to be disassociated with * the principal or the group in the entry. * @return true if the permission is removed, false if the @@ -119,7 +119,7 @@ public class AclEntryImpl implements AclEntry { /** * Checks if the passed permission is part of the allowed * permission set in this entry. - * + * * @param permission The permission that has to be part of * the permission set in the entry. * @return true if the permission passed is part of the diff --git a/base/util/src/netscape/security/acl/AclImpl.java b/base/util/src/netscape/security/acl/AclImpl.java index 76750b7b9..75ff02083 100644 --- a/base/util/src/netscape/security/acl/AclImpl.java +++ b/base/util/src/netscape/security/acl/AclImpl.java @@ -30,7 +30,7 @@ import java.util.Vector; /** * An Access Control List (ACL) is encapsulated by this class. - * + * * @author Satish Dharmaraj */ public class AclImpl extends OwnerImpl implements Acl { @@ -59,7 +59,7 @@ public class AclImpl extends OwnerImpl implements Acl { /** * Sets the name of the ACL. - * + * * @param caller the principal who is invoking this method. * @param name the name of the ACL. * @exception NotOwnerException if the caller principal is @@ -75,7 +75,7 @@ public class AclImpl extends OwnerImpl implements Acl { /** * Returns the name of the ACL. - * + * * @return the name of the ACL. */ public String getName() { @@ -90,7 +90,7 @@ public class AclImpl extends OwnerImpl implements Acl { * or positive) already in the table, a false value is returned. * The caller principal must be a part of the owners list of * the ACL in order to invoke this method. - * + * * @param caller the principal who is invoking this method. * @param entry the ACL entry that must be added to the ACL. * @return true on success, false if the entry is already present. @@ -116,7 +116,7 @@ public class AclImpl extends OwnerImpl implements Acl { * Removes an ACL entry from this ACL. * The caller principal must be a part of the owners list of the ACL * in order to invoke this method. - * + * * @param caller the principal who is invoking this method. * @param entry the ACL entry that must be removed from the ACL. * @return true on success, false if the entry is not part of the ACL. @@ -139,10 +139,10 @@ public class AclImpl extends OwnerImpl implements Acl { * This method returns the set of allowed permissions for the * specified principal. This set of allowed permissions is calculated * as follows: - * + * * If there is no entry for a group or a principal an empty permission * set is assumed. - * + * * The group positive permission set is the union of all * the positive permissions of each group that the individual belongs to. * The group negative permission set is the union of all @@ -151,18 +151,18 @@ public class AclImpl extends OwnerImpl implements Acl { * the postive permission set and the negative permission set, * it is removed from both. The group positive and negatoive permission * sets are calculated. - * + * * The individial positive permission set and the individual negative * permission set is then calculated. Again abscence of an entry means * the empty set. - * + * * The set of permissions granted to the principal is then calculated using * the simple rule: Individual permissions always override the Group permissions. * Specifically, individual negative permission set (specific * denial of permissions) overrides the group positive permission set. * And the individual positive permission set override the group negative * permission set. - * + * * @param user the principal for which the ACL entry is returned. * @return The resulting permission set that the principal is allowed. */ @@ -211,7 +211,7 @@ public class AclImpl extends OwnerImpl implements Acl { * permission false is returned, a true value is returned otherwise. * This method does not authenticate the principal. It presumes that * the principal is a valid authenticated principal. - * + * * @param principal the name of the authenticated principal * @param permission the permission that the principal must have. * @return true of the principal has the permission desired, false @@ -253,10 +253,10 @@ public class AclImpl extends OwnerImpl implements Acl { } // - // Find the table that this entry belongs to. There are 4 - // tables that are maintained. One each for postive and - // negative ACLs and one each for groups and users. - // This method figures out which + // Find the table that this entry belongs to. There are 4 + // tables that are maintained. One each for postive and + // negative ACLs and one each for groups and users. + // This method figures out which // table is the one that this AclEntry belongs to. // private Hashtable<Principal, AclEntry> findTable(AclEntry entry) { diff --git a/base/util/src/netscape/security/acl/AllPermissionsImpl.java b/base/util/src/netscape/security/acl/AllPermissionsImpl.java index f2b57742f..df3ff6451 100644 --- a/base/util/src/netscape/security/acl/AllPermissionsImpl.java +++ b/base/util/src/netscape/security/acl/AllPermissionsImpl.java @@ -21,7 +21,7 @@ import java.security.acl.Permission; /** * This class implements the principal interface for the set of all permissions. - * + * * @author Satish Dharmaraj */ public class AllPermissionsImpl extends PermissionImpl { @@ -33,7 +33,7 @@ public class AllPermissionsImpl extends PermissionImpl { /** * This function returns true if the permission passed matches the permission represented in * this interface. - * + * * @param another The Permission object to compare with. * @return true always */ diff --git a/base/util/src/netscape/security/acl/GroupImpl.java b/base/util/src/netscape/security/acl/GroupImpl.java index ed087a544..d28e83f00 100644 --- a/base/util/src/netscape/security/acl/GroupImpl.java +++ b/base/util/src/netscape/security/acl/GroupImpl.java @@ -24,7 +24,7 @@ import java.util.Vector; /** * This class implements a group of principals. - * + * * @author Satish Dharmaraj */ public class GroupImpl implements Group { @@ -33,7 +33,7 @@ public class GroupImpl implements Group { /** * Constructs a Group object with no members. - * + * * @param groupName the name of the group */ public GroupImpl(String groupName) { @@ -42,7 +42,7 @@ public class GroupImpl implements Group { /** * adds the specified member to the group. - * + * * @param user The principal to add to the group. * @return true if the member was added - false if the * member could not be added. @@ -61,7 +61,7 @@ public class GroupImpl implements Group { /** * removes the specified member from the group. - * + * * @param user The principal to remove from the group. * @param true if the principal was removed false if * the principal was not a member @@ -80,7 +80,7 @@ public class GroupImpl implements Group { /** * This function returns true if the group passed matches * the group represented in this interface. - * + * * @param another The group to compare this group to. */ public boolean equals(Group another) { @@ -103,7 +103,7 @@ public class GroupImpl implements Group { /** * returns true if the passed principal is a member of the group. - * + * * @param member The principal whose membership must be checked for. * @return true if the principal is a member of this group, * false otherwise @@ -133,7 +133,7 @@ public class GroupImpl implements Group { // // This function is the recursive search of groups for this // implementation of the Group. The search proceeds building up - // a vector of already seen groups. Only new groups are considered, + // a vector of already seen groups. Only new groups are considered, // thereby avoiding loops. // boolean isMemberRecurse(Principal member, Vector<Group> alreadySeen) { @@ -147,12 +147,12 @@ public class GroupImpl implements Group { return true; } else if (p instanceof GroupImpl) { // - // if not recurse if the group has not been checked already. - // Can call method in this package only if the object is an - // instance of this class. Otherwise call the method defined - // in the interface. (This can lead to a loop if a mixture of - // implementations form a loop, but we live with this improbable - // case rather than clutter the interface by forcing the + // if not recurse if the group has not been checked already. + // Can call method in this package only if the object is an + // instance of this class. Otherwise call the method defined + // in the interface. (This can lead to a loop if a mixture of + // implementations form a loop, but we live with this improbable + // case rather than clutter the interface by forcing the // implementation of this method.) // GroupImpl g = (GroupImpl) p; diff --git a/base/util/src/netscape/security/acl/OwnerImpl.java b/base/util/src/netscape/security/acl/OwnerImpl.java index 3f47a1dd8..0e6e13e52 100644 --- a/base/util/src/netscape/security/acl/OwnerImpl.java +++ b/base/util/src/netscape/security/acl/OwnerImpl.java @@ -28,7 +28,7 @@ import java.util.Enumeration; * Class implementing the Owner interface. The * initial owner principal is configured as * part of the constructor. - * + * * @author Satish Dharmaraj */ public class OwnerImpl implements Owner { @@ -45,7 +45,7 @@ public class OwnerImpl implements Owner { * The caller principal must be a part of the owners list of the ACL in * order to invoke this method. The initial owner is configured * at ACL construction time. - * + * * @param caller the principal who is invoking this method. * @param owner The owner that should be added to the owners list. * @return true if success, false if already an owner. @@ -66,7 +66,7 @@ public class OwnerImpl implements Owner { * raised. * The caller principal must be a part of the owners list of the ACL in * order to invoke this method. - * + * * @param caller the principal who is invoking this method. * @param owner The owner to be removed from the owners list. * @return true if the owner is removed, false if the owner is not part @@ -95,7 +95,7 @@ public class OwnerImpl implements Owner { /** * returns if the given principal belongs to the owner list. - * + * * @param owner The owner to check if part of the owners list * @return true if the passed principal is in the owner list, false if not. */ diff --git a/base/util/src/netscape/security/acl/PermissionImpl.java b/base/util/src/netscape/security/acl/PermissionImpl.java index 2e73d3c7e..b20570a81 100644 --- a/base/util/src/netscape/security/acl/PermissionImpl.java +++ b/base/util/src/netscape/security/acl/PermissionImpl.java @@ -22,7 +22,7 @@ import java.security.acl.Permission; /** * The PermissionImpl class implements the permission * interface for permissions that are strings. - * + * * @author Satish Dharmaraj */ public class PermissionImpl implements Permission { @@ -31,7 +31,7 @@ public class PermissionImpl implements Permission { /** * Construct a permission object using a string. - * + * * @param permission the stringified version of the permission. */ public PermissionImpl(String permission) { @@ -41,7 +41,7 @@ public class PermissionImpl implements Permission { /** * This function returns true if the object passed matches the permission * represented in this interface. - * + * * @param another The Permission object to compare with. * @return true if the Permission objects are equal, false otherwise */ @@ -56,7 +56,7 @@ public class PermissionImpl implements Permission { /** * Prints a stringified version of the permission. - * + * * @return the string representation of the Permission. */ public String toString() { diff --git a/base/util/src/netscape/security/acl/PrincipalImpl.java b/base/util/src/netscape/security/acl/PrincipalImpl.java index 25fa11095..54de845d0 100644 --- a/base/util/src/netscape/security/acl/PrincipalImpl.java +++ b/base/util/src/netscape/security/acl/PrincipalImpl.java @@ -21,7 +21,7 @@ import java.security.Principal; /** * This class implements the principal interface. - * + * * @author Satish Dharmaraj */ public class PrincipalImpl implements Principal { @@ -30,7 +30,7 @@ public class PrincipalImpl implements Principal { /** * Construct a principal from a string user name. - * + * * @param user The string form of the principal name. */ public PrincipalImpl(String user) { @@ -40,7 +40,7 @@ public class PrincipalImpl implements Principal { /** * This function returns true if the object passed matches * the principal represented in this implementation - * + * * @param another the Principal to compare with. * @return true if the Principal passed is the same as that * encapsulated in this object, false otherwise diff --git a/base/util/src/netscape/security/acl/WorldGroupImpl.java b/base/util/src/netscape/security/acl/WorldGroupImpl.java index 2f885cbec..a8eea8a7e 100644 --- a/base/util/src/netscape/security/acl/WorldGroupImpl.java +++ b/base/util/src/netscape/security/acl/WorldGroupImpl.java @@ -21,7 +21,7 @@ import java.security.Principal; /** * This class implements a group of principals. - * + * * @author Satish Dharmaraj */ public class WorldGroupImpl extends GroupImpl { @@ -32,7 +32,7 @@ public class WorldGroupImpl extends GroupImpl { /** * returns true for all passed principals - * + * * @param member The principal whose membership must be checked in this Group. * @return true always since this is the "world" group. */ diff --git a/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java b/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java index b8e2933dd..13f8007ed 100644 --- a/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java +++ b/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java @@ -41,7 +41,7 @@ import netscape.security.x509.URIName; /** * This represents the authority information access extension * as defined in RFC2459. - * + * * id-pkix OBJECT IDENTIFIER ::= { iso(1) identified-organization(3) dod(6) * internet(1) security(5) mechanisms(5) * pkix(7) } } @@ -55,11 +55,11 @@ import netscape.security.x509.URIName; * id-ad OBJECT IDENTIFIER ::= { id-pkix 48 } * id-ad-ocsp OBJECT IDENTIFIER ::= { id-ad 1 } * id-ad-caIssuers OBJECT IDENTIFIER ::= { id-ad 2 } - * + * * Need to make sure the following is added to CMS.cfg: * oidmap.auth_info_access.class=com.netscape.certsrv.cert.AuthInfoAccessExtension * oidmap.auth_info_access.oid=1.3.6.1.5.5.7.1.1 - * + * * @author thomask * @version $Revision$, $Date$ */ @@ -83,7 +83,7 @@ public class AuthInfoAccessExtension extends Extension implements CertAttrSet { /** * Create the extension from the passed DER encoded value of the same. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -201,7 +201,7 @@ public class AuthInfoAccessExtension extends Extension implements CertAttrSet { /** * Write the extension to the DerOutputStream. - * + * * @param out the DerOutputStream to write the extension to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java b/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java index 018fd71c8..f659cd1ad 100644 --- a/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java +++ b/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java @@ -33,11 +33,11 @@ import netscape.security.x509.Extension; /** * This represents the CertificateRenewalWindow extension * as defined in draft-thayes-cert-renewal-00 - * + * * CertificateRenewalWindow ::= SEQUENCE { * beginTime GeneralizedTime, * endTime GeneralizedTime OPTIONAL } - * + * * @author thomask * @version $Revision$, $Date$ */ @@ -161,7 +161,7 @@ public class CertificateRenewalWindowExtension extends Extension /** * Write the extension to the DerOutputStream. - * + * * @param out the DerOutputStream to write the extension to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/extensions/CertificateScopeEntry.java b/base/util/src/netscape/security/extensions/CertificateScopeEntry.java index 527093ccf..0e16a1d35 100644 --- a/base/util/src/netscape/security/extensions/CertificateScopeEntry.java +++ b/base/util/src/netscape/security/extensions/CertificateScopeEntry.java @@ -27,13 +27,13 @@ import netscape.security.x509.GeneralName; /** * This represents the CertificateScopeOfUse extension * as defined in draft-thayes-cert-scope-00 - * + * * CertificateScopeEntry ::= SEQUENCE { * name GeneralName, -- pattern, as for NameConstraints * portNumber INTEGER OPTIONAL * } * CertificateScopeOfUse ::= SEQUENCE OF CertificateScopeEntry - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java b/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java index 16641f36b..7055ad9d1 100644 --- a/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java +++ b/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java @@ -34,13 +34,13 @@ import netscape.security.x509.OIDMap; /** * This represents the CertificateScopeOfUse extension * as defined in draft-thayes-cert-scope-00 - * + * * CertificateScopeEntry ::= SEQUENCE { * name GeneralName, -- pattern, as for NameConstraints * portNumber INTEGER OPTIONAL * } * CertificateScopeOfUse ::= SEQUENCE OF CertificateScopeEntry - * + * * @author thomask * @version $Revision$, $Date$ */ @@ -166,7 +166,7 @@ public class CertificateScopeOfUseExtension extends Extension /** * Write the extension to the DerOutputStream. - * + * * @param out the DerOutputStream to write the extension to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/extensions/GenericASN1Extension.java b/base/util/src/netscape/security/extensions/GenericASN1Extension.java index ff1ea7173..778f9cdf5 100644 --- a/base/util/src/netscape/security/extensions/GenericASN1Extension.java +++ b/base/util/src/netscape/security/extensions/GenericASN1Extension.java @@ -173,7 +173,7 @@ public class GenericASN1Extension extends Extension /** * Create a GenericASN1Extension with the value and oid. * The criticality is set to false. - * + * * @param the values to be set for the extension. */ public GenericASN1Extension(String name, String oid, String pattern, boolean critical, @@ -199,7 +199,7 @@ public class GenericASN1Extension extends Extension /** * Create a GenericASN1Extension with the value and oid. * The criticality is set to false. - * + * * @param the values to be set for the extension. */ public GenericASN1Extension(Hashtable<String, String> config) @@ -228,7 +228,7 @@ public class GenericASN1Extension extends Extension /** * Create the extension from the passed DER encoded value of the same. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -276,7 +276,7 @@ public class GenericASN1Extension extends Extension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -286,7 +286,7 @@ public class GenericASN1Extension extends Extension /** * Write the extension to the DerOutputStream. - * + * * @param out the DerOutputStream to write the extension to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java b/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java index 81b8cf5b5..5295cf6a1 100644 --- a/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java +++ b/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java @@ -34,11 +34,11 @@ import netscape.security.x509.OIDMap; /** * RFC3280: - * + * * id-ce-inhibitAnyPolicy OBJECT IDENTIFIER ::= { id-ce 54 } - * + * * InhibitAnyPolicy ::= SkipCerts - * + * * SkipCerts ::= INTEGER (0..MAX) */ public class InhibitAnyPolicyExtension diff --git a/base/util/src/netscape/security/extensions/KerberosName.java b/base/util/src/netscape/security/extensions/KerberosName.java index 0a6a6e213..cf1ddc0a8 100644 --- a/base/util/src/netscape/security/extensions/KerberosName.java +++ b/base/util/src/netscape/security/extensions/KerberosName.java @@ -31,17 +31,17 @@ import netscape.security.util.ObjectIdentifier; /** * This represents a KerberosName as defined in * RFC 1510. - * + * * KerberosName ::= SEQUENCE { * realm [0] Realm, * principalName [1] CertPrincipalName -- defined above * } - * + * * CertPrincipalName ::= SEQUENCE { * name-type[0] INTEGER, * name-string[1] SEQUENCE OF UTF8String * } - * + * * @author thomask * @version $Revision$, $Date$ */ @@ -63,7 +63,7 @@ public class KerberosName { /** * Write the extension to the DerOutputStream. - * + * * @param out the DerOutputStream to write the extension to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/extensions/NSCertTypeExtension.java b/base/util/src/netscape/security/extensions/NSCertTypeExtension.java index 04b3038e5..9865cde0a 100644 --- a/base/util/src/netscape/security/extensions/NSCertTypeExtension.java +++ b/base/util/src/netscape/security/extensions/NSCertTypeExtension.java @@ -33,11 +33,11 @@ import netscape.security.x509.Extension; /** * NSCertTypeExtension * Represents Netscape Certificate Type Extension - * + * * <p> * This deprecated extension, if present, defines both the purpose (e.g., encipherment, signature, certificate signing) * and the application (e.g., SSL, S/Mime or Object Signing of the key contained in the certificate. - * + * * @author galperin * @version $Revision$, $Date$ */ @@ -142,7 +142,7 @@ public class NSCertTypeExtension extends Extension implements CertAttrSet { /** * Check if bit is set. - * + * * @param position the position in the bit string to check. */ public boolean isSet(int position) { @@ -201,7 +201,7 @@ public class NSCertTypeExtension extends Extension implements CertAttrSet { /** * Create a NSCertTypeExtension with the passed bit settings. * The criticality is set to false. - * + * * @param bitString the bits to be set for the extension. */ public NSCertTypeExtension(boolean critical, byte[] bitString) throws IOException { @@ -220,7 +220,7 @@ public class NSCertTypeExtension extends Extension implements CertAttrSet { /** * Create the extension from the passed DER encoded value of the same. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -331,7 +331,7 @@ public class NSCertTypeExtension extends Extension implements CertAttrSet { /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -341,7 +341,7 @@ public class NSCertTypeExtension extends Extension implements CertAttrSet { /** * Write the extension to the DerOutputStream. - * + * * @param out the DerOutputStream to write the extension to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java b/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java index 5c373289f..6bd5c95b6 100644 --- a/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java +++ b/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java @@ -41,7 +41,7 @@ import netscape.security.x509.URIName; /** * This represents the subject information access extension * as defined in RFC3280. - * + * * @author thomask * @version $Revision$, $Date$ */ @@ -65,7 +65,7 @@ public class SubjectInfoAccessExtension extends Extension implements CertAttrSet /** * Create the extension from the passed DER encoded value of the same. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -183,7 +183,7 @@ public class SubjectInfoAccessExtension extends Extension implements CertAttrSet /** * Write the extension to the DerOutputStream. - * + * * @param out the DerOutputStream to write the extension to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/pkcs/ContentInfo.java b/base/util/src/netscape/security/pkcs/ContentInfo.java index 9825494c2..d6a4db7c6 100644 --- a/base/util/src/netscape/security/pkcs/ContentInfo.java +++ b/base/util/src/netscape/security/pkcs/ContentInfo.java @@ -26,7 +26,7 @@ import netscape.security.util.ObjectIdentifier; /** * A ContentInfo type, as defined in PKCS#7. - * + * * @version 1.12 * @author Benjamin Renaud */ diff --git a/base/util/src/netscape/security/pkcs/PKCS10.java b/base/util/src/netscape/security/pkcs/PKCS10.java index a6ddd203f..2d1c8eadb 100644 --- a/base/util/src/netscape/security/pkcs/PKCS10.java +++ b/base/util/src/netscape/security/pkcs/PKCS10.java @@ -43,28 +43,28 @@ import netscape.security.x509.X509Key; * the entity which created the certificate request. These cert requests * basically consist of the subject's X.500 name and public key, signed * using the corresponding private key. - * + * * The ASN.1 syntax for a Certification Request is: - * + * * <pre> * CertificationRequest ::= SEQUENCE { * certificationRequestInfo CertificationRequestInfo, * signatureAlgorithm SignatureAlgorithmIdentifier, * signature Signature * } - * + * * SignatureAlgorithmIdentifier ::= AlgorithmIdentifier * Signature ::= BIT STRING - * + * * CertificationRequestInfo ::= SEQUENCE { * version Version, * subject Name, * subjectPublicKeyInfo SubjectPublicKeyInfo, * attributes [0] IMPLICIT Attributes - * } + * } * Attributes ::= SET OF Attribute * </pre> - * + * * @author David Brownell * @author Amit Kapoor * @author Hemma Prafullchandra @@ -75,7 +75,7 @@ public class PKCS10 { * Constructs an unsigned PKCS #10 certificate request. Before this * request may be used, it must be encoded and signed. Then it * must be retrieved in some conventional format (e.g. string). - * + * * @param publicKey the public key that should be placed * into the certificate generated by the CA. */ @@ -88,7 +88,7 @@ public class PKCS10 { * Constructs an unsigned PKCS #10 certificate request. Before this * request may be used, it must be encoded and signed. Then it * must be retrieved in some conventional format (e.g. string). - * + * * @param publicKey the public key that should be placed * into the certificate generated by the CA. * @param attributes additonal set of PKCS10 attributes requested @@ -107,7 +107,7 @@ public class PKCS10 { * the request's signature as it does so. This constructor would * typically be used by a Certificate Authority, from which a new * certificate would then be constructed. - * + * * @param data the DER-encoded PKCS #10 request. * @param sigver boolean specifies signature verification enabled or not * @exception IOException for low level errors reading the data @@ -207,7 +207,7 @@ public class PKCS10 { /** * Create the signed certificate request. This will later be * retrieved in either string or binary format. - * + * * @param requester identifies the signer (by X.500 name) * and provides the private key used to sign. * @exception IOException on errors. @@ -284,7 +284,7 @@ public class PKCS10 { /** * Returns the encoded and signed certificate request as a * DER-encoded byte array. - * + * * @return the certificate request, or null if encodeAndSign() * has not yet been called. */ @@ -299,7 +299,7 @@ public class PKCS10 { * used this for some time. Some certificate authorities expect some * more information, in particular contact information for the web * server administrator. - * + * * @param out the print stream where the certificate request * will be printed. * @exception IOException when an output operation failed diff --git a/base/util/src/netscape/security/pkcs/PKCS10Attribute.java b/base/util/src/netscape/security/pkcs/PKCS10Attribute.java index a649c395a..eae4b0479 100644 --- a/base/util/src/netscape/security/pkcs/PKCS10Attribute.java +++ b/base/util/src/netscape/security/pkcs/PKCS10Attribute.java @@ -37,17 +37,17 @@ import netscape.security.x509.OIDMap; /** * Represent a PKCS Attribute. - * + * * <p> * Attributes are addiitonal attributes which can be inserted in a PKCS certificate request. For example a * "Driving License Certificate" could have the driving license number as a attribute. - * + * * <p> * Attributes are represented as a sequence of the attribute identifier (Object Identifier) and a set of DER encoded * attribute values. The current implementation only supports one value per attribute. - * + * * ASN.1 definition of Attribute: - * + * * <pre> * Attribute :: SEQUENCE { * type AttributeValue, @@ -55,7 +55,7 @@ import netscape.security.x509.OIDMap; * } * AttributeValue ::= ANY * </pre> - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.13 @@ -127,8 +127,8 @@ public class PKCS10Attribute implements DerEncoder, Serializable { Object[] passed = new Object[] { value }; attributeValue = cons.newInstance(passed); } else { - // attribute classes are usable for PKCS10 attributes. - // this is used where the attributes are not actual + // attribute classes are usable for PKCS10 attributes. + // this is used where the attributes are not actual // implemented extensions. attributeValue = new ACertAttrSet(inAttrValue); } @@ -142,7 +142,7 @@ public class PKCS10Attribute implements DerEncoder, Serializable { /** * Constructs an attribute from individual components of ObjectIdentifier * and the DER encoded value. - * + * * @param attributeId the ObjectIdentifier of the attribute. * @param attributeValue the CertAttrSet. */ @@ -155,7 +155,7 @@ public class PKCS10Attribute implements DerEncoder, Serializable { /** * Constructs an attribute from another attribute. To be used for * creating decoded subclasses. - * + * * @param attr the attribute to create from. */ public PKCS10Attribute(PKCS10Attribute attr) { @@ -165,7 +165,7 @@ public class PKCS10Attribute implements DerEncoder, Serializable { /** * Write the output to the DerOutputStream. - * + * * @param out the OutputStream to write the attribute to. * @exception CertificateException on certificate encoding errors. * @exception IOException on encoding errors. @@ -196,10 +196,10 @@ public class PKCS10Attribute implements DerEncoder, Serializable { /** * DER encode this object onto an output stream. * Implements the <code>DerEncoder</code> interface. - * + * * @param out * the OutputStream on which to write the DER encoding. - * + * * @exception IOException on encoding errors. */ public void derEncode(OutputStream out) throws IOException { diff --git a/base/util/src/netscape/security/pkcs/PKCS10Attributes.java b/base/util/src/netscape/security/pkcs/PKCS10Attributes.java index 8beb1e64c..d9b463b5f 100644 --- a/base/util/src/netscape/security/pkcs/PKCS10Attributes.java +++ b/base/util/src/netscape/security/pkcs/PKCS10Attributes.java @@ -30,7 +30,7 @@ import netscape.security.util.DerValue; /** * This class defines the PKCS10 attributes for the request. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.10 @@ -52,7 +52,7 @@ public class PKCS10Attributes extends Vector<PKCS10Attribute> implements DerEnco /** * Create the object, decoding the values from the passed DER stream. - * + * * @param in the DerInputStream to read the attributes from. * @exception IOException on decoding errors. */ @@ -73,9 +73,9 @@ public class PKCS10Attributes extends Vector<PKCS10Attribute> implements DerEnco /** * Encode the attributes in DER form to the stream. - * + * * @param out the OutputStream to marshal the contents to. - * + * * @exception IOException on encoding errors. */ public void encode(OutputStream out) @@ -86,7 +86,7 @@ public class PKCS10Attributes extends Vector<PKCS10Attribute> implements DerEnco /** * Encode the attributes in DER form to the stream. * Implements the <code>DerEncoder</code> interface. - * + * * @param out the OutputStream to marshal the contents to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/pkcs/PKCS7.java b/base/util/src/netscape/security/pkcs/PKCS7.java index c8fb69582..26a0bdb34 100644 --- a/base/util/src/netscape/security/pkcs/PKCS7.java +++ b/base/util/src/netscape/security/pkcs/PKCS7.java @@ -43,7 +43,7 @@ import netscape.security.x509.X509CertImpl; * type, where to the type of data signed is plain Data. * For signedData, <tt>crls</tt>, <tt>attributes</tt> and * PKCS#6 Extended Certificates are not supported. - * + * * @version 1.33 97/12/10 * @author Benjamin Renaud */ @@ -61,7 +61,7 @@ public class PKCS7 { /** * Unmarshals a PKCS7 block from its encoded form, parsing the * encoded bytes from the InputStream. - * + * * @param in an input stream holding at least one PKCS7 block. * @exception ParsingException on parsing errors. * @exception IOException on other errors. @@ -93,7 +93,7 @@ public class PKCS7 { /** * Unmarshals a PKCS7 block from its encoded form, parsing the * encoded bytes from the DerInputStream. - * + * * @param derin a DerInputStream holding at least one PKCS7 block. * @exception ParsingException on parsing errors. */ @@ -104,7 +104,7 @@ public class PKCS7 { /** * Unmarshals a PKCS7 block from its encoded form, parsing the * encoded bytes. - * + * * @param bytes the encoded bytes. * @exception ParsingException on parsing errors. */ @@ -133,7 +133,7 @@ public class PKCS7 { /** * Construct an initialized PKCS7 block. - * + * * @param digestAlgorithmIds the message digest algorithm identifiers. * @param contentInfo the content information. * @param certificates an array of X.509 certificates. @@ -224,7 +224,7 @@ public class PKCS7 { /** * Encodes the signed data to an output stream. - * + * * @param out the output stream to write the encoded data to. * @exception IOException on encoding errors. */ @@ -254,7 +254,7 @@ public class PKCS7 { /** * Encodes the signed data to a DerOutputStream. - * + * * @param out the DerOutputStream to write the encoded data to. * @exception IOException on encoding errors. */ @@ -313,10 +313,10 @@ public class PKCS7 { /** * This verifies a given SignerInfo. - * + * * @param info the signer information. * @param bytes the DER encoded content information. - * + * * @exception NoSuchAlgorithmException on unrecognized algorithms. * @exception SignatureException on signature handling errors. */ @@ -327,9 +327,9 @@ public class PKCS7 { /** * Returns all signerInfos which self-verify. - * + * * @param bytes the DER encoded content information. - * + * * @exception NoSuchAlgorithmException on unrecognized algorithms. * @exception SignatureException on signature handling errors. */ @@ -355,7 +355,7 @@ public class PKCS7 { /** * Returns all signerInfos which self-verify. - * + * * @exception NoSuchAlgorithmException on unrecognized algorithms. * @exception SignatureException on signature handling errors. */ @@ -403,7 +403,7 @@ public class PKCS7 { * Returns the X.509 certificate listed in this PKCS7 block * which has a matching serial number and Issuer name, or * null if one is not found. - * + * * @param serial the serial number of the certificate to retrieve. * @param name the Distinguished Name of the Issuer. */ diff --git a/base/util/src/netscape/security/pkcs/PKCS8Key.java b/base/util/src/netscape/security/pkcs/PKCS8Key.java index 7c5f64582..db1d6b275 100644 --- a/base/util/src/netscape/security/pkcs/PKCS8Key.java +++ b/base/util/src/netscape/security/pkcs/PKCS8Key.java @@ -39,7 +39,7 @@ import netscape.security.x509.AlgorithmId; /** * Holds a PKCS#8 key, for example a private key - * + * * @version 1.30, 97/12/10 * @author Dave Brownell * @author Benjamin Renaud @@ -74,12 +74,12 @@ public class PKCS8Key implements PrivateKey { * the runtime environment is configured with a specific class for * this kind of key, a subclass is returned. Otherwise, a generic * PKCS8Key object is returned. - * + * * <P> * This mechanism gurantees that keys (and algorithms) may be freely manipulated and transferred, without risk of * losing information. Also, when a key (or algorithm) needs some special handling, that specific need can be * accomodated. - * + * * @param in the DER-encoded SubjectPublicKeyInfo value * @exception IOException on data format errors */ @@ -117,11 +117,11 @@ public class PKCS8Key implements PrivateKey { * keys encapsulate two unsigned integers (modulus and exponent) as * DER values within the <code>key</code> bits; Diffie-Hellman and * DSS/DSA keys encapsulate a single unsigned integer. - * + * * <P> * This function is called when creating PKCS#8 SubjectPublicKeyInfo values using the PKCS8Key member functions, * such as <code>parse</code> and <code>decode</code>. - * + * * @exception IOException if a parsing error occurs. * @exception InvalidKeyException if the key encoding is invalid. */ @@ -248,7 +248,7 @@ public class PKCS8Key implements PrivateKey { /** * Returns the DER-encoded form of the key as a byte array. - * + * * @exception InvalidKeyException if an encoding error occurs. */ public byte[] encode() throws InvalidKeyException { @@ -286,14 +286,14 @@ public class PKCS8Key implements PrivateKey { * PKCS#8 format: a sequence consisting of a version, an algorithm * ID and a bit string which holds the key. (That bit string is * often used to encapsulate another DER encoded sequence.) - * + * * <P> * Subclasses should not normally redefine this method; they should instead provide a <code>parseKeyBits</code> * method to parse any fields inside the <code>key</code> member. - * + * * @param in an input stream with a DER-encoded PKCS#8 * SubjectPublicKeyInfo value - * + * * @exception InvalidKeyException if a parsing error occurs. */ public void decode(InputStream in) throws InvalidKeyException { @@ -381,7 +381,7 @@ public class PKCS8Key implements PrivateKey { * to compare is not of type <code>Key</code>. * Otherwise, the encoding of this key object is compared with the * encoding of the given key object. - * + * * @param object the object with which to compare * @return <code>true</code> if this key has the same encoding as the * object argument; <code>false</code> otherwise. diff --git a/base/util/src/netscape/security/pkcs/PKCS9Attribute.java b/base/util/src/netscape/security/pkcs/PKCS9Attribute.java index 6a6fd7dc9..1239ccaf3 100644 --- a/base/util/src/netscape/security/pkcs/PKCS9Attribute.java +++ b/base/util/src/netscape/security/pkcs/PKCS9Attribute.java @@ -34,7 +34,7 @@ import netscape.security.x509.CertificateExtensions; * Class supporting any PKCS9 attribute except * ExtendedCertificateAttribute. Supports DER decoding and access to * attribute values, but not DER encoding or setting of values. - * + * * @version 1.2 97/12/10 * @author Douglas Hoover */ @@ -51,7 +51,7 @@ public class PKCS9Attribute implements DerEncoder { * Array of attribute OIDs defined in PKCS9, by number. */ static final ObjectIdentifier[] PKCS9_OIDS = - //new ObjectIdentifier[10]; + //new ObjectIdentifier[10]; // There are some Obsolete(?) attribute identifiers. // This is mainly for extensionRequest (14) in pkcs10. // We just add the other 4 as by products. @@ -174,118 +174,118 @@ public class PKCS9Attribute implements DerEncoder { /** * Class types required for values for a given PKCS9 * attribute type. - * + * * <P> * The following table shows the correspondence between attribute types and value component classes. - * + * * <P> * <TABLE BORDER CELLPADDING=8 ALIGN=CENTER> - * + * * <TR> * <TH>OID</TH> * <TH>Attribute Type Name</TH> * <TH>Kind</TH> * <TH>Value Class</TH> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.1</TD> * <TD>EmailAddress</TD> * <TD>Multiple-valued</TD> * <TD><code>String[]</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.2</TD> * <TD>UnstructuredName</TD> * <TD>Multiple-valued</TD> * <TD><code>String</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.3</TD> * <TD>ContentType</TD> * <TD>Single-valued</TD> * <TD><code>ObjectIdentifier</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.4</TD> * <TD>MessageDigest</TD> * <TD>Single-valued</TD> * <TD><code>byte[]</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.5</TD> * <TD>SigningTime</TD> * <TD>Single-valued</TD> * <TD><code>Date</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.6</TD> * <TD>Countersignature</TD> * <TD>Multiple-valued</TD> * <TD><code>SignerInfo</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.7</TD> * <TD>ChallengePassword</TD> * <TD>Single-valued</TD> * <TD><code>String</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.8</TD> * <TD>UnstructuredAddress</TD> * <TD>Single-valued</TD> * <TD><code>String</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.9</TD> * <TD>ExtendedCertificateAttributes</TD> * <TD>Multiple-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.10</TD> * <TD>IssuerAndSerialNumber</TD> * <TD>Single-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.11</TD> * <TD>PasswordCheck</TD> * <TD>Single-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.12</TD> * <TD>PublicKey</TD> * <TD>Single-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.13</TD> * <TD>SigningDescription</TD> * <TD>Single-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.14</TD> * <TD>ExtensionRequest</TD> * <TD>Single-valued</TD> * <TD><code>Sequence</code></TD> * </TR> - * + * * </TABLE> */ private static final Class<?>[] VALUE_CLASSES = new Class[15]; @@ -348,118 +348,118 @@ public class PKCS9Attribute implements DerEncoder { * value. If the attribute is * multiple-valued, provide an array containing all the values. * Arrays of length zero are accepted, though probably useless. - * + * * <P> * The following table gives the class that <code>value</code> must have for a given attribute. - * + * * <P> * <TABLE BORDER CELLPADDING=8 ALIGN=CENTER> - * + * * <TR> * <TH>OID</TH> * <TH>Attribute Type Name</TH> * <TH>Kind</TH> * <TH>Value Class</TH> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.1</TD> * <TD>EmailAddress</TD> * <TD>Multiple-valued</TD> * <TD><code>String[]</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.2</TD> * <TD>UnstructuredName</TD> * <TD>Multiple-valued</TD> * <TD><code>String[]</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.3</TD> * <TD>ContentType</TD> * <TD>Single-valued</TD> * <TD><code>ObjectIdentifier</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.4</TD> * <TD>MessageDigest</TD> * <TD>Single-valued</TD> * <TD><code>byte[]</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.5</TD> * <TD>SigningTime</TD> * <TD>Single-valued</TD> * <TD><code>Date</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.6</TD> * <TD>Countersignature</TD> * <TD>Multiple-valued</TD> * <TD><code>SignerInfo[]</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.7</TD> * <TD>ChallengePassword</TD> * <TD>Single-valued</TD> * <TD><code>String</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.8</TD> * <TD>UnstructuredAddress</TD> * <TD>Single-valued</TD> * <TD><code>String[]</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.9</TD> * <TD>ExtendedCertificateAttributes</TD> * <TD>Multiple-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.10</TD> * <TD>IssuerAndSerialNumber</TD> * <TD>Single-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.11</TD> * <TD>PasswordCheck</TD> * <TD>Single-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.12</TD> * <TD>PublicKey</TD> * <TD>Single-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.13</TD> * <TD>SigningDescription</TD> * <TD>Single-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.14</TD> * <TD>ExtensionRequest</TD> * <TD>Single-valued</TD> * <TD><code>Sequence</code></TD> * </TR> - * + * * </TABLE> */ public PKCS9Attribute(ObjectIdentifier oid, Object value) @@ -474,121 +474,121 @@ public class PKCS9Attribute implements DerEncoder { * value. If the attribute is * multiple-valued, provide an array containing all the values. * Arrays of length zero are accepted, though probably useless. - * + * * <P> * The following table gives the class that <code>value</code> must have for a given attribute. Reasonable variants * of these attributes are accepted; in particular, case does not matter. - * + * * <P> * <TABLE BORDER CELLPADDING=8 ALIGN=CENTER> - * + * * <TR> * <TH>OID</TH> * <TH>Attribute Type Name</TH> * <TH>Kind</TH> * <TH>Value Class</TH> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.1</TD> * <TD>EmailAddress</TD> * <TD>Multiple-valued</TD> * <TD><code>String[]</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.2</TD> * <TD>UnstructuredName</TD> * <TD>Multiple-valued</TD> * <TD><code>String[]</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.3</TD> * <TD>ContentType</TD> * <TD>Single-valued</TD> * <TD><code>ObjectIdentifier</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.4</TD> * <TD>MessageDigest</TD> * <TD>Single-valued</TD> * <TD><code>byte[]</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.5</TD> * <TD>SigningTime</TD> * <TD>Single-valued</TD> * <TD><code>Date</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.6</TD> * <TD>Countersignature</TD> * <TD>Multiple-valued</TD> * <TD><code>SignerInfo[]</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.7</TD> * <TD>ChallengePassword</TD> * <TD>Single-valued</TD> * <TD><code>String</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.8</TD> * <TD>UnstructuredAddress</TD> * <TD>Single-valued</TD> * <TD><code>String[]</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.9</TD> * <TD>ExtendedCertificateAttributes</TD> * <TD>Multiple-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.10</TD> * <TD>IssuerAndSerialNumber</TD> * <TD>Single-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.11</TD> * <TD>PasswordCheck</TD> * <TD>Single-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.12</TD> * <TD>PublicKey</TD> * <TD>Single-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.13</TD> * <TD>SigningDescription</TD> * <TD>Single-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.14</TD> * <TD>ExtensionRequest</TD> * <TD>Single-valued</TD> * <TD><code>Sequence</code></TD> * </TR> - * + * * </TABLE> - * + * * @exception IllegalArgumentException * if the <code>name</code> is not recognized of the <code>value</code> has the wrong type. */ @@ -628,7 +628,7 @@ public class PKCS9Attribute implements DerEncoder { /** * Construct a PKCS9Attribute from its encoding on an input * stream. - * + * * @exception IOException on parsing error. */ public PKCS9Attribute(DerValue derVal) throws IOException { @@ -638,7 +638,7 @@ public class PKCS9Attribute implements DerEncoder { /** * Decode a PKCS9 attribute. - * + * * @param val * the DerValue representing the DER encoding of the attribute. */ @@ -752,7 +752,7 @@ public class PKCS9Attribute implements DerEncoder { /** * Write the DER encoding of this attribute to an output stream. - * + * * <P> * N.B.: This method always encodes values of ChallengePassword and UnstructuredAddress attributes as ASN.1 * <code>PrintableString</code>s, without checking whether they should be encoded as <code>T61String</code>s. @@ -876,120 +876,120 @@ public class PKCS9Attribute implements DerEncoder { * single-valued, return just the one value. If the attribute is * multiple-valued, return an array containing all the values. * It is possible for this array to be of length 0. - * + * * <P> * The following table gives the class of the value returned, depending on the type of this attribute. - * + * * <P> * <TABLE BORDER CELLPADDING=8 ALIGN=CENTER> - * + * * <TR> * <TH>OID</TH> * <TH>Attribute Type Name</TH> * <TH>Kind</TH> * <TH>Value Class</TH> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.1</TD> * <TD>EmailAddress</TD> * <TD>Multiple-valued</TD> * <TD><code>String[]</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.2</TD> * <TD>UnstructuredName</TD> * <TD>Multiple-valued</TD> * <TD><code>String[]</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.3</TD> * <TD>ContentType</TD> * <TD>Single-valued</TD> * <TD><code>ObjectIdentifier</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.4</TD> * <TD>MessageDigest</TD> * <TD>Single-valued</TD> * <TD><code>byte[]</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.5</TD> * <TD>SigningTime</TD> * <TD>Single-valued</TD> * <TD><code>Date</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.6</TD> * <TD>Countersignature</TD> * <TD>Multiple-valued</TD> * <TD><code>SignerInfo[]</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.7</TD> * <TD>ChallengePassword</TD> * <TD>Single-valued</TD> * <TD><code>String</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.8</TD> * <TD>UnstructuredAddress</TD> * <TD>Single-valued</TD> * <TD><code>String[]</code></TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.9</TD> * <TD>ExtendedCertificateAttributes</TD> * <TD>Multiple-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.10</TD> * <TD>IssuerAndSerialNumber</TD> * <TD>Single-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.11</TD> * <TD>PasswordCheck</TD> * <TD>Single-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.12</TD> * <TD>PublicKey</TD> * <TD>Single-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.13</TD> * <TD>SigningDescription</TD> * <TD>Single-valued</TD> * <TD>(not supported)</TD> * </TR> - * + * * <TR> * <TD>1.2.840.113549.1.9.14</TD> * <TD>ExtensionRequest</TD> * <TD>Single-valued</TD> * <TD><code>Sequence</code></TD> * </TR> - * + * * </TABLE> - * + * */ public Object getValue() { return value; @@ -1073,7 +1073,7 @@ public class PKCS9Attribute implements DerEncoder { /** * Beginning the search at <code>start</code>, find the first * index <code>i</code> such that <code>a[i] = obj</code>. - * + * * @return the index, if found, and -1 otherwise. */ static int indexOf(Object obj, Object[] a, int start) { diff --git a/base/util/src/netscape/security/pkcs/PKCS9Attributes.java b/base/util/src/netscape/security/pkcs/PKCS9Attributes.java index 485cdded1..39bf2340e 100644 --- a/base/util/src/netscape/security/pkcs/PKCS9Attributes.java +++ b/base/util/src/netscape/security/pkcs/PKCS9Attributes.java @@ -29,7 +29,7 @@ import netscape.security.util.ObjectIdentifier; /** * A set of attributes of class PKCS9Attribute. - * + * * @version 1.2 97/12/10 * @author Douglas Hoover */ @@ -57,16 +57,16 @@ public class PKCS9Attributes { * with OIDs on the given * list. If the array is null, accept all attributes supported by * class PKCS9Attribute. - * + * * @param permittedAttributes * Array of attribute OIDs that will be accepted. * @param buf * the contents of the DER encoding of the attribute set. - * + * * @exception IOException * on i/o error, encoding syntax error, unacceptable or * unsupported attribute, or duplicate attribute. - * + * * @see PKCS9Attribute */ public PKCS9Attributes(ObjectIdentifier[] permittedAttributes, @@ -90,11 +90,11 @@ public class PKCS9Attributes { * Construct a set of PKCS9 Attributes from its contents of its * DER encoding on a DerInputStream. Accept all attributes * supported by class PKCS9Attribute. - * + * * @exception IOException * on i/o error, encoding syntax error, or unsupported or * duplicate attribute. - * + * * @see PKCS9Attribute */ public PKCS9Attributes(DerInputStream in) throws IOException { @@ -109,11 +109,11 @@ public class PKCS9Attributes { * PCK9 attributes. * DER encoding on a DerInputStream. All attributes in <code>attribs</code> must be * supported by class PKCS9Attribute. - * + * * @exception IOException * on i/o error, encoding syntax error, or unsupported or * duplicate attribute. - * + * * @see PKCS9Attribute */ public PKCS9Attributes(PKCS9Attribute[] attribs) @@ -136,10 +136,10 @@ public class PKCS9Attributes { /** * Decode this set of PKCS9 attribute set from the contents of its * DER encoding. - * + * * @param buf * the contents of the DER encoding of the attribute set. - * + * * @exception IOException * on i/o error, encoding syntax error, unacceptable or * unsupported attribute, or duplicate attribute. @@ -179,10 +179,10 @@ public class PKCS9Attributes { /** * Put the DER encoding of this PKCS9 attribute set on an * DerOutputStream, tagged with the given implicit tag. - * + * * @param tag the implicit tag to use in the DER encoding. * @param out the output stream on which to put the DER encoding. - * + * * @exception IOException on output error. */ public void encode(byte tag, OutputStream out) throws IOException { @@ -282,7 +282,7 @@ public class PKCS9Attributes { if (value == null) continue; - // we have a value; print it + // we have a value; print it if (first) first = false; else diff --git a/base/util/src/netscape/security/pkcs/SignerInfo.java b/base/util/src/netscape/security/pkcs/SignerInfo.java index adb0115cc..794033c87 100644 --- a/base/util/src/netscape/security/pkcs/SignerInfo.java +++ b/base/util/src/netscape/security/pkcs/SignerInfo.java @@ -38,7 +38,7 @@ import netscape.security.x509.X500Name; /** * A SignerInfo, as defined in PKCS#7's signedData type. - * + * * @author Benjamin Renaud * @version 1.27 97/12/10 */ @@ -110,7 +110,7 @@ public class SignerInfo implements DerEncoder { authenticatedAttributes = new PKCS9Attributes(derin); } - // digestEncryptionAlgorithmId - little RSA naming scheme - + // digestEncryptionAlgorithmId - little RSA naming scheme - // signature == encryption... tmp = derin.getDerValue(); @@ -141,10 +141,10 @@ public class SignerInfo implements DerEncoder { /** * DER encode this object onto an output stream. * Implements the <code>DerEncoder</code> interface. - * + * * @param out * the output stream on which to write the DER encoding. - * + * * @exception IOException on encoding error. */ public void derEncode(OutputStream out) throws IOException { @@ -229,11 +229,11 @@ public class SignerInfo implements DerEncoder { return null; } - // message digest attribute matched + // message digest attribute matched // digest of original data - // the data actually signed is the DER encoding of - // the authenticated attributes (tagged with + // the data actually signed is the DER encoding of + // the authenticated attributes (tagged with // the "SET OF" tag, not 0xA0). dataSigned = authenticatedAttributes.getDerEncoding(); } diff --git a/base/util/src/netscape/security/provider/DSA.java b/base/util/src/netscape/security/provider/DSA.java index 262095576..c9dc6c546 100644 --- a/base/util/src/netscape/security/provider/DSA.java +++ b/base/util/src/netscape/security/provider/DSA.java @@ -40,11 +40,11 @@ import netscape.security.util.DerValue; * The Digital Signature Standard (using the Digital Signature * Algorithm), as described in fips186 of the National Instute of * Standards and Technology (NIST), using fips180-1 (SHA-1). - * + * * @author Benjamin Renaud - * + * * @version 1.86, 97/09/17 - * + * * @see DSAPublicKey * @see DSAPrivateKey */ @@ -95,9 +95,9 @@ public final class DSA extends Signature { /** * Initialize the DSA object with a DSA private key. - * + * * @param privateKey the DSA private key - * + * * @exception InvalidKeyException if the key is not a valid DSA private * key. */ @@ -116,9 +116,9 @@ public final class DSA extends Signature { /** * Initialize the DSA object with a DSA public key. - * + * * @param publicKey the DSA public key. - * + * * @exception InvalidKeyException if the key is not a valid DSA public * key. */ @@ -143,13 +143,13 @@ public final class DSA extends Signature { * Sign all the data thus far updated. The signature is formatted * according to the Canonical Encoding Rules, returned as a DER * sequence of Integer, r and s. - * + * * @return a signature block formatted according to the Canonical * Encoding Rules. - * + * * @exception SignatureException if the signature object was not * properly initialized, or if another exception occurs. - * + * * @see netscape.security.provider.DSA#engineUpdate * @see netscape.security.provider.DSA#engineVerify */ @@ -178,13 +178,13 @@ public final class DSA extends Signature { /** * Verify all the data thus far updated. - * + * * @param signature the alledged signature, encoded using the * Canonical Encoding Rules, as a sequence of integers, r and s. - * + * * @exception SignatureException if the signature object was not * properly initialized, or if another exception occurs. - * + * * @see netscape.security.provider.DSA#engineUpdate * @see netscape.security.provider.DSA#engineSign */ @@ -327,11 +327,11 @@ public final class DSA extends Signature { /** * Compute k for a DSA signature. - * + * * @param seed the seed for generating k. This seed should be * secure. This is what is refered to as the KSEED in the DSA * specification. - * + * * @param g the g parameter from the DSA key pair. */ BigInteger generateK(int[] seed, BigInteger q) { @@ -427,13 +427,13 @@ public final class DSA extends Signature { /** * This implementation recognizes the following parameter: * <dl> - * + * * <dt><tt>Kseed</tt> - * + * * <dd>a byte array. - * + * * </dl> - * + * * @deprecated */ protected void engineSetParameter(String key, Object param) { @@ -458,17 +458,17 @@ public final class DSA extends Signature { /** * Return the value of the requested parameter. Recognized * parameters are: - * + * * <dl> - * + * * <dt><tt>Kseed</tt> - * + * * <dd>a byte array. - * + * * </dl> - * + * * @return the value of the requested parameter. - * + * * @deprecated */ protected Object engineGetParameter(String key) { @@ -491,7 +491,7 @@ public final class DSA extends Signature { /** * Update a byte to be signed or verified. - * + * * @param b the byte to updated. */ protected void engineUpdate(byte b) { @@ -500,7 +500,7 @@ public final class DSA extends Signature { /** * Update an array of bytes to be signed or verified. - * + * * @param data the bytes to be updated. */ protected void engineUpdate(byte[] data, int off, int len) { diff --git a/base/util/src/netscape/security/provider/DSAKeyFactory.java b/base/util/src/netscape/security/provider/DSAKeyFactory.java index 41f0081f2..ada152921 100755 --- a/base/util/src/netscape/security/provider/DSAKeyFactory.java +++ b/base/util/src/netscape/security/provider/DSAKeyFactory.java @@ -32,11 +32,11 @@ import java.security.spec.X509EncodedKeySpec; /** * This class implements the DSA key factory of the Sun provider. - * + * * @author Jan Luehe - * + * * @version 1.8, 97/12/10 - * + * * @since JDK1.2 */ @@ -45,11 +45,11 @@ public class DSAKeyFactory extends KeyFactorySpi { /** * Generates a public key object from the provided key specification * (key material). - * + * * @param keySpec the specification (key material) of the public key - * + * * @return the public key - * + * * @exception InvalidKeySpecException if the given key specification * is inappropriate for this key factory to produce a public key. */ @@ -77,11 +77,11 @@ public class DSAKeyFactory extends KeyFactorySpi { /** * Generates a private key object from the provided key specification * (key material). - * + * * @param keySpec the specification (key material) of the private key - * + * * @return the private key - * + * * @exception InvalidKeySpecException if the given key specification * is inappropriate for this key factory to produce a private key. */ @@ -109,15 +109,15 @@ public class DSAKeyFactory extends KeyFactorySpi { /** * Returns a specification (key material) of the given key object * in the requested format. - * + * * @param key the key - * + * * @param keySpec the requested format in which the key material shall be * returned - * + * * @return the underlying key specification (key material) in the * requested format - * + * * @exception InvalidKeySpecException if the requested key specification is * inappropriate for the given key, or the given key cannot be processed * (e.g., the given key has an unrecognized algorithm or format). @@ -188,11 +188,11 @@ public class DSAKeyFactory extends KeyFactorySpi { /** * Translates a key object, whose provider may be unknown or potentially * untrusted, into a corresponding key object of this key factory. - * + * * @param key the key whose provider is unknown or untrusted - * + * * @return the translated key - * + * * @exception InvalidKeyException if the given key cannot be processed by * this key factory. */ diff --git a/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java b/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java index 3e04792bf..c0fc274a9 100644 --- a/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java +++ b/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java @@ -40,9 +40,9 @@ import netscape.security.x509.AlgIdDSA; * This class generates DSA key parameters and public/private key * pairs according to the DSS standard NIST FIPS 186. It uses the * updated version of SHA, SHA-1 as described in FIPS 180-1. - * + * * @author Benjamin Renaud - * + * * @version 1.23, 97/12/10 */ @@ -60,7 +60,7 @@ public class DSAKeyPairGenerator extends KeyPairGenerator from the DSA specification, FIPS 186, and the FIPS 186 Change No 1, which updates the test vector using SHA-1 instead of SHA (for both the G function and the message - hash. + hash. */ precomputedParams = new Hashtable<Integer, AlgIdDSA>(); @@ -206,7 +206,7 @@ public class DSAKeyPairGenerator extends KeyPairGenerator /** * Initializes the DSA object using a DSA parameter object. - * + * * @param params a fully initialized DSA parameter object. */ public void initialize(DSAParams params, SecureRandom random) @@ -217,11 +217,11 @@ public class DSAKeyPairGenerator extends KeyPairGenerator /** * Initializes the DSA object using a parameter object. - * + * * @param params the parameter set to be used to generate * the keys. * @param random the source of randomness for this generator. - * + * * @exception InvalidAlgorithmParameterException if the given parameters * are inappropriate for this key pair generator */ @@ -238,11 +238,11 @@ public class DSAKeyPairGenerator extends KeyPairGenerator /** * Generates a pair of keys usable by any JavaSecurity compliant * DSA implementation. - * + * * @param rnd the source of random bits from which the random key * generation parameters are drawn. In particular, this includes * the XSEED parameter. - * + * * @exception InvalidParameterException if the modulus is not * between 512 and 1024. */ @@ -339,13 +339,13 @@ public class DSAKeyPairGenerator extends KeyPairGenerator * Given a seed, generate the private key component of the key * pair. In the terminology used in the DSA specification * (FIPS-186) seed is the XSEED quantity. - * + * * @param seed the seed to use to generate the private key. */ BigInteger generateX(int[] seed, BigInteger q) { - /* Test vector - int[] tseed = { 0xbd029bbe, 0x7f51960b, 0xcf9edb2b, + /* Test vector + int[] tseed = { 0xbd029bbe, 0x7f51960b, 0xcf9edb2b, 0x61f06f0f, 0xeb5a38b6 }; seed = tseed; */ @@ -368,9 +368,9 @@ public class DSAKeyPairGenerator extends KeyPairGenerator /** * Generate the public key component y of the key pair. - * + * * @param x the private key component. - * + * * @param p the base parameter. */ BigInteger generateY(BigInteger x, BigInteger p, BigInteger g) { diff --git a/base/util/src/netscape/security/provider/DSAParameterGenerator.java b/base/util/src/netscape/security/provider/DSAParameterGenerator.java index cd7b8de33..3a316cac5 100755 --- a/base/util/src/netscape/security/provider/DSAParameterGenerator.java +++ b/base/util/src/netscape/security/provider/DSAParameterGenerator.java @@ -68,7 +68,7 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi { /** * Initializes this parameter generator for a certain strength * and source of randomness. - * + * * @param strength the strength (size of prime) in bits * @param random the source of randomness */ @@ -91,10 +91,10 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi { /** * Initializes this parameter generator with a set of * algorithm-specific parameter generation values. - * + * * @param params the set of algorithm-specific parameter generation values * @param random the source of randomness - * + * * @exception InvalidAlgorithmParameterException if the given parameter * generation values are inappropriate for this parameter generator */ @@ -106,7 +106,7 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi { /** * Generates the parameters. - * + * * @return the new AlgorithmParameters object */ protected AlgorithmParameters engineGenerateParameters() { @@ -148,7 +148,7 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi { * * @param random the source of randomness to generate the * seed - * @param L the size of <code>p</code>, in bits. + * @param L the size of <code>p</code>, in bits. * * @return an array of BigInteger, with <code>p</code> at index 0 and * <code>q</code> at index 1. @@ -178,7 +178,7 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi { * * @return an array of BigInteger, with <code>p</code> at index 0, * <code>q</code> at index 1, the seed at index 2, and the counter value - * at index 3, or null if the seed does not yield suitable numbers. + * at index 3, or null if the seed does not yield suitable numbers. */ BigInteger[] generatePandQ(byte[] seed, int L) { diff --git a/base/util/src/netscape/security/provider/DSAParameters.java b/base/util/src/netscape/security/provider/DSAParameters.java index e2a5dd128..d22ab10fc 100755 --- a/base/util/src/netscape/security/provider/DSAParameters.java +++ b/base/util/src/netscape/security/provider/DSAParameters.java @@ -32,11 +32,11 @@ import netscape.security.util.DerValue; * This class implements the parameter set used by the * Digital Signature Algorithm as specified in the FIPS 186 * standard. - * + * * @author Jan Luehe - * + * * @version 1.8, 97/12/10 - * + * * @since JDK1.2 */ diff --git a/base/util/src/netscape/security/provider/DSAPrivateKey.java b/base/util/src/netscape/security/provider/DSAPrivateKey.java index 0cfc5e5ea..d18206c1e 100644 --- a/base/util/src/netscape/security/provider/DSAPrivateKey.java +++ b/base/util/src/netscape/security/provider/DSAPrivateKey.java @@ -33,11 +33,11 @@ import netscape.security.x509.AlgIdDSA; /** * A PKCS#8 private key for the Digital Signature Algorithm. - * + * * @author Benjamin Renaud - * + * * @version 1.47, 97/12/10 - * + * * @see DSAPublicKey * @see AlgIdDSA * @see DSA @@ -110,7 +110,7 @@ public final class DSAPrivateKey extends PKCS8Key /** * Get the raw private key, x, without the parameters. - * + * */ public BigInteger getX() { return x; diff --git a/base/util/src/netscape/security/provider/DSAPublicKey.java b/base/util/src/netscape/security/provider/DSAPublicKey.java index 89262809b..699a28261 100644 --- a/base/util/src/netscape/security/provider/DSAPublicKey.java +++ b/base/util/src/netscape/security/provider/DSAPublicKey.java @@ -34,11 +34,11 @@ import netscape.security.x509.X509Key; /** * An X.509 public key for the Digital Signature Algorithm. - * + * * @author Benjamin Renaud - * + * * @version 1.52, 97/12/10 - * + * * @see DSAPrivateKey * @see AlgIdDSA * @see DSA @@ -54,7 +54,7 @@ public final class DSAPublicKey extends X509Key private BigInteger y; /* - * Keep this constructor for backwards compatibility with JDK1.1. + * Keep this constructor for backwards compatibility with JDK1.1. */ public DSAPublicKey() { } @@ -110,7 +110,7 @@ public final class DSAPublicKey extends X509Key /** * Get the raw public value, y, without the parameters. - * + * */ public BigInteger getY() { return y; diff --git a/base/util/src/netscape/security/provider/MD5.java b/base/util/src/netscape/security/provider/MD5.java index d7aeacaee..00d3a4c29 100644 --- a/base/util/src/netscape/security/provider/MD5.java +++ b/base/util/src/netscape/security/provider/MD5.java @@ -24,7 +24,7 @@ import java.security.MessageDigestSpi; * The MD5 class is used to compute an MD5 message digest over a given * buffer of bytes. It is an implementation of the RSA Data Security Inc * MD5 algorithim as described in internet RFC 1321. - * + * * @version 1.24 97/12/10 * @author Chuck McManis * @author Benjamin Renaud diff --git a/base/util/src/netscape/security/provider/RSAPublicKey.java b/base/util/src/netscape/security/provider/RSAPublicKey.java index 4c65b4fa0..a70d1aeee 100644 --- a/base/util/src/netscape/security/provider/RSAPublicKey.java +++ b/base/util/src/netscape/security/provider/RSAPublicKey.java @@ -31,19 +31,19 @@ import netscape.security.x509.X509Key; /** * An X.509 public key for the RSA Algorithm. - * + * * @author galperin - * + * * @version $Revision$, $Date$ - * + * */ public final class RSAPublicKey extends X509Key implements Serializable { /* XXX This currently understands only PKCS#1 RSA Encryption OID and parameter format - Later we may consider adding X509v3 OID for RSA keys. Besides - different OID it also has a parameter equal to modulus size + Later we may consider adding X509v3 OID for RSA keys. Besides + different OID it also has a parameter equal to modulus size in bits (redundant!) */ @@ -59,7 +59,7 @@ public final class RSAPublicKey extends X509Key implements Serializable { private BigInt publicExponent; /* - * Keep this constructor for backwards compatibility with JDK1.1. + * Keep this constructor for backwards compatibility with JDK1.1. */ public RSAPublicKey() { } @@ -97,7 +97,7 @@ public final class RSAPublicKey extends X509Key implements Serializable { /** * Get key size as number of bits in modulus * (Always rounded up to a multiple of 8) - * + * */ public int getKeySize() { return this.modulus.byteLength() * 8; @@ -105,7 +105,7 @@ public final class RSAPublicKey extends X509Key implements Serializable { /** * Get the raw public exponent - * + * */ public BigInt getPublicExponent() { return this.publicExponent; @@ -113,7 +113,7 @@ public final class RSAPublicKey extends X509Key implements Serializable { /** * Get the raw modulus - * + * */ public BigInt getModulus() { return this.modulus; diff --git a/base/util/src/netscape/security/provider/SHA.java b/base/util/src/netscape/security/provider/SHA.java index 42a6b8b90..c19992309 100644 --- a/base/util/src/netscape/security/provider/SHA.java +++ b/base/util/src/netscape/security/provider/SHA.java @@ -25,11 +25,11 @@ import java.security.MessageDigestSpi; * the National Institute of Standards and Technology along with the * National Security Agency. This is the updated version of SHA * fip-180 as superseded by fip-180-1. - * + * * <p> * It implement JavaSecurity MessageDigest, and can be used by in the Java Security framework, as a pluggable * implementation, as a filter for the digest stream classes. - * + * * @version 1.30 97/12/10 * @author Roger Riggs * @author Benjamin Renaud @@ -38,7 +38,7 @@ import java.security.MessageDigestSpi; public class SHA extends MessageDigestSpi implements Cloneable { /* This private hookm controlled by the appropriate constructor, - causes this class to implement the first version of SHA, + causes this class to implement the first version of SHA, as defined in FIPS 180, as opposed to FIPS 180-1. This was useful for DSA testing. */ private int version = 1; @@ -81,7 +81,7 @@ public class SHA extends MessageDigestSpi implements Cloneable { /** * Update a byte. - * + * * @param b the byte */ private void engineUpdate(int b) { @@ -105,7 +105,7 @@ public class SHA extends MessageDigestSpi implements Cloneable { /** * Update a buffer. - * + * * @param b the data to be updated. * @param off the start offset in the data * @param len the number of bytes to be updated. @@ -256,11 +256,11 @@ public class SHA extends MessageDigestSpi implements Cloneable { /** * Compute a the hash for the current block. - * + * * This is in the same vein as Peter Gutmann's algorithm listed in * the back of Applied Cryptography, Compact implementation of * "old" NIST Secure Hash Algorithm. - * + * */ private void computeBlock() { int temp, a, b, c, d, e; diff --git a/base/util/src/netscape/security/provider/Sun.java b/base/util/src/netscape/security/provider/Sun.java index df384aeab..e056b7bb1 100644 --- a/base/util/src/netscape/security/provider/Sun.java +++ b/base/util/src/netscape/security/provider/Sun.java @@ -22,32 +22,32 @@ import java.security.Provider; /** * The SUN Security Provider. * - * @author Benjamin Renaud + * @author Benjamin Renaud * * @version 1.24, 97/12/10 */ /** * Defines the SUN provider. - * + * * Algorithm supported, and their names: - * + * * - SHA-1 is the message digest scheme decribed FIPS 180-1. * Aliases for SHA-1 are SHA. - * + * * - DSA is the signature scheme described in FIPS 186. (SHA used in * DSA is SHA-1: FIPS 186 with Change No 1.) Aliases for DSA are * SHA/DSA, SHA-1/DSA, SHA1/DSA, DSS and the object identifier * strings "OID.1.3.14.3.2.13", "OID.1.3.14.3.2.27" and * "OID.1.2.840.10040.4.3". - * + * * - DSA is the key generation scheme as described in FIPS 186. * Aliases for DSA include the OID strings "OID.1.3.14.3.2.12" * and "OID.1.2.840.10040.4.1". - * + * * - MD5 is the message digest scheme described in RFC 1321. * There are no aliases for MD5. - * + * * Notes: The name of algorithm described in FIPS-180 is SHA-0, and is * not supported by the SUN provider.) */ @@ -69,7 +69,7 @@ public final class Sun extends Provider { // AccessController.beginPrivileged(); /* - * Signature engines + * Signature engines */ put("Signature.DSA", "netscape.security.provider.DSA"); @@ -89,7 +89,7 @@ public final class Sun extends Provider { put("Alg.Alias.Signature.SHA1withDSA", "DSA"); /* - * Key Pair Generator engines + * Key Pair Generator engines */ put("KeyPairGenerator.DSA", "netscape.security.provider.DSAKeyPairGenerator"); @@ -101,8 +101,8 @@ public final class Sun extends Provider { put("Alg.Alias.KeyPairGenerator.1.3.14.3.2.12", "DSA"); put("Alg.Alias.KeyPairGenerator.1.2.840.10040.4.1", "DSA"); - /* - * Digest engines + /* + * Digest engines */ put("MessageDigest.MD5", "netscape.security.provider.MD5"); put("MessageDigest.SHA-1", "netscape.security.provider.SHA"); diff --git a/base/util/src/netscape/security/util/ASN1CharStrConvMap.java b/base/util/src/netscape/security/util/ASN1CharStrConvMap.java index c9c364f4f..912b363e5 100644 --- a/base/util/src/netscape/security/util/ASN1CharStrConvMap.java +++ b/base/util/src/netscape/security/util/ASN1CharStrConvMap.java @@ -28,13 +28,13 @@ import java.util.Map; * Maps a ASN.1 character string type to a charset encoder and decoder. * The converter is used to convert a DerValue of a ASN.1 character string type * from bytes to unicode characters and vice versa. - * + * * <p> * A global default ASN1CharStrConvMap is created when the class is initialized. The global default map is extensible. - * + * * @author Lily Hsiao * @author Slava Galperin - * + * */ public class ASN1CharStrConvMap { @@ -48,10 +48,10 @@ public class ASN1CharStrConvMap { /** * Get an encoder for the specified DER tag. - * + * * @param tag A DER tag of a ASN.1 character string type, * for example DerValue.tag_PrintableString. - * + * * @return An encoder for the DER tag. */ public CharsetEncoder getEncoder(byte tag) { @@ -63,10 +63,10 @@ public class ASN1CharStrConvMap { /** * Get a decoder for the given DER tag. - * + * * @param tag A DER tag of a ASN.1 character string type, * for example DerValue.tag_PrintableString. - * + * * @return A decoder for the DER tag. */ public CharsetDecoder getDecoder(byte tag) { @@ -78,7 +78,7 @@ public class ASN1CharStrConvMap { /** * Add a tag-charset entry in the map. - * + * * @param tag A DER tag of a ASN.1 character string type, * ex. DerValue.tag_IA5String * @param charset A charset for the tag. @@ -101,7 +101,7 @@ public class ASN1CharStrConvMap { /** * Get an iterator of all tags in the map. - * + * * @return An Iterator of DER tags in the map as Bytes. */ public Iterator<Byte> getTags() { @@ -112,7 +112,7 @@ public class ASN1CharStrConvMap { /** * Get the global ASN1CharStrConvMap. - * + * * @return The global default ASN1CharStrConvMap. */ static public ASN1CharStrConvMap getDefault() { @@ -121,7 +121,7 @@ public class ASN1CharStrConvMap { /** * Set the global default ASN1CharStrConvMap. - * + * * @param newDefault The new default ASN1CharStrConvMap. */ static public void setDefault(ASN1CharStrConvMap newDefault) { diff --git a/base/util/src/netscape/security/util/BigInt.java b/base/util/src/netscape/security/util/BigInt.java index 9210648f1..aed24e7ad 100644 --- a/base/util/src/netscape/security/util/BigInt.java +++ b/base/util/src/netscape/security/util/BigInt.java @@ -25,12 +25,12 @@ import java.math.BigInteger; * such parsed values. Convert to "BigInteger" if you need to do * arbitrary precision arithmetic, rather than just represent * the number as a wrapped array of bytes. - * + * * <P> * <em><b>NOTE:</b> This class may eventually disappear, to * be supplanted by big-endian byte arrays which hold both signed * and unsigned arbitrary-precision integers. - * + * * @version 1.23 * @author David Brownell */ @@ -42,7 +42,7 @@ public final class BigInt { /** * Constructs a "Big" integer from a set of (big-endian) bytes. * Leading zeroes should be stripped off. - * + * * @param data a sequence of bytes, most significant bytes/digits * first. CONSUMED. */ @@ -80,7 +80,7 @@ public final class BigInt { /** * Constructs a "Big" integer from a normal Java integer. - * + * * @param i the java primitive integer */ public BigInt(int i) { @@ -107,7 +107,7 @@ public final class BigInt { /** * Converts the "big" integer to a java primitive integer. - * + * * @exception NumberFormatException if 32 bits is insufficient. */ public int toInt() { @@ -181,7 +181,7 @@ public final class BigInt { /** * Returns true iff the parameter is a numerically equivalent * BigInt. - * + * * @param other the object being compared with this one. */ public boolean equals(Object other) { @@ -192,7 +192,7 @@ public final class BigInt { /** * Returns true iff the parameter is numerically equivalent. - * + * * @param other the BigInt being compared with this one. */ public boolean equals(BigInt other) { diff --git a/base/util/src/netscape/security/util/BitArray.java b/base/util/src/netscape/security/util/BitArray.java index ab77c226e..e37de4eb5 100644 --- a/base/util/src/netscape/security/util/BitArray.java +++ b/base/util/src/netscape/security/util/BitArray.java @@ -21,7 +21,7 @@ import java.io.ByteArrayOutputStream; /** * A packed array of booleans. - * + * * @author Joshua Bloch * @author Douglas Hoover * @version 1.2 97/12/10 @@ -78,7 +78,7 @@ public class BitArray { int unusedBits = repLength * BITS_PER_UNIT - length; byte bitMask = (byte) (0xFF << unusedBits); - /* + /* normalize the representation: 1. discard extra bytes 2. zero out extra bits in the last byte @@ -191,7 +191,7 @@ public class BitArray { /** * Returns a hash code value for this bit array. - * + * * @return a hash code value for this bit array. */ public int hashCode() { diff --git a/base/util/src/netscape/security/util/ByteArrayLexOrder.java b/base/util/src/netscape/security/util/ByteArrayLexOrder.java index 2ee2f740e..48954850e 100644 --- a/base/util/src/netscape/security/util/ByteArrayLexOrder.java +++ b/base/util/src/netscape/security/util/ByteArrayLexOrder.java @@ -21,7 +21,7 @@ import java.util.Comparator; /** * Compare two byte arrays in lexicographical order. - * + * * @version 1.4 97/12/10 * @author D. N. Hoover */ @@ -33,12 +33,12 @@ public class ByteArrayLexOrder implements Comparator<byte[]> { * in order until they differ--the array with the smaller entry * is "smaller". If array entries are * equal till one array ends, then the longer array is "bigger". - * + * * @param obj1 first byte array to compare. * @param obj2 second byte array to compare. * @return negative number if obj1 < obj2, 0 if obj1 == obj2, * positive number if obj1 > obj2. - * + * * @exception <code>ClassCastException</code> if either argument is not a byte array. */ public final int compare(byte[] bytes1, byte[] bytes2) { diff --git a/base/util/src/netscape/security/util/ByteArrayTagOrder.java b/base/util/src/netscape/security/util/ByteArrayTagOrder.java index e57a3b5f1..40a627627 100644 --- a/base/util/src/netscape/security/util/ByteArrayTagOrder.java +++ b/base/util/src/netscape/security/util/ByteArrayTagOrder.java @@ -25,18 +25,18 @@ public class ByteArrayTagOrder implements Comparator<byte[]> { * Compare two byte arrays, by the order of their tags, * as defined in ITU-T X.680, sec. 6.4. (First compare * tag classes, then tag numbers, ignoring the constructivity bit.) - * + * * @param obj1 first byte array to compare. * @param obj2 second byte array to compare. * @return negative number if obj1 < obj2, 0 if obj1 == obj2, * positive number if obj1 > obj2. - * + * * @exception <code>ClassCastException</code> if either argument is not a byte array. */ public final int compare(byte[] bytes1, byte[] bytes2) { - // tag order is same as byte order ignoring any difference in + // tag order is same as byte order ignoring any difference in // the constructivity bit (0x02) return (bytes1[0] | 0x20) - (bytes2[0] | 0x20); } diff --git a/base/util/src/netscape/security/util/CertPrettyPrint.java b/base/util/src/netscape/security/util/CertPrettyPrint.java index 3a8c65fd0..7dfbf1588 100644 --- a/base/util/src/netscape/security/util/CertPrettyPrint.java +++ b/base/util/src/netscape/security/util/CertPrettyPrint.java @@ -40,7 +40,7 @@ import org.mozilla.jss.pkcs7.SignedData; /** * This class will display the certificate content in predefined * format. - * + * * @author Jack Pan-Chen * @version $Revision$, $Date$ */ @@ -82,7 +82,7 @@ public class CertPrettyPrint { /** * This method return string representation of the certificate * 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/util/src/netscape/security/util/CrlPrettyPrint.java b/base/util/src/netscape/security/util/CrlPrettyPrint.java index edf1217ea..77c1e196f 100644 --- a/base/util/src/netscape/security/util/CrlPrettyPrint.java +++ b/base/util/src/netscape/security/util/CrlPrettyPrint.java @@ -32,7 +32,7 @@ import netscape.security.x509.X509CRLImpl; /** * This class will display the certificate content in predefined * format. - * + * * @author Andrew Wnuk * @version $Revision$, $Date$ */ @@ -66,7 +66,7 @@ public class CrlPrettyPrint { * 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/util/src/netscape/security/util/DerEncoder.java b/base/util/src/netscape/security/util/DerEncoder.java index c2eb64fc0..b19ca2cd2 100644 --- a/base/util/src/netscape/security/util/DerEncoder.java +++ b/base/util/src/netscape/security/util/DerEncoder.java @@ -23,7 +23,7 @@ import java.io.OutputStream; /** * Interface to an object that knows how to write its own DER * encoding to an output stream. - * + * * @version 1.2 97/12/10 * @author D. N. Hoover */ @@ -31,7 +31,7 @@ public interface DerEncoder { /** * DER encode this object and write the results to a stream. - * + * * @param out the stream on which the DER encoding is written. */ public void derEncode(OutputStream out) diff --git a/base/util/src/netscape/security/util/DerInputBuffer.java b/base/util/src/netscape/security/util/DerInputBuffer.java index 7534f3d06..429bf4d6a 100644 --- a/base/util/src/netscape/security/util/DerInputBuffer.java +++ b/base/util/src/netscape/security/util/DerInputBuffer.java @@ -27,7 +27,7 @@ import java.io.OutputStream; * does so with impunity, since it's not intended to be exposed to the * anyone who could violate the "typed value stream" DER model and hence * corrupt the input stream of DER values. - * + * * @version 1.11 * @author David Brownell */ diff --git a/base/util/src/netscape/security/util/DerInputStream.java b/base/util/src/netscape/security/util/DerInputStream.java index 20ced6757..7508f81b9 100644 --- a/base/util/src/netscape/security/util/DerInputStream.java +++ b/base/util/src/netscape/security/util/DerInputStream.java @@ -31,18 +31,18 @@ import java.util.Vector; * the advantage that it allows only a single encoding of primitive data. * (High level data such as dates still support many encodings.) That is, * it uses the "Definite" Encoding Rules (DER) not the "Basic" ones (BER). - * + * * <P> * Note that, like BER/1, DER streams are streams of explicitly tagged data values. Accordingly, this programming * interface does not expose any variant of the java.io.InputStream interface, since that kind of input stream holds * untagged data values and using that I/O model could prevent correct parsing of the DER data. - * + * * <P> * At this time, this class supports only a subset of the types of DER data encodings which are defined. That subset is * sufficient for parsing most X.509 certificates. - * + * * @version 1.35 - * + * * @author David Brownell * @author Amit Kapoor * @author Hemma Prafullchandra @@ -60,7 +60,7 @@ public class DerInputStream { * Create a DER input stream from a data buffer. The buffer is not * copied, it is shared. Accordingly, the buffer should be treated * as read-only. - * + * * @param data the buffer from which to create the string (CONSUMED) */ public DerInputStream(byte[] data) { @@ -72,7 +72,7 @@ public class DerInputStream { * Create a DER input stream from part of a data buffer. * The buffer is not copied, it is shared. Accordingly, the * buffer should be treated as read-only. - * + * * @param data the buffer from which to create the string (CONSUMED) * @param offset the first index of <em>data</em> which will * be read as DER input in the new stream @@ -91,7 +91,7 @@ public class DerInputStream { /** * Creates a new DER input stream from part of this input stream. - * + * * @param len how long a chunk of the current input stream to use, * starting at the current position. * @param do_skip true if the existing data in the input stream should @@ -173,8 +173,8 @@ public class DerInputStream { int length = getLength(buffer) - 1; /* - * First byte = number of excess bits in the last octet of the - * representation. + * First byte = number of excess bits in the last octet of the + * representation. */ int validBits = length * 8 - buffer.read(); @@ -231,7 +231,7 @@ public class DerInputStream { * ordered, and they are often used, like a "struct" in C or C++, * to group data values. They may have optional or context * specific values. - * + * * @param startLen guess about how long the sequence will be * (used to initialize an auto-growing data structure) * @return array of the values in the sequence @@ -256,7 +256,7 @@ public class DerInputStream { * though DER may specify an order for some kinds of sets (such * as the attributes in an X.500 relative distinguished name) * to facilitate binary comparisons of encoded values. - * + * * @param startLen guess about how large the set will be * (used to initialize an auto-growing data structure) * @return array of the values in the sequence @@ -272,7 +272,7 @@ public class DerInputStream { * though DER may specify an order for some kinds of sets (such * as the attributes in an X.500 relative distinguished name) * to facilitate binary comparisons of encoded values. - * + * * @param startLen guess about how large the set will be * (used to initialize an auto-growing data structure) * @param implicit if true tag is assumed implicit. @@ -299,7 +299,7 @@ public class DerInputStream { if (len == 0) // return empty array instead of null, which should be - // used only for missing optionals + // used only for missing optionals return new DerValue[0]; /* diff --git a/base/util/src/netscape/security/util/DerOutputStream.java b/base/util/src/netscape/security/util/DerOutputStream.java index 62290d604..df16d0b38 100644 --- a/base/util/src/netscape/security/util/DerOutputStream.java +++ b/base/util/src/netscape/security/util/DerOutputStream.java @@ -36,13 +36,13 @@ import java.util.TimeZone; * Output stream marshaling DER-encoded data. This is eventually provided * in the form of a byte array; there is no advance limit on the size of * that byte array. - * + * * <P> * At this time, this class supports only a subset of the types of DER data encodings which are defined. That subset is * sufficient for generating most X.509 certificates. - * + * * @version 1.32 - * + * * @author David Brownell * @author Amit Kapoor * @author Hemma Prafullchandra @@ -51,7 +51,7 @@ public class DerOutputStream extends ByteArrayOutputStream implements DerEncoder { /** * Construct an DER output stream. - * + * * @param size how large a buffer to preallocate. */ public DerOutputStream(int size) { @@ -68,7 +68,7 @@ public class DerOutputStream * Writes tagged, pre-marshaled data. This calcuates and encodes * the length, so that the output data is the standard triple of * { tag, length, data } used by all DER values. - * + * * @param tag the DER value tag for the data, such as <em>DerValue.tag_Sequence</em> * @param buf buffered data, which must be DER-encoded */ @@ -82,7 +82,7 @@ public class DerOutputStream * Writes tagged data using buffer-to-buffer copy. As above, * this writes a standard DER record. This is often used when * efficiently encapsulating values in sequences. - * + * * @param tag the DER value tag for the data, such as <em>DerValue.tag_Sequence</em> * @param out buffered data */ @@ -96,14 +96,14 @@ public class DerOutputStream * Writes implicitly tagged data using buffer-to-buffer copy. As above, * this writes a standard DER record. This is often used when * efficiently encapsulating implicitly tagged values. - * + * * @param tag the DER value of the context-specific tag that replaces * original tag of the value in the output , such as in - * + * * <pre> * <em> <field> [N] IMPLICIT <type></em> * </pre> - * + * * For example, <em>FooLength [1] IMPLICIT INTEGER</em>, with value=4; * would be encoded as "81 01 04" whereas in explicit * tagging it would be encoded as "A1 03 02 01 04". @@ -236,7 +236,7 @@ public class DerOutputStream /** * Marshals a DER bit string on the output stream. The bit * string must be byte-aligned. - * + * * @param bits the bit string, MSB first */ public void putBitString(byte[] bits) throws IOException { @@ -297,7 +297,7 @@ public class DerOutputStream byte lastByte = bitString[maxIndex]; length = (maxIndex + 1) * 8; // maximum, might reduce in next step - // now find the last 1 bit in this last byte + // now find the last 1 bit in this last byte for (i = 1; i <= 0x80; i <<= 1) { if ((lastByte & i) == 0) { length--; @@ -311,7 +311,7 @@ public class DerOutputStream /** * Marshals a DER bit string on the output stream. * The bit strings need not be byte-aligned. - * + * * @param bits the bit string, MSB first */ public void putUnalignedBitString(BitArray ba) throws IOException { @@ -327,7 +327,7 @@ public class DerOutputStream * Marshals a DER bit string on the output stream. * All trailing 0 bits will be stripped off in accordance with DER * encoding. - * + * * @param bits the bit string, MSB first */ public void putUnalignedBitString(byte[] bitString) throws IOException { @@ -338,7 +338,7 @@ public class DerOutputStream * Marshals a DER bit string on the output stream. * All trailing 0 bits will be stripped off in accordance with DER * encoding. - * + * * @param bits the bit string as an array of booleans. */ public void putUnalignedBitString(boolean[] bitString) throws IOException { @@ -347,7 +347,7 @@ public class DerOutputStream /** * DER-encodes an ASN.1 OCTET STRING value on the output stream. - * + * * @param octets the octet string */ public void putOctetString(byte[] octets) throws IOException { @@ -390,7 +390,7 @@ public class DerOutputStream * Marshals the contents of a set on the output stream without * ordering the elements. Ok for BER encoding, but not for DER * encoding. - * + * * For DER encoding, use orderedPutSet() or orderedPutSetOf(). */ public void putSet(DerValue[] set) throws IOException { @@ -419,7 +419,7 @@ public class DerOutputStream * set elements be sorted into ascending lexicographical order * before being output. Hence sets with the same tags and * elements have the same DER encoding. - * + * * This method supports the ASN.1 "SET OF" construct, but not * "SET", which uses a different order. */ @@ -433,7 +433,7 @@ public class DerOutputStream * set elements be sorted into ascending tag order * before being output. Hence sets with the same tags and * elements have the same DER encoding. - * + * * This method supports the ASN.1 "SET" construct, but not * "SET OF", which uses a different order. */ @@ -456,7 +456,7 @@ public class DerOutputStream /** * Marshals a the contents of a set on the output stream with the * encodings of its sorted in increasing order. - * + * * @param order the order to use when sorting encodings of components. */ private void putOrderedSet(byte tag, DerEncoder[] set, @@ -612,7 +612,7 @@ public class DerOutputStream /** * Marshals a DER UTC time/date value. - * + * * <P> * YYMMDDhhmmss{Z|+hhmm|-hhmm} ... emits only using Zulu time and with seconds (even if seconds=0) as per IETF-PKIX * partI. @@ -642,7 +642,7 @@ public class DerOutputStream /** * Marshals a DER Generalized Time/date value. - * + * * <P> * YYYYMMDDhhmmss{Z|+hhmm|-hhmm} ... emits only using Zulu time and with seconds (even if seconds=0) as per * IETF-PKIX partI. @@ -669,7 +669,7 @@ public class DerOutputStream /** * Put the encoding of the length in the stream. - * + * * @param len the length of the attribute. * @exception IOException on writing errors. */ @@ -703,7 +703,7 @@ public class DerOutputStream /** * Put the tag of the attribute in the stream. - * + * * @param class the tag class type, one of UNIVERSAL, CONTEXT, * APPLICATION or PRIVATE * @param form if true, the value is constructed, otherwise it is @@ -720,7 +720,7 @@ public class DerOutputStream /** * Write the current contents of this <code>DerOutputStream</code> to an <code>OutputStream</code>. - * + * * @exception IOException on output error. */ public void derEncode(OutputStream out) throws IOException { diff --git a/base/util/src/netscape/security/util/DerValue.java b/base/util/src/netscape/security/util/DerValue.java index 71b6f7f2c..40215626a 100644 --- a/base/util/src/netscape/security/util/DerValue.java +++ b/base/util/src/netscape/security/util/DerValue.java @@ -34,18 +34,18 @@ import netscape.security.x509.GenericValueConverter; * Represents a single DER-encoded value. DER encoding rules are a subset * of the "Basic" Encoding Rules (BER), but they only support a single way * ("Definite" encoding) to encode any given value. - * + * * <P> * All DER-encoded data are triples <em>{type, length, data}</em>. This class represents such tagged values as they have * been read (or constructed), and provides structured access to the encoded data. - * + * * <P> * At this time, this class supports only a subset of the types of DER data encodings which are defined. That subset is * sufficient for parsing most X.509 certificates, and working with selected additional formats (such as PKCS #10 * certificate requests, and some kinds of PKCS #7 data). - * + * * @version 1.43 - * + * * @author David Brownell * @author Amit Kapoor * @author Hemma Prafullchandra @@ -215,7 +215,7 @@ public class DerValue { /** * Creates a DerValue from a tag and some DER-encoded data. - * + * * @param tag the DER type tag * @param data the DER-encoded data */ @@ -229,7 +229,7 @@ public class DerValue { /** * Creates a DerValue from a tag and some DER-encoded data. - * + * * @param tag the DER type tag * @param data the DER-encoded data * @param offset offset of the data @@ -264,7 +264,7 @@ public class DerValue { * Get an ASN.1/DER encoded datum from a buffer. The * entire buffer must hold exactly one datum, including * its tag and length. - * + * * @param buf buffer holding a single DER-encoded datum. */ public DerValue(byte[] buf) throws IOException { @@ -275,7 +275,7 @@ public class DerValue { * Get an ASN.1/DER encoded datum from part of a buffer. * That part of the buffer must hold exactly one datum, including * its tag and length. - * + * * @param buf the buffer * @param offset start point of the single DER-encoded dataum * @param length how many bytes are in the encoded datum @@ -287,7 +287,7 @@ public class DerValue { /** * Get an ASN1/DER encoded datum from an input stream. The * stream may have additional data following the encoded datum. - * + * * @param in the input stream holding a single DER datum, * which may be followed by additional data */ @@ -336,7 +336,7 @@ public class DerValue { /** * Returns an ASN.1 BOOLEAN - * + * * @return the boolean held in this DER value */ public boolean getBoolean() throws IOException { @@ -354,7 +354,7 @@ public class DerValue { /** * Returns an ASN.1 OBJECT IDENTIFIER. - * + * * @return the OID held in this DER value */ public ObjectIdentifier getOID() throws IOException { @@ -365,7 +365,7 @@ public class DerValue { /** * Returns an ASN.1 OCTET STRING - * + * * @return the octet string held in this DER value */ public byte[] getOctetString() throws IOException { @@ -382,7 +382,7 @@ public class DerValue { /** * Returns an ASN.1 unsigned integer value of enumerated value. - * + * * @return the (unsigned) integer held in this DER value */ public int getEnumerated() @@ -412,7 +412,7 @@ public class DerValue { /** * Returns an ASN.1 unsigned INTEGER value. - * + * * @return the (unsigned) integer held in this DER value */ public BigInt getInteger() throws IOException { @@ -424,7 +424,7 @@ public class DerValue { /** * Returns an ASN.1 unsigned INTEGER value, the parameter determining * if the tag is implicit. - * + * * @param tagImplicit if true, ignores the tag value as it is * assumed implicit. * @return the (unsigned) integer held in this DER value @@ -441,7 +441,7 @@ public class DerValue { /** * Returns an ASN.1 BIT STRING value. The bit string must be byte-aligned. - * + * * @return the bit string held in this value */ public byte[] getBitString() throws IOException { @@ -454,7 +454,7 @@ public class DerValue { /** * Returns an ASN.1 BIT STRING value that need not be byte-aligned. - * + * * @return a BitArray representing the bit string held in this value */ public BitArray getUnalignedBitString() throws IOException { @@ -477,7 +477,7 @@ public class DerValue { /** * Returns an ASN.1 BIT STRING value, with the tag assumed implicit * based on the parameter. The bit string must be byte-aligned. - * + * * @param tagImplicit if true, the tag is assumed implicit. * @return the bit string held in this value */ @@ -493,7 +493,7 @@ public class DerValue { /** * Returns an ASN.1 BIT STRING value, with the tag assumed implicit * based on the parameter. The bit string need not be byte-aligned. - * + * * @param tagImplicit if true, the tag is assumed implicit. * @return the bit string held in this value */ @@ -509,7 +509,7 @@ public class DerValue { /** * Returns an ASN.1 STRING value - * + * * @return the printable string held in this value */ public String getPrintableString() @@ -546,7 +546,7 @@ public class DerValue { /** * Returns an ASN.1 T61 (Teletype) STRING value - * + * * @return the teletype string held in this value */ public String getT61String() throws IOException { @@ -559,7 +559,7 @@ public class DerValue { /** * Returns an ASN.1 IA5 (ASCII) STRING value - * + * * @return the ASCII string held in this value */ public String getIA5String() throws IOException { @@ -600,7 +600,7 @@ public class DerValue { /** * Returns true iff the other object is a DER value which * is bitwise equal to this one. - * + * * @param other the object being compared with this one */ public boolean equals(Object other) { @@ -614,7 +614,7 @@ public class DerValue { * Bitwise equality comparison. DER encoded values have a single * encoding, so that bitwise equality of the encoded values is an * efficient way to establish equivalence of the unencoded values. - * + * * @param other the object being compared with this one */ public boolean equals(DerValue other) { @@ -631,7 +631,7 @@ public class DerValue { /** * Returns a printable representation of the value. - * + * * @return printable representation of the value */ public String toString() { @@ -656,7 +656,7 @@ public class DerValue { /** * Returns a DER-encoded value, such that if it's passed to the * DerValue constructor, a value equivalent to "this" is returned. - * + * * @return DER-encoded value, including tag and length. */ public byte[] toByteArray() throws IOException { @@ -688,7 +688,7 @@ public class DerValue { /** * Create the tag of the attribute. - * + * * @param class the tag class type, one of UNIVERSAL, CONTEXT, * APPLICATION or PRIVATE * @param form if true, the value is constructed, otherwise it @@ -706,7 +706,7 @@ public class DerValue { /** * Set the tag of the attribute. Commonly used to reset the * tag value used for IMPLICIT encodings. - * + * * @param tag the tag value */ public void resetTag(byte tag) { diff --git a/base/util/src/netscape/security/util/ExtPrettyPrint.java b/base/util/src/netscape/security/util/ExtPrettyPrint.java index 90d0d094f..c0e9050ea 100644 --- a/base/util/src/netscape/security/util/ExtPrettyPrint.java +++ b/base/util/src/netscape/security/util/ExtPrettyPrint.java @@ -80,7 +80,7 @@ import netscape.security.x509.UserNotice; /** * This class will display the certificate content in predefined * format. - * + * * @author Andrew Wnuk * @version $Revision$, $Date$ */ @@ -115,7 +115,7 @@ public class ExtPrettyPrint { /** * This method return string representation of the certificate * 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/util/src/netscape/security/util/IA5CharsetDecoder.java b/base/util/src/netscape/security/util/IA5CharsetDecoder.java index 620d65aca..106bf9fb7 100644 --- a/base/util/src/netscape/security/util/IA5CharsetDecoder.java +++ b/base/util/src/netscape/security/util/IA5CharsetDecoder.java @@ -26,7 +26,7 @@ import java.nio.charset.CodingErrorAction; /** * Converts bytes in ASN.1 IA5String character set to IA5String characters. - * + * * @author Lily Hsiao * @author Slava Galperin */ diff --git a/base/util/src/netscape/security/util/IA5CharsetEncoder.java b/base/util/src/netscape/security/util/IA5CharsetEncoder.java index dad0c9a2d..6581e95b1 100644 --- a/base/util/src/netscape/security/util/IA5CharsetEncoder.java +++ b/base/util/src/netscape/security/util/IA5CharsetEncoder.java @@ -26,7 +26,7 @@ import java.nio.charset.CodingErrorAction; /** * Converts characters in ASN.1 IA5String character set to IA5String bytes. - * + * * @author Lily Hsiao * @author Slava Galperin */ diff --git a/base/util/src/netscape/security/util/ObjectIdentifier.java b/base/util/src/netscape/security/util/ObjectIdentifier.java index 6ff02d1b0..a1d7b0a75 100644 --- a/base/util/src/netscape/security/util/ObjectIdentifier.java +++ b/base/util/src/netscape/security/util/ObjectIdentifier.java @@ -24,19 +24,19 @@ import java.util.StringTokenizer; /** * Represent an ISO Object Identifier. - * + * * <P> * Object Identifiers are arbitrary length hierarchical identifiers. The individual components are numbers, and they * define paths from the root of an ISO-managed identifier space. You will sometimes see a string name used instead of * (or in addition to) the numerical id. These are synonyms for the numerical IDs, but are not widely used since most * sites do not know all the requisite strings, while all sites can parse the numeric forms. - * + * * <P> * So for example, JavaSoft has the sole authority to assign the meaning to identifiers below the 1.3.6.1.4.42.2.17 node * in the hierarchy, and other organizations can easily acquire the ability to assign such unique identifiers. - * + * * @version 1.23 - * + * * @author David Brownell * @author Amit Kapoor * @author Hemma Prafullchandra @@ -95,11 +95,11 @@ final public class ObjectIdentifier implements Serializable { * Constructs an object ID from an ASN.1 encoded input stream. * The encoding of the ID in the stream uses "DER", a BER/1 subset. * In this case, that means a triple { typeId, length, data }. - * + * * <P> * <STRONG>NOTE:</STRONG> When an exception is thrown, the input stream has not been returned to its "initial" * state. - * + * * @param in DER-encoded data holding an object ID * @exception IOException indicates a decoding error */ @@ -275,7 +275,7 @@ final public class ObjectIdentifier implements Serializable { /** * Compares this identifier with another, for sorting purposes. * An identifier does not precede itself. - * + * * @param other identifer that may precede this one. * @return true iff <em>other</em> precedes this one * in a particular sorting order. @@ -308,7 +308,7 @@ final public class ObjectIdentifier implements Serializable { /** * Compares this identifier with another, for equality. - * + * * @return true iff the names are identical. */ public boolean equals(ObjectIdentifier other) { @@ -372,7 +372,7 @@ final public class ObjectIdentifier implements Serializable { * should help reduces in-memory Object Identifier object. * This function also provide additional checking on the OID. * A valid OID should start with 0, 1, or 2. - * + * * Notes: * This function never returns null. IOException is raised * in error conditions. diff --git a/base/util/src/netscape/security/util/PrettyPrintFormat.java b/base/util/src/netscape/security/util/PrettyPrintFormat.java index 25bc23d26..4bbc87936 100644 --- a/base/util/src/netscape/security/util/PrettyPrintFormat.java +++ b/base/util/src/netscape/security/util/PrettyPrintFormat.java @@ -20,7 +20,7 @@ package netscape.security.util; /** * This class will display the certificate content in predefined * format. - * + * * @author Andrew Wnuk * @version $Revision$, $Date$ */ @@ -74,7 +74,7 @@ public class PrettyPrintFormat { /** * Provide white space indention * stevep - speed improvements. Factor of 10 improvement - * + * * @param numSpace number of white space to be returned * @return white spaces */ @@ -90,7 +90,7 @@ public class PrettyPrintFormat { /** * 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/util/src/netscape/security/util/PrettyPrintResources.java b/base/util/src/netscape/security/util/PrettyPrintResources.java index a3f068f64..2c91a0ef0 100644 --- a/base/util/src/netscape/security/util/PrettyPrintResources.java +++ b/base/util/src/netscape/security/util/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/util/src/netscape/security/util/PrintableCharsetDecoder.java b/base/util/src/netscape/security/util/PrintableCharsetDecoder.java index 014095494..cf557d492 100644 --- a/base/util/src/netscape/security/util/PrintableCharsetDecoder.java +++ b/base/util/src/netscape/security/util/PrintableCharsetDecoder.java @@ -27,7 +27,7 @@ import java.nio.charset.CodingErrorAction; /** * Converts bytes in ASN.1 PrintableString character set to PrintableString * characters. - * + * * @author Lily Hsiao * @author Slava Galperin */ diff --git a/base/util/src/netscape/security/util/PrintableCharsetEncoder.java b/base/util/src/netscape/security/util/PrintableCharsetEncoder.java index bc658096a..9ee40ad15 100644 --- a/base/util/src/netscape/security/util/PrintableCharsetEncoder.java +++ b/base/util/src/netscape/security/util/PrintableCharsetEncoder.java @@ -27,7 +27,7 @@ import java.nio.charset.CodingErrorAction; /** * Converts characters in ASN.1 PrintableString character set to PrintableString * bytes. - * + * * @author Lily Hsiao * @author Slava Galperin */ diff --git a/base/util/src/netscape/security/util/PubKeyPrettyPrint.java b/base/util/src/netscape/security/util/PubKeyPrettyPrint.java index 46c007cd9..88fcdddb5 100644 --- a/base/util/src/netscape/security/util/PubKeyPrettyPrint.java +++ b/base/util/src/netscape/security/util/PubKeyPrettyPrint.java @@ -27,7 +27,7 @@ import netscape.security.x509.X509Key; /** * This class will display the certificate content in predefined * format. - * + * * @author Jack Pan-Chen * @author Andrew Wnuk * @version $Revision$, $Date$ @@ -58,7 +58,7 @@ public class PubKeyPrettyPrint { /** * This method return string representation of the certificate * 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/util/src/netscape/security/util/UniversalCharsetDecoder.java b/base/util/src/netscape/security/util/UniversalCharsetDecoder.java index a41c5ad50..cb23ec7e2 100644 --- a/base/util/src/netscape/security/util/UniversalCharsetDecoder.java +++ b/base/util/src/netscape/security/util/UniversalCharsetDecoder.java @@ -27,7 +27,7 @@ import java.nio.charset.CodingErrorAction; /** * Converts bytes in ASN.1 UniversalString character set to UniversalString * characters. - * + * * @author Lily Hsiao * @author Slava Galperin */ diff --git a/base/util/src/netscape/security/util/UniversalCharsetEncoder.java b/base/util/src/netscape/security/util/UniversalCharsetEncoder.java index cd2a51296..bb9ad4fcc 100644 --- a/base/util/src/netscape/security/util/UniversalCharsetEncoder.java +++ b/base/util/src/netscape/security/util/UniversalCharsetEncoder.java @@ -26,7 +26,7 @@ import java.nio.charset.CoderResult; /** * Converts characters in ASN.1 UniversalString character set to UniversalString * bytes. - * + * * @author Lily Hsiao * @author Slava Galperin */ diff --git a/base/util/src/netscape/security/x509/ACertAttrSet.java b/base/util/src/netscape/security/x509/ACertAttrSet.java index 8a757d7f5..437af2317 100755 --- a/base/util/src/netscape/security/x509/ACertAttrSet.java +++ b/base/util/src/netscape/security/x509/ACertAttrSet.java @@ -28,7 +28,7 @@ import netscape.security.util.DerValue; /** * A plain certattr set used by pkcs10 to parse an unknown attribute. - * + * * @author Lily Hsiao */ public class ACertAttrSet implements CertAttrSet { @@ -45,7 +45,7 @@ public class ACertAttrSet implements CertAttrSet { /** * Returns a short string describing this certificate attribute. - * + * * @return value of this certificate attribute in * printable form. */ @@ -56,9 +56,9 @@ public class ACertAttrSet implements CertAttrSet { /** * Encodes the attribute to the output stream in a format * that can be parsed by the <code>decode</code> method. - * + * * @param out the OutputStream to encode the attribute to. - * + * * @exception CertificateException on encoding or validity errors. * @exception IOException on other errors. */ @@ -69,9 +69,9 @@ public class ACertAttrSet implements CertAttrSet { /** * Decodes the attribute in the input stream. - * + * * @param in the InputStream to read the encoded attribute from. - * + * * @exception CertificateException on decoding or validity errors. * @exception IOException on other errors. */ @@ -82,10 +82,10 @@ public class ACertAttrSet implements CertAttrSet { /** * Sets an attribute value within this CertAttrSet. - * + * * @param name the name of the attribute (e.g. "x509.info.key") * @param obj the attribute object. - * + * * @exception CertificateException on attribute handling errors. * @exception IOException on other errors. */ @@ -96,9 +96,9 @@ public class ACertAttrSet implements CertAttrSet { /** * Gets an attribute value for this CertAttrSet. - * + * * @param name the name of the attribute to return. - * + * * @exception CertificateException on attribute handling errors. * @exception IOException on other errors. */ @@ -109,9 +109,9 @@ public class ACertAttrSet implements CertAttrSet { /** * Deletes an attribute value from this CertAttrSet. - * + * * @param name the name of the attribute to delete. - * + * * @exception CertificateException on attribute handling errors. * @exception IOException on other errors. */ @@ -123,7 +123,7 @@ public class ACertAttrSet implements CertAttrSet { /** * Returns an enumeration of the names of the attributes existing within * this attribute. - * + * * @return an enumeration of the attribute names. */ public Enumeration<String> getAttributeNames() { @@ -132,7 +132,7 @@ public class ACertAttrSet implements CertAttrSet { /** * Returns the name (identifier) of this CertAttrSet. - * + * * @return the name of this CertAttrSet. */ public String getName() { diff --git a/base/util/src/netscape/security/x509/AVA.java b/base/util/src/netscape/security/x509/AVA.java index ad94c2c61..fc6601223 100644 --- a/base/util/src/netscape/security/x509/AVA.java +++ b/base/util/src/netscape/security/x509/AVA.java @@ -37,17 +37,17 @@ import netscape.security.util.ObjectIdentifier; * some attribute ID, has some particular value. Values are as a rule ASN.1 * printable strings. A conventional set of type IDs is recognized when * parsing (and generating) RFC 1779 syntax strings. - * + * * <P> * AVAs are components of X.500 relative names. Think of them as being individual fields of a database record. The * attribute ID is how you identify the field, and the value is part of a particular record. - * + * * @see X500Name * @see RDN * @see LdapDNStrConverter - * + * * @version 1.14 - * + * * @author David Brownell * @author Amit Kapoor * @author Hemma Prafullchandra @@ -61,7 +61,7 @@ public final class AVA implements DerEncoder { /** * Constructs an AVA from a Ldap DN string with one AVA component * using the global default LdapDNStrConverter. - * + * * @see LdapDNStrConverter * @param avaString a Ldap DN string with one AVA component. */ @@ -87,7 +87,7 @@ public final class AVA implements DerEncoder { /** * Constructs an AVA from a Ldap DN string containing one AVA * component using the specified LdapDNStrConverter. - * + * * @see LdapDNStrConverter * @param avaString a Ldap DN string containing one AVA. * @param ldapDNStrConverter a LdapDNStrConverter @@ -102,7 +102,7 @@ public final class AVA implements DerEncoder { /** * Constructs an AVA from an OID and DerValue. - * + * * @param type an ObjectIdentifier * @param val a DerValue */ @@ -119,11 +119,11 @@ public final class AVA implements DerEncoder { * Parses an RFC 1779 style AVA string: CN=fee fie foe fum * or perhaps with quotes. Not all defined AVA tags are supported; * of current note are X.400 related ones (PRMD, ADMD, etc). - * + * * This terminates at unescaped AVA separators ("+") or RDN * separators (",", ";"), or DN terminators (">"), and removes * cosmetic whitespace at the end of values. - * + * * @see LdapDNStrConverter * @param in the input stream. */ @@ -149,7 +149,7 @@ public final class AVA implements DerEncoder { /** * Constructs an AVA from a Der Input Stream. - * + * * @param in the Der Input Stream. */ public AVA(DerInputStream in) throws IOException { @@ -181,7 +181,7 @@ public final class AVA implements DerEncoder { /** * Returns true if another AVA has the same OID and DerValue. - * + * * @param other the other AVA. * @return ture iff other AVA has same oid and value. */ @@ -192,7 +192,7 @@ public final class AVA implements DerEncoder { /** * Compares the AVA with an Object, returns true if the object is * an AVA and has the same OID and value. - * + * * @param other the other object. * @return true iff other object is an AVA and has same oid and value. */ @@ -206,7 +206,7 @@ public final class AVA implements DerEncoder { /** * Encodes the AVA to a Der output stream. * AVAs are encoded as a SEQUENCE of two elements. - * + * * @param out The Der output stream. */ public void encode(DerOutputStream out) throws IOException { @@ -216,10 +216,10 @@ public final class AVA implements DerEncoder { /** * DER encode this object onto an output stream. * Implements the <code>DerEncoder</code> interface. - * + * * @param out * the output stream on which to write the DER encoding. - * + * * @exception IOException on encoding error. */ public void derEncode(OutputStream out) throws IOException { @@ -235,7 +235,7 @@ public final class AVA implements DerEncoder { /** * Returns a Ldap DN string with one AVA component using * the global default LdapDNStrConverter. - * + * * @return a Ldap DN string * @exception IOException if an error occurs during conversion. * @see LdapDNStrConverter @@ -249,7 +249,7 @@ public final class AVA implements DerEncoder { /** * Returns a Ldap DN string with one AVA component using the specified * LdapDNStrConverter. - * + * * @return a Ldap DN string * @param ldapDNStrConverter a Ldap DN String Converter * @exception IOException if an error occurs during the conversion. @@ -263,14 +263,14 @@ public final class AVA implements DerEncoder { /** * Returns a Ldap DN string with the AVA component using the global * default LdapDNStrConverter, or null if an error occurs in conversion. - * + * * @return a Ldap DN string containing the AVA, or null if an * error occurs in the conversion. */ public String toString() { String s; try { - // NOTE that a LdapDNString is returned here to match the + // NOTE that a LdapDNString is returned here to match the // original source from sun. Could also return the raw value // (before Ldap escaping) here. s = toLdapDNString(); @@ -282,7 +282,7 @@ public final class AVA implements DerEncoder { /** * Returns the OID in the AVA. - * + * * @return the ObjectIdentifier in this AVA. */ public ObjectIdentifier getOid() { @@ -291,7 +291,7 @@ public final class AVA implements DerEncoder { /** * Returns the value in this AVA as a DerValue - * + * * @return attribute value in this AVA. */ public DerValue getValue() { diff --git a/base/util/src/netscape/security/x509/AVAValueConverter.java b/base/util/src/netscape/security/x509/AVAValueConverter.java index cd3ce7616..50ccd4d8a 100644 --- a/base/util/src/netscape/security/x509/AVAValueConverter.java +++ b/base/util/src/netscape/security/x509/AVAValueConverter.java @@ -26,23 +26,23 @@ import netscape.security.util.DerValue; * DER encoded ASN.1 value and vice versa. * The converters are associated with attribute types, such as * directory string, ia5string, etc. - * + * * <P> * For example, to convert a string, such as an organization name for the "O" attribute to a DerValue, the "O" attribute * is mapped to the DirStrConverter which is used to convert the organization name to a DER encoded Directory String * which is a DerValue of a ASN.1 PrintableString, T.61String or UniversalString for the organization name. - * + * * @author Lily Hsiao, Slava Galperin at Netscape Communications, Inc. */ public interface AVAValueConverter { /** * Converts a string to a DER encoded attribute value. - * + * * @param valueString An AVA value string not encoded in any form. - * + * * @return A DerValue object. - * + * * @exception IOException if an error occurs during the conversion. */ public DerValue getValue(String valueString) @@ -53,11 +53,11 @@ public interface AVAValueConverter { * Specify the order of DER tags to use if more than one encoding is * possible. Currently Directory Strings can have different order * for backwards compatibility. By 2003 all should be UTF8String. - * + * * @param valueString An AVA value string not encoded in any form. - * + * * @return A DerValue object. - * + * * @exception IOException if an error occurs during the conversion. */ public DerValue getValue(String valueString, byte[] tags) @@ -65,7 +65,7 @@ public interface AVAValueConverter { /** * Converts a BER encoded value to a DER encoded attribute value. - * + * * @param berStream A byte array of the BER encoded AVA value. * @return A DerValue object. */ @@ -74,11 +74,11 @@ public interface AVAValueConverter { /** * Converts a DER encoded value to a string, not encoded in any form. - * + * * @param avaValue A DerValue object. - * + * * @return A string for the value or null if it can't be converted. - * + * * @exception IOException if an error occurs during the conversion. */ public String getAsString(DerValue avaValue) diff --git a/base/util/src/netscape/security/x509/Attribute.java b/base/util/src/netscape/security/x509/Attribute.java index 11e22db10..6cc1bfa03 100644 --- a/base/util/src/netscape/security/x509/Attribute.java +++ b/base/util/src/netscape/security/x509/Attribute.java @@ -32,27 +32,27 @@ import netscape.security.util.ObjectIdentifier; * An attribute, as identified by some attribute ID, has some particular values. * Values are as a rule ASN.1 printable strings. A conventional set of type IDs * is recognized when parsing. The following shows the syntax: - * + * * <pre> - * + * * Attribute ::= SEQUENCE { * type AttributeType, * value SET OF AttributeValue * -- at least one value is required --} - * + * * AttributeType ::= OBJECT IDENTIFIER - * + * * AttributeValue ::= ANY - * + * * </pre> - * + * * Refer to draft-ietf-pkix-ipki-part1-11 for the support attributes listed on * page 96 of the internet draft. The are listed here for easy reference: name, * common name, surname, given name, initials, generation qualifier, dn qualifier, * country name, locality name, state or province name, organization name, organization * unit name, title, pkcs9 email. Not all the attributes are supported. Please check * the X500NameAttrMap for defined attributes. - * + * * @author Christine Ho */ @@ -71,7 +71,7 @@ public final class Attribute implements Serializable, DerEncoder { /** * Construct an attribute from attribute type and attribute value - * + * * @param oid the object identifier of the attribute type * @param value the value string */ @@ -89,7 +89,7 @@ public final class Attribute implements Serializable, DerEncoder { /** * Construct an attribute from attribute type and attribute values - * + * * @param oid the object identifier of the attribute type * @param values String value vector */ @@ -112,7 +112,7 @@ public final class Attribute implements Serializable, DerEncoder { /** * Construct an attribute from attribute type and attribute values - * + * * @param oid attribute type string CN,OU,O,C,L,TITLE,ST,STREET,UID,MAIL,E,DC * @param values String value vector */ @@ -148,7 +148,7 @@ public final class Attribute implements Serializable, DerEncoder { /** * Construct an attribute from a der encoded object. This der * der encoded value should represent the attribute object. - * + * * @param value the attribute object in der encode form. */ public Attribute(DerValue val) @@ -168,7 +168,7 @@ public final class Attribute implements Serializable, DerEncoder { /** * Returns the OID in the Attribute. - * + * * @return the ObjectIdentifier in this Attribute. */ public ObjectIdentifier getOid() { @@ -177,7 +177,7 @@ public final class Attribute implements Serializable, DerEncoder { /** * Returns enumeration of values in this attribute. - * + * * @return Enumeration of values of this Attribute. */ public Enumeration<String> getValues() { @@ -189,7 +189,7 @@ public final class Attribute implements Serializable, DerEncoder { /** * Encodes the Attribute to a Der output stream. * Attribute are encoded as a SEQUENCE of two elements. - * + * * @param out The Der output stream. */ public void encode(DerOutputStream out) throws IOException { @@ -199,10 +199,10 @@ public final class Attribute implements Serializable, DerEncoder { /** * DER encode this object onto an output stream. * Implements the <code>DerEncoder</code> interface. - * + * * @param out * the output stream on which to write the DER encoding. - * + * * @exception IOException on encoding error. */ public void derEncode(OutputStream out) throws IOException { diff --git a/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java b/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java index 91b6c2598..a8df9d132 100644 --- a/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java +++ b/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java @@ -29,14 +29,14 @@ import netscape.security.util.DerValue; /** * This class represents the Authority Key Identifier Extension. - * + * * <p> * The authority key identifier extension provides a means of identifying the particular public key used to sign a * certificate. This extension would be used where an issuer has multiple signing keys (either due to multiple * concurrent key pairs or due to changeover). * <p> * The ASN.1 syntax for this is: - * + * * <pre> * AuthorityKeyIdentifier ::= SEQUENCE { * keyIdentifier [0] KeyIdentifier OPTIONAL, @@ -45,7 +45,7 @@ import netscape.security.util.DerValue; * } * KeyIdentifier ::= OCTET STRING * </pre> - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.9 @@ -130,7 +130,7 @@ public class AuthorityKeyIdentifierExtension extends Extension /** * The default constructor for this extension. Null parameters make * the element optional (not present). - * + * * @param id the KeyIdentifier associated with this extension. * @param names the GeneralNames associated with this extension * @param serialNum the CertificateSerialNumber associated with @@ -151,7 +151,7 @@ public class AuthorityKeyIdentifierExtension extends Extension /** * Create the extension from the passed DER encoded value of the same. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -176,8 +176,8 @@ public class AuthorityKeyIdentifierExtension extends Extension } // NB. this is always encoded with the IMPLICIT tag - // The checks only make sense if we assume implicit tagging, - // with explicit tagging the form is always constructed. + // The checks only make sense if we assume implicit tagging, + // with explicit tagging the form is always constructed. while (val.data.available() != 0) { DerValue opt = val.data.getDerValue(); @@ -232,7 +232,7 @@ public class AuthorityKeyIdentifierExtension extends Extension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -242,7 +242,7 @@ public class AuthorityKeyIdentifierExtension extends Extension /** * Write the extension to the OutputStream. - * + * * @param out the OutputStream to write the extension to. * @exception IOException on error. */ diff --git a/base/util/src/netscape/security/x509/BasicConstraintsExtension.java b/base/util/src/netscape/security/x509/BasicConstraintsExtension.java index 2688e961d..ed619cb1b 100644 --- a/base/util/src/netscape/security/x509/BasicConstraintsExtension.java +++ b/base/util/src/netscape/security/x509/BasicConstraintsExtension.java @@ -30,11 +30,11 @@ import netscape.security.util.DerValue; /** * This class represents the Basic Constraints Extension. - * + * * <p> * The basic constraints extension identifies whether the subject of the certificate is a CA and how deep a * certification path may exist through that CA. - * + * * <pre> * The ASN.1 syntax for this extension is: * BasicConstraints ::= SEQUENCE { @@ -42,7 +42,7 @@ import netscape.security.util.DerValue; * pathLenConstraint INTEGER (0..MAX) OPTIONAL * } * </pre> - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.7 @@ -88,7 +88,7 @@ public class BasicConstraintsExtension extends Extension /** * Default constructor for this object. - * + * * @param ca true, if the subject of the Certificate is a CA. * @param len specifies the depth of the certification path. */ @@ -106,7 +106,7 @@ public class BasicConstraintsExtension extends Extension /** * Default constructor for this object. - * + * * @param ca true, if the subject of the Certificate is a CA. * @param len specifies the depth of the certification path. */ @@ -120,7 +120,7 @@ public class BasicConstraintsExtension extends Extension /** * Create the extension from the passed DER encoded value of the same. - * + * * @param extension the DER encoded value of the extension. * @exception IOException on error. */ @@ -193,7 +193,7 @@ public class BasicConstraintsExtension extends Extension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -203,7 +203,7 @@ public class BasicConstraintsExtension extends Extension /** * Encode this extension value to the output stream. - * + * * @param out the DerOutputStream to encode the extension to. */ public void encode(OutputStream out) throws IOException { diff --git a/base/util/src/netscape/security/x509/CPSuri.java b/base/util/src/netscape/security/x509/CPSuri.java index d0a2e0762..b39f04895 100644 --- a/base/util/src/netscape/security/x509/CPSuri.java +++ b/base/util/src/netscape/security/x509/CPSuri.java @@ -24,9 +24,9 @@ import netscape.security.util.DerValue; /** * Represent the CPSuri Qualifier. - * + * * CPSuri ::= IA5String; - * + * * @author Thomas Kwan */ public class CPSuri extends Qualifier { @@ -39,7 +39,7 @@ public class CPSuri extends Qualifier { /** * Create a PolicyQualifierInfo - * + * * @param id the ObjectIdentifier for the policy id. */ public CPSuri(String uri) { @@ -52,7 +52,7 @@ public class CPSuri extends Qualifier { /** * Write the PolicyQualifier to the DerOutputStream. - * + * * @param out the DerOutputStream to write the object to. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/CRLDistributionPoint.java b/base/util/src/netscape/security/x509/CRLDistributionPoint.java index c7ad84389..442957449 100644 --- a/base/util/src/netscape/security/x509/CRLDistributionPoint.java +++ b/base/util/src/netscape/security/x509/CRLDistributionPoint.java @@ -43,11 +43,11 @@ import org.mozilla.jss.asn1.Tag; * distributionPoint [0] DistributionPointName OPTIONAL, * reasons [1] ReasonFlags OPTIONAL, * cRLIssuer [2] GeneralNames OPTIONAL } - * + * * DistributionPointName ::= CHOICE { * fullName [0] GeneralNames, * nameRelativeToCRLIssuer [1] RelativeDistinguishedName } - * + * * ReasonFlags ::= BIT STRING { * unused (0), * keyCompromise (1), @@ -92,7 +92,7 @@ public class CRLDistributionPoint implements ASN1Value { * If it is set to a non-null value, <code>relativeName</code> will be * set to <code>null</code>, because at most one of these two attributes * can be specified at a time. - * + * * @exception GeneralNamesException If an error occurs encoding the * name. */ @@ -156,7 +156,7 @@ public class CRLDistributionPoint implements ASN1Value { /** * Sets the CRLIssuer for the CRL at this distribution point. * May be set to <code>null</code>. - * + * * @exception GeneralNamesException If an error occurs encoding the name. */ public void setCRLIssuer(GeneralNames CRLIssuer) @@ -235,7 +235,7 @@ public class CRLDistributionPoint implements ASN1Value { seq.encode(implicitTag, ostream); } catch (InvalidBERException e) { - // this shouldn't happen unless there is a bug in one of + // this shouldn't happen unless there is a bug in one of // the Sun encoding classes throw new IOException(e.toString()); } diff --git a/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java b/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java index c939a7431..6ab962fae 100644 --- a/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java +++ b/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java @@ -37,19 +37,19 @@ import org.mozilla.jss.asn1.SEQUENCE; /** * An extension that tells applications where to find the CRL for * this certificate. - * + * * <pre> * cRLDistributionPoints ::= SEQUENCE SIZE (1..MAX) OF DistributionPoint - * + * * DistributionPoint ::= SEQUENCE { * distributionPoint [0] DistributionPointName OPTIONAL, * reasons [1] ReasonFlags OPTIONAL, * cRLIssuer [2] GeneralNames OPTIONAL } - * + * * DistributionPointName ::= CHOICE { * fullName [0] GeneralNames, * nameRelativeToCRLIssuer [1] RelativeDistinguishedName } - * + * * ReasonFlags ::= BIT STRING { * unused (0), * keyCompromise (1), @@ -334,7 +334,7 @@ public class CRLDistributionPointsExtension extends Extension /** * Given a bit array representing reason flags, extracts the reasons * and returns them as an array. - * + * * @param bitFlags A bit vector containing reason flags. * @return An array of reasons contained in the bit vector. * May be zero-length but will not be null. @@ -347,7 +347,7 @@ public class CRLDistributionPointsExtension extends Extension * Given a bit array representing reason flags, extracts the reasons * and returns them as an array. Currently, only the first byte * of the bitflags are examined. - * + * * @param bitFlags A bit vector containing reason flags. The format * is big-endian (MSB first). Only the first byte is examined. * @return An array of reasons contained in the bit vector. diff --git a/base/util/src/netscape/security/x509/CRLExtensions.java b/base/util/src/netscape/security/x509/CRLExtensions.java index bdadcc12e..4a567e173 100755 --- a/base/util/src/netscape/security/x509/CRLExtensions.java +++ b/base/util/src/netscape/security/x509/CRLExtensions.java @@ -35,7 +35,7 @@ import netscape.security.util.DerValue; /** * This class defines the CRL Extensions. - * + * * @author Hemma Prafullchandra * @version 1.4 */ @@ -94,7 +94,7 @@ public class CRLExtensions extends Vector<Extension> { /** * Create the object, decoding the values from the passed DER stream. - * + * * @param in the DerInputStream to read the Extension from. * @exception CRLException on decoding errors. * @exception X509ExtensionException on extension handling errors. @@ -117,7 +117,7 @@ public class CRLExtensions extends Vector<Extension> { /** * Decode the extensions from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception CRLException on decoding or validity errors. * @exception X509ExtensionException on extension handling errors. @@ -142,7 +142,7 @@ public class CRLExtensions extends Vector<Extension> { /** * Encode the extensions in DER form to the stream. - * + * * @param out the DerOutputStream to marshal the contents to. * @param isExplicit the tag indicating whether this is an entry * extension or a CRL extension. @@ -185,7 +185,7 @@ public class CRLExtensions extends Vector<Extension> { /** * Get the extension with this alias. - * + * * @param alias the identifier string for the extension to retrieve. * @exception X509ExtensionException on extension handling errors. */ @@ -207,7 +207,7 @@ public class CRLExtensions extends Vector<Extension> { /** * Set the extension value with this alias. - * + * * @param alias the identifier string for the extension to set. * @param obj the Object to set the extension identified by the * alias. @@ -220,7 +220,7 @@ public class CRLExtensions extends Vector<Extension> { /** * Return an enumeration of names of the extensions. - * + * * @return an enumeration of the names of the extensions in this CRL. */ public Enumeration<Extension> getElements() { diff --git a/base/util/src/netscape/security/x509/CRLNumberExtension.java b/base/util/src/netscape/security/x509/CRLNumberExtension.java index 7c89b179f..4cacde942 100755 --- a/base/util/src/netscape/security/x509/CRLNumberExtension.java +++ b/base/util/src/netscape/security/x509/CRLNumberExtension.java @@ -31,12 +31,12 @@ import netscape.security.util.DerValue; /** * Represent the CRL Number Extension. - * + * * <p> * This extension, if present, conveys a monotonically increasing sequence number for each CRL issued by a given CA * through a specific CA X.500 Directory entry or CRL distribution point. This extension allows users to easily * determine when a particular CRL supersedes another CRL. - * + * * @author Hemma Prafullchandra * @version 1.2 * @see Extension @@ -69,7 +69,7 @@ public class CRLNumberExtension extends Extension /** * Create a CRLNumberExtension with the integer value . * The criticality is set to false. - * + * * @param crlNum the value to be set for the extension. */ public CRLNumberExtension(int crlNum) throws IOException { @@ -82,7 +82,7 @@ public class CRLNumberExtension extends Extension /** * Create a CRLNumberExtension with the BigInteger value . * The criticality is set to false. - * + * * @param crlNum the value to be set for the extension. */ public CRLNumberExtension(BigInteger crlNum) throws IOException { @@ -94,7 +94,7 @@ public class CRLNumberExtension extends Extension /** * Create a CRLNumberExtension with the BigInteger value . - * + * * @param critical true if the extension is to be treated as critical. * @param crlNum the value to be set for the extension. */ @@ -107,7 +107,7 @@ public class CRLNumberExtension extends Extension /** * Create the extension from the passed DER encoded value of the same. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -181,7 +181,7 @@ public class CRLNumberExtension extends Extension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -191,7 +191,7 @@ public class CRLNumberExtension extends Extension /** * Write the extension to the DerOutputStream. - * + * * @param out the DerOutputStream to write the extension to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/x509/CRLReasonExtension.java b/base/util/src/netscape/security/x509/CRLReasonExtension.java index 3c11fc70b..bd82ff2fc 100644 --- a/base/util/src/netscape/security/x509/CRLReasonExtension.java +++ b/base/util/src/netscape/security/x509/CRLReasonExtension.java @@ -28,10 +28,10 @@ import netscape.security.util.DerValue; /** * Represent the CRLReason Extension of CRL entry. - * + * * <p> * This extension, if present, defines the identifies the reason for the certificate revocation. - * + * * @author galperin * @version $Revision$, $Date$ * @see Extension @@ -75,7 +75,7 @@ public final class CRLReasonExtension extends Extension implements CertAttrSet { /** * Default constructor - * + * */ public CRLReasonExtension() { @@ -86,7 +86,7 @@ public final class CRLReasonExtension extends Extension implements CertAttrSet { /** * Create extension value for specific revocation reason - * + * */ public CRLReasonExtension(RevocationReason reason) { @@ -104,7 +104,7 @@ public final class CRLReasonExtension extends Extension implements CertAttrSet { /** * Create the object from the passed DER encoded value. - * + * * @param derVal the DerValue decoded from the stream. * @exception IOException on decoding errors. */ @@ -169,7 +169,7 @@ public final class CRLReasonExtension extends Extension implements CertAttrSet { /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -188,7 +188,7 @@ public final class CRLReasonExtension extends Extension implements CertAttrSet { /** * Write the extension to the DerOutputStream. - * + * * @param out the OutputStream to write the extension to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/x509/CertAndKeyGen.java b/base/util/src/netscape/security/x509/CertAndKeyGen.java index 1579d46bf..703585f36 100644 --- a/base/util/src/netscape/security/x509/CertAndKeyGen.java +++ b/base/util/src/netscape/security/x509/CertAndKeyGen.java @@ -38,22 +38,22 @@ import netscape.security.pkcs.PKCS10; /** * Generate a pair of keys, and provide access to them. This class is * provided primarily for ease of use. - * + * * <P> * This provides some simple certificate management functionality. Specifically, it allows you to create self-signed * X.509 certificates as well as PKCS 10 based certificate signing requests. - * + * * <P> * Keys for some public key signature algorithms have algorithm parameters, such as DSS/DSA. Some sites' Certificate * Authorities adopt fixed algorithm parameters, which speeds up some operations including key generation and signing. * <em>At this time, this interface * does not provide a way to provide such algorithm parameters, e.g. * by providing the CA certificate which includes those parameters.</em> - * + * * <P> * Also, note that at this time only signature-capable keys may be acquired through this interface. Diffie-Hellman keys, * used for secure key exchange, may be supported later. - * + * * @author David Brownell * @author Hemma Prafullchandra * @version 1.44 @@ -64,7 +64,7 @@ public final class CertAndKeyGen { /** * Creates a CertAndKeyGen object for a particular key type * and signature algorithm. - * + * * @param keyType type of key, e.g. "RSA", "DSA" * @param sigAlg name of the signature algorithm, e.g. "MD5WithRSA", * "MD2WithRSA", "SHAwithDSA". @@ -83,7 +83,7 @@ public final class CertAndKeyGen { * to get a reproducible sequence of keys and signatures, or * because you may be able to take advantage of strong sources * of randomness/entropy in your environment. - * + * * @deprecated All random numbers come from PKCS #11 now. */ public void setRandom(SecureRandom generator) { @@ -97,12 +97,12 @@ public final class CertAndKeyGen { * for the same key size, because of the "work factor" involved in * brute force attacks. As computers become faster, it becomes * easier to perform such attacks. Small keys are to be avoided. - * + * * <P> * Note that not all values of "keyBits" are valid for all algorithms, and not all public key algorithms are * currently supported for use in X.509 certificates. If the algorithm you specified does not produce X.509 * compatible keys, an invalid key exception is thrown. - * + * * @param keyBits the number of bits in the keys. * @exception InvalidKeyException if the environment does not * provide X.509 public keys for this signature algorithm. @@ -140,7 +140,7 @@ public final class CertAndKeyGen { /** * Returns the private key of the generated key pair. - * + * * <P> * <STRONG><em>Be extremely careful when handling private keys. * When private keys are not kept secret, they lose their ability @@ -154,15 +154,15 @@ public final class CertAndKeyGen { /** * Returns a self-signed X.509v1 certificate for the public key. * The certificate is immediately valid. - * + * * <P> * Such certificates normally are used to identify a "Certificate Authority" (CA). Accordingly, they will not always * be accepted by other parties. However, such certificates are also useful when you are bootstrapping your security * infrastructure, or deploying system prototypes. - * + * * @deprecated Use the new <a href = * "#getSelfCertificate(netscape.security.x509.X500Name, long)"> - * + * * @param myname X.500 name of the subject (who is also the issuer) * @param validity how long the certificate should be valid, in seconds */ @@ -185,12 +185,12 @@ public final class CertAndKeyGen { /** * Returns a self-signed X.509v3 certificate for the public key. * The certificate is immediately valid. No extensions. - * + * * <P> * Such certificates normally are used to identify a "Certificate Authority" (CA). Accordingly, they will not always * be accepted by other parties. However, such certificates are also useful when you are bootstrapping your security * infrastructure, or deploying system prototypes. - * + * * @param myname X.500 name of the subject (who is also the issuer) * @param validity how long the certificate should be valid, in seconds * @exception CertificateException on certificate handling errors. @@ -246,11 +246,11 @@ public final class CertAndKeyGen { * Returns a PKCS #10 certificate request. The caller uses either <code>PKCS10.print</code> or * <code>PKCS10.toByteArray</code> operations on the result, to get the request in an appropriate * transmission format. - * + * * <P> * PKCS #10 certificate requests are sent, along with some proof of identity, to Certificate Authorities (CAs) which * then issue X.509 public key certificates. - * + * * @param myname X.500 name of the subject * @exception InvalidKeyException on key handling errors. * @exception SignatureException on signature handling errors. diff --git a/base/util/src/netscape/security/x509/CertAttrSet.java b/base/util/src/netscape/security/x509/CertAttrSet.java index 7e8d6db82..2dde4430e 100755 --- a/base/util/src/netscape/security/x509/CertAttrSet.java +++ b/base/util/src/netscape/security/x509/CertAttrSet.java @@ -31,7 +31,7 @@ import java.util.Enumeration; * <p> * A CertAttrSet itself can also be comprised of other sub-sets. In the case of X.509 V3 certificates, for example, the * "extensions" attribute has subattributes, such as those for KeyUsage and AuthorityKeyIdentifier. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.9 @@ -40,7 +40,7 @@ import java.util.Enumeration; public interface CertAttrSet { /** * Returns a short string describing this certificate attribute. - * + * * @return value of this certificate attribute in * printable form. */ @@ -49,9 +49,9 @@ public interface CertAttrSet { /** * Encodes the attribute to the output stream in a format * that can be parsed by the <code>decode</code> method. - * + * * @param out the OutputStream to encode the attribute to. - * + * * @exception CertificateException on encoding or validity errors. * @exception IOException on other errors. */ @@ -60,9 +60,9 @@ public interface CertAttrSet { /** * Decodes the attribute in the input stream. - * + * * @param in the InputStream to read the encoded attribute from. - * + * * @exception CertificateException on decoding or validity errors. * @exception IOException on other errors. */ @@ -71,10 +71,10 @@ public interface CertAttrSet { /** * Sets an attribute value within this CertAttrSet. - * + * * @param name the name of the attribute (e.g. "x509.info.key") * @param obj the attribute object. - * + * * @exception CertificateException on attribute handling errors. * @exception IOException on other errors. */ @@ -83,9 +83,9 @@ public interface CertAttrSet { /** * Gets an attribute value for this CertAttrSet. - * + * * @param name the name of the attribute to return. - * + * * @exception CertificateException on attribute handling errors. * @exception IOException on other errors. */ @@ -94,9 +94,9 @@ public interface CertAttrSet { /** * Deletes an attribute value from this CertAttrSet. - * + * * @param name the name of the attribute to delete. - * + * * @exception CertificateException on attribute handling errors. * @exception IOException on other errors. */ @@ -106,14 +106,14 @@ public interface CertAttrSet { /** * Returns an enumeration of the names of the attributes existing within * this attribute. - * + * * @return an enumeration of the attribute names. */ Enumeration<String> getAttributeNames(); /** * Returns the name (identifier) of this CertAttrSet. - * + * * @return the name of this CertAttrSet. */ String getName(); diff --git a/base/util/src/netscape/security/x509/CertException.java b/base/util/src/netscape/security/x509/CertException.java index 31d9e686e..d9a618925 100644 --- a/base/util/src/netscape/security/x509/CertException.java +++ b/base/util/src/netscape/security/x509/CertException.java @@ -19,9 +19,9 @@ package netscape.security.x509; /** * CertException indicates one of a variety of certificate problems. - * + * * @version 1.18 - * + * * @author David Brownell * @author Amit Kapoor * @author Hemma Prafullchandra diff --git a/base/util/src/netscape/security/x509/CertParseError.java b/base/util/src/netscape/security/x509/CertParseError.java index 7328c7207..dc4aa7b8f 100644 --- a/base/util/src/netscape/security/x509/CertParseError.java +++ b/base/util/src/netscape/security/x509/CertParseError.java @@ -23,7 +23,7 @@ package netscape.security.x509; /** * CertException indicates one of a variety of certificate problems. - * + * * @version 1.7 * @author David Brownell */ diff --git a/base/util/src/netscape/security/x509/CertificateAlgorithmId.java b/base/util/src/netscape/security/x509/CertificateAlgorithmId.java index 41610844e..b1b14f42b 100644 --- a/base/util/src/netscape/security/x509/CertificateAlgorithmId.java +++ b/base/util/src/netscape/security/x509/CertificateAlgorithmId.java @@ -32,7 +32,7 @@ import netscape.security.util.DerValue; /** * This class defines the AlgorithmId for the Certificate. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.7 @@ -58,7 +58,7 @@ public class CertificateAlgorithmId implements CertAttrSet, Serializable { /** * Default constructor for the certificate attribute. - * + * * @param algId the Algorithm identifier */ public CertificateAlgorithmId(AlgorithmId algId) { @@ -67,7 +67,7 @@ public class CertificateAlgorithmId implements CertAttrSet, Serializable { /** * Create the object, decoding the values from the passed DER stream. - * + * * @param in the DerInputStream to read the serial number from. * @exception IOException on decoding errors. */ @@ -78,7 +78,7 @@ public class CertificateAlgorithmId implements CertAttrSet, Serializable { /** * Create the object, decoding the values from the passed stream. - * + * * @param in the InputStream to read the serial number from. * @exception IOException on decoding errors. */ @@ -109,7 +109,7 @@ public class CertificateAlgorithmId implements CertAttrSet, Serializable { /** * Encode the algorithm identifier in DER form to the stream. - * + * * @param out the DerOutputStream to marshal the contents to. * @exception IOException on errors. */ @@ -122,7 +122,7 @@ public class CertificateAlgorithmId implements CertAttrSet, Serializable { /** * Decode the algorithm identifier from the passed stream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/CertificateChain.java b/base/util/src/netscape/security/x509/CertificateChain.java index b60325378..60df0ec65 100644 --- a/base/util/src/netscape/security/x509/CertificateChain.java +++ b/base/util/src/netscape/security/x509/CertificateChain.java @@ -33,7 +33,7 @@ public class CertificateChain implements Serializable { /** * constructs a certificate chain from a certificate. - * + * * @param cert a certificate */ public CertificateChain(X509Certificate cert) { @@ -43,7 +43,7 @@ public class CertificateChain implements Serializable { /** * constructs a certificate chain from a X509 certificate array. - * + * * @param chain a certificate array. */ public CertificateChain(X509Certificate[] chain) { @@ -52,7 +52,7 @@ public class CertificateChain implements Serializable { /** * returns the certificate at specified index in chain. - * + * * @param index the index. * @return the X509 certificate at the given index. */ @@ -62,7 +62,7 @@ public class CertificateChain implements Serializable { /** * returns the first certificate in chain. - * + * * @return the X509 certificate at the given index. */ public X509Certificate getFirstCertificate() { @@ -71,7 +71,7 @@ public class CertificateChain implements Serializable { /** * returns the certificate chain as an array of X509 certificates. - * + * * @return an array of X509 Certificates. */ public X509Certificate[] getChain() { diff --git a/base/util/src/netscape/security/x509/CertificateExtensions.java b/base/util/src/netscape/security/x509/CertificateExtensions.java index b9667d8f6..a358a0f6a 100644 --- a/base/util/src/netscape/security/x509/CertificateExtensions.java +++ b/base/util/src/netscape/security/x509/CertificateExtensions.java @@ -37,7 +37,7 @@ import netscape.security.util.DerValue; /** * This class defines the Extensions attribute for the Certificate. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.11 @@ -111,7 +111,7 @@ public class CertificateExtensions extends Vector<Extension> /** * Create the object, decoding the values from the passed DER stream. - * + * * @param in the DerInputStream to read the Extension from. * @exception IOException on decoding errors. */ @@ -129,7 +129,7 @@ public class CertificateExtensions extends Vector<Extension> /** * Decode the extensions from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -148,7 +148,7 @@ public class CertificateExtensions extends Vector<Extension> /** * Decode the extensions from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -182,7 +182,7 @@ public class CertificateExtensions extends Vector<Extension> /** * Encode the extensions in DER form to the stream. - * + * * @param out the DerOutputStream to marshal the contents to. * @exception CertificateException on encoding errors. * @exception IOException on errors. @@ -212,7 +212,7 @@ public class CertificateExtensions extends Vector<Extension> /** * Set the attribute value. - * + * * @param name the extension name used in the cache. * @param obj the object to set. * @exception IOException if the object could not be cached. @@ -224,7 +224,7 @@ public class CertificateExtensions extends Vector<Extension> /** * Get the attribute value. - * + * * @param name the extension name used in the lookup. * @exception IOException if named extension is not found. */ @@ -238,7 +238,7 @@ public class CertificateExtensions extends Vector<Extension> /** * Delete the attribute value. - * + * * @param name the extension name used in the lookup. * @exception IOException if named extension is not found. */ diff --git a/base/util/src/netscape/security/x509/CertificateIssuerExtension.java b/base/util/src/netscape/security/x509/CertificateIssuerExtension.java index 774116bcc..4f20cb685 100644 --- a/base/util/src/netscape/security/x509/CertificateIssuerExtension.java +++ b/base/util/src/netscape/security/x509/CertificateIssuerExtension.java @@ -30,11 +30,11 @@ import netscape.security.util.DerValue; /** * Represent the CRL Certificate Issuer Extension. - * + * * <p> * This CRL entry extension identifies the certificate issuer associated with an entry in an indirect CRL, i.e. a CRL * that has the indirectCRL indicator set in its issuing distribution point extension. - * + * * @see Extension * @see CertAttrSet */ @@ -81,7 +81,7 @@ public class CertificateIssuerExtension extends Extension /** * Create a CertificateIssuerExtension with the passed GeneralNames * and criticality. - * + * * @param critical true if the extension is to be treated as critical. * @param names the GeneralNames for the issuer. * @exception IOException on error. @@ -96,7 +96,7 @@ public class CertificateIssuerExtension extends Extension /** * Create a CertificateIssuerExtension with the passed GeneralNames. - * + * * @param names the GeneralNames for the issuer. * @exception IOException on error. */ @@ -119,7 +119,7 @@ public class CertificateIssuerExtension extends Extension /** * Create the extension from the passed DER encoded value. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -157,7 +157,7 @@ public class CertificateIssuerExtension extends Extension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -167,7 +167,7 @@ public class CertificateIssuerExtension extends Extension /** * Write the extension to the OutputStream. - * + * * @param out the OutputStream to write the extension to. * @exception IOException on encoding error. */ diff --git a/base/util/src/netscape/security/x509/CertificateIssuerName.java b/base/util/src/netscape/security/x509/CertificateIssuerName.java index a2f9026c1..a075fdf56 100644 --- a/base/util/src/netscape/security/x509/CertificateIssuerName.java +++ b/base/util/src/netscape/security/x509/CertificateIssuerName.java @@ -29,7 +29,7 @@ import netscape.security.util.DerValue; /** * This class defines the X500Name attribute for the Certificate. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.6 @@ -52,7 +52,7 @@ public class CertificateIssuerName implements CertAttrSet { /** * Default constructor for the certificate attribute. - * + * * @param name the X500Name */ public CertificateIssuerName(X500Name name) { @@ -61,7 +61,7 @@ public class CertificateIssuerName implements CertAttrSet { /** * Create the object, decoding the values from the passed DER stream. - * + * * @param in the DerInputStream to read the X500Name from. * @exception IOException on decoding errors. */ @@ -71,7 +71,7 @@ public class CertificateIssuerName implements CertAttrSet { /** * Create the object, decoding the values from the passed stream. - * + * * @param in the InputStream to read the X500Name from. * @exception IOException on decoding errors. */ @@ -91,7 +91,7 @@ public class CertificateIssuerName implements CertAttrSet { /** * Encode the name in DER form to the stream. - * + * * @param out the DerOutputStream to marshal the contents to. * @exception IOException on errors. */ @@ -104,7 +104,7 @@ public class CertificateIssuerName implements CertAttrSet { /** * Decode the name in DER form from the stream. - * + * * @param in the InputStream to marshal the contents from. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java b/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java index 351116ffb..af9c92b49 100644 --- a/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java +++ b/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java @@ -30,7 +30,7 @@ import netscape.security.util.DerValue; /** * This class defines the subject/issuer unique identity attribute * for the Certificate. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.6 @@ -52,7 +52,7 @@ public class CertificateIssuerUniqueIdentity implements CertAttrSet { /** * Default constructor for the certificate attribute. - * + * * @param key the UniqueIdentity */ public CertificateIssuerUniqueIdentity(UniqueIdentity id) { @@ -61,7 +61,7 @@ public class CertificateIssuerUniqueIdentity implements CertAttrSet { /** * Create the object, decoding the values from the passed DER stream. - * + * * @param in the DerInputStream to read the UniqueIdentity from. * @exception IOException on decoding errors. */ @@ -72,7 +72,7 @@ public class CertificateIssuerUniqueIdentity implements CertAttrSet { /** * Create the object, decoding the values from the passed stream. - * + * * @param in the InputStream to read the UniqueIdentity from. * @exception IOException on decoding errors. */ @@ -84,7 +84,7 @@ public class CertificateIssuerUniqueIdentity implements CertAttrSet { /** * Create the object, decoding the values from the passed DER value. - * + * * @param in the DerValue to read the UniqueIdentity from. * @exception IOException on decoding errors. */ @@ -104,7 +104,7 @@ public class CertificateIssuerUniqueIdentity implements CertAttrSet { /** * Decode the identity in DER form from the stream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on errors. */ @@ -115,7 +115,7 @@ public class CertificateIssuerUniqueIdentity implements CertAttrSet { /** * Encode the identity in DER form to the stream. - * + * * @param out the DerOutputStream to marshal the contents to. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java b/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java index fedc15917..7fdd6ba02 100644 --- a/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java +++ b/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java @@ -34,7 +34,7 @@ import com.netscape.cmsutil.util.Utils; /** * This class defines the Certificate Policies Extension. - * + * * <p> * The certificate policies extension conatins a sequence of policy information terms, each of which consists of an * object identifier (OID) and optional qualifiers. These policy information terms indicate the policy under which the @@ -42,11 +42,11 @@ import com.netscape.cmsutil.util.Utils; * requirements are expected to have a list of those policies which they will accept and to compare the policy OIDs in * the certificate to that list. If this extension is critical, the path validation software must be able to interpret * this extension, or must reject the certificate. - * + * * <pre> * CertificatePolicies ::= SEQUENECE OF PolicyInformation * </pre> - * + * * @author Christine Ho * @see Extension * @see CertAttrSet @@ -69,7 +69,7 @@ public class CertificatePoliciesExtension extends Extension public static final String NAME = "CertificatePolicies"; public static final String INFOS = "infos"; - // Private data members + // Private data members private Vector<CertificatePolicyInfo> mInfos; // Encode this extension value @@ -93,7 +93,7 @@ public class CertificatePoliciesExtension extends Extension /** * Create a CertificatePolicies with the Vector of CertificatePolicyInfo. - * + * * @param infos the Vector of CertificatePolicyInfo. */ public CertificatePoliciesExtension(Vector<CertificatePolicyInfo> infos) throws IOException { @@ -114,7 +114,7 @@ public class CertificatePoliciesExtension extends Extension /** * Create the extension from the passed DER encoded value. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -157,7 +157,7 @@ public class CertificatePoliciesExtension extends Extension /** * Write the extension to the OutputStream. - * + * * @param out the OutputStream to write the extension to. * @exception IOException on encoding errors. */ @@ -174,7 +174,7 @@ public class CertificatePoliciesExtension extends Extension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -253,7 +253,7 @@ public class CertificatePoliciesExtension extends Extension /** * From ASN.1 dump - * + * * 0 30 133: SEQUENCE { * 3 30 45: . SEQUENCE { * 5 06 3: . . OBJECT IDENTIFIER '1 2 3 5' diff --git a/base/util/src/netscape/security/x509/CertificatePolicyId.java b/base/util/src/netscape/security/x509/CertificatePolicyId.java index bfc93b0bb..d4af18c6a 100644 --- a/base/util/src/netscape/security/x509/CertificatePolicyId.java +++ b/base/util/src/netscape/security/x509/CertificatePolicyId.java @@ -25,7 +25,7 @@ import netscape.security.util.ObjectIdentifier; /** * Represent the CertificatePolicyId ASN.1 object. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.5 @@ -39,7 +39,7 @@ public class CertificatePolicyId implements java.io.Serializable { /** * Create a CertificatePolicyId with the ObjectIdentifier. - * + * * @param id the ObjectIdentifier for the policy id. */ public CertificatePolicyId(ObjectIdentifier id) { @@ -48,7 +48,7 @@ public class CertificatePolicyId implements java.io.Serializable { /** * Create the object from its Der encoded value. - * + * * @param val the DER encoded value for the same. */ public CertificatePolicyId(DerValue val) throws IOException { @@ -75,7 +75,7 @@ public class CertificatePolicyId implements java.io.Serializable { /** * Write the CertificatePolicyId to the DerOutputStream. - * + * * @param out the DerOutputStream to write the object to. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/CertificatePolicyInfo.java b/base/util/src/netscape/security/x509/CertificatePolicyInfo.java index 33e541c65..375cfbe7c 100644 --- a/base/util/src/netscape/security/x509/CertificatePolicyInfo.java +++ b/base/util/src/netscape/security/x509/CertificatePolicyInfo.java @@ -24,7 +24,7 @@ import netscape.security.util.DerValue; /** * Represent the CertificatePolicyInformation ASN.1 object. - * + * * @author Christine Ho */ public class CertificatePolicyInfo implements java.io.Serializable { @@ -37,7 +37,7 @@ public class CertificatePolicyInfo implements java.io.Serializable { /** * Create a CertificatePolicyInfo with the passed CertificatePolicyId's. - * + * * @param id the CertificatePolicyId. */ public CertificatePolicyInfo(CertificatePolicyId id) { @@ -52,7 +52,7 @@ public class CertificatePolicyInfo implements java.io.Serializable { /** * Create the CertificatePolicyInfo from the DER encoded value. - * + * * @param val the DER encoded value of the same. */ public CertificatePolicyInfo(DerValue val) throws IOException { @@ -94,7 +94,7 @@ public class CertificatePolicyInfo implements java.io.Serializable { /** * Write the CertificatePolicyInfo to the DerOutputStream. - * + * * @param out the DerOutputStream to write the object to. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/CertificatePolicyMap.java b/base/util/src/netscape/security/x509/CertificatePolicyMap.java index 75ddf3314..aef43d387 100644 --- a/base/util/src/netscape/security/x509/CertificatePolicyMap.java +++ b/base/util/src/netscape/security/x509/CertificatePolicyMap.java @@ -24,7 +24,7 @@ import netscape.security.util.DerValue; /** * Represent the CertificatePolicyMap ASN.1 object. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.5 @@ -35,7 +35,7 @@ public class CertificatePolicyMap { /** * Create a CertificatePolicyMap with the passed CertificatePolicyId's. - * + * * @param issuer the CertificatePolicyId for the issuer CA. * @param subject the CertificatePolicyId for the subject CA. */ @@ -47,7 +47,7 @@ public class CertificatePolicyMap { /** * Create the CertificatePolicyMap from the DER encoded value. - * + * * @param val the DER encoded value of the same. */ public CertificatePolicyMap(DerValue val) throws IOException { @@ -86,7 +86,7 @@ public class CertificatePolicyMap { /** * Write the CertificatePolicyMap to the DerOutputStream. - * + * * @param out the DerOutputStream to write the object to. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/CertificatePolicySet.java b/base/util/src/netscape/security/x509/CertificatePolicySet.java index 86d9c107f..68a5e3139 100644 --- a/base/util/src/netscape/security/x509/CertificatePolicySet.java +++ b/base/util/src/netscape/security/x509/CertificatePolicySet.java @@ -26,7 +26,7 @@ import netscape.security.util.DerValue; /** * This class defines the certificate policy set ASN.1 object. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.4 @@ -36,7 +36,7 @@ public class CertificatePolicySet { /** * The default constructor for this class. - * + * * @param ids the sequence of CertificatePolicyId's. */ public CertificatePolicySet(Vector<CertificatePolicyId> ids) { @@ -45,7 +45,7 @@ public class CertificatePolicySet { /** * Create the object from the DerValue. - * + * * @param in the passed DerInputStream. * @exception IOException on decoding errors. */ @@ -72,7 +72,7 @@ public class CertificatePolicySet { /** * Encode the policy set to the output stream. - * + * * @param out the DerOutputStream to encode the data to. */ public void encode(DerOutputStream out) throws IOException { diff --git a/base/util/src/netscape/security/x509/CertificateSerialNumber.java b/base/util/src/netscape/security/x509/CertificateSerialNumber.java index e9655178f..6dd353f16 100644 --- a/base/util/src/netscape/security/x509/CertificateSerialNumber.java +++ b/base/util/src/netscape/security/x509/CertificateSerialNumber.java @@ -30,7 +30,7 @@ import netscape.security.util.DerValue; /** * This class defines the SerialNumber attribute for the Certificate. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.6 @@ -53,7 +53,7 @@ public class CertificateSerialNumber implements CertAttrSet { /** * Default constructor for the certificate attribute. - * + * * @param serial the serial number for the certificate. */ public CertificateSerialNumber(BigInteger num) { @@ -62,7 +62,7 @@ public class CertificateSerialNumber implements CertAttrSet { /** * Default constructor for the certificate attribute. - * + * * @param serial the serial number for the certificate. */ public CertificateSerialNumber(int num) { @@ -71,7 +71,7 @@ public class CertificateSerialNumber implements CertAttrSet { /** * Create the object, decoding the values from the passed DER stream. - * + * * @param in the DerInputStream to read the serial number from. * @exception IOException on decoding errors. */ @@ -81,7 +81,7 @@ public class CertificateSerialNumber implements CertAttrSet { /** * Create the object, decoding the values from the passed stream. - * + * * @param in the InputStream to read the serial number from. * @exception IOException on decoding errors. */ @@ -91,7 +91,7 @@ public class CertificateSerialNumber implements CertAttrSet { /** * Create the object, decoding the values from the passed DerValue. - * + * * @param val the DER encoded value. * @exception IOException on decoding errors. */ @@ -110,7 +110,7 @@ public class CertificateSerialNumber implements CertAttrSet { /** * Encode the serial number in DER form to the stream. - * + * * @param out the DerOutputStream to marshal the contents to. * @exception IOException on errors. */ @@ -123,7 +123,7 @@ public class CertificateSerialNumber implements CertAttrSet { /** * Decode the serial number in DER form from the stream. - * + * * @param in the InputStream to marshal the contents from. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/CertificateSubjectName.java b/base/util/src/netscape/security/x509/CertificateSubjectName.java index 6159638b9..0f4ed7d61 100644 --- a/base/util/src/netscape/security/x509/CertificateSubjectName.java +++ b/base/util/src/netscape/security/x509/CertificateSubjectName.java @@ -32,7 +32,7 @@ import netscape.security.util.DerValue; /** * This class defines the X500Name attribute for the Certificate. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.6 @@ -59,7 +59,7 @@ public class CertificateSubjectName implements CertAttrSet, Serializable { /** * Default constructor for the certificate attribute. - * + * * @param name the X500Name */ public CertificateSubjectName(X500Name name) { @@ -68,7 +68,7 @@ public class CertificateSubjectName implements CertAttrSet, Serializable { /** * Create the object, decoding the values from the passed DER stream. - * + * * @param in the DerInputStream to read the X500Name from. * @exception IOException on decoding errors. */ @@ -78,7 +78,7 @@ public class CertificateSubjectName implements CertAttrSet, Serializable { /** * Create the object, decoding the values from the passed stream. - * + * * @param in the InputStream to read the X500Name from. * @exception IOException on decoding errors. */ @@ -108,7 +108,7 @@ public class CertificateSubjectName implements CertAttrSet, Serializable { /** * Encode the name in DER form to the stream. - * + * * @param out the DerOutputStream to marshal the contents to. * @exception IOException on errors. */ @@ -121,7 +121,7 @@ public class CertificateSubjectName implements CertAttrSet, Serializable { /** * Decode the name in DER form from the stream. - * + * * @param in the InputStream to marshal the contents from. * @exception IOException on errors. */ @@ -134,7 +134,7 @@ public class CertificateSubjectName implements CertAttrSet, Serializable { /** * Decode the name in DER form from the stream. - * + * * @param in the InputStream to marshal the contents from. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java b/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java index 51687e86d..9f9f9222c 100644 --- a/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java +++ b/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java @@ -30,7 +30,7 @@ import netscape.security.util.DerValue; /** * This class defines the subject/issuer unique identity attribute * for the Certificate. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.6 @@ -52,7 +52,7 @@ public class CertificateSubjectUniqueIdentity implements CertAttrSet { /** * Default constructor for the certificate attribute. - * + * * @param key the UniqueIdentity */ public CertificateSubjectUniqueIdentity(UniqueIdentity id) { @@ -61,7 +61,7 @@ public class CertificateSubjectUniqueIdentity implements CertAttrSet { /** * Create the object, decoding the values from the passed DER stream. - * + * * @param in the DerInputStream to read the UniqueIdentity from. * @exception IOException on decoding errors. */ @@ -72,7 +72,7 @@ public class CertificateSubjectUniqueIdentity implements CertAttrSet { /** * Create the object, decoding the values from the passed stream. - * + * * @param in the InputStream to read the UniqueIdentity from. * @exception IOException on decoding errors. */ @@ -84,7 +84,7 @@ public class CertificateSubjectUniqueIdentity implements CertAttrSet { /** * Create the object, decoding the values from the passed DER value. - * + * * @param in the DerValue to read the UniqueIdentity from. * @exception IOException on decoding errors. */ @@ -104,7 +104,7 @@ public class CertificateSubjectUniqueIdentity implements CertAttrSet { /** * Decode the identity in DER form from the stream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on errors. */ @@ -115,7 +115,7 @@ public class CertificateSubjectUniqueIdentity implements CertAttrSet { /** * Encode the identity in DER form to the stream. - * + * * @param out the DerOutputStream to marshal the contents to. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/CertificateValidity.java b/base/util/src/netscape/security/x509/CertificateValidity.java index 0c2c841b0..511f1b1eb 100644 --- a/base/util/src/netscape/security/x509/CertificateValidity.java +++ b/base/util/src/netscape/security/x509/CertificateValidity.java @@ -35,7 +35,7 @@ import netscape.security.util.DerValue; /** * This class defines the interval for which the certificate is valid. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.12 @@ -113,7 +113,7 @@ public class CertificateValidity implements CertAttrSet, Serializable { /** * The default constructor for this class for the specified interval. - * + * * @param notBefore the date and time before which the certificate * is not valid. * @param notAfter the date and time after which the certificate is @@ -126,7 +126,7 @@ public class CertificateValidity implements CertAttrSet, Serializable { /** * Create the object, decoding the values from the passed DER stream. - * + * * @param in the DerInputStream to read the CertificateValidity from. * @exception IOException on decoding errors. */ @@ -147,7 +147,7 @@ public class CertificateValidity implements CertAttrSet, Serializable { /** * Decode the CertificateValidity period from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on errors. */ @@ -168,7 +168,7 @@ public class CertificateValidity implements CertAttrSet, Serializable { /** * Encode the CertificateValidity period in DER form to the stream. - * + * * @param out the OutputStream to marshal the contents to. * @exception IOException on errors. */ @@ -264,7 +264,7 @@ public class CertificateValidity implements CertAttrSet, Serializable { /** * Verify that the current time is within the validity period. - * + * * @exception CertificateExpiredException if the certificate has expired. * @exception CertificateNotYetValidException if the certificate is not * yet valid. @@ -277,15 +277,15 @@ public class CertificateValidity implements CertAttrSet, Serializable { /** * Verify that the passed time is within the validity period. - * + * * @param now the Date against which to compare the validity * period. - * + * * @exception CertificateExpiredException if the certificate has expired * with respect to the <code>Date</code> supplied. * @exception CertificateNotYetValidException if the certificate is not * yet valid with respect to the <code>Date</code> supplied. - * + * */ public void valid(Date now) throws CertificateNotYetValidException, CertificateExpiredException { diff --git a/base/util/src/netscape/security/x509/CertificateVersion.java b/base/util/src/netscape/security/x509/CertificateVersion.java index d3659779f..5cc260d77 100644 --- a/base/util/src/netscape/security/x509/CertificateVersion.java +++ b/base/util/src/netscape/security/x509/CertificateVersion.java @@ -30,7 +30,7 @@ import netscape.security.util.DerValue; /** * This class defines the version of the X509 Certificate. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.8 @@ -89,7 +89,7 @@ public class CertificateVersion implements CertAttrSet { /** * The constructor for this class for the required version. - * + * * @param version the version for the certificate. * @exception IOException if the version is not valid. */ @@ -106,7 +106,7 @@ public class CertificateVersion implements CertAttrSet { /** * Create the object, decoding the values from the passed DER stream. - * + * * @param in the DerInputStream to read the CertificateVersion from. * @exception IOException on decoding errors. */ @@ -119,7 +119,7 @@ public class CertificateVersion implements CertAttrSet { /** * Create the object, decoding the values from the passed stream. - * + * * @param in the InputStream to read the CertificateVersion from. * @exception IOException on decoding errors. */ @@ -132,7 +132,7 @@ public class CertificateVersion implements CertAttrSet { /** * Create the object, decoding the values from the passed DerValue. - * + * * @param val the Der encoded value. * @exception IOException on decoding errors. */ @@ -151,7 +151,7 @@ public class CertificateVersion implements CertAttrSet { /** * Encode the CertificateVersion period in DER form to the stream. - * + * * @param out the OutputStream to marshal the contents to. * @exception IOException on errors. */ @@ -172,7 +172,7 @@ public class CertificateVersion implements CertAttrSet { /** * Decode the CertificateVersion period in DER form from the stream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/CertificateX509Key.java b/base/util/src/netscape/security/x509/CertificateX509Key.java index c7003bb8e..a77a1e7dd 100644 --- a/base/util/src/netscape/security/x509/CertificateX509Key.java +++ b/base/util/src/netscape/security/x509/CertificateX509Key.java @@ -32,7 +32,7 @@ import netscape.security.util.DerValue; /** * This class defines the X509Key attribute for the Certificate. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.5 @@ -59,7 +59,7 @@ public class CertificateX509Key implements CertAttrSet, Serializable { /** * Default constructor for the certificate attribute. - * + * * @param key the X509Key */ public CertificateX509Key(X509Key key) { @@ -68,7 +68,7 @@ public class CertificateX509Key implements CertAttrSet, Serializable { /** * Create the object, decoding the values from the passed DER stream. - * + * * @param in the DerInputStream to read the X509Key from. * @exception IOException on decoding errors. */ @@ -79,7 +79,7 @@ public class CertificateX509Key implements CertAttrSet, Serializable { /** * Create the object, decoding the values from the passed stream. - * + * * @param in the InputStream to read the X509Key from. * @exception IOException on decoding errors. */ @@ -99,7 +99,7 @@ public class CertificateX509Key implements CertAttrSet, Serializable { /** * Decode the key in DER form from the stream. - * + * * @param in the InputStream to unmarshal the contents from * @exception IOException on decoding or validity errors. */ @@ -120,7 +120,7 @@ public class CertificateX509Key implements CertAttrSet, Serializable { /** * Encode the key in DER form to the stream. - * + * * @param out the OutputStream to marshal the contents to. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/DNSName.java b/base/util/src/netscape/security/x509/DNSName.java index 831f51cc1..361c23571 100644 --- a/base/util/src/netscape/security/x509/DNSName.java +++ b/base/util/src/netscape/security/x509/DNSName.java @@ -25,7 +25,7 @@ import netscape.security.util.DerValue; /** * This class implements the DNSName as required by the GeneralNames * ASN.1 object. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.4 @@ -39,7 +39,7 @@ public class DNSName implements GeneralNameInterface { /** * Create the DNSName object from the passed encoded Der value. - * + * * @param derValue the encoded DER DNSName. * @exception IOException on error. */ @@ -49,7 +49,7 @@ public class DNSName implements GeneralNameInterface { /** * Create the DNSName object with the specified name. - * + * * @param name the DNSName. */ public DNSName(String name) { @@ -65,7 +65,7 @@ public class DNSName implements GeneralNameInterface { /** * Encode the DNS name into the DerOutputStream. - * + * * @param out the DER stream to encode the DNSName to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java b/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java index da870f4fd..4b64d59a9 100755 --- a/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java +++ b/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java @@ -32,12 +32,12 @@ import netscape.security.util.DerValue; /** * Represent the Delta CRL Indicator Extension. - * + * * <p> * The delta CRL indicator is a critical CRL extension that identifies a delta-CRL. The value of BaseCRLNumber * identifies the CRL number of the base CRL that was used as the starting point in the generation of this delta- CRL. * The delta-CRL contains the changes between the base CRL and the current CRL issued along with the delta-CRL. - * + * * @see Extension * @see CertAttrSet */ @@ -81,7 +81,7 @@ public class DeltaCRLIndicatorExtension extends Extension /** * Create a DeltaCRLIndicatorExtension with the integer value. * The criticality is set to true. - * + * * @param baseCRLNum the value to be set for the extension. */ public DeltaCRLIndicatorExtension(int baseCRLNum) throws IOException { @@ -94,7 +94,7 @@ public class DeltaCRLIndicatorExtension extends Extension /** * Create a DeltaCRLIndicatorExtension with the BigInteger value. * The criticality is set to true. - * + * * @param baseCRLNum the value to be set for the extension. */ public DeltaCRLIndicatorExtension(BigInteger baseCRLNum) throws IOException { @@ -106,7 +106,7 @@ public class DeltaCRLIndicatorExtension extends Extension /** * Create a DeltaCRLIndicatorExtension with the BigInteger value. - * + * * @param critical true if the extension is to be treated as critical. * @param baseCRLNum the value to be set for the extension. */ @@ -120,7 +120,7 @@ public class DeltaCRLIndicatorExtension extends Extension /** * Create the extension from the passed DER encoded value of the same. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -194,7 +194,7 @@ public class DeltaCRLIndicatorExtension extends Extension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -204,7 +204,7 @@ public class DeltaCRLIndicatorExtension extends Extension /** * Write the extension to the DerOutputStream. - * + * * @param out the DerOutputStream to write the extension to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/x509/DirStrConverter.java b/base/util/src/netscape/security/x509/DirStrConverter.java index 776344c0a..01d80bee4 100644 --- a/base/util/src/netscape/security/x509/DirStrConverter.java +++ b/base/util/src/netscape/security/x509/DirStrConverter.java @@ -30,17 +30,17 @@ import netscape.security.util.DerValue; * A DirStrConverter converts a string to a DerValue of ASN.1 Directory String, * which is a CHOICE of Printable (subset of ASCII), T.61 (Teletex) or * Universal String (UCS-4), and vice versa. - * + * * <p> * The string to DerValue conversion is done as follows. If the string has only PrintableString characters it is * converted to a ASN.1 Printable String using the PrintableString encoder from the global default ASN1CharStrConvMap. * If it has only characters covered in the PrintableString or T.61 character set it is converted to a ASN.1 T.61 string * using the T.61 encoder from the ASN1CharStrCovnMap. Otherwise it is converted to a ASN.1 UniversalString (UCS-4 * character set) which covers all characters. - * + * * @see AVAValueConverter * @see ASN1CharStrConvMap - * + * * @author Lily Hsiao, Slava Galperin at Netscape Communications, Inc. */ @@ -59,11 +59,11 @@ public class DirStrConverter implements AVAValueConverter { * Converts a string to a DER encoded ASN1 Directory String, which is a * CHOICE of PrintableString, T.61String or UniversalString. * The string is taken as is i.e. should not be in Ldap DN string syntax. - * + * * @param ds a string representing a directory string value. - * + * * @return a DerValue - * + * * @exception IOException if the string cannot be converted, such as * when a UniversalString encoder * isn't available and the string contains @@ -121,13 +121,13 @@ public class DirStrConverter implements AVAValueConverter { * Creates a DerValue from a BER encoded value, obtained from for example * a attribute value in octothorpe form of a Ldap DN string. * Checks if the BER encoded value is legal for a DirectoryString. - * + * * NOTE: currently only supports DER encoding for the BER encoded value. - * + * * @param berStream Byte array of a BER encoded value. - * + * * @return DerValue object. - * + * * @exception IOException If the BER value cannot be converted to a * valid Directory String DER value. */ @@ -148,7 +148,7 @@ public class DirStrConverter implements AVAValueConverter { /** * Converts a DerValue to a string. * The string is not in any syntax, such as RFC1779 string syntax. - * + * * @param avaValue a DerValue * @return a string if the value can be converted. * @exception IOException if a decoder needed for the diff --git a/base/util/src/netscape/security/x509/DisplayText.java b/base/util/src/netscape/security/x509/DisplayText.java index a379617a7..1c43d4946 100644 --- a/base/util/src/netscape/security/x509/DisplayText.java +++ b/base/util/src/netscape/security/x509/DisplayText.java @@ -24,13 +24,13 @@ import netscape.security.util.DerValue; /** * Represent the DisplayText. - * + * * DisplayText ::= CHOICE { * visibleString VisibleString (SIZE (1..200)), * bmpString BMPString (SIZE (1..200)), * utf8String UTF8String (SIZE (1..200)), * } - * + * * @author Thomas Kwan */ public class DisplayText { @@ -56,7 +56,7 @@ public class DisplayText { /** * Write the DisplayText to the DerOutputStream. - * + * * @param out the DerOutputStream to write the object to. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/EDIPartyName.java b/base/util/src/netscape/security/x509/EDIPartyName.java index 0c69242cc..eac5c0953 100644 --- a/base/util/src/netscape/security/x509/EDIPartyName.java +++ b/base/util/src/netscape/security/x509/EDIPartyName.java @@ -26,13 +26,13 @@ import netscape.security.util.DerValue; /** * This class defines the EDIPartyName of the GeneralName choice. * The ASN.1 syntax for this is: - * + * * <pre> * EDIPartyName ::= SEQUENCE { * nameAssigner [0] DirectoryString OPTIONAL, * partyName [1] DirectoryString } * </pre> - * + * * @author Hemma Prafullchandra * @version 1.2 * @see GeneralName @@ -54,7 +54,7 @@ public class EDIPartyName implements GeneralNameInterface { /** * Create the EDIPartyName object from the specified names. - * + * * @param assignerName the name of the assigner * @param partyName the name of the EDI party. */ @@ -65,7 +65,7 @@ public class EDIPartyName implements GeneralNameInterface { /** * Create the EDIPartyName object from the specified name. - * + * * @param partyName the name of the EDI party. */ public EDIPartyName(String partyName) { @@ -74,7 +74,7 @@ public class EDIPartyName implements GeneralNameInterface { /** * Create the EDIPartyName object from the passed encoded Der value. - * + * * @param derValue the encoded DER EDIPartyName. * @exception IOException on error. */ @@ -116,7 +116,7 @@ public class EDIPartyName implements GeneralNameInterface { /** * Encode the EDI party name into the DerOutputStream. - * + * * @param out the DER stream to encode the EDIPartyName to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/x509/Extension.java b/base/util/src/netscape/security/x509/Extension.java index 7dc9e2890..8d575606a 100644 --- a/base/util/src/netscape/security/x509/Extension.java +++ b/base/util/src/netscape/security/x509/Extension.java @@ -27,16 +27,16 @@ import netscape.security.util.ObjectIdentifier; /** * Represent a X509 Extension Attribute. - * + * * <p> * Extensions are addiitonal attributes which can be inserted in a X509 v3 certificate. For example a * "Driving License Certificate" could have the driving license number as a extension. - * + * * <p> * Extensions are represented as a sequence of the extension identifier (Object Identifier), a boolean flag stating * whether the extension is to be treated as being critical and the extension value itself (this is again a DER encoding * of the extension value). - * + * * <pre> * ASN.1 definition of Extension: * Extension ::= SEQUENCE { @@ -45,7 +45,7 @@ import netscape.security.util.ObjectIdentifier; * extensionValue OCTET STRING * } * </pre> - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.9 @@ -92,7 +92,7 @@ public class Extension implements Serializable { /** * Constructs an Extension from individual components of ObjectIdentifier, * criticality and the DER encoded OctetString. - * + * * @param extensionId the ObjectIdentifier of the extension * @param critical the boolean indicating if the extension is critical * @param extensionValue the DER encoded octet string of the value. @@ -110,7 +110,7 @@ public class Extension implements Serializable { /** * Constructs an Extension from another extension. To be used for * creating decoded subclasses. - * + * * @param ext the extension to create from. */ public Extension(Extension ext) { @@ -121,7 +121,7 @@ public class Extension implements Serializable { /** * Write the extension to the DerOutputStream. - * + * * @param out the DerOutputStream to write the extension to. * @exception IOException on encoding errors */ diff --git a/base/util/src/netscape/security/x509/Extensions.java b/base/util/src/netscape/security/x509/Extensions.java index 622367ab6..e0a7e1f60 100644 --- a/base/util/src/netscape/security/x509/Extensions.java +++ b/base/util/src/netscape/security/x509/Extensions.java @@ -34,7 +34,7 @@ import netscape.security.util.DerValue; /** * This class defines the Extensions attribute for the Certificate. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.11 @@ -107,7 +107,7 @@ public class Extensions extends Vector<Extension> /** * Create the object, decoding the values from the passed DER stream. - * + * * @param in the DerInputStream to read the Extension from. * @exception IOException on decoding errors. */ @@ -125,7 +125,7 @@ public class Extensions extends Vector<Extension> /** * Decode the extensions from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -144,7 +144,7 @@ public class Extensions extends Vector<Extension> /** * Encode the extensions in DER form to the stream. - * + * * @param out the DerOutputStream to marshal the contents to. * @exception CertificateException on encoding errors. * @exception IOException on errors. @@ -170,7 +170,7 @@ public class Extensions extends Vector<Extension> /** * Set the attribute value. - * + * * @param name the extension name used in the cache. * @param obj the object to set. * @exception IOException if the object could not be cached. @@ -182,7 +182,7 @@ public class Extensions extends Vector<Extension> /** * Get the attribute value. - * + * * @param name the extension name used in the lookup. * @exception IOException if named extension is not found. */ @@ -196,7 +196,7 @@ public class Extensions extends Vector<Extension> /** * Delete the attribute value. - * + * * @param name the extension name used in the lookup. * @exception IOException if named extension is not found. */ diff --git a/base/util/src/netscape/security/x509/FreshestCRLExtension.java b/base/util/src/netscape/security/x509/FreshestCRLExtension.java index c749ae04e..8e32bed66 100644 --- a/base/util/src/netscape/security/x509/FreshestCRLExtension.java +++ b/base/util/src/netscape/security/x509/FreshestCRLExtension.java @@ -38,19 +38,19 @@ import org.mozilla.jss.asn1.SEQUENCE; * An extension that tells applications where to find * the latest (freshest) delta CRL for this certificate * or full CRL. - * + * * <pre> * cRLDistributionPoints ::= SEQUENCE SIZE (1..MAX) OF DistributionPoint - * + * * DistributionPoint ::= SEQUENCE { * distributionPoint [0] DistributionPointName OPTIONAL, * reasons [1] ReasonFlags OPTIONAL, * cRLIssuer [2] GeneralNames OPTIONAL } - * + * * DistributionPointName ::= CHOICE { * fullName [0] GeneralNames, * nameRelativeToCRLIssuer [1] RelativeDistinguishedName } - * + * * ReasonFlags ::= BIT STRING { * unused (0), * keyCompromise (1), @@ -339,7 +339,7 @@ public class FreshestCRLExtension extends Extension /** * Given a bit array representing reason flags, extracts the reasons * and returns them as an array. - * + * * @param bitFlags A bit vector containing reason flags. * @return An array of reasons contained in the bit vector. * May be zero-length but will not be null. @@ -352,7 +352,7 @@ public class FreshestCRLExtension extends Extension * Given a bit array representing reason flags, extracts the reasons * and returns them as an array. Currently, only the first byte * of the bitflags are examined. - * + * * @param bitFlags A bit vector containing reason flags. The format * is big-endian (MSB first). Only the first byte is examined. * @return An array of reasons contained in the bit vector. diff --git a/base/util/src/netscape/security/x509/GeneralName.java b/base/util/src/netscape/security/x509/GeneralName.java index 5ed98d830..a90ac7bf2 100644 --- a/base/util/src/netscape/security/x509/GeneralName.java +++ b/base/util/src/netscape/security/x509/GeneralName.java @@ -26,7 +26,7 @@ import netscape.security.util.DerValue; * This class implements the ASN.1 GeneralName object class. * <p> * The ASN.1 syntax for this is: - * + * * <pre> * GeneralName ::= CHOICE { * otherName [0] OtherName, @@ -40,7 +40,7 @@ import netscape.security.util.DerValue; * registeredID [8] OBJECT IDENTIFIER * } * </pre> - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.7 @@ -56,7 +56,7 @@ public class GeneralName implements GeneralNameInterface { /** * Default constructor for the class. - * + * * @param name the selected CHOICE from the list. */ public GeneralName(GeneralNameInterface name) { @@ -65,15 +65,15 @@ public class GeneralName implements GeneralNameInterface { /** * Create the object from its DER encoded value. - * + * * @param encName the DER encoded GeneralName. */ public GeneralName(DerValue encName) throws IOException { short tag = (byte) (encName.tag & 0x1f); - // NB. this is always encoded with the IMPLICIT tag - // The checks only make sense if we assume implicit tagging, - // with explicit tagging the form is always constructed. + // NB. this is always encoded with the IMPLICIT tag + // The checks only make sense if we assume implicit tagging, + // with explicit tagging the form is always constructed. switch (tag) { case GeneralNameInterface.NAME_RFC822: if (encName.isContextSpecific() && !encName.isConstructed()) { @@ -167,7 +167,7 @@ public class GeneralName implements GeneralNameInterface { /** * Encode the name to the specified DerOutputStream. - * + * * @param out the DerOutputStream to encode the the GeneralName to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/x509/GeneralNameInterface.java b/base/util/src/netscape/security/x509/GeneralNameInterface.java index 4a9673663..7225ccc04 100644 --- a/base/util/src/netscape/security/x509/GeneralNameInterface.java +++ b/base/util/src/netscape/security/x509/GeneralNameInterface.java @@ -24,7 +24,7 @@ import netscape.security.util.DerOutputStream; /** * This interface specifies the abstract methods which have to be * implemented by all the members of the GeneralNames ASN.1 object. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.6 @@ -51,7 +51,7 @@ public interface GeneralNameInterface extends java.io.Serializable { /** * Encode the name to the specified DerOutputStream. - * + * * @param out the DerOutputStream to encode the GeneralName to. * @exception IOException thrown if the GeneralName could not be * encoded. diff --git a/base/util/src/netscape/security/x509/GeneralNames.java b/base/util/src/netscape/security/x509/GeneralNames.java index 9e06db5ac..08084764a 100644 --- a/base/util/src/netscape/security/x509/GeneralNames.java +++ b/base/util/src/netscape/security/x509/GeneralNames.java @@ -29,11 +29,11 @@ import netscape.security.util.DerValue; * X509 certificates. * <p> * The ASN.1 syntax for this is: - * + * * <pre> * GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName * </pre> - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.7 @@ -46,11 +46,11 @@ public class GeneralNames extends Vector<GeneralNameInterface> { /** * Create the GeneralNames, decoding from the passed DerValue. - * + * * <b>Caution when using this constructor. It may be broken! * Better to call addElement(gni) directly where gni is * a GeneralNameInterface object </b> - * + * * @param derVal the DerValue to construct the GeneralNames from. * @exception GeneralNamesException on decoding error. * @exception IOException on error. @@ -75,7 +75,7 @@ public class GeneralNames extends Vector<GeneralNameInterface> { /** * Create the GeneralNames - * + * * @param names a non-empty array of names to put into the * generalNames */ @@ -99,7 +99,7 @@ public class GeneralNames extends Vector<GeneralNameInterface> { /** * Write the extension to the DerOutputStream. - * + * * @param out the DerOutputStream to write the extension to. * @exception GeneralNamesException on encoding error. * @exception IOException on error. diff --git a/base/util/src/netscape/security/x509/GeneralNamesException.java b/base/util/src/netscape/security/x509/GeneralNamesException.java index 6309ed114..11c763fda 100644 --- a/base/util/src/netscape/security/x509/GeneralNamesException.java +++ b/base/util/src/netscape/security/x509/GeneralNamesException.java @@ -21,7 +21,7 @@ import java.security.GeneralSecurityException; /** * Generic General Names Exception. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.4 @@ -41,7 +41,7 @@ public class GeneralNamesException extends GeneralSecurityException { /** * Constructs the exception with the specified error message. - * + * * @param message the requisite error message. */ public GeneralNamesException(String message) { diff --git a/base/util/src/netscape/security/x509/GeneralSubtree.java b/base/util/src/netscape/security/x509/GeneralSubtree.java index 635427e0b..6a5cdc540 100644 --- a/base/util/src/netscape/security/x509/GeneralSubtree.java +++ b/base/util/src/netscape/security/x509/GeneralSubtree.java @@ -26,7 +26,7 @@ import netscape.security.util.PrettyPrintFormat; /** * Represent the GeneralSubtree ASN.1 object, whose syntax is: - * + * * <pre> * GeneralSubtree ::= SEQUENCE { * base GeneralName, @@ -35,7 +35,7 @@ import netscape.security.util.PrettyPrintFormat; * } * BaseDistance ::= INTEGER (0..MAX) * </pre> - * + * * @version 1.5 * @author Amit Kapoor * @author Hemma Prafullchandra @@ -53,7 +53,7 @@ public class GeneralSubtree { /** * The default constructor for the class. - * + * * @param name the GeneralName * @param min the minimum BaseDistance * @param max the maximum BaseDistance @@ -66,7 +66,7 @@ public class GeneralSubtree { /** * Create the object from its DER encoded form. - * + * * @param val the DER encoded from of the same. */ public GeneralSubtree(DerValue val) throws IOException { @@ -122,7 +122,7 @@ public class GeneralSubtree { /** * Encode the GeneralSubtree. - * + * * @param out the DerOutputStream to encode this object to. */ public void encode(DerOutputStream out) throws IOException { diff --git a/base/util/src/netscape/security/x509/GeneralSubtrees.java b/base/util/src/netscape/security/x509/GeneralSubtrees.java index 37097ca71..0c3c64cb2 100644 --- a/base/util/src/netscape/security/x509/GeneralSubtrees.java +++ b/base/util/src/netscape/security/x509/GeneralSubtrees.java @@ -27,9 +27,9 @@ import netscape.security.util.PrettyPrintFormat; /** * Represent the GeneralSubtrees ASN.1 object. - * + * * @version 1.4 - * + * * @author Amit Kapoor * @author Hemma Prafullchandra */ @@ -39,7 +39,7 @@ public class GeneralSubtrees { /** * The default constructor for the class. - * + * * @param trees the sequence of GeneralSubtree. */ public GeneralSubtrees(Vector<GeneralSubtree> trees) { @@ -48,7 +48,7 @@ public class GeneralSubtrees { /** * Create the object from the passed DER encoded form. - * + * * @param val the DER encoded form of the same. */ public GeneralSubtrees(DerValue val) throws IOException { @@ -88,7 +88,7 @@ public class GeneralSubtrees { /** * Encode the GeneralSubtrees. - * + * * @param out the DerOutputStrean to encode this object to. */ public void encode(DerOutputStream out) throws IOException { diff --git a/base/util/src/netscape/security/x509/GenericValueConverter.java b/base/util/src/netscape/security/x509/GenericValueConverter.java index 73bc1979c..f08ebcca5 100644 --- a/base/util/src/netscape/security/x509/GenericValueConverter.java +++ b/base/util/src/netscape/security/x509/GenericValueConverter.java @@ -31,16 +31,16 @@ import netscape.security.util.DerValue; * a particular attribute to a DER encoded ASN.1 character string type. * Currently supports PrintableString, IA5String, BMPString T.61String and * Universal String. - * + * * <p> * The conversion is done as follows. An encoder is obtained for the all the character sets from the global default * ASN1CharStrConvMap. The encoders are then used to convert the string to the smallest character set first -- * printableString. If the string contains characters outside of that character set, it is converted to the next * character set -- IA5String character set. If that is not enough it is converted to a BMPString, then Universal String * which contains all characters. - * + * * @author Lily Hsiao, Slava Galperin at Netscape Communications, Inc. - * + * */ public class GenericValueConverter implements AVAValueConverter { @@ -51,16 +51,16 @@ public class GenericValueConverter implements AVAValueConverter { * Converts a string to a DER encoded ASN.1 primtable string, defined here * as a PrintableString, IA5String, T.61String, BMPString or * UniversalString. The string is not expected to be encoded in any form. - * + * * <p> * If an encoder is not available for a character set that is needed to convert the string, the string cannot be * converted and an IOException is thrown. For example, if the string contains characters outside the * PrintableString character and only a PrintableString encoder is available then an IOException is thrown. - * + * * @param s A string representing a generic attribute string value. - * + * * @return The DER value of the attribute. - * + * * @exception IOException if the string cannot be converted, such as * when an encoder needed is * unavailable. @@ -99,13 +99,13 @@ public class GenericValueConverter implements AVAValueConverter { /** * Creates a DerValue from the byte array of BER encoded value. - * + * * NOTE: currently only supports DER encoding (a form of BER) on input . - * + * * @param berStream Byte array of a BER encoded value. - * + * * @return DerValue object. - * + * * @exception IOException If the BER value cannot be converted to a * valid Directory String DER value. */ @@ -119,7 +119,7 @@ public class GenericValueConverter implements AVAValueConverter { /** * Converts a DerValue of ASN1 Character string type to a java string * (the string is not encoded in any form). - * + * * @param avaValue A DerValue * @return A string representing the attribute value. * @exception IOException if a decoder needed for the diff --git a/base/util/src/netscape/security/x509/HoldInstructionExtension.java b/base/util/src/netscape/security/x509/HoldInstructionExtension.java index b42bb6ac9..82e8475af 100644 --- a/base/util/src/netscape/security/x509/HoldInstructionExtension.java +++ b/base/util/src/netscape/security/x509/HoldInstructionExtension.java @@ -32,11 +32,11 @@ import netscape.security.util.ObjectIdentifier; /** * Represent the CRL Hold Instruction Code Extension. - * + * * <p> * The hold instruction code is a non-critical CRL entry extension that provides a registered instruction identifier * which indicates the action to be taken after encountering a certificate that has been placed on hold. - * + * * @see Extension * @see CertAttrSet */ @@ -121,7 +121,7 @@ public class HoldInstructionExtension extends Extension /** * Create a HoldInstructionExtension with the date. * The criticality is set to false. - * + * * @param code the value to be set for the extension. */ public HoldInstructionExtension(int code) @@ -137,7 +137,7 @@ public class HoldInstructionExtension extends Extension /** * Create a HoldInstructionExtension with the date. * The criticality is set to false. - * + * * @param oidStr the value to be set for the extension. */ public HoldInstructionExtension(String oidStr) @@ -154,7 +154,7 @@ public class HoldInstructionExtension extends Extension /** * Create a HoldInstructionExtension with the date. * The criticality is set to false. - * + * * @param oid the value to be set for the extension. */ public HoldInstructionExtension(ObjectIdentifier oid) @@ -170,7 +170,7 @@ public class HoldInstructionExtension extends Extension /** * Create a HoldInstructionExtension with the date. * The criticality is set to false. - * + * * @param critical true if the extension is to be treated as critical. * @param code the value to be set for the extension. */ @@ -187,7 +187,7 @@ public class HoldInstructionExtension extends Extension /** * Create a HoldInstructionExtension with the date. * The criticality is set to false. - * + * * @param critical true if the extension is to be treated as critical. * @param oidStr the value to be set for the extension. */ @@ -205,7 +205,7 @@ public class HoldInstructionExtension extends Extension /** * Create a HoldInstructionExtension with the date. * The criticality is set to false. - * + * * @param critical true if the extension is to be treated as critical. * @param oid the value to be set for the extension. */ @@ -221,7 +221,7 @@ public class HoldInstructionExtension extends Extension /** * Create the extension from the passed DER encoded value of the same. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -309,7 +309,7 @@ public class HoldInstructionExtension extends Extension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -319,7 +319,7 @@ public class HoldInstructionExtension extends Extension /** * Write the extension to the DerOutputStream. - * + * * @param out the DerOutputStream to write the extension to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/x509/IA5StringConverter.java b/base/util/src/netscape/security/x509/IA5StringConverter.java index eced75a58..f01d090d1 100644 --- a/base/util/src/netscape/security/x509/IA5StringConverter.java +++ b/base/util/src/netscape/security/x509/IA5StringConverter.java @@ -29,16 +29,16 @@ import netscape.security.util.DerValue; /** * A AVAValueConverter that converts a IA5String attribute to a DerValue * and vice versa. An example an attribute that is a IA5String string is "E". - * + * * @see AVAValueConverter - * + * * @author Lily Hsiao, Slava Galperin at Netscape Communications, Inc. */ public class IA5StringConverter implements AVAValueConverter { - // public constructors + // public constructors - /* + /* * Contructs a IA5String Converter. */ public IA5StringConverter() { @@ -46,11 +46,11 @@ public class IA5StringConverter implements AVAValueConverter { /* * Converts a string with ASN.1 IA5String characters to a DerValue. - * + * * @param valueString a string with IA5String characters. - * - * @return a DerValue. - * + * + * @return a DerValue. + * * @exception IOException if a IA5String encoder is not * available for the conversion. */ @@ -81,11 +81,11 @@ public class IA5StringConverter implements AVAValueConverter { * Checks if the BER encoded value is a IA5String. * NOTE only DER encoding is currently supported on for the BER * encoded value. - * + * * @param berStream a byte array of the BER encoded value. - * - * @return a DerValue. - * + * + * @return a DerValue. + * * @exception IOException if the BER value cannot be converted * to a IA5String DER value. */ @@ -100,9 +100,9 @@ public class IA5StringConverter implements AVAValueConverter { } /* - * Converts a DerValue of IA5String to a java string with IA5String - * characters. - * + * Converts a DerValue of IA5String to a java string with IA5String + * characters. + * * @param avaValue a DerValue. * * @return a string with IA5String characters. diff --git a/base/util/src/netscape/security/x509/IPAddressName.java b/base/util/src/netscape/security/x509/IPAddressName.java index 75b5bc564..1270f910d 100644 --- a/base/util/src/netscape/security/x509/IPAddressName.java +++ b/base/util/src/netscape/security/x509/IPAddressName.java @@ -26,13 +26,13 @@ import netscape.security.util.DerValue; /** * This class implements the IPAddressName as required by the GeneralNames * ASN.1 object. - * + * * @see GeneralName * @see GeneralNameInterface * @see GeneralNames - * + * * @version 1.2 - * + * * @author Amit Kapoor * @author Hemma Prafullchandra */ @@ -45,7 +45,7 @@ public class IPAddressName implements GeneralNameInterface { /** * Create the IPAddressName object from the passed encoded Der value. - * + * * @param derValue the encoded DER IPAddressName. * @exception IOException on error. */ @@ -55,7 +55,7 @@ public class IPAddressName implements GeneralNameInterface { /** * Create the IPAddressName object with the specified name. - * + * * @param name the IPAddressName. */ public IPAddressName(byte[] address) { @@ -72,7 +72,7 @@ public class IPAddressName implements GeneralNameInterface { * ip address and a string representing the netmask, with encoding * having ip address encoding followed by the netmask encoding. * This form is needed for name constraints extension. - * + * * @param s the ip address in the format: n.n.n.n or x:x:x:x:x:x:x:x (RFC 1884) * @param netmask the netmask address in the format: n.n.n.n or x:x:x:x:x:x:x:x (RFC 1884) */ @@ -101,7 +101,7 @@ public class IPAddressName implements GeneralNameInterface { /** * Create the IPAddressName object with a string representing the * ip address. - * + * * @param s the ip address in the format: n.n.n.n or x:x:x:x:x:x:x:x */ public IPAddressName(String s) { @@ -125,7 +125,7 @@ public class IPAddressName implements GeneralNameInterface { /** * Encode the IPAddress name into the DerOutputStream. - * + * * @param out the DER stream to encode the IPAddressName to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/x509/InvalidityDateExtension.java b/base/util/src/netscape/security/x509/InvalidityDateExtension.java index 44c76275f..8a9730385 100755 --- a/base/util/src/netscape/security/x509/InvalidityDateExtension.java +++ b/base/util/src/netscape/security/x509/InvalidityDateExtension.java @@ -32,12 +32,12 @@ import netscape.security.util.DerValue; /** * Represent the CRL Invalidity Date Extension. - * + * * <p> * This CRL entry extension, if present, provides the date on which it is known or suspected that the private key was * compromised or that the certificate otherwise became invalid. Invalidity date may be earlier than the revocation * date. - * + * * @see Extension * @see CertAttrSet */ @@ -82,7 +82,7 @@ public class InvalidityDateExtension extends Extension /** * Create a InvalidityDateExtension with the date. * The criticality is set to false. - * + * * @param dateOfInvalidity the value to be set for the extension. */ public InvalidityDateExtension(Date dateOfInvalidity) @@ -96,7 +96,7 @@ public class InvalidityDateExtension extends Extension /** * Create a InvalidityDateExtension with the date. * The criticality is set to false. - * + * * @param critical true if the extension is to be treated as critical. * @param dateOfInvalidity the value to be set for the extension. */ @@ -110,7 +110,7 @@ public class InvalidityDateExtension extends Extension /** * Create the extension from the passed DER encoded value of the same. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -196,7 +196,7 @@ public class InvalidityDateExtension extends Extension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -206,7 +206,7 @@ public class InvalidityDateExtension extends Extension /** * Write the extension to the DerOutputStream. - * + * * @param out the DerOutputStream to write the extension to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java b/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java index df0289f9e..62b3ecf94 100644 --- a/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java +++ b/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java @@ -29,15 +29,15 @@ import netscape.security.util.DerValue; /** * This represents the Issuer Alternative Name Extension. - * + * * This extension, if present, allows the issuer to specify multiple * alternative names. - * + * * <p> * Extensions are represented as a sequence of the extension identifier (Object Identifier), a boolean flag stating * whether the extension is to be treated as being critical and the extension value itself (this is again a DER encoding * of the extension value). - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.7 @@ -78,7 +78,7 @@ public class IssuerAlternativeNameExtension /** * Create a IssuerAlternativeNameExtension with the passed GeneralNames. - * + * * @param critical true if the extension is to be treated as critical. * @param names the GeneralNames for the issuer. * @exception IOException on error. @@ -93,7 +93,7 @@ public class IssuerAlternativeNameExtension /** * Create a IssuerAlternativeNameExtension with the passed GeneralNames. - * + * * @param names the GeneralNames for the issuer. * @exception IOException on error. */ @@ -116,7 +116,7 @@ public class IssuerAlternativeNameExtension /** * Create the extension from the passed DER encoded value. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -154,7 +154,7 @@ public class IssuerAlternativeNameExtension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -164,7 +164,7 @@ public class IssuerAlternativeNameExtension /** * Write the extension to the OutputStream. - * + * * @param out the OutputStream to write the extension to. * @exception IOException on encoding error. */ diff --git a/base/util/src/netscape/security/x509/IssuingDistributionPoint.java b/base/util/src/netscape/security/x509/IssuingDistributionPoint.java index 0f0747f84..504587bf4 100644 --- a/base/util/src/netscape/security/x509/IssuingDistributionPoint.java +++ b/base/util/src/netscape/security/x509/IssuingDistributionPoint.java @@ -42,11 +42,11 @@ import org.mozilla.jss.asn1.Tag; * onlyContainsCACerts [2] BOOLEAN DEFAULT FALSE, * onlySomeReasons [3] ReasonFlags OPTIONAL, * indirectCRL [4] BOOLEAN DEFAULT FALSE } - * + * * DistributionPointName ::= CHOICE { * fullName [0] GeneralNames, * nameRelativeToCRLIssuer [1] RelativeDistinguishedName } - * + * * ReasonFlags ::= BIT STRING { * unused (0), * keyCompromise (1), @@ -55,9 +55,9 @@ import org.mozilla.jss.asn1.Tag; * superseded (4), * cessationOfOperation (5), * certificateHold (6) } - * + * * GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName - * + * * GeneralName ::= CHOICE { * otherName [0] OtherName, * rfc822Name [1] IA5String, @@ -68,27 +68,27 @@ import org.mozilla.jss.asn1.Tag; * uniformResourceIdentifier [6] IA5String, * iPAddress [7] OCTET STRING, * registeredID [8] OBJECT IDENTIFIER} - * + * * OtherName ::= SEQUENCE { * type-id OBJECT IDENTIFIER, * value [0] EXPLICIT ANY DEFINED BY type-id } - * + * * EDIPartyName ::= SEQUENCE { * nameAssigner [0] DirectoryString OPTIONAL, * partyName [1] DirectoryString } - * + * * RelativeDistinguishedName ::= * SET OF AttributeTypeAndValue - * + * * AttributeTypeAndValue ::= SEQUENCE { * type AttributeType, * value AttributeValue } - * + * * AttributeType ::= OBJECT IDENTIFIER - * + * * AttributeValue ::= ANY DEFINED BY AttributeType * </pre> - * + * * See the documentation in <code>CRLDistributionPoint</code> for * the <code>DistributionPointName</code> and <code>ReasonFlags</code> ASN.1 types. */ @@ -126,7 +126,7 @@ public class IssuingDistributionPoint implements ASN1Value { * If it is set to a non-null value, <code>relativeName</code> will be * set to <code>null</code>, because at most one of these two attributes * can be specified at a time. - * + * * @exception GeneralNamesException If an error occurs encoding the * name. */ diff --git a/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java b/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java index d5f5100bf..bcbaa2e3d 100644 --- a/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java +++ b/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java @@ -35,7 +35,7 @@ import org.mozilla.jss.asn1.ASN1Util; /** * A critical CRL extension that identifies the CRL distribution point * for a particular CRL - * + * * <pre> * issuingDistributionPoint ::= SEQUENCE { * distributionPoint [0] DistributionPointName OPTIONAL, @@ -43,11 +43,11 @@ import org.mozilla.jss.asn1.ASN1Util; * onlyContainsCACerts [2] BOOLEAN DEFAULT FALSE, * onlySomeReasons [3] ReasonFlags OPTIONAL, * indirectCRL [4] BOOLEAN DEFAULT FALSE } - * + * * DistributionPointName ::= CHOICE { * fullName [0] GeneralNames, * nameRelativeToCRLIssuer [1] RelativeDistinguishedName } - * + * * ReasonFlags ::= BIT STRING { * unused (0), * keyCompromise (1), @@ -56,9 +56,9 @@ import org.mozilla.jss.asn1.ASN1Util; * superseded (4), * cessationOfOperation (5), * certificateHold (6) } - * + * * GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName - * + * * GeneralName ::= CHOICE { * otherName [0] OtherName, * rfc822Name [1] IA5String, @@ -69,24 +69,24 @@ import org.mozilla.jss.asn1.ASN1Util; * uniformResourceIdentifier [6] IA5String, * iPAddress [7] OCTET STRING, * registeredID [8] OBJECT IDENTIFIER} - * + * * OtherName ::= SEQUENCE { * type-id OBJECT IDENTIFIER, * value [0] EXPLICIT ANY DEFINED BY type-id } - * + * * EDIPartyName ::= SEQUENCE { * nameAssigner [0] DirectoryString OPTIONAL, * partyName [1] DirectoryString } - * + * * RelativeDistinguishedName ::= * SET OF AttributeTypeAndValue - * + * * AttributeTypeAndValue ::= SEQUENCE { * type AttributeType, * value AttributeValue } - * + * * AttributeType ::= OBJECT IDENTIFIER - * + * * AttributeValue ::= ANY DEFINED BY AttributeType * </pre> */ diff --git a/base/util/src/netscape/security/x509/KeyIdentifier.java b/base/util/src/netscape/security/x509/KeyIdentifier.java index 631f6fd65..c3d16030e 100644 --- a/base/util/src/netscape/security/x509/KeyIdentifier.java +++ b/base/util/src/netscape/security/x509/KeyIdentifier.java @@ -24,7 +24,7 @@ import netscape.security.util.DerValue; /** * Represent the Key Identifier ASN.1 object. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.4 @@ -38,7 +38,7 @@ public class KeyIdentifier implements java.io.Serializable { /** * Create a KeyIdentifier with the passed bit settings. - * + * * @param octetString the octet string identifying the key identifier. */ public KeyIdentifier(byte[] octetString) { @@ -47,7 +47,7 @@ public class KeyIdentifier implements java.io.Serializable { /** * Create a KeyIdentifier from the DER encoded value. - * + * * @param val the DerValue */ public KeyIdentifier(DerValue val) throws IOException { @@ -77,7 +77,7 @@ public class KeyIdentifier implements java.io.Serializable { /** * Write the KeyIdentifier to the DerOutputStream. - * + * * @param out the DerOutputStream to write the object to. * @exception IOException */ diff --git a/base/util/src/netscape/security/x509/KeyUsageExtension.java b/base/util/src/netscape/security/x509/KeyUsageExtension.java index 56084dbcf..52cac0265 100644 --- a/base/util/src/netscape/security/x509/KeyUsageExtension.java +++ b/base/util/src/netscape/security/x509/KeyUsageExtension.java @@ -30,12 +30,12 @@ import netscape.security.util.DerValue; /** * Represent the Key Usage Extension. - * + * * <p> * This extension, if present, defines the purpose (e.g., encipherment, signature, certificate signing) of the key * contained in the certificate. The usage restriction might be employed when a multipurpose key is to be restricted * (e.g., when an RSA key should be used only for signing or only for key encipherment). - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.9 @@ -106,7 +106,7 @@ public class KeyUsageExtension extends Extension /** * Check if bit is set. - * + * * @param position the position in the bit string to check. */ private boolean isSet(int position) { @@ -131,7 +131,7 @@ public class KeyUsageExtension extends Extension /** * Create a KeyUsageExtension with the passed bit settings. The criticality * is set to true. - * + * * @param bitString the bits to be set for the extension. */ public KeyUsageExtension(boolean critical, byte[] bitString) throws IOException { @@ -153,7 +153,7 @@ public class KeyUsageExtension extends Extension /** * Create a KeyUsageExtension with the passed bit settings. The criticality * is set to true. - * + * * @param bitString the bits to be set for the extension. */ public KeyUsageExtension(boolean critical, boolean[] bitString) throws IOException { @@ -173,7 +173,7 @@ public class KeyUsageExtension extends Extension /** * Create a KeyUsageExtension with the passed bit settings. The criticality * is set to true. - * + * * @param bitString the bits to be set for the extension. */ public KeyUsageExtension(BitArray bitString) throws IOException { @@ -185,7 +185,7 @@ public class KeyUsageExtension extends Extension /** * Create the extension from the passed DER encoded value of the same. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -356,7 +356,7 @@ public class KeyUsageExtension extends Extension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -366,7 +366,7 @@ public class KeyUsageExtension extends Extension /** * Write the extension to the DerOutputStream. - * + * * @param out the DerOutputStream to write the extension to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/x509/LdapDNStrConverter.java b/base/util/src/netscape/security/x509/LdapDNStrConverter.java index a8cb87813..b42ed6183 100644 --- a/base/util/src/netscape/security/x509/LdapDNStrConverter.java +++ b/base/util/src/netscape/security/x509/LdapDNStrConverter.java @@ -22,20 +22,20 @@ import java.io.IOException; /** * Abstract class that converts a Ldap DN String to an X500Name, RDN or AVA * and vice versa, except the string is a java string in unicode. - * + * * @author Lily Hsiao, Slava Galperin at Netscape Communications, Inc. */ public abstract class LdapDNStrConverter { - // + // // public parsing methods. // /** * Converts a Ldap DN string to a X500Name object. - * + * * @param dn a Ldap DN String. - * + * * @return an X500Name object for the Ldap DN String. */ public abstract X500Name parseDN(String dn) @@ -49,9 +49,9 @@ public abstract class LdapDNStrConverter { /** * Converts a Ldap DN string to a RDN object. - * + * * @param rdn a Ldap DN String - * + * * @return an RDN object. */ public abstract RDN parseRDN(String rdn) @@ -65,7 +65,7 @@ public abstract class LdapDNStrConverter { /** * Converts a Ldap DN string to a AVA object. - * + * * @param ava a Ldap DN string. * @return an AVA object. */ @@ -84,7 +84,7 @@ public abstract class LdapDNStrConverter { /** * Converts a X500Name object to a Ldap dn string. - * + * * @param dn an X500Name object. * @return a Ldap DN String. */ @@ -92,7 +92,7 @@ public abstract class LdapDNStrConverter { /** * Converts an RDN object to a Ldap dn string. - * + * * @param rdn an RDN object. * @return a Ldap dn string. */ @@ -100,7 +100,7 @@ public abstract class LdapDNStrConverter { /** * Converts an AVA object to a Ldap dn string. - * + * * @param ava An AVA object. * @return A Ldap dn string. */ @@ -114,9 +114,9 @@ public abstract class LdapDNStrConverter { * Gets a global default Ldap DN String converter. * Currently it is LdapV3DNStrConverter object using the default * X500NameAttrMap and accepts unknown OIDs. - * + * * @see netscape.security.x509.LdapV3DNStrConverter - * + * * @return The global default LdapDNStrConverter instance. */ public static LdapDNStrConverter getDefault() { @@ -125,7 +125,7 @@ public abstract class LdapDNStrConverter { /** * Set the global default LdapDNStrConverter object. - * + * * @param defConverter A LdapDNStrConverter object to become * the global default. */ diff --git a/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java b/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java index 1245cc6bd..f01da74ec 100644 --- a/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java +++ b/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java @@ -39,13 +39,13 @@ import netscape.security.util.ObjectIdentifier; * A converter that converts Ldap v3 DN strings as specified in * draft-ietf-asid-ldapv3-dn-03.txt to a X500Name, RDN or AVA and * vice versa. - * + * * @see LdapDNStrConverter * @see X500Name * @see RDN * @see AVA * @see X500NameAttrMap - * + * * @author Lily Hsiao, Slava Galperin at Netscape Communications, Inc. */ @@ -57,7 +57,7 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { /** * Constructs a LdapV3DNStrConverter using the global default * X500NameAttrMap and accept OIDs not in the default X500NameAttrMap. - * + * * @see X500NameAttrMap */ public LdapV3DNStrConverter() { @@ -70,7 +70,7 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { * Constructs a LdapV3DNStrConverter using the specified X500NameAttrMap * and a boolean indicating whether to accept OIDs not listed in the * X500NameAttrMap. - * + * * @param attributeMap a X500NameAttrMap * @param doAcceptUnknownOids whether to convert unregistered OIDs * (oids not in the X500NameAttrMap) @@ -90,7 +90,7 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { /** * Parse a Ldap v3 DN string to a X500Name. - * + * * @param dn a LDAP v3 DN String * @return a X500Name * @exception IOException if an error occurs during the conversion. @@ -114,7 +114,7 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { /** * Parse a Ldap v3 DN string with a RDN component to a RDN - * + * * @param rdn a LDAP v3 DN String * @return a RDN * @exception IOException if an error occurs during the conversion. @@ -138,7 +138,7 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { /** * Parse a Ldap v3 DN string with a AVA component to a AVA. - * + * * @param ava a LDAP v3 DN string * @return a AVA */ @@ -165,12 +165,12 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { /** * Parses a Ldap DN string in a string reader to a X500Name. - * + * * @param in Pushback string reader for a Ldap DN string. * The pushback reader must have a pushback buffer size > 2. - * + * * @return a X500Name - * + * * @exception IOException if any reading or parsing error occurs. */ public X500Name parseDN(PushbackReader in) @@ -206,13 +206,13 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { * Parses Ldap DN string with a rdn component * from a string reader to a RDN. The string reader will point * to the separator after the rdn component or -1 if at end of string. - * + * * @param in Pushback string reader containing a Ldap DN string with * at least one rdn component. * The pushback reader must have a pushback buffer size > 2. - * + * * @return RDN object of the first rdn component in the Ldap DN string. - * + * * @exception IOException if any read or parse error occurs. */ public RDN parseRDN(PushbackReader in) @@ -250,11 +250,11 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { * Parses a Ldap DN string with a AVA component * from a string reader to an AVA. The string reader will point * to the AVA separator after the ava string or -1 if end of string. - * + * * @param in a Pushback reader containg a Ldap string with * at least one AVA component. * The Pushback reader must have a pushback buffer size > 2. - * + * * @return AVA object of the first AVA component in the Ldap DN string. */ public AVA parseAVA(PushbackReader in) @@ -415,9 +415,9 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { * from the attribute map or, if this keyword is an OID not * in the attribute map, create a new ObjectIdentifier for the keyword * if acceptUnknownOids is true. - * + * * @param avaKeyword AVA keyword from a Ldap DN string. - * + * * @return a ObjectIdentifier object * @exception IOException if the keyword is an OID not in the attribute * map and acceptUnknownOids is false, or @@ -462,12 +462,12 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { * to a DerValue of ASN.1 type PrintableString, T61String or * UniversalString. A Directory String is a ASN.1 CHOICE of Printable, * T.61 or Universal string. - * + * * @param avaValueString a attribute value from a Ldap DN string. * @param oid OID of the attribute. - * + * * @return DerValue for the value. - * + * * @exception IOException if an error occurs during conversion. * @see AVAValueConverter */ @@ -501,10 +501,10 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { * is a legal value for the attribute. * <p> * <strong><i>NOTE:</i></strong> only DER encoded values are supported for the BER encoded value. - * + * * @param berValue a value in BER encoding * @param oid ObjectIdentifier of the attribute. - * + * * @return DerValue for the BER encoded value * @exception IOException if an error occurs during conversion. */ @@ -526,11 +526,11 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { /** * Converts a X500Name object to a Ldap v3 DN string (except in unicode). - * + * * @param x500name a X500Name - * + * * @return a Ldap v3 DN String (except in unicode). - * + * * @exception IOException if an error is encountered during conversion. */ public String encodeDN(X500Name x500name) @@ -555,11 +555,11 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { /** * Converts a RDN to a Ldap v3 DN string (except in unicode). - * + * * @param rdn a RDN - * + * * @return a LDAP v3 DN string (except in unicode). - * + * * @exception IOException if an error is encountered during conversion. */ public String encodeRDN(RDN rdn) @@ -582,11 +582,11 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { /** * Converts a AVA to a Ldap v3 DN String (except in unicode). - * + * * @param ava an AVA - * + * * @return a Ldap v3 DN string (except in unicode). - * + * * @exception IOException If an error is encountered during exception. */ public String encodeAVA(AVA ava) @@ -609,11 +609,11 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { /** * Converts an OID to a attribute keyword in a Ldap v3 DN string * - either a keyword if known or a string of "1.2.3.4" syntax. - * + * * @param oid a ObjectIdentifier - * + * * @return a keyword to use in a Ldap V3 DN string. - * + * * @exception IOException if an error is encountered during conversion. */ public String encodeOID(ObjectIdentifier oid) @@ -632,7 +632,7 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { * Converts a value as a DerValue to a string in a Ldap V3 DN String. * If the value cannot be converted to a string it will be encoded in * octothorpe form. - * + * * @param attrValue a value as a DerValue. * @param oid OID for the attribute. * @return a string for the value in a LDAP v3 DN String @@ -692,7 +692,7 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { /** * converts a raw value string to a string in Ldap V3 DN string format. - * + * * @param valueStr a 'raw' value string. * @return a attribute value string in Ldap V3 DN string format. */ @@ -748,7 +748,7 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { /** * gets the X500NameAttrMap used by the converter. - * + * * @return X500NameAttrMap used by this converter. */ public X500NameAttrMap getAttrMap() { @@ -758,7 +758,7 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { /** * returns true if the converter accepts unregistered attributes i.e. * OIDS not in the X500NameAttrMap. - * + * * @return true if converter converts attributes not in the * X500NameAttrMap. */ diff --git a/base/util/src/netscape/security/x509/NSCCommentExtension.java b/base/util/src/netscape/security/x509/NSCCommentExtension.java index 0912d5b0c..8bf1d6882 100644 --- a/base/util/src/netscape/security/x509/NSCCommentExtension.java +++ b/base/util/src/netscape/security/x509/NSCCommentExtension.java @@ -31,7 +31,7 @@ import netscape.security.util.PrettyPrintFormat; /** * This class defines the NSCCommentExtension - * + * * @author asondhi * @see Extension * @see CertAttrSet @@ -57,7 +57,7 @@ public class NSCCommentExtension extends Extension new ObjectIdentifier("2.16.840.1.113730.1.13"); public String mComment = null; - // Private data members + // Private data members private Vector<Object> mInfos; private PrettyPrintFormat pp = new PrettyPrintFormat(":"); @@ -74,7 +74,7 @@ public class NSCCommentExtension extends Extension /** * Create a NSCCommentExtension with the Vector of CertificatePolicyInfo. - * + * * @param infos the Vector of CertificatePolicyInfo. */ public NSCCommentExtension(boolean critical, String comment) throws IOException { @@ -95,7 +95,7 @@ public class NSCCommentExtension extends Extension /** * Create the extension from the passed DER encoded value. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -139,7 +139,7 @@ public class NSCCommentExtension extends Extension /** * Write the extension to the OutputStream. - * + * * @param out the OutputStream to write the extension to. * @exception IOException on encoding errors. */ @@ -156,7 +156,7 @@ public class NSCCommentExtension extends Extension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ diff --git a/base/util/src/netscape/security/x509/NameConstraintsExtension.java b/base/util/src/netscape/security/x509/NameConstraintsExtension.java index 948d0d8c9..018dd5074 100644 --- a/base/util/src/netscape/security/x509/NameConstraintsExtension.java +++ b/base/util/src/netscape/security/x509/NameConstraintsExtension.java @@ -37,7 +37,7 @@ import netscape.security.util.PrettyPrintFormat; * information appearing in the permitted subtrees. * <p> * The ASN.1 syntax for this is: - * + * * <pre> * NameConstraints ::= SEQUENCE { * permittedSubtrees [0] GeneralSubtrees OPTIONAL, @@ -50,7 +50,7 @@ import netscape.security.util.PrettyPrintFormat; * maximum [1] BaseDistance OPTIONAL } * BaseDistance ::== INTEGER (0..MAX) * </pre> - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.10 @@ -113,7 +113,7 @@ public class NameConstraintsExtension extends Extension * The default constructor for this class. Either parameter * can be set to null to indicate it is omitted but both * cannot be null. - * + * * @param permitted the permitted GeneralSubtrees (null for optional). * @param excluded the excluded GeneralSubtrees (null for optional). */ @@ -145,7 +145,7 @@ public class NameConstraintsExtension extends Extension /** * Create the extension from the passed DER encoded value. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -219,7 +219,7 @@ public class NameConstraintsExtension extends Extension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -229,7 +229,7 @@ public class NameConstraintsExtension extends Extension /** * Write the extension to the OutputStream. - * + * * @param out the OutputStream to write the extension to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/x509/NoticeReference.java b/base/util/src/netscape/security/x509/NoticeReference.java index 150b34f40..d4703b200 100644 --- a/base/util/src/netscape/security/x509/NoticeReference.java +++ b/base/util/src/netscape/security/x509/NoticeReference.java @@ -26,12 +26,12 @@ import netscape.security.util.DerValue; /** * Represent the NoticeReference. - * + * * NoticeReference ::= SEQUENCE { * organization DisplayText, * noticeNumbers SEQUENCE OF INTEGER * } - * + * * @author Thomas Kwan */ public class NoticeReference { @@ -77,7 +77,7 @@ public class NoticeReference { /** * Write the NoticeReference to the DerOutputStream. - * + * * @param out the DerOutputStream to write the object to. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/OIDMap.java b/base/util/src/netscape/security/x509/OIDMap.java index 9c732d938..41c1fa289 100644 --- a/base/util/src/netscape/security/x509/OIDMap.java +++ b/base/util/src/netscape/security/x509/OIDMap.java @@ -31,7 +31,7 @@ import netscape.security.util.ObjectIdentifier; * This class defines the mapping from OID & name to classes and vice * versa. Used by CertificateExtensions & PKCS10 to get the java * classes associated with a particular OID/name. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.12 @@ -212,7 +212,7 @@ public class OIDMap { /** * Add a name to lookup table. - * + * * @param className the name of the fully qualified class implementing * the asn object. * @param oid the string representation of the object identifier for @@ -239,7 +239,7 @@ public class OIDMap { /** * Return user friendly name associated with the OID. - * + * * @param oid the name of the object identifier to be returned. * @return the user friendly name or null if no name * is registered for this oid. @@ -250,7 +250,7 @@ public class OIDMap { /** * Return Object identifier for user friendly name. - * + * * @param name the user friendly name. * @return the Object Identifier or null if no oid * is registered for this name. @@ -261,7 +261,7 @@ public class OIDMap { /** * Return the java class object associated with the user friendly name. - * + * * @param name the user friendly name. * @exception CertificateException if class cannot be instantiated. */ @@ -280,7 +280,7 @@ public class OIDMap { /** * Return the java class object associated with the object identifier.. - * + * * @param oid the name of the object identifier to be returned. * @exception CertificateException if class cannot be instatiated. */ diff --git a/base/util/src/netscape/security/x509/OIDName.java b/base/util/src/netscape/security/x509/OIDName.java index e5c1b7ac3..38ebff87d 100644 --- a/base/util/src/netscape/security/x509/OIDName.java +++ b/base/util/src/netscape/security/x509/OIDName.java @@ -26,7 +26,7 @@ import netscape.security.util.ObjectIdentifier; /** * This class implements the OIDName as required by the GeneralNames * ASN.1 object. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.3 @@ -43,7 +43,7 @@ public class OIDName implements GeneralNameInterface { /** * Create the OIDName object from the passed encoded Der value. - * + * * @param derValue the encoded DER OIDName. * @exception IOException on error. */ @@ -53,7 +53,7 @@ public class OIDName implements GeneralNameInterface { /** * Create the OIDName object with the specified name. - * + * * @param name the OIDName. */ public OIDName(ObjectIdentifier oid) { @@ -73,7 +73,7 @@ public class OIDName implements GeneralNameInterface { /** * Encode the OID name into the DerOutputStream. - * + * * @param out the DER stream to encode the OIDName to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/x509/OtherName.java b/base/util/src/netscape/security/x509/OtherName.java index 38d3a0af3..b2533ecbb 100644 --- a/base/util/src/netscape/security/x509/OtherName.java +++ b/base/util/src/netscape/security/x509/OtherName.java @@ -27,18 +27,18 @@ import netscape.security.util.ObjectIdentifier; /** * This class implements the OtherName as required by the GeneralNames * ASN.1 object. - * + * * OtherName ::= SEQUENCE { * type-id OBJECT IDENTIFIER, * value [0] EXPLICIT ANY DEFINED BY type-id * } - * + * * @see GeneralName * @see GeneralNameInterface * @see GeneralNames - * + * * @version 1.2 - * + * * @author Amit Kapoor * @author Hemma Prafullchandra */ @@ -52,7 +52,7 @@ public class OtherName implements GeneralNameInterface { /** * Create the IPAddressName object from the passed encoded Der value. - * + * * @param derValue the encoded DER IPAddressName. * @exception IOException on error. */ @@ -103,7 +103,7 @@ public class OtherName implements GeneralNameInterface { /** * Create the IPAddressName object with the specified name. - * + * * @param name the IPAddressName. */ public OtherName(byte[] data) { @@ -126,7 +126,7 @@ public class OtherName implements GeneralNameInterface { /** * Encode the IPAddress name into the DerOutputStream. - * + * * @param out the DER stream to encode the IPAddressName to. * @exception IOException on encoding errors. */ @@ -157,9 +157,9 @@ public class OtherName implements GeneralNameInterface { // Decode all the Attributes mOID = derVal.data.getOID(); - // skip tag + // skip tag DerValue tag = derVal.data.getDerValue(); - // read data + // read data DerValue data = tag.data.getDerValue(); mData = data.toByteArray(); } diff --git a/base/util/src/netscape/security/x509/PKIXExtensions.java b/base/util/src/netscape/security/x509/PKIXExtensions.java index 9946a5c57..2e35544bf 100644 --- a/base/util/src/netscape/security/x509/PKIXExtensions.java +++ b/base/util/src/netscape/security/x509/PKIXExtensions.java @@ -21,20 +21,20 @@ import netscape.security.util.ObjectIdentifier; /** * Lists all the object identifiers of the X509 extensions of the PKIX profile. - * + * * <p> * Extensions are addiitonal attributes which can be inserted in a X509 v3 certificate. For example a * "Driving License Certificate" could have the driving license number as a extension. - * + * * <p> * Extensions are represented as a sequence of the extension identifier (Object Identifier), a boolean flag stating * whether the extension is to be treated as being critical and the extension value itself (this is again a DER encoding * of the extension value). - * + * * @see Extension - * + * * @version 1.4 - * + * * @author Amit Kapoor * @author Hemma Prafullchandra */ diff --git a/base/util/src/netscape/security/x509/PolicyConstraint.java b/base/util/src/netscape/security/x509/PolicyConstraint.java index 22f9cebed..6ceecc665 100644 --- a/base/util/src/netscape/security/x509/PolicyConstraint.java +++ b/base/util/src/netscape/security/x509/PolicyConstraint.java @@ -26,7 +26,7 @@ import netscape.security.util.DerValue; /** * This class defines the PolicyConstraint ASN.1 object. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.4 @@ -42,7 +42,7 @@ public class PolicyConstraint { /** * The default constructor for this object - * + * * @param set the CertificatePolicySet (null for optional). * @param require require explicit policy (-1 for optional). * @param inhibit inhibit policy mapping (-1 for optional). @@ -55,7 +55,7 @@ public class PolicyConstraint { /** * Create the PolicyConstraint from the DerValue. - * + * * @param val the DerValue of the PolicyConstraint. * @exception IOException on decoding errors. */ @@ -107,7 +107,7 @@ public class PolicyConstraint { /** * Encode the object to the output stream. - * + * * @param out the DerOutputStream to encode the object to. */ public void encode(DerOutputStream out) throws IOException { diff --git a/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java b/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java index 7d98b21ba..abf46e428 100644 --- a/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java +++ b/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java @@ -38,7 +38,7 @@ import netscape.security.util.DerValue; * a path contain an acceptable policy identifier. * <p> * The ASN.1 syntax for this is (IMPLICIT tagging is defined in the module definition): - * + * * <pre> * PolicyConstraints ::= SEQUENCE { * requireExplicitPolicy [0] SkipCerts OPTIONAL, @@ -46,7 +46,7 @@ import netscape.security.util.DerValue; * } * SkipCerts ::= INTEGER (0..MAX) * </pre> - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.9 @@ -101,7 +101,7 @@ public class PolicyConstraintsExtension extends Extension /** * Create a PolicyConstraintsExtension object with criticality and * both require explicit policy and inhibit policy mapping. - * + * * @param critical whether this extension should be critical * @param require require explicit policy (-1 for optional). * @param inhibit inhibit policy mapping (-1 for optional). @@ -114,7 +114,7 @@ public class PolicyConstraintsExtension extends Extension /** * Create a PolicyConstraintsExtension object with both * require explicit policy and inhibit policy mapping. - * + * * @param require require explicit policy (-1 for optional). * @param inhibit inhibit policy mapping (-1 for optional). */ @@ -134,7 +134,7 @@ public class PolicyConstraintsExtension extends Extension /** * Create the extension from its DER encoded value and criticality. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -200,7 +200,7 @@ public class PolicyConstraintsExtension extends Extension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -210,7 +210,7 @@ public class PolicyConstraintsExtension extends Extension /** * Write the extension to the DerOutputStream. - * + * * @param out the DerOutputStream to write the extension to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/x509/PolicyMappingsExtension.java b/base/util/src/netscape/security/x509/PolicyMappingsExtension.java index 9bdfb611b..bb782ea52 100644 --- a/base/util/src/netscape/security/x509/PolicyMappingsExtension.java +++ b/base/util/src/netscape/security/x509/PolicyMappingsExtension.java @@ -29,18 +29,18 @@ import netscape.security.util.DerValue; /** * Represent the Policy Mappings Extension. - * + * * This extension, if present, identifies the certificate policies considered * identical between the issuing and the subject CA. * <p> * Extensions are addiitonal attributes which can be inserted in a X509 v3 certificate. For example a * "Driving License Certificate" could have the driving license number as a extension. - * + * * <p> * Extensions are represented as a sequence of the extension identifier (Object Identifier), a boolean flag stating * whether the extension is to be treated as being critical and the extension value itself (this is again a DER encoding * of the extension value). - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.7 @@ -81,7 +81,7 @@ public class PolicyMappingsExtension extends Extension /** * Create a PolicyMappings with the Vector of CertificatePolicyMap. - * + * * @param maps the Vector of CertificatePolicyMap. */ public PolicyMappingsExtension(Vector<CertificatePolicyMap> map) throws IOException { @@ -90,7 +90,7 @@ public class PolicyMappingsExtension extends Extension /** * Create a PolicyMappings with the Vector of CertificatePolicyMap. - * + * * @param maps the Vector of CertificatePolicyMap. */ public PolicyMappingsExtension(boolean critical, Vector<CertificatePolicyMap> map) @@ -119,7 +119,7 @@ public class PolicyMappingsExtension extends Extension /** * Create the extension from the passed DER encoded value. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -162,7 +162,7 @@ public class PolicyMappingsExtension extends Extension /** * Write the extension to the OutputStream. - * + * * @param out the OutputStream to write the extension to. * @exception IOException on encoding errors. */ @@ -179,7 +179,7 @@ public class PolicyMappingsExtension extends Extension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ diff --git a/base/util/src/netscape/security/x509/PolicyQualifierInfo.java b/base/util/src/netscape/security/x509/PolicyQualifierInfo.java index 56d3e32c0..a676e8f62 100644 --- a/base/util/src/netscape/security/x509/PolicyQualifierInfo.java +++ b/base/util/src/netscape/security/x509/PolicyQualifierInfo.java @@ -25,12 +25,12 @@ import netscape.security.util.ObjectIdentifier; /** * Represent the PolicyQualifierInfo. - * + * * policyQualifierInfo ::= SEQUENCE { * policyQualifierId PolicyQualifierId * qualifier ANY DEFINED BY policyQualifierId * } - * + * * @author Thomas Kwan */ public class PolicyQualifierInfo implements java.io.Serializable { @@ -52,7 +52,7 @@ public class PolicyQualifierInfo implements java.io.Serializable { /** * Create a PolicyQualifierInfo - * + * * @param id the ObjectIdentifier for the policy id. */ public PolicyQualifierInfo(ObjectIdentifier id, Qualifier qualifier) { @@ -62,7 +62,7 @@ public class PolicyQualifierInfo implements java.io.Serializable { /** * Create the object from its Der encoded value. - * + * * @param val the DER encoded value for the same. */ public PolicyQualifierInfo(DerValue val) throws IOException { @@ -105,7 +105,7 @@ public class PolicyQualifierInfo implements java.io.Serializable { /** * Write the PolicyQualifier to the DerOutputStream. - * + * * @param out the DerOutputStream to write the object to. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/PolicyQualifiers.java b/base/util/src/netscape/security/x509/PolicyQualifiers.java index ee756f50a..632dc89de 100644 --- a/base/util/src/netscape/security/x509/PolicyQualifiers.java +++ b/base/util/src/netscape/security/x509/PolicyQualifiers.java @@ -25,9 +25,9 @@ import netscape.security.util.DerValue; /** * Represent the PolicyQualifiers. - * + * * policyQualifiers ::= SEQUENCE SIZE (1..MAX) OF PolicyQualifierInfo - * + * * @author Thomas Kwan */ public class PolicyQualifiers implements java.io.Serializable { @@ -40,7 +40,7 @@ public class PolicyQualifiers implements java.io.Serializable { /** * Create a PolicyQualifiers with the ObjectIdentifier. - * + * * @param id the ObjectIdentifier for the policy id. */ public PolicyQualifiers() { @@ -48,7 +48,7 @@ public class PolicyQualifiers implements java.io.Serializable { /** * Create the object from its Der encoded value. - * + * * @param val the DER encoded value for the same. */ public PolicyQualifiers(DerValue val) throws IOException { @@ -90,7 +90,7 @@ public class PolicyQualifiers implements java.io.Serializable { /** * Write the PolicyQualifiers to the DerOutputStream. - * + * * @param out the DerOutputStream to write the object to. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/PrintableConverter.java b/base/util/src/netscape/security/x509/PrintableConverter.java index d63696d8f..27e6ad4d2 100644 --- a/base/util/src/netscape/security/x509/PrintableConverter.java +++ b/base/util/src/netscape/security/x509/PrintableConverter.java @@ -29,10 +29,10 @@ import netscape.security.util.DerValue; /** * A AVAValueConverter that converts a Printable String attribute to a DerValue * and vice versa. An example an attribute that is a printable string is "C". - * + * * @see ASN1CharStrConvMap * @see AVAValueConverter - * + * * @author Lily Hsiao, Slava Galperin at Netscape Communications, Inc. */ @@ -44,11 +44,11 @@ public class PrintableConverter implements AVAValueConverter { /** * Converts a string with ASN.1 Printable characters to a DerValue. - * + * * @param valueString a string with Printable characters. - * + * * @return a DerValue. - * + * * @exception IOException if a Printable encoder is not * available for the conversion. */ @@ -78,11 +78,11 @@ public class PrintableConverter implements AVAValueConverter { * Converts a BER encoded value of PrintableString to a DER encoded value. * Checks if the BER encoded value is a PrintableString. * NOTE only DER encoded values are currently accepted on input. - * + * * @param berStream A byte array of the BER encoded value. - * + * * @return A DerValue. - * + * * @exception IOException if the BER value cannot be converted to a * PrintableString DER value. */ @@ -97,11 +97,11 @@ public class PrintableConverter implements AVAValueConverter { /** * Converts a DerValue of PrintableString to a java string with * PrintableString characters. - * + * * @param avaValue a DerValue. - * + * * @return a string with PrintableString characters. - * + * * @exception IOException if the DerValue is not a PrintableString i.e. * The DerValue cannot be converted to a string * with PrintableString characters. diff --git a/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java b/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java index e3ecdb33d..5544fdb75 100644 --- a/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java +++ b/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java @@ -35,19 +35,19 @@ import netscape.security.util.DerValue; /** * This class defines the Private Key Usage Extension. - * + * * <p> * The Private Key Usage Period extension allows the certificate issuer to specify a different validity period for the * private key than the certificate. This extension is intended for use with digital signature keys. This extension * consists of two optional components notBefore and notAfter. The private key associated with the certificate should * not be used to sign objects before or after the times specified by the two components, respectively. - * + * * <pre> * PrivateKeyUsagePeriod ::= SEQUENCE { * notBefore [0] GeneralizedTime OPTIONAL, * notAfter [1] GeneralizedTime OPTIONAL } * </pre> - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.12 @@ -102,7 +102,7 @@ public class PrivateKeyUsageExtension extends Extension /** * The default constructor for PrivateKeyUsageExtension. - * + * * @param notBefore the date/time before which the private key * should not be used. * @param notAfter the date/time after which the private key @@ -120,10 +120,10 @@ public class PrivateKeyUsageExtension extends Extension /** * Create the extension from the passed DER encoded value. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. - * + * * @exception CertificateException on certificate parsing errors. * @exception IOException on error. */ @@ -143,9 +143,9 @@ public class PrivateKeyUsageExtension extends Extension DerInputStream str = new DerInputStream(extValue); DerValue[] seq = str.getSequence(2); - // NB. this is always encoded with the IMPLICIT tag - // The checks only make sense if we assume implicit tagging, - // with explicit tagging the form is always constructed. + // NB. this is always encoded with the IMPLICIT tag + // The checks only make sense if we assume implicit tagging, + // with explicit tagging the form is always constructed. for (int i = 0; i < seq.length; i++) { DerValue opt = seq[i]; @@ -201,7 +201,7 @@ public class PrivateKeyUsageExtension extends Extension /** * Verify that that the current time is within the validity period. - * + * * @exception CertificateExpiredException if the certificate has expired. * @exception CertificateNotYetValidException if the certificate is not * yet valid. @@ -214,12 +214,12 @@ public class PrivateKeyUsageExtension extends Extension /** * Verify that that the passed time is within the validity period. - * + * * @exception CertificateExpiredException if the certificate has expired * with respect to the <code>Date</code> supplied. * @exception CertificateNotYetValidException if the certificate is not * yet valid with respect to the <code>Date</code> supplied. - * + * */ public void valid(Date now) throws CertificateNotYetValidException, CertificateExpiredException { @@ -240,7 +240,7 @@ public class PrivateKeyUsageExtension extends Extension /** * Write the extension to the OutputStream. - * + * * @param out the OutputStream to write the extension to. * @exception IOException on encoding errors. */ @@ -257,7 +257,7 @@ public class PrivateKeyUsageExtension extends Extension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception CertificateException on decoding errors. */ @@ -267,7 +267,7 @@ public class PrivateKeyUsageExtension extends Extension /** * Set the attribute value. - * + * * @exception CertificateException on attribute handling errors. */ public void set(String name, Object obj) @@ -288,7 +288,7 @@ public class PrivateKeyUsageExtension extends Extension /** * Get the attribute value. - * + * * @exception CertificateException on attribute handling errors. */ public Object get(String name) throws CertificateException { @@ -304,7 +304,7 @@ public class PrivateKeyUsageExtension extends Extension /** * Delete the attribute value. - * + * * @exception CertificateException on attribute handling errors. */ public void delete(String name) throws CertificateException { diff --git a/base/util/src/netscape/security/x509/Qualifier.java b/base/util/src/netscape/security/x509/Qualifier.java index 7c0c7edfe..86e0e3708 100644 --- a/base/util/src/netscape/security/x509/Qualifier.java +++ b/base/util/src/netscape/security/x509/Qualifier.java @@ -24,12 +24,12 @@ import netscape.security.util.DerValue; /** * Represent the Qualifier. - * + * * Qualifier ::= CHOICE { * cPRuri CPSuri, * userNotice UserNotice * } - * + * * @author Thomas Kwan */ public class Qualifier implements java.io.Serializable { @@ -41,7 +41,7 @@ public class Qualifier implements java.io.Serializable { /** * Create a PolicyQualifierInfo - * + * * @param id the ObjectIdentifier for the policy id. */ public Qualifier() { @@ -53,7 +53,7 @@ public class Qualifier implements java.io.Serializable { /** * Write the PolicyQualifier to the DerOutputStream. - * + * * @param out the DerOutputStream to write the object to. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/RDN.java b/base/util/src/netscape/security/x509/RDN.java index c5e8765a0..6a4e7e1a9 100644 --- a/base/util/src/netscape/security/x509/RDN.java +++ b/base/util/src/netscape/security/x509/RDN.java @@ -30,26 +30,26 @@ import netscape.security.util.ObjectIdentifier; * RDNs are a set of {attribute = value} assertions. Some of those * attributes are "distinguished" (unique w/in context). Order is * never relevant. - * + * * Some X.500 names include only a single distinguished attribute * per RDN. This style is currently common. - * + * * Note that DER-encoded RDNs sort AVAs by assertion OID ... so that * when we parse this data we don't have to worry about canonicalizing * it, but we'll need to sort them when we expose the RDN class more. - * + * * @see X500Name * @see AVA * @see LdapDNStrConverter */ public class RDN { - // public constructors + // public constructors /** * Constructs a RDN from a Ldap DN String with one RDN component * using the global default LdapDNStrConverter. - * + * * @see LdapDNStrConverter * @param rdnString a Ldap DN string with one RDN component, e.g. as * defined in RFC1779. @@ -76,7 +76,7 @@ public class RDN { * using the specified Ldap DN Str converter. * For example, RFC1779StrConverter can be passed to parse a Ldap * DN string in RFC1779 format. - * + * * @see LdapDNStrConverter * @param rdnString Ldap DN string. * @param ldapDNStrConverter a LdapDNStrConverter. @@ -89,7 +89,7 @@ public class RDN { /** * Constructs a RDN from a DerValue. - * + * * @param set Der value of a set of AVAs. */ public RDN(DerValue set) throws IOException { @@ -129,7 +129,7 @@ public class RDN { /** * Constructs a RDN from a Der Input Stream. - * + * * @param in a Der Input Stream. */ public RDN(DerInputStream in) throws IOException { @@ -143,7 +143,7 @@ public class RDN { /** * Constructs a RDN from an array of AVA. - * + * * @param avas a AVA Array. */ public RDN(AVA avas[]) { @@ -163,7 +163,7 @@ public class RDN { /** * returns an array of AVA in the RDN. - * + * * @return array of AVA in this RDN. */ public AVA[] getAssertion() { @@ -172,7 +172,7 @@ public class RDN { /** * returns the number of AVAs in the RDN. - * + * * @return number of AVAs in this RDN. */ public int getAssertionLength() { @@ -204,7 +204,7 @@ public class RDN { /** * Checks if this RDN is the same as another by comparing the AVAs * in the RDNs. - * + * * @param other the other RDN. * @return true iff the other RDN is the same. */ @@ -234,7 +234,7 @@ public class RDN { /** * Encodes this RDN to a Der output stream. - * + * * @param out the Der Output Stream. */ public void encode(DerOutputStream out) throws IOException { @@ -248,7 +248,7 @@ public class RDN { /** * returns an enumeration of AVAs that make up this RDN. - * + * * @return an enumeration of AVAs that make up this RDN. */ public Enumeration<AVA> getAVAs() { @@ -258,7 +258,7 @@ public class RDN { /** * Returns a Ldap DN string with one RDN component using the * global default LdapDNStrConverter. - * + * * @see LdapDNStrConverter * @return the Ldap DN String of this RDN. * @exception IOException if an error occurs during the conversion. @@ -271,7 +271,7 @@ public class RDN { /** * Returns a Ldap DN String with this RDN component using the specified * LdapDNStrConverter. - * + * * @see LdapDNStrConverter * @param ldapDNStrConverter a LdapDNStrConverter. * @return a Ldap DN String. @@ -285,7 +285,7 @@ public class RDN { /** * Returns a Ldap DN string with this RDN component using the global * default LdapDNStrConverter. - * + * * @see LdapDNStrConverter * @return the Ldap DN String with this RDN component, null if an error * occurs in the conversion. diff --git a/base/util/src/netscape/security/x509/RFC1779StrConverter.java b/base/util/src/netscape/security/x509/RFC1779StrConverter.java index 6527d0fff..e7411801c 100644 --- a/base/util/src/netscape/security/x509/RFC1779StrConverter.java +++ b/base/util/src/netscape/security/x509/RFC1779StrConverter.java @@ -24,17 +24,17 @@ import netscape.security.util.ObjectIdentifier; /** * Converts a RFC 1779 string to a X500Name, RDN or AVA object and vice versa. - * + * * @see LdapDNStrConverter * @see LdapV3DNStrConverter - * + * * @author Lily Hsiao, Slava Galperin at Netscape Communications, Inc. */ public class RFC1779StrConverter extends LdapV3DNStrConverter { // // Constructors. - // + // /** * Constructs a RFC1779StrConverter using the global default @@ -47,7 +47,7 @@ public class RFC1779StrConverter extends LdapV3DNStrConverter { /** * Constructs a RFC1779StrConverter using the specified X500NameAttrMap * and boolean for whether to accept OIDs not in the X500NameAttrMap. - * + * * @param attributeMap A X500NameAttrMap to use for this converter. * @param doAcceptUnknownOids Accept unregistered attributes, i.e. OIDs * not in the map). @@ -64,11 +64,11 @@ public class RFC1779StrConverter extends LdapV3DNStrConverter { /** * Converts a OID to a attribute keyword in a Ldap DN string or * to a "OID.1.2.3.4" string syntax as defined in RFC1779. - * + * * @param oid an ObjectIdentifier. - * + * * @return a attribute keyword or "OID.1.2.3.4" string. - * + * * @exception IOException if an error occurs during the conversion. */ public String encodeOID(ObjectIdentifier oid) @@ -85,7 +85,7 @@ public class RFC1779StrConverter extends LdapV3DNStrConverter { /** * Converts a attribute value as a DerValue to a string in a * RFC1779 Ldap DN string. - * + * * @param attrValue an attribute value. * @param oid ObjectIdentifier for the attribute. * @return a string in RFC1779 syntax. diff --git a/base/util/src/netscape/security/x509/RFC822Name.java b/base/util/src/netscape/security/x509/RFC822Name.java index 257b5c51d..8509b3766 100644 --- a/base/util/src/netscape/security/x509/RFC822Name.java +++ b/base/util/src/netscape/security/x509/RFC822Name.java @@ -25,7 +25,7 @@ import netscape.security.util.DerValue; /** * This class implements the RFC822Name as required by the GeneralNames * ASN.1 object. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.3 @@ -42,7 +42,7 @@ public class RFC822Name implements GeneralNameInterface { /** * Create the RFC822Name object from the passed encoded Der value. - * + * * @param derValue the encoded DER RFC822Name. * @exception IOException on error. */ @@ -52,7 +52,7 @@ public class RFC822Name implements GeneralNameInterface { /** * Create the RFC822Name object with the specified name. - * + * * @param name the RFC822Name. */ public RFC822Name(String name) { @@ -68,7 +68,7 @@ public class RFC822Name implements GeneralNameInterface { /** * Encode the RFC822 name into the DerOutputStream. - * + * * @param out the DER stream to encode the RFC822Name to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/x509/ReasonFlags.java b/base/util/src/netscape/security/x509/ReasonFlags.java index e43c7022c..b5153e108 100755 --- a/base/util/src/netscape/security/x509/ReasonFlags.java +++ b/base/util/src/netscape/security/x509/ReasonFlags.java @@ -28,10 +28,10 @@ import netscape.security.util.DerValue; /** * Represent the CRL Reason Flags. - * + * * <p> * This extension, if present, defines the identifies the reason for the certificate revocation. - * + * * @author Hemma Prafullchandra * @version 1.3 * @see Extension @@ -57,7 +57,7 @@ public class ReasonFlags { /** * Check if bit is set. - * + * * @param position the position in the bit string to check. */ private boolean isSet(int position) { @@ -79,7 +79,7 @@ public class ReasonFlags { /** * Create a ReasonFlags with the passed bit settings. - * + * * @param reasons the bits to be set for the ReasonFlags. */ public ReasonFlags(byte[] reasons) { @@ -88,7 +88,7 @@ public class ReasonFlags { /** * Create a ReasonFlags with the passed bit settings. - * + * * @param reasons the bits to be set for the ReasonFlags. */ public ReasonFlags(boolean[] reasons) { @@ -97,7 +97,7 @@ public class ReasonFlags { /** * Create a ReasonFlags with the passed bit settings. - * + * * @param reasons the bits to be set for the ReasonFlags. */ public ReasonFlags(BitArray reasons) { @@ -106,7 +106,7 @@ public class ReasonFlags { /** * Create the object from the passed DER encoded value. - * + * * @param in the DerInputStream to read the ReasonFlags from. * @exception IOException on decoding errors. */ @@ -117,7 +117,7 @@ public class ReasonFlags { /** * Create the object from the passed DER encoded value. - * + * * @param derVal the DerValue decoded from the stream. * @exception IOException on decoding errors. */ @@ -254,7 +254,7 @@ public class ReasonFlags { /** * Write the extension to the DerOutputStream. - * + * * @param out the DerOutputStream to write the extension to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/x509/RevocationReason.java b/base/util/src/netscape/security/x509/RevocationReason.java index 419eb1772..cbd7fe73d 100644 --- a/base/util/src/netscape/security/x509/RevocationReason.java +++ b/base/util/src/netscape/security/x509/RevocationReason.java @@ -19,8 +19,8 @@ package netscape.security.x509; /** * Represent the enumerated type used in CRLReason Extension of CRL entry. - * - * + * + * * @author galperin * @version $Revision$, $Date$ */ @@ -45,7 +45,7 @@ public final class RevocationReason { /** * Create a RevocationReason with the passed integer value. - * + * * @param reason integer value of the enumeration alternative. */ private RevocationReason(int reason) { diff --git a/base/util/src/netscape/security/x509/RevokedCertImpl.java b/base/util/src/netscape/security/x509/RevokedCertImpl.java index 345694fb1..45aa78920 100755 --- a/base/util/src/netscape/security/x509/RevokedCertImpl.java +++ b/base/util/src/netscape/security/x509/RevokedCertImpl.java @@ -39,7 +39,7 @@ import netscape.security.util.ObjectIdentifier; * <p> * Abstract class for a revoked certificate in a CRL. This class is for each entry in the * <code>revokedCertificates</code>, so it deals with the inner <em>SEQUENCE</em>. The ASN.1 definition for this is: - * + * * <pre> * revokedCertificates SEQUENCE OF SEQUENCE { * userCertificate CertificateSerialNumber, @@ -47,11 +47,11 @@ import netscape.security.util.ObjectIdentifier; * crlEntryExtensions Extensions OPTIONAL * -- if present, must be v2 * } OPTIONAL - * + * * CertificateSerialNumber ::= INTEGER - * + * * Extensions ::= SEQUENCE SIZE (1..MAX) OF Extension - * + * * Extension ::= SEQUENCE { * extnId OBJECT IDENTIFIER, * critical BOOLEAN DEFAULT FALSE, @@ -61,7 +61,7 @@ import netscape.security.util.ObjectIdentifier; * -- the extnId object identifier value * } * </pre> - * + * * @author Hemma Prafullchandra * @version 1.6 97/12/10 */ @@ -88,7 +88,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable /** * Constructs a revoked certificate entry using the serial number and * revocation date. - * + * * @param num * the serial number of the revoked certificate. * @param date @@ -102,7 +102,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable /** * Constructs a revoked certificate entry using the serial number, * revocation date and the entry extensions. - * + * * @param num * the serial number of the revoked certificate. * @param date @@ -137,7 +137,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable /** * Sets extensions for this impl. - * + * * @param crlEntryExts * CRLExtensions */ @@ -147,7 +147,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable /** * Unmarshals a revoked certificate from its encoded form. - * + * * @param revokedCert * the encoded bytes. * @exception CRLException @@ -167,7 +167,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable /** * Unmarshals a revoked certificate from its encoded form. - * + * * @param derValue * the DER value containing the revoked certificate. * @exception CRLException @@ -183,7 +183,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable /** * Returns true if this revoked certificate entry has extensions, otherwise * false. - * + * * @return true if this CRL entry has extensions, otherwise false. */ public boolean hasExtensions() { @@ -195,7 +195,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable /** * Decode a revoked certificate from an input stream. - * + * * @param inStrm * an input stream holding at least one revoked certificate * @exception CRLException @@ -215,7 +215,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable /** * Encodes the revoked certificate to an output stream. - * + * * @param outStrm * an output stream to which the encoded revoked certificate is * written. @@ -251,7 +251,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable /** * Gets the serial number for this RevokedCertificate, the <em>userCertificate</em>. - * + * * @return the serial number. */ public BigInteger getSerialNumber() { @@ -260,7 +260,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable /** * Gets the revocation date for this RevokedCertificate, the <em>revocationDate</em>. - * + * * @return the revocation date. */ public Date getRevocationDate() { @@ -269,7 +269,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable /** * Returns extensions for this impl. - * + * * @return the CRLExtensions */ public CRLExtensions getExtensions() { @@ -278,7 +278,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable /** * Returns a printable string of this revoked certificate. - * + * * @return value of this revoked certificate in a printable form. */ public String toString() { @@ -299,7 +299,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable /** * Gets a Set of the extension(s) marked CRITICAL in the * RevokedCertificate by OID strings. - * + * * @return a set of the extension oid strings in the * Object that are marked critical. */ @@ -319,7 +319,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable /** * Gets a Set of the extension(s) marked NON-CRITICAL in the * RevokedCertificate by OID strings. - * + * * @return a set of the extension oid strings in the * Object that are marked critical. */ @@ -344,7 +344,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable * by ".", that means,<br> * <positive whole number>.<positive whole number>.<positive * whole number>.<...> - * + * * @param oid the Object Identifier value for the extension. * @return the DER encoded octet string of the extension value. */ diff --git a/base/util/src/netscape/security/x509/RevokedCertificate.java b/base/util/src/netscape/security/x509/RevokedCertificate.java index 2087d064a..a4f6e9cab 100644 --- a/base/util/src/netscape/security/x509/RevokedCertificate.java +++ b/base/util/src/netscape/security/x509/RevokedCertificate.java @@ -25,9 +25,9 @@ import java.util.Date; /** * <p> * Abstract class for a revoked certificate in a CRL (Certificate Revocation List). - * + * * The ASN.1 definition for <em>revokedCertificates</em> is: - * + * * <pre> * revokedCertificates SEQUENCE OF SEQUENCE { * userCertificate CertificateSerialNumber, @@ -49,9 +49,9 @@ import java.util.Date; * -- the extnId object identifier value * } * </pre> - * + * * @see X509CRL - * + * * @author Hemma Prafullchandra * @version 1.4 97/12/10 */ @@ -62,7 +62,7 @@ public abstract class RevokedCertificate extends X509CRLEntry { /** * Gets the serial number for this RevokedCertificate, * the <em>userCertificate</em>. - * + * * @return the serial number. */ public abstract BigInteger getSerialNumber(); @@ -70,7 +70,7 @@ public abstract class RevokedCertificate extends X509CRLEntry { /** * Gets the revocation date for this RevokedCertificate, * the <em>revocationDate</em>. - * + * * @return the revocation date. */ public abstract Date getRevocationDate(); @@ -78,14 +78,14 @@ public abstract class RevokedCertificate extends X509CRLEntry { /** * Returns true if this revoked certificate entry has * extensions. - * + * * @return true if this entry has extensions, false otherwise. */ public abstract boolean hasExtensions(); /** * Returns a string representation of this revoked certificate. - * + * * @return a string representation of this revoked certificate. */ public abstract String toString(); diff --git a/base/util/src/netscape/security/x509/SerialNumber.java b/base/util/src/netscape/security/x509/SerialNumber.java index a2d7109c0..eee2f8169 100644 --- a/base/util/src/netscape/security/x509/SerialNumber.java +++ b/base/util/src/netscape/security/x509/SerialNumber.java @@ -28,7 +28,7 @@ import netscape.security.util.DerValue; /** * This class defines the SerialNumber class used by certificates. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.5 @@ -46,7 +46,7 @@ public class SerialNumber { /** * The default constructor for this class using BigInteger. - * + * * @param num the BigInteger number used to create the serial number. */ public SerialNumber(BigInteger num) { @@ -59,7 +59,7 @@ public class SerialNumber { /** * The default constructor for this class using int. - * + * * @param num the BigInteger number used to create the serial number. */ public SerialNumber(int num) { @@ -68,7 +68,7 @@ public class SerialNumber { /** * Create the object, decoding the values from the passed DER stream. - * + * * @param in the DerInputStream to read the SerialNumber from. * @exception IOException on decoding errors. */ @@ -79,7 +79,7 @@ public class SerialNumber { /** * Create the object, decoding the values from the passed DerValue. - * + * * @param val the DerValue to read the SerialNumber from. * @exception IOException on decoding errors. */ @@ -89,7 +89,7 @@ public class SerialNumber { /** * Create the object, decoding the values from the passed stream. - * + * * @param in the InputStream to read the SerialNumber from. * @exception IOException on decoding errors. */ @@ -107,7 +107,7 @@ public class SerialNumber { /** * Encode the SerialNumber in DER form to the stream. - * + * * @param out the DerOutputStream to marshal the contents to. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java b/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java index c30ae1576..cdeff8f65 100644 --- a/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java +++ b/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java @@ -29,22 +29,22 @@ import netscape.security.util.DerValue; /** * This represents the Subject Alternative Name Extension. - * + * * This extension, if present, allows the subject to specify multiple * alternative names. - * + * * <p> * Extensions are represented as a sequence of the extension identifier (Object Identifier), a boolean flag stating * whether the extension is to be treated as being critical and the extension value itself (this is again a DER encoding * of the extension value). * <p> * The ASN.1 syntax for this is: - * + * * <pre> * SubjectAltName ::= GeneralNames * GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName * </pre> - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.9 @@ -85,7 +85,7 @@ public class SubjectAlternativeNameExtension extends Extension /** * Create a SubjectAlternativeNameExtension with the passed GeneralNames. - * + * * @param names the GeneralNames for the subject. * @exception IOException on error. */ @@ -116,7 +116,7 @@ public class SubjectAlternativeNameExtension extends Extension /** * Create the extension from the passed DER encoded value. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -156,7 +156,7 @@ public class SubjectAlternativeNameExtension extends Extension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -166,7 +166,7 @@ public class SubjectAlternativeNameExtension extends Extension /** * Write the extension to the OutputStream. - * + * * @param out the OutputStream to write the extension to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java b/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java index b249ef600..3414b81c6 100644 --- a/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java +++ b/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java @@ -29,30 +29,30 @@ import netscape.security.util.DerValue; /** * This class represents the Subject Directory Attributes Extension. - * + * * <p> * The subject directory attributes extension is not recommended as an essential part of this profile, but it may be * used in local environments. This extension MUST be non-critical. - * + * * <pre> * The ASN.1 syntax for this extension is: - * + * * SubjectDirectoryAttributes ::= SEQUENCE (1..MAX) OF Attribute - * + * * Attribute ::= SEQUENCE { * type AttributeType, * value SET OF AttributeValue * -- at least one value is required --} - * + * * AttributeType ::= OBJECT IDENTIFIER - * + * * AttributeValue ::= ANY - * + * * </pre> - * + * * @author Christine Ho * @version 1.7 - * + * * @see CertAttrSet * @see Extension */ @@ -118,7 +118,7 @@ public class SubjectDirAttributesExtension extends Extension /** * Default constructor for this object. - * + * * @param derVal Der encoded value of this extension */ public SubjectDirAttributesExtension(DerValue derVal) throws IOException { @@ -130,7 +130,7 @@ public class SubjectDirAttributesExtension extends Extension /** * Default constructor for this object. - * + * * @param list Attribute object list */ public SubjectDirAttributesExtension(Attribute[] list) throws IOException { @@ -151,7 +151,7 @@ public class SubjectDirAttributesExtension extends Extension /** * Constructor from parsing extension - * + * * @param list Attribute object list */ public SubjectDirAttributesExtension(Boolean crit, Object value) @@ -172,7 +172,7 @@ public class SubjectDirAttributesExtension extends Extension /** * Constructor for this object. - * + * * @param list Attribute object list * @param critical The criticality */ @@ -210,7 +210,7 @@ public class SubjectDirAttributesExtension extends Extension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ @@ -221,7 +221,7 @@ public class SubjectDirAttributesExtension extends Extension /** * Encode this extension value to the output stream. - * + * * @param out the DerOutputStream to encode the extension to. */ public void encode(OutputStream out) throws IOException { diff --git a/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java b/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java index ea0ebae82..68ff9555f 100644 --- a/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java +++ b/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java @@ -29,20 +29,20 @@ import netscape.security.util.DerValue; /** * Represent the Subject Key Identifier Extension. - * + * * This extension, if present, provides a means of identifying the particular * public key used in an application. This extension by default is marked * non-critical. - * + * * <p> * Extensions are addiitonal attributes which can be inserted in a X509 v3 certificate. For example a * "Driving License Certificate" could have the driving license number as a extension. - * + * * <p> * Extensions are represented as a sequence of the extension identifier (Object Identifier), a boolean flag stating * whether the extension is to be treated as being critical and the extension value itself (this is again a DER encoding * of the extension value). - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.7 @@ -80,7 +80,7 @@ public class SubjectKeyIdentifierExtension extends Extension /** * Create a SubjectKeyIdentifierExtension with the passed octet string. * The criticality is set to False. - * + * * @param octetString the octet string identifying the key identifier. */ public SubjectKeyIdentifierExtension(boolean critical, byte[] octetString) @@ -103,7 +103,7 @@ public class SubjectKeyIdentifierExtension extends Extension /** * Create the extension from the passed DER encoded value. - * + * * @param critical true if the extension is to be treated as critical. * @param value Array of DER encoded bytes of the actual value. * @exception IOException on error. @@ -136,7 +136,7 @@ public class SubjectKeyIdentifierExtension extends Extension /** * Write the extension to the OutputStream. - * + * * @param out the OutputStream to write the extension to. * @exception IOException on encoding errors. */ @@ -153,7 +153,7 @@ public class SubjectKeyIdentifierExtension extends Extension /** * Decode the extension from the InputStream. - * + * * @param in the InputStream to unmarshal the contents from. * @exception IOException on decoding or validity errors. */ diff --git a/base/util/src/netscape/security/x509/URIName.java b/base/util/src/netscape/security/x509/URIName.java index cc321a3b3..539ad249c 100644 --- a/base/util/src/netscape/security/x509/URIName.java +++ b/base/util/src/netscape/security/x509/URIName.java @@ -25,7 +25,7 @@ import netscape.security.util.DerValue; /** * This class implements the URIName as required by the GeneralNames * ASN.1 object. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.3 @@ -42,7 +42,7 @@ public class URIName implements GeneralNameInterface { /** * Create the URIName object from the passed encoded Der value. - * + * * @param derValue the encoded DER URIName. * @exception IOException on error. */ @@ -52,7 +52,7 @@ public class URIName implements GeneralNameInterface { /** * Create the URIName object with the specified name. - * + * * @param name the URIName. */ public URIName(String name) { @@ -68,7 +68,7 @@ public class URIName implements GeneralNameInterface { /** * Encode the URI name into the DerOutputStream. - * + * * @param out the DER stream to encode the URIName to. * @exception IOException on encoding errors. */ diff --git a/base/util/src/netscape/security/x509/UniqueIdentity.java b/base/util/src/netscape/security/x509/UniqueIdentity.java index 5113efeaf..c5a0e1d00 100644 --- a/base/util/src/netscape/security/x509/UniqueIdentity.java +++ b/base/util/src/netscape/security/x509/UniqueIdentity.java @@ -26,7 +26,7 @@ import netscape.security.util.DerValue; /** * This class defines the UniqueIdentity class used by certificates. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.6 @@ -37,7 +37,7 @@ public class UniqueIdentity { /** * The default constructor for this class. - * + * * @param id the byte array containing the unique identifier. */ public UniqueIdentity(BitArray id) { @@ -46,7 +46,7 @@ public class UniqueIdentity { /** * The default constructor for this class. - * + * * @param id the byte array containing the unique identifier. */ public UniqueIdentity(byte[] id) { @@ -55,7 +55,7 @@ public class UniqueIdentity { /** * Create the object, decoding the values from the passed DER stream. - * + * * @param in the DerInputStream to read the UniqueIdentity from. * @exception IOException on decoding errors. */ @@ -66,7 +66,7 @@ public class UniqueIdentity { /** * Create the object, decoding the values from the passed DER stream. - * + * * @param derVal the DerValue decoded from the stream. * @param tag the tag the value is encoded under. * @exception IOException on decoding errors. @@ -84,7 +84,7 @@ public class UniqueIdentity { /** * Encode the UniqueIdentity in DER form to the stream. - * + * * @param out the DerOutputStream to marshal the contents to. * @param tag enocode it under the following tag. * @exception IOException on errors. diff --git a/base/util/src/netscape/security/x509/UserNotice.java b/base/util/src/netscape/security/x509/UserNotice.java index dc2e1d535..9be215b94 100644 --- a/base/util/src/netscape/security/x509/UserNotice.java +++ b/base/util/src/netscape/security/x509/UserNotice.java @@ -24,12 +24,12 @@ import netscape.security.util.DerValue; /** * Represent the UserNotice Qualifier. - * + * * UserNotice ::= SEQUENCE { * noticeRef NoticeReference OPTIONAL, * explicitText DisplayText OPTIONAL * } - * + * * @author Thomas Kwan */ public class UserNotice extends Qualifier { @@ -76,7 +76,7 @@ public class UserNotice extends Qualifier { /** * Write the UserNotice to the DerOutputStream. - * + * * @param out the DerOutputStream to write the object to. * @exception IOException on errors. */ diff --git a/base/util/src/netscape/security/x509/X500Name.java b/base/util/src/netscape/security/x509/X500Name.java index d44003baa..abffbe7b1 100644 --- a/base/util/src/netscape/security/x509/X500Name.java +++ b/base/util/src/netscape/security/x509/X500Name.java @@ -32,14 +32,14 @@ import netscape.security.util.ObjectIdentifier; * identified by X.509 certificates. They are world-wide, hierarchical, * and descriptive. Entities can be identified by attributes, and in * some systems can be searched for according to those attributes. - * + * * <P> * <em>This class exposes only partial X.500 name functionality. Most * notably, it works best if Relative Distinguished Names only have one * (unique) attribute each, and if only the most common attributes need * to be visible to applications. This limitation, and others, will * be lifted over time.</em> - * + * * @author David Brownell * @author Amit Kapoor * @author Hemma Prafullchandra @@ -63,7 +63,7 @@ public class X500Name implements Principal, GeneralNameInterface { * as &lb;CN=Dave, OU=JavaSoft, O=Sun Microsystems, C=US&rb;. The * older "/C=US/O=Sun Microsystems, Inc/OU=JavaSoft/CN=Dave" syntax * is not currently supported. (The former is RFC 1779 style.) - * + * * @param ldapDNString a Ldap DN String e.g. as defined in RFC1779 */ public X500Name(String ldapDNString) @@ -81,9 +81,9 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Constructs a X500Name from a Ldap DN String using the specified * LdapDNStrConverter. Also use the input tags. - * + * * @see LdapDNStrConverter - * + * * @param ldapDNString a Ldap DN String e.g. as defined in RFC1779. * @param ldapDNStrConverter A LdapDNStrConverter */ @@ -114,9 +114,9 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Constructs a X500Name from a Ldap DN String using the specified * LdapDNStrConverter. - * + * * @see LdapDNStrConverter - * + * * @param ldapDNString a Ldap DN String e.g. as defined in RFC1779. * @param ldapDNStrConverter A LdapDNStrConverter */ @@ -135,7 +135,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Constructs a X500Name from fields common in enterprise application * environments. - * + * * @param commonName common name of a person, e.g. "Vivette Davis" * @param organizationUnit small organization name, e.g. "Purchasing" * @param organizationName large organization name, e.g. "Onizuka, Inc." @@ -176,7 +176,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Constructs a X500Name from fields common in Internet application * environments. - * + * * @param commonName common name of a person, e.g. "Vivette Davis" * @param organizationUnit small organization name, e.g. "Purchasing" * @param organizationName large organization name, e.g. "Onizuka, Inc." @@ -229,7 +229,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Constructs a name from an ASN.1 encoded value. The encoding * of the name in the stream uses DER (a BER/1 subset). - * + * * @param value a DER-encoded value holding an X.500 name. */ public X500Name(DerValue value) throws IOException { @@ -240,7 +240,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Constructs a name from an ASN.1 encoded input stream. The encoding * of the name in the stream uses DER (a BER/1 subset). - * + * * @param in DER-encoded data holding an X.500 name. */ public X500Name(DerInputStream in) @@ -250,7 +250,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Constructs a name from an ASN.1 encoded byte array. - * + * * @param name DER-encoded byte array holding an X.500 name. */ public X500Name(byte[] name) @@ -263,7 +263,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Constructs a X500Name from array of RDN. The RDNs are expected to * be in big endian order i.e. most significant first. - * + * * @param rdns an array of RDN. */ public X500Name(RDN[] rdns) @@ -273,7 +273,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * convenience method. - * + * * @param rdns a vector of rdns. */ public X500Name(Vector<RDN> rdnVector) @@ -287,7 +287,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Compares this name with another, for equality. - * + * * @return true iff the names are identical. */ synchronized public boolean equals(X500Name other) { @@ -339,7 +339,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Returns a "Country" name component. If more than one * such attribute exists, the topmost one is returned. - * + * * @return "C=" component of the name, if any. */ public String getCountry() throws IOException { @@ -351,7 +351,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Returns an "Organization" name component. If more than * one such attribute exists, the topmost one is returned. - * + * * @return "O=" component of the name, if any. */ public String getOrganization() throws IOException { @@ -363,7 +363,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Returns an "Organizational Unit" name component. If more * than one such attribute exists, the topmost one is returned. - * + * * @return "OU=" component of the name, if any. */ public String getOrganizationalUnit() throws IOException { @@ -375,7 +375,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Returns a "Common Name" component. If more than one such * attribute exists, the topmost one is returned. - * + * * @return "CN=" component of the name, if any. */ public String getCommonName() throws IOException { @@ -387,7 +387,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Returns a "UID" component. If more than one such * attribute exists, the topmost one is returned. - * + * * @return "UID=" component of the name, if any. */ public String getUserID() throws IOException { @@ -399,7 +399,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Returns a "Locality" name component. If more than one * such component exists, the topmost one is returned. - * + * * @return "L=" component of the name, if any. */ public String getLocality() throws IOException { @@ -411,7 +411,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Returns a "State" name component. If more than one * such component exists, the topmost one is returned. - * + * * @return "S=" component of the name, if any. */ public String getState() throws IOException { @@ -423,7 +423,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Returns a "Email" name component. If more than one * such component exists, the topmost one is returned. - * + * * @return "E=" component of the name, if any. */ public String getEmail() throws IOException { @@ -436,7 +436,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Returns a Ldap DN String from the X500Name using the global default * LdapDNStrConverter - * + * * @see LdapDNStrConverter * @return Ldap DN string of this X500Name using the default converter. */ @@ -452,7 +452,7 @@ public class X500Name implements Principal, GeneralNameInterface { * using the specified LdapDNStrconverter. * For example, RFC1779String converter can be passed to convert the * DN to RFC1779 string syntax. - * + * * @see LdapDNStrConverter * @param ldapDNStrConverter a LdapDNStrConverter * @return Ldap DN string of the X500Name @@ -512,7 +512,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Returns an enumerator of RDNs in the X500Name. - * + * * @return enumeration of rdns in this X500Name. */ public Enumeration<RDN> getRDNs() { @@ -521,7 +521,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Returns an array of RDN in the X500Name. - * + * * @return array of RDN in this X500name. */ public RDN[] getNames() { @@ -530,7 +530,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Returns the number of RDNs in the X500Name. - * + * * @return number of RDNs in this X500Name. */ public int getNamesLength() { @@ -560,7 +560,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Encodes the name in DER-encoded form. - * + * * @param out where to put the DER-encoded X.500 name */ public void encode(DerOutputStream out) throws IOException { @@ -583,7 +583,7 @@ public class X500Name implements Principal, GeneralNameInterface { /** * Gets the name in DER-encoded form. - * + * * @return the DER encoded byte array of this name, * null if no names are present. */ diff --git a/base/util/src/netscape/security/x509/X500NameAttrMap.java b/base/util/src/netscape/security/x509/X500NameAttrMap.java index 1c87c79b8..8821c5e71 100644 --- a/base/util/src/netscape/security/x509/X500NameAttrMap.java +++ b/base/util/src/netscape/security/x509/X500NameAttrMap.java @@ -29,9 +29,9 @@ import netscape.security.util.ObjectIdentifier; * 2.5.4.3 and the Directory String Converter. The Directory String * Converter converts from a string to a DerValue with tag Printable, T.61 or * UniversalString. - * + * * @author Lily Hsiao, Slava Galperin at Netscape Communications, Inc. - * + * */ public class X500NameAttrMap { @@ -51,9 +51,9 @@ public class X500NameAttrMap { /** * Get the attribute name (keyword) of the specified OID. - * + * * @param oid An ObjectIdentifier - * + * * @return An attribute name (keyword string) for the OID. */ public String getName(ObjectIdentifier oid) { @@ -63,9 +63,9 @@ public class X500NameAttrMap { /** * Get the ObjectIdentifier of the attribute name. - * + * * @param name An attribute name (string of ascii characters) - * + * * @return An ObjectIdentifier for the attribute. */ public ObjectIdentifier getOid(String name) { @@ -75,9 +75,9 @@ public class X500NameAttrMap { /** * Get the Attribute Value Converter for the specified attribute name. - * + * * @param name An attribute name - * + * * @return An attribute value converter for the attribute name */ public AVAValueConverter getValueConverter(String name) { @@ -90,9 +90,9 @@ public class X500NameAttrMap { /** * Get the Attribute Value Converter for the specified ObjectIdentifier. - * + * * @param oid An ObjectIdentifier - * + * * @return An AVAValueConverter for the OID. */ public AVAValueConverter getValueConverter(ObjectIdentifier oid) { @@ -101,7 +101,7 @@ public class X500NameAttrMap { /** * Get an Enumeration of all attribute names in this map. - * + * * @return An Enumeration of all attribute names. */ public Enumeration<String> getAllNames() { @@ -110,7 +110,7 @@ public class X500NameAttrMap { /** * Get an Enumeration of all ObjectIdentifiers in this map. - * + * * @return An Enumeration of all OIDs in this map. */ public Enumeration<ObjectIdentifier> getAllOIDs() { @@ -119,7 +119,7 @@ public class X500NameAttrMap { /** * Get the ObjectIdentifier object in the map for the specified OID. - * + * * @param oid An ObjectIdentifier. * @return The ObjectIdentifier object in this map for the OID. */ @@ -131,13 +131,13 @@ public class X500NameAttrMap { } // - // public add methods. + // public add methods. // /** * Adds a attribute name, ObjectIdentifier, AVAValueConverter entry * to the map. - * + * * @param name An attribute name (string of ascii chars) * @param oid The ObjectIdentifier for the attribute. * @param valueConverter An AVAValueConverter object for converting @@ -168,11 +168,11 @@ public class X500NameAttrMap { // // public static methods. - // + // /** * Get the global default X500NameAttrMap. - * + * * @return The global default X500NameAttrMap. */ public static X500NameAttrMap getDefault() { @@ -181,7 +181,7 @@ public class X500NameAttrMap { /** * Get the global default X500NamAttrMap using the DirStrConverter. - * + * * @return The global default X500NameAttrMap using the DirStrConverter. */ @@ -192,7 +192,7 @@ public class X500NameAttrMap { /** * Set the global default X500NameAttrMap. - * + * * @param newDefault The new default X500NameAttrMap. */ public static void setDefault(X500NameAttrMap newDefault) { @@ -217,8 +217,8 @@ public class X500NameAttrMap { private static X500NameAttrMap defDirMap; - /* - * Create the default maps on initialization. + /* + * Create the default maps on initialization. */ static { defMap = new X500NameAttrMap(); @@ -251,7 +251,7 @@ public class X500NameAttrMap { defMap.addNameOID("TITLE", new ObjectIdentifier("2.5.4.12"), directoryStr); - // RFC 1274 UserId, rfc822MailBox + // RFC 1274 UserId, rfc822MailBox defMap.addNameOID("UID", new ObjectIdentifier("0.9.2342.19200300.100.1.1"), directoryStr); diff --git a/base/util/src/netscape/security/x509/X509AttributeName.java b/base/util/src/netscape/security/x509/X509AttributeName.java index 2f6c46cb1..2616ddb8e 100644 --- a/base/util/src/netscape/security/x509/X509AttributeName.java +++ b/base/util/src/netscape/security/x509/X509AttributeName.java @@ -19,7 +19,7 @@ package netscape.security.x509; /** * This class is used to parse attribute names like "x509.info.extensions". - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.4 @@ -35,7 +35,7 @@ public class X509AttributeName { /** * Default constructor for the class. Name is of the form * "x509.info.extensions". - * + * * @param name the attribute name. */ public X509AttributeName(String name) { diff --git a/base/util/src/netscape/security/x509/X509CRLImpl.java b/base/util/src/netscape/security/x509/X509CRLImpl.java index 8c69b6aa0..05afe2653 100755 --- a/base/util/src/netscape/security/x509/X509CRLImpl.java +++ b/base/util/src/netscape/security/x509/X509CRLImpl.java @@ -51,7 +51,7 @@ import netscape.security.util.ObjectIdentifier; * An implmentation for X509 CRL (Certificate Revocation List). * <p> * The X.509 v2 CRL format is described below in ASN.1: - * + * * <pre> * </pre> * <p> @@ -62,7 +62,7 @@ import netscape.security.util.ObjectIdentifier; * <draft-ietf-pkix-ipki-part1-06.txt>. * <p> * The ASN.1 definition of <code>tbsCertList</code> is: - * + * * <pre> * TBSCertList ::= SEQUENCE { * version Version OPTIONAL, @@ -81,7 +81,7 @@ import netscape.security.util.ObjectIdentifier; * -- if present, must be v2 * } * </pre> - * + * * @author Hemma Prafullchandra * @version 1.8 * @see X509CRL @@ -115,7 +115,7 @@ public class X509CRLImpl extends X509CRL { * need to examine and use CRL contents. Note that the buffer * must include only one CRL, and no "garbage" may be left at * the end. - * + * * @param crlData the encoded bytes, with no trailing padding. * @exception CRLException on parsing errors. * @exception X509ExtensionException on extension handling errors. @@ -148,7 +148,7 @@ public class X509CRLImpl extends X509CRL { /** * Unmarshals an X.509 CRL from an input stream. Only one CRL * is expected at the end of the input stream. - * + * * @param inStrm an input stream holding at least one CRL * @exception CRLException on parsing errors. * @exception X509ExtensionException on extension handling errors. @@ -167,7 +167,7 @@ public class X509CRLImpl extends X509CRL { /** * Initial CRL constructor, no revoked certs, and no extensions. - * + * * @param issuer the name of the CA issuing this CRL. * @param thisUpdate the Date of this issue. * @param nextUpdate the Date of the next CRL. @@ -180,12 +180,12 @@ public class X509CRLImpl extends X509CRL { /** * CRL constructor, revoked certs, no extensions. - * + * * @param issuer the name of the CA issuing this CRL. * @param thisUpdate the Date of this issue. * @param nextUpdate the Date of the next CRL. * @param badCerts the array of revoked certificates. - * + * * @exception CRLException on parsing/construction errors. * @exception X509ExtensionException on extension handling errors. */ @@ -204,13 +204,13 @@ public class X509CRLImpl extends X509CRL { /** * CRL constructor, revoked certs and extensions. - * + * * @param issuer the name of the CA issuing this CRL. * @param thisUpdate the Date of this issue. * @param nextUpdate the Date of the next CRL. * @param badCerts the array of revoked certificates. * @param crlExts the CRL extensions. - * + * * @exception CRLException on parsing/construction errors. * @exception X509ExtensionException on extension handling errors. */ @@ -241,7 +241,7 @@ public class X509CRLImpl extends X509CRL { * This will be used by code that constructs CRL and uses * encodeInfo() in order to sign it using external means * (other than sign() method) - * + * * @param issuer the name of the CA issuing this CRL. * @param sigAlg signing algorithm id * @param thisUpdate the Date of this issue. @@ -258,14 +258,14 @@ public class X509CRLImpl extends X509CRL { /** * CRL constructor, revoked certs and extensions. - * + * * @param issuer the name of the CA issuing this CRL. * @param sigAlg signing algorithm id * @param thisUpdate the Date of this issue. * @param nextUpdate the Date of the next CRL. * @param badCerts the hashtable of revoked certificates. * @param crlExts the CRL extensions. - * + * * @exception CRLException on parsing/construction errors. * @exception X509ExtensionException on extension handling errors. */ @@ -286,7 +286,7 @@ public class X509CRLImpl extends X509CRL { /** * Returns the ASN.1 DER encoded form of this CRL. - * + * * @exception CRLException if an encoding error occurs. */ public byte[] getEncoded() throws CRLException { @@ -299,7 +299,7 @@ public class X509CRLImpl extends X509CRL { /** * Returns true if signedCRL was set. - * + * * @param byte array of containing signed CRL. */ public boolean setSignedCRL(byte[] crl) { @@ -319,7 +319,7 @@ public class X509CRLImpl extends X509CRL { /** * Encodes the "to-be-signed" CRL to the OutputStream. - * + * * @param out the OutputStream to write to. * @exception CRLException on encoding errors. * @exception X509ExtensionException on extension encoding errors. @@ -363,9 +363,9 @@ public class X509CRLImpl extends X509CRL { /** * Verifies that this CRL was signed using the * private key that corresponds to the specified public key. - * + * * @param key the PublicKey used to carry out the verification. - * + * * @exception NoSuchAlgorithmException on unsupported signature * algorithms. * @exception InvalidKeyException on incorrect key. @@ -384,10 +384,10 @@ public class X509CRLImpl extends X509CRL { * private key that corresponds to the specified public key, * and that the signature verification was computed by * the given provider. - * + * * @param key the PublicKey used to carry out the verification. * @param sigProvider the name of the signature provider. - * + * * @exception NoSuchAlgorithmException on unsupported signature * algorithms. * @exception InvalidKeyException on incorrect key. @@ -431,10 +431,10 @@ public class X509CRLImpl extends X509CRL { /** * Encodes an X.509 CRL, and signs it using the key * passed. - * + * * @param key the private key used for signing. * @param algorithm the name of the signature algorithm used. - * + * * @exception NoSuchAlgorithmException on unsupported signature * algorithms. * @exception InvalidKeyException on incorrect key. @@ -452,11 +452,11 @@ public class X509CRLImpl extends X509CRL { /** * Encodes an X.509 CRL, and signs it using the key * passed. - * + * * @param key the private key used for signing. * @param algorithm the name of the signature algorithm used. * @param provider the name of the provider. - * + * * @exception NoSuchAlgorithmException on unsupported signature * algorithms. * @exception InvalidKeyException on incorrect key. @@ -510,7 +510,7 @@ public class X509CRLImpl extends X509CRL { /** * Returns a printable string of this CRL. - * + * * @return value of this CRL in a printable form. */ public String toString() { @@ -545,7 +545,7 @@ public class X509CRLImpl extends X509CRL { /** * Checks whether the given serial number is on this CRL. - * + * * @param serialNumber the number to check for. * @return true if the given serial number is on this CRL, * false otherwise. @@ -569,13 +569,13 @@ public class X509CRLImpl extends X509CRL { /** * Gets the version number from the CRL. * The ASN.1 definition for this is: - * + * * <pre> * Version ::= INTEGER { v1(0), v2(1), v3(2) } * -- v3 does not apply to CRLs but appears for consistency * -- with definition of Version for certs * </pre> - * + * * @return the version number. */ public int getVersion() { @@ -588,29 +588,29 @@ public class X509CRLImpl extends X509CRL { * issued the CRL). The issuer name field contains an * X.500 distinguished name (DN). * The ASN.1 definition for this is: - * + * * <pre> * issuer Name - * + * * Name ::= CHOICE { RDNSequence } * RDNSequence ::= SEQUENCE OF RelativeDistinguishedName * RelativeDistinguishedName ::= * SET OF AttributeValueAssertion - * + * * AttributeValueAssertion ::= SEQUENCE { * AttributeType, * AttributeValue } * AttributeType ::= OBJECT IDENTIFIER * AttributeValue ::= ANY * </pre> - * + * * The Name describes a hierarchical name composed of attributes, * such as country name, and corresponding values, such as US. * The type of the component AttributeValue is determined by the * AttributeType; in general it will be a directoryString. * A directoryString is usually one of PrintableString, * TeletexString or UniversalString. - * + * * @return the issuer name. */ public Principal getIssuerDN() { @@ -620,7 +620,7 @@ public class X509CRLImpl extends X509CRL { /** * Gets the thisUpdate date from the CRL. * The ASN.1 definition for this is: - * + * * @return the thisUpdate date from the CRL. */ public Date getThisUpdate() { @@ -629,7 +629,7 @@ public class X509CRLImpl extends X509CRL { /** * Gets the nextUpdate date from the CRL. - * + * * @return the nextUpdate date from the CRL, or null if * not present. */ @@ -642,7 +642,7 @@ public class X509CRLImpl extends X509CRL { /** * Get the revoked certificate from the CRL by the serial * number provided. - * + * * @return the revoked certificate or null if there is * no entry in the CRL marked with the provided serial number. * @see RevokedCertificate @@ -658,7 +658,7 @@ public class X509CRLImpl extends X509CRL { /** * Gets all the revoked certificates from the CRL. * A Set of RevokedCertificate. - * + * * @return all the revoked certificates or null if there are * none. * @see RevokedCertificate @@ -691,7 +691,7 @@ public class X509CRLImpl extends X509CRL { /** * Gets the DER encoded CRL information, the <code>tbsCertList</code> from this CRL. * This can be used to verify the signature independently. - * + * * @return the DER encoded CRL information. * @exception CRLException on parsing errors. * @exception X509ExtensionException on extension parsing errors. @@ -707,7 +707,7 @@ public class X509CRLImpl extends X509CRL { /** * Gets the raw Signature bits from the CRL. - * + * * @return the signature. */ public byte[] getSignature() { @@ -720,7 +720,7 @@ public class X509CRLImpl extends X509CRL { /** * Returns true if signature was set. - * + * * @param byte array of containing CRL signature. */ public boolean setSignature(byte[] crlSignature) { @@ -737,7 +737,7 @@ public class X509CRLImpl extends X509CRL { * Gets the signature algorithm name for the CRL * signature algorithm. For example, the string "SHA1withDSA". * The ASN.1 definition for this is: - * + * * <pre> * AlgorithmIdentifier ::= SEQUENCE { * algorithm OBJECT IDENTIFIER, @@ -746,7 +746,7 @@ public class X509CRLImpl extends X509CRL { * -- registered for use with the * -- algorithm object identifier value * </pre> - * + * * @return the signature algorithm name. */ public String getSigAlgName() { @@ -762,7 +762,7 @@ public class X509CRLImpl extends X509CRL { * <positive whole number>.<positive whole number>.<...> * For example, the string "1.2.840.10040.4.3" identifies the SHA-1 * with DSA signature algorithm, as per the PKIX part I. - * + * * @return the signature algorithm oid string. */ public String getSigAlgOID() { @@ -777,7 +777,7 @@ public class X509CRLImpl extends X509CRL { * CRL's signature algorithm. In most cases, the signature * algorithm parameters are null, the parameters are usually * supplied with the Public Key. - * + * * @return the DER encoded signature algorithm parameters, or * null if no parameters are present. */ @@ -794,7 +794,7 @@ public class X509CRLImpl extends X509CRL { /** * Gets a Set of the extension(s) marked CRITICAL in the * CRL by OID strings. - * + * * @return a set of the extension oid strings in the * CRL that are marked critical. */ @@ -815,7 +815,7 @@ public class X509CRLImpl extends X509CRL { /** * Gets a Set of the extension(s) marked NON-CRITICAL in the * CRL by OID strings. - * + * * @return a set of the extension oid strings in the * CRL that are NOT marked critical. */ @@ -839,7 +839,7 @@ public class X509CRLImpl extends X509CRL { * represented by a set of positive whole number separated * by ".", that means,<br> * <positive whole number>.<positive whole number>.<...> - * + * * @param oid the Object Identifier value for the extension. * @return the der encoded octet string of the extension value. */ @@ -932,7 +932,7 @@ public class X509CRLImpl extends X509CRL { /** * Returns extensions for this impl. - * + * * @param extn CRLExtensions */ public CRLExtensions getExtensions() { diff --git a/base/util/src/netscape/security/x509/X509Cert.java b/base/util/src/netscape/security/x509/X509Cert.java index 9ab7ba754..5b6036049 100644 --- a/base/util/src/netscape/security/x509/X509Cert.java +++ b/base/util/src/netscape/security/x509/X509Cert.java @@ -41,7 +41,7 @@ import netscape.security.util.DerValue; /** * @author David Brownell * @version 1.5 - * + * * @see CertAndKeyGen * @deprecated Use the new X509Certificate class. * This class is only restored for backwards compatibility. @@ -71,7 +71,7 @@ public class X509Cert implements Certificate, Serializable { * must include only a certificate, and no "garbage" may be left at * the end. If you need to ignore data at the end of a certificate, * use another constructor. - * + * * @param cert the encoded bytes, with no terminatu (CONSUMED) * @exception IOException when the certificate is improperly encoded. */ @@ -90,11 +90,11 @@ public class X509Cert implements Certificate, Serializable { * encoded bytes. This form of constructor is used by agents which * need to examine and use certificate contents. That is, this is * one of the most commonly used constructors. - * + * * @param buf the buffer holding the encoded bytes * @param offset the offset in the buffer where the bytes begin * @param len how many bytes of certificate exist - * + * * @exception IOException when the certificate is improperly encoded. */ public X509Cert( @@ -114,7 +114,7 @@ public class X509Cert implements Certificate, Serializable { * Unmarshal a certificate from its encoded form, parsing a DER value. * This form of constructor is used by agents which need to examine * and use certificate contents. - * + * * @param derVal the der value containing the encoded cert. * @exception IOException when the certificate is improperly encoded. */ @@ -131,25 +131,25 @@ public class X509Cert implements Certificate, Serializable { * which later <a href="#signAndEncode">signs and encodes</a> the * certificate. Also, self-signed certificates serve as CA certificates, * and are sometimes used as certificate requests. - * + * * <P> * Until the certificate has been signed and encoded, some of the mandatory fields in the certificate will not be * available via accessor functions: the serial number, issuer name and signing algorithm, and of course the signed * certificate. The fields passed to this constructor are available, and must be non-null. - * + * * <P> * Note that the public key being signed is generally independent of the signature algorithm being used. So for * example Diffie-Hellman keys (which do not support signatures) can be placed in X.509 certificates when some other * signature algorithm (e.g. DSS/DSA, or one of the RSA based algorithms) is used. - * + * * @see CertAndKeyGen - * + * * @param subjectName the X.500 distinguished name being certified * @param subjectPublicKey the public key being certified. This * must be an "X509Key" implementing the "PublicKey" interface. * @param notBefore the first time the certificate is valid * @param notAfter the last time the certificate is valid - * + * * @exception CertException if the public key is inappropriate */ public X509Cert( @@ -174,7 +174,7 @@ public class X509Cert implements Certificate, Serializable { /** * Decode an X.509 certificate from an input stream. - * + * * @param in an input stream holding at least one certificate * @exception IOException when the certificate is improperly encoded. */ @@ -189,7 +189,7 @@ public class X509Cert implements Certificate, Serializable { /** * Appends the certificate to an output stream. - * + * * @param out an input stream to which the certificate is appended. * @exception IOException when appending fails. */ @@ -201,7 +201,7 @@ public class X509Cert implements Certificate, Serializable { * Compares two certificates. This is false if the * certificates are not both X.509 certs, otherwise it * compares them as binary data. - * + * * @param other the object being compared with this one * @return true iff the certificates are equivalent */ @@ -215,7 +215,7 @@ public class X509Cert implements Certificate, Serializable { /** * Compares two certificates, returning false if any data * differs between the two. - * + * * @param other the object being compared with this one * @return true iff the certificates are equivalent */ @@ -255,13 +255,13 @@ public class X509Cert implements Certificate, Serializable { * was not signed using the verification key provided. Successfully * verifying a certificate does <em>not</em> indicate that one should * trust the entity which it represents. - * + * * <P> * <em>Note that since this class represents only a single X.509 * certificate, it cannot know anything about the certificate chain * which is used to provide the verification key and to establish trust. * Other code must manage and use those cert chains. - * + * * <P>For now, you must walk the cert chain being used to verify any * given cert. Start at the root, which is a self-signed certificate; * verify it using the key inside the certificate. Then use that to @@ -271,7 +271,7 @@ public class X509Cert implements Certificate, Serializable { * if any of the verification operations for its certificate chain * were unsuccessful. * </em> - * + * * @param issuerPublicKey the public key of the issuing CA * @exception CertException when the certificate is not valid. */ @@ -327,15 +327,15 @@ public class X509Cert implements Certificate, Serializable { * passed (associating a signature algorithm and an X.500 name). * This operation is used to implement the certificate generation * functionality of a certificate authority. - * + * * @see #getSignedCert * @see #getSigner * @see CertAndKeyGen - * + * * @param serial the serial number of the certificate (non-null) * @param issuer the certificate issuer (CA) (non-null) * @return the signed certificate, as returned by getSignedCert - * + * * @exception IOException if any of the data could not be encoded, * or when any mandatory data was omitted * @exception SignatureException on signing failures @@ -375,7 +375,7 @@ public class X509Cert implements Certificate, Serializable { * Returns an X500Signer that may be used to create signatures. Those * signature may in turn be verified using this certificate (or a * copy of it). - * + * * <P> * <em><b>NOTE:</b> If the private key is by itself capable of * creating signatures, this fact may not be recognized at this time. @@ -383,13 +383,13 @@ public class X509Cert implements Certificate, Serializable { * parameters from higher in the certificate chain is not supportable * without using an X509CertChain API, and there is no current support * for other sources of algorithm parameters.</em> - * + * * @param algorithm the signature algorithm to be used. Note that a * given public/private key pair may support several such algorithms. * @param privateKey the private key used to create the signature, * which must correspond to the public key in this certificate * @return the Signer object - * + * * @exception NoSuchAlgorithmException if the signature * algorithm is not supported * @exception InvalidKeyException if either the key in the certificate, @@ -426,7 +426,7 @@ public class X509Cert implements Certificate, Serializable { * Returns a signature object that may be used to verify signatures * created using a specified signature algorithm and the public key * contained in this certificate. - * + * * <P> * <em><b>NOTE:</b> If the public key in this certificate is not by * itself capable of verifying signatures, this may not be recognized @@ -434,7 +434,7 @@ public class X509Cert implements Certificate, Serializable { * their algorithm parameters from higher in the certificate chain * is not supportable without using an X509CertChain API, and there * is no current support for other sources of algorithm parameters.</em> - * + * * @param algorithm the algorithm of the signature to be verified * @return the Signature object * @exception NoSuchAlgorithmException if the signature @@ -512,7 +512,7 @@ public class X509Cert implements Certificate, Serializable { * to perform a public key operation. Those keys need to be augmented * by algorithm parameters, which the certificate generation policy * chose not to place in the certificate. - * + * * <P> * Two such public key algorithms are: DSS/DSA, where algorithm parameters could be acquired from a CA certificate * in the chain of issuers; and Diffie-Hellman, with a similar solution although the CA then needs both a @@ -576,7 +576,7 @@ public class X509Cert implements Certificate, Serializable { /** * Returns a printable representation of the certificate. - * + * * @param detailed true iff lots of detail is requested */ public String toString(boolean detailed) { @@ -664,7 +664,7 @@ public class X509Cert implements Certificate, Serializable { in = seq[0].data; - /* + /* * Version -- this is optional (default zero). If it's there it's * the first field and is specially tagged. * @@ -801,7 +801,7 @@ public class X509Cert implements Certificate, Serializable { */ private byte[] sign(X500Signer issuer, byte data[]) throws IOException, SignatureException { - /* + /* * Encode the to-be-signed data, then the algorithm used * to create the signature. */ diff --git a/base/util/src/netscape/security/x509/X509CertImpl.java b/base/util/src/netscape/security/x509/X509CertImpl.java index 9c62b36a6..f93fb9009 100755 --- a/base/util/src/netscape/security/x509/X509CertImpl.java +++ b/base/util/src/netscape/security/x509/X509CertImpl.java @@ -59,22 +59,22 @@ import netscape.security.util.ObjectIdentifier; * software distribution, and Secure Electronic Transactions (SET). There * is a commercial infrastructure ready to manage large scale deployments * of X.509 identity certificates. - * + * * <P> * These certificates are managed and vouched for by <em>Certificate * Authorities</em> (CAs). CAs are services which create certificates by placing data in the X.509 standard format and * then digitally signing that data. Such signatures are quite difficult to forge. CAs act as trusted third parties, * making introductions between agents who have no direct knowledge of each other. CA certificates are either signed by * themselves, or by some other CA such as a "root" CA. - * + * * <P> * RFC 1422 is very informative, though it does not describe much of the recent work being done with X.509 certificates. * That includes a 1996 version (X.509v3) and a variety of enhancements being made to facilitate an explosion of * personal certificates used as "Internet Drivers' Licences", or with SET for credit card transactions. - * + * * <P> * More recent work includes the IETF PKIX Working Group efforts, especially part 1. - * + * * @author Dave Brownell * @author Amit Kapoor * @author Hemma Prafullchandra @@ -152,7 +152,7 @@ public class X509CertImpl extends X509Certificate * must include only a certificate, and no "garbage" may be left at * the end. If you need to ignore data at the end of a certificate, * use another constructor. - * + * * @param certData the encoded bytes, with no trailing padding. * @exception CertificateException on parsing and initialization errors. */ @@ -165,7 +165,7 @@ public class X509CertImpl extends X509Certificate * As a special optimization, this constructor acts as X509CertImpl(byte[]) * except that it takes an X509CertInfo which it uses as a 'hint' for * how to construct one field. - * + * * @param certData the encode bytes, with no traiing padding * @param certInfo the certInfo which has already been constructed * from the certData @@ -190,7 +190,7 @@ public class X509CertImpl extends X509Certificate /** * unmarshals an X.509 certificate from an input stream. - * + * * @param in an input stream holding at least one certificate * @exception CertificateException on parsing and initialization errors. */ @@ -209,7 +209,7 @@ public class X509CertImpl extends X509Certificate /** * Construct an initialized X509 Certificate. The certificate is stored * in raw form and has to be signed to be useful. - * + * * @param certInfo the X509CertificateInfo which the Certificate is to be * created from. */ @@ -221,7 +221,7 @@ public class X509CertImpl extends X509Certificate * Unmarshal a certificate from its encoded form, parsing a DER value. * This form of constructor is used by agents which need to examine * and use certificate contents. - * + * * @param derVal the der value containing the encoded cert. * @exception CertificateException on parsing and initialization errors. */ @@ -242,7 +242,7 @@ public class X509CertImpl extends X509Certificate /** * Decode an X.509 certificate from an input stream. - * + * * @param in an input stream holding at least one certificate * @exception CertificateException on parsing errors. * @exception IOException on other errors. @@ -257,7 +257,7 @@ public class X509CertImpl extends X509Certificate /** * Appends the certificate to an output stream. - * + * * @param out an input stream to which the certificate is appended. * @exception CertificateEncodingException on encoding errors. */ @@ -276,10 +276,10 @@ public class X509CertImpl extends X509Certificate /** * DER encode this object onto an output stream. * Implements the <code>DerEncoder</code> interface. - * + * * @param out * the output stream on which to write the DER encoding. - * + * * @exception IOException on encoding error. */ public void derEncode(OutputStream out) throws IOException { @@ -294,7 +294,7 @@ public class X509CertImpl extends X509Certificate * assumed that each certificate type would have only a single * form of encoding; for example, X.509 certificates would * be encoded as ASN.1 DER. - * + * * @exception CertificateEncodingException if an encoding error occurs. */ public byte[] getEncoded() throws CertificateEncodingException { @@ -311,9 +311,9 @@ public class X509CertImpl extends X509Certificate * verification key provided. Successfully verifying a certificate * does <em>not</em> indicate that one should trust the entity which * it represents. - * + * * @param key the public key used for verification. - * + * * @exception InvalidKeyException on incorrect key. * @exception NoSuchAlgorithmException on unsupported signature * algorithms. @@ -333,10 +333,10 @@ public class X509CertImpl extends X509Certificate * verification key provided. Successfully verifying a certificate * does <em>not</em> indicate that one should trust the entity which * it represents. - * + * * @param key the public key used for verification. * @param sigProvider the name of the provider. - * + * * @exception NoSuchAlgorithmException on unsupported signature * algorithms. * @exception InvalidKeyException on incorrect key. @@ -369,10 +369,10 @@ public class X509CertImpl extends X509Certificate * passed (associating a signature algorithm and an X.500 name). * This operation is used to implement the certificate generation * functionality of a certificate authority. - * + * * @param key the private key used for signing. * @param algorithm the name of the signature algorithm used. - * + * * @exception InvalidKeyException on incorrect key. * @exception NoSuchAlgorithmException on unsupported signature * algorithms. @@ -391,11 +391,11 @@ public class X509CertImpl extends X509Certificate * passed (associating a signature algorithm and an X.500 name). * This operation is used to implement the certificate generation * functionality of a certificate authority. - * + * * @param key the private key used for signing. * @param algorithm the name of the signature algorithm used. * @param provider the name of the provider. - * + * * @exception NoSuchAlgorithmException on unsupported signature * algorithms. * @exception InvalidKeyException on incorrect key. @@ -449,7 +449,7 @@ public class X509CertImpl extends X509Certificate /** * Checks that the certificate is currently valid, i.e. the current * time is within the specified validity period. - * + * * @exception CertificateExpiredException if the certificate has expired. * @exception CertificateNotYetValidException if the certificate is not * yet valid. @@ -464,10 +464,10 @@ public class X509CertImpl extends X509Certificate * Checks that the specified date is within the certificate's * validity period, or basically if the certificate would be * valid at the specified date/time. - * + * * @param date the Date to check against to see if this certificate * is valid at that date/time. - * + * * @exception CertificateExpiredException if the certificate has expired * with respect to the <code>date</code> supplied. * @exception CertificateNotYetValidException if the certificate is not @@ -489,7 +489,7 @@ public class X509CertImpl extends X509Certificate /** * Return the requested attribute from the certificate. - * + * * @param name the name of the attribute. * @exception CertificateParsingException on invalid attribute identifier. */ @@ -531,7 +531,7 @@ public class X509CertImpl extends X509Certificate /** * Set the requested attribute in the certificate. - * + * * @param name the name of the attribute. * @param obj the value of the attribute. * @exception CertificateException on invalid attribute identifier. @@ -573,7 +573,7 @@ public class X509CertImpl extends X509Certificate /** * Delete the requested attribute from the certificate. - * + * * @param name the name of the attribute. * @exception CertificateException on invalid attribute identifier. * @exception IOException on other errors. @@ -663,7 +663,7 @@ public class X509CertImpl extends X509Certificate /** * Gets the publickey from this certificate. - * + * * @return the publickey. */ public PublicKey getPublicKey() { @@ -680,7 +680,7 @@ public class X509CertImpl extends X509Certificate /** * Gets the version number from the certificate. - * + * * @return the version number. */ public int getVersion() { @@ -697,7 +697,7 @@ public class X509CertImpl extends X509Certificate /** * Gets the serial number from the certificate. - * + * * @return the serial number. */ public BigInteger getSerialNumber() { @@ -715,7 +715,7 @@ public class X509CertImpl extends X509Certificate /** * Gets the subject distinguished name from the certificate. - * + * * @return the subject name. */ public Principal getSubjectDN() { @@ -733,7 +733,7 @@ public class X509CertImpl extends X509Certificate /** * Gets the issuer distinguished name from the certificate. - * + * * @return the issuer name. */ public Principal getIssuerDN() { @@ -751,7 +751,7 @@ public class X509CertImpl extends X509Certificate /** * Gets the notBefore date from the validity period of the certificate. - * + * * @return the start date of the validity period. */ public Date getNotBefore() { @@ -768,7 +768,7 @@ public class X509CertImpl extends X509Certificate /** * Gets the notAfter date from the validity period of the certificate. - * + * * @return the end date of the validity period. */ public Date getNotAfter() { @@ -786,7 +786,7 @@ public class X509CertImpl extends X509Certificate /** * Gets the DER encoded certificate informations, the <code>tbsCertificate</code> from this certificate. * This can be used to verify the signature independently. - * + * * @return the DER encoded certificate information. * @exception CertificateEncodingException if an encoding error occurs. */ @@ -799,7 +799,7 @@ public class X509CertImpl extends X509Certificate /** * Gets the raw Signature bits from the certificate. - * + * * @return the signature. */ public byte[] getSignature() { @@ -814,7 +814,7 @@ public class X509CertImpl extends X509Certificate * Gets the signature algorithm name for the certificate * signature algorithm. * For example, the string "SHA-1/DSA" or "DSS". - * + * * @return the signature algorithm name. */ public String getSigAlgName() { @@ -826,7 +826,7 @@ public class X509CertImpl extends X509Certificate /** * Gets the signature algorithm OID string from the certificate. * For example, the string "1.2.840.10040.4.3" - * + * * @return the signature algorithm oid string. */ public String getSigAlgOID() { @@ -839,7 +839,7 @@ public class X509CertImpl extends X509Certificate /** * Gets the DER encoded signature algorithm parameters from this * certificate's signature algorithm. - * + * * @return the DER encoded signature algorithm parameters, or * null if no parameters are present. */ @@ -855,7 +855,7 @@ public class X509CertImpl extends X509Certificate /** * Gets the Issuer Unique Identity from the certificate. - * + * * @return the Issuer Unique Identity. */ public boolean[] getIssuerUniqueID() { @@ -876,7 +876,7 @@ public class X509CertImpl extends X509Certificate /** * Gets the Subject Unique Identity from the certificate. - * + * * @return the Subject Unique Identity. */ public boolean[] getSubjectUniqueID() { @@ -898,7 +898,7 @@ public class X509CertImpl extends X509Certificate /** * Gets a Set of the extension(s) marked CRITICAL in the * certificate by OID strings. - * + * * @return a set of the extension oid strings in the * certificate that are marked critical. */ @@ -926,7 +926,7 @@ public class X509CertImpl extends X509Certificate /** * Gets a Set of the extension(s) marked NON-CRITICAL in the * certificate by OID strings. - * + * * @return a set of the extension oid strings in the * certificate that are NOT marked critical. */ @@ -977,7 +977,7 @@ public class X509CertImpl extends X509Certificate /** * Gets the DER encoded extension identified by the passed * in oid String. - * + * * @param oid the Object Identifier value for the extension. */ public byte[] getExtensionValue(String oid) { @@ -1024,7 +1024,7 @@ public class X509CertImpl extends X509Certificate /** * Get a boolean array representing the bits of the KeyUsage extension, * (oid = 2.5.29.15). - * + * * @return the bit values of this extension as an array of booleans. */ public boolean[] getKeyUsage() { @@ -1047,7 +1047,7 @@ public class X509CertImpl extends X509Certificate /** * Get the certificate constraints path length from the * the critical BasicConstraints extension, (oid = 2.5.29.19). - * + * * @return the length of the constraint. */ public int getBasicConstraints() { @@ -1170,12 +1170,12 @@ public class X509CertImpl extends X509Certificate /** * Construct the alternate Certificate class with the Certificate * type and Certificate encoding bytes. - * + * * <p> - * + * * @param type the standard name of the Certificate type. * <p> - * + * * @param data the Certificate data. */ protected CertificateRep1(String type, byte[] data) { @@ -1185,11 +1185,11 @@ public class X509CertImpl extends X509Certificate /** * Resolve the Certificate Object. - * + * * <p> - * + * * @return the resolved Certificate Object. - * + * * @throws java.io.ObjectStreamException if the Certificate could not * be resolved. */ diff --git a/base/util/src/netscape/security/x509/X509CertInfo.java b/base/util/src/netscape/security/x509/X509CertInfo.java index 4777cd958..20ef2bd6a 100644 --- a/base/util/src/netscape/security/x509/X509CertInfo.java +++ b/base/util/src/netscape/security/x509/X509CertInfo.java @@ -36,25 +36,25 @@ import netscape.security.util.DerValue; /** * The X509CertInfo class represents X.509 certificate information. - * + * * <P> * X.509 certificates have several base data elements, including: * <UL> - * + * * <LI>The <em>Subject Name</em>, an X.500 Distinguished Name for the entity (subject) for which the certificate was * issued. - * + * * <LI>The <em>Subject Public Key</em>, the public key of the subject. This is one of the most important parts of the * certificate. - * + * * <LI>The <em>Validity Period</em>, a time period (e.g. six months) within which the certificate is valid (unless * revoked). - * + * * <LI>The <em>Issuer Name</em>, an X.500 Distinguished Name for the Certificate Authority (CA) which issued the * certificate. - * + * * <LI>A <em>Serial Number</em> assigned by the CA, for use in certificate revocation and other applications. - * + * * @author Amit Kapoor * @author Hemma Prafullchandra * @version 1.16 @@ -146,7 +146,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { * must include only a certificate, and no "garbage" may be left at * the end. If you need to ignore data at the end of a certificate, * use another constructor. - * + * * @param cert the encoded bytes, with no trailing data. * @exception CertificateParsingException on parsing errors. */ @@ -164,7 +164,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { * Unmarshal a certificate from its encoded form, parsing a DER value. * This form of constructor is used by agents which need to examine * and use certificate contents. - * + * * @param derVal the der value containing the encoded cert. * @exception CertificateParsingException on parsing errors. */ @@ -178,7 +178,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { /** * Decode an X.509 certificate from an input stream. - * + * * @param in an input stream holding at least one certificate * @exception CertificateParsingException on decoding errors. * @exception IOException on other errors. @@ -192,7 +192,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { /** * Appends the certificate to an output stream. - * + * * @param out an output stream to which the certificate is appended. * @exception CertificateException on encoding errors. * @exception IOException on other errors. @@ -204,7 +204,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { /** * Appends the certificate to an output stream. - * + * * @param out An output stream to which the certificate is appended. * @param ignoreCache Whether to ignore the internal cache when encoding. * (the cache can easily become out of date). @@ -248,7 +248,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { /** * Returns the encoded certificate info. - * + * * @exception CertificateEncodingException on encoding information errors. */ public byte[] getEncodedInfo() throws CertificateEncodingException { @@ -276,7 +276,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { * Compares two X509CertInfo objects. This is false if the * certificates are not both X.509 certs, otherwise it * compares them as binary data. - * + * * @param other the object being compared with this one * @return true iff the certificates are equivalent */ @@ -291,7 +291,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { /** * Compares two certificates, returning false if any data * differs between the two. - * + * * @param other the object being compared with this one * @return true iff the certificates are equivalent */ @@ -383,7 +383,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { /** * Set the certificate attribute. - * + * * @param name the name of the Certificate attribute. * @param val the value of the Certificate attribute. * @exception CertificateException on invalid attributes. @@ -486,7 +486,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { /** * Delete the certificate attribute. - * + * * @param name the name of the Certificate attribute. * @exception CertificateException on invalid attributes. * @exception IOException on other errors. @@ -579,9 +579,9 @@ public class X509CertInfo implements CertAttrSet, Serializable { /** * Get the certificate attribute. - * + * * @param name the name of the Certificate attribute. - * + * * @exception CertificateException on invalid attributes. * @exception IOException on other errors. */ @@ -817,7 +817,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { /** * Set the version number of the certificate. - * + * * @param val the Object class value for the Extensions * @exception CertificateException on invalid data. */ @@ -830,7 +830,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { /** * Set the serial number of the certificate. - * + * * @param val the Object class value for the CertificateSerialNumber * @exception CertificateException on invalid data. */ @@ -843,7 +843,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { /** * Set the algorithm id of the certificate. - * + * * @param val the Object class value for the AlgorithmId * @exception CertificateException on invalid data. */ @@ -857,7 +857,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { /** * Set the issuer name of the certificate. - * + * * @param val the Object class value for the issuer * @exception CertificateException on invalid data. */ @@ -871,7 +871,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { /** * Set the validity interval of the certificate. - * + * * @param val the Object class value for the CertificateValidity * @exception CertificateException on invalid data. */ @@ -885,7 +885,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { /** * Set the subject name of the certificate. - * + * * @param val the Object class value for the Subject * @exception CertificateException on invalid data. */ @@ -899,7 +899,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { /** * Set the public key in the certificate. - * + * * @param val the Object class value for the PublicKey * @exception CertificateException on invalid data. */ @@ -913,7 +913,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { /** * Set the Issuer Unique Identity in the certificate. - * + * * @param val the Object class value for the IssuerUniqueId * @exception CertificateException */ @@ -930,7 +930,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { /** * Set the Subject Unique Identity in the certificate. - * + * * @param val the Object class value for the SubjectUniqueId * @exception CertificateException */ @@ -947,7 +947,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { /** * Set the extensions in the certificate. - * + * * @param val the Object class value for the Extensions * @exception CertificateException */ diff --git a/base/util/src/netscape/security/x509/X509ExtensionException.java b/base/util/src/netscape/security/x509/X509ExtensionException.java index c7174aed8..6e30746e3 100644 --- a/base/util/src/netscape/security/x509/X509ExtensionException.java +++ b/base/util/src/netscape/security/x509/X509ExtensionException.java @@ -21,7 +21,7 @@ import java.security.GeneralSecurityException; /** * X.509 Extension Exception. - * + * * @author Hemma Prafullchandra * 1.2 */ @@ -45,7 +45,7 @@ public class X509ExtensionException extends GeneralSecurityException { * Constructs the exception with the specified detail * message. A detail message is a String that describes this * particular exception. - * + * * @param message the detail message. */ public X509ExtensionException(String message) { diff --git a/base/util/src/netscape/security/x509/X509Key.java b/base/util/src/netscape/security/x509/X509Key.java index a8253c0d8..5c8ac3a88 100644 --- a/base/util/src/netscape/security/x509/X509Key.java +++ b/base/util/src/netscape/security/x509/X509Key.java @@ -39,13 +39,13 @@ import netscape.security.util.DerValue; * certificate. Includes a description of the algorithm to be used * with the key; these keys normally are used as * "SubjectPublicKeyInfo". - * + * * <P> * While this class can represent any kind of X.509 key, it may be desirable to provide subclasses which understand how * to parse keying data. For example, RSA public keys have two members, one for the public modulus and one for the prime * exponent. If such a class is provided, it is used when parsing X.509 keys. If one is not provided, the key still * parses correctly. - * + * * @version 1.74, 97/12/10 * @author David Brownell */ @@ -88,12 +88,12 @@ public class X509Key implements PublicKey { * the runtime environment is configured with a specific class for * this kind of key, a subclass is returned. Otherwise, a generic * X509Key object is returned. - * + * * <P> * This mechanism gurantees that keys (and algorithms) may be freely manipulated and transferred, without risk of * losing information. Also, when a key (or algorithm) needs some special handling, that specific need can be * accomodated. - * + * * @param in the DER-encoded SubjectPublicKeyInfo value * @exception IOException on data format errors */ @@ -123,11 +123,11 @@ public class X509Key implements PublicKey { * keys encapsulate two unsigned integers (modulus and exponent) as * DER values within the <code>key</code> bits; Diffie-Hellman and * DSS/DSA keys encapsulate a single unsigned integer. - * + * * <P> * This function is called when creating X.509 SubjectPublicKeyInfo values using the X509Key member functions, such * as <code>parse</code> and <code>decode</code>. - * + * * @exception IOException on parsing errors. * @exception InvalidKeyException on invalid key encodings. */ @@ -236,7 +236,7 @@ public class X509Key implements PublicKey { /** * Encode SubjectPublicKeyInfo sequence on the DER output stream. - * + * * @exception IOException on encoding errors. */ public final void encode(DerOutputStream out) throws IOException { @@ -271,7 +271,7 @@ public class X509Key implements PublicKey { /** * Returns the DER-encoded form of the key as a byte array. - * + * * @exception InvalidKeyException on encoding errors. */ public byte[] encode() throws InvalidKeyException { @@ -310,16 +310,16 @@ public class X509Key implements PublicKey { * sequence consisting of an algorithm ID and a bit string which holds * the key. (That bit string is often used to encapsulate another DER * encoded sequence.) - * + * * <P> * Subclasses should not normally redefine this method; they should instead provide a <code>parseKeyBits</code> * method to parse any fields inside the <code>key</code> member. - * + * * <P> * The exception to this rule is that since private keys need not be encoded using the X.509 * <code>SubjectPublicKeyInfo</code> format, private keys may override this method, <code>encode</code>, and of * course <code>getFormat</code>. - * + * * @param in an input stream with a DER-encoded X.509 * SubjectPublicKeyInfo value * @exception InvalidKeyException on parsing errors. @@ -436,7 +436,7 @@ public class X509Key implements PublicKey { } /* - * parsePublicKey returns a PublicKey for use with package JSS from within netscape.security.*. + * parsePublicKey returns a PublicKey for use with package JSS from within netscape.security.*. * This function provide an interim solution for migrating from using the netscape.security.* package * to using the JSS package. */ @@ -461,23 +461,23 @@ public class X509Key implements PublicKey { return subjectKey; } - /* buildPublicKey returns a PublicKey for use with the JSS package from within netscape.security.*. + /* buildPublicKey returns a PublicKey for use with the JSS package from within netscape.security.*. * This function provide an interim solution for migrating from using the netscape.security.* package * to using the JSS package. */ static PublicKey buildPublicKey(AlgorithmId algid, byte[] key) throws IOException, InvalidKeyException { - /* - * Use the algid and key parameters to produce the ASN.1 encoding - * of the key, which will then be used as the input to the - * key factory. + /* + * Use the algid and key parameters to produce the ASN.1 encoding + * of the key, which will then be used as the input to the + * key factory. */ DerOutputStream x509EncodedKeyStream = new DerOutputStream(); encode(x509EncodedKeyStream, algid, key); X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(x509EncodedKeyStream.toByteArray()); try { - // Instantiate the key factory of the appropriate algorithm + // Instantiate the key factory of the appropriate algorithm KeyFactory keyFac = null; if (Security.getProvider("Mozilla-JSS") == null) { keyFac = KeyFactory.getInstance(algid.getName()); @@ -486,16 +486,16 @@ public class X509Key implements PublicKey { "Mozilla-JSS"); } - // Generate the public key + // Generate the public key PublicKey pubKey = keyFac.generatePublic(x509KeySpec); - /* - * Return specialized X509Key, where the structure within the - * key has been parsed + /* + * Return specialized X509Key, where the structure within the + * key has been parsed */ return pubKey; } catch (NoSuchAlgorithmException e) { - // Return generic X509Key with opaque key data (see below) + // Return generic X509Key with opaque key data (see below) throw new InvalidKeyException(e.toString()); } catch (InvalidKeySpecException e) { throw new InvalidKeyException(e.toString()); |