diff options
Diffstat (limited to 'base/common/src/com/netscape/cms')
92 files changed, 42 insertions, 346 deletions
diff --git a/base/common/src/com/netscape/cms/authentication/AVAPattern.java b/base/common/src/com/netscape/cms/authentication/AVAPattern.java index 823b396e9..3e984c0cc 100644 --- a/base/common/src/com/netscape/cms/authentication/AVAPattern.java +++ b/base/common/src/com/netscape/cms/authentication/AVAPattern.java @@ -130,8 +130,6 @@ class AVAPattern { public static final String TYPE_RDN = "$rdn"; public static final String TYPE_CONSTANT = "constant"; - private static final char[] endChars = new char[] { '+', ',' }; - private static final LdapV3DNStrConverter mLdapDNStrConverter = new LdapV3DNStrConverter(); diff --git a/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java b/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java index b8216d6bc..c65dd3971 100644 --- a/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java @@ -35,7 +35,6 @@ import com.netscape.certsrv.authentication.ISSLClientCertProvider; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.SessionContext; -import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.profile.EProfileException; import com.netscape.certsrv.profile.IProfile; import com.netscape.certsrv.profile.IProfileAuthenticator; @@ -78,10 +77,6 @@ public class AgentCertAuthentication implements IAuthManager, private IUGSubsystem mUGSub = null; private ICertUserLocator mCULocator = null; - private ILogger mLogger = CMS.getLogger(); - - private IConfigStore mRevocationChecking = null; - private String mRequestor = null; public AgentCertAuthentication() { } diff --git a/base/common/src/com/netscape/cms/authentication/HashAuthentication.java b/base/common/src/com/netscape/cms/authentication/HashAuthentication.java index b9808e639..9ebf8a7c0 100644 --- a/base/common/src/com/netscape/cms/authentication/HashAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/HashAuthentication.java @@ -55,12 +55,7 @@ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo { protected static String[] mRequiredCreds = { CRED_UID, CRED_PAGEID, CRED_FINGERPRINT, CRED_HOST }; public static final long DEFAULT_TIMEOUT = 600000; - private boolean mEnable = false; - private long mTimeout = DEFAULT_TIMEOUT; // in milliseconds - private String mSecret; - private int mPageID; - private String mHost; - private long mLastLogin = 0; + private MessageDigest mSHADigest = null; private Hashtable<String, IAuthToken> mData = null; private IConfigStore mConfig; diff --git a/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java b/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java index dbae4a1ca..2bec1b68d 100644 --- a/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java @@ -38,7 +38,6 @@ import com.netscape.certsrv.authentication.ISSLClientCertProvider; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.SessionContext; -import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.profile.EProfileException; import com.netscape.certsrv.profile.IProfile; import com.netscape.certsrv.profile.IProfileAuthenticator; @@ -73,11 +72,6 @@ public class SSLclientCertAuthentication implements IAuthManager, private String mImplName = null; private IConfigStore mConfig = null; - private ILogger mLogger = CMS.getLogger(); - - private IConfigStore mRevocationChecking = null; - private String mRequestor = null; - public SSLclientCertAuthentication() { } diff --git a/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java b/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java index 10cb94299..923b05019 100644 --- a/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java @@ -32,13 +32,11 @@ import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.SessionContext; -import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.profile.EProfileException; import com.netscape.certsrv.profile.IProfile; import com.netscape.certsrv.profile.IProfileAuthenticator; import com.netscape.certsrv.property.IDescriptor; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.cmsutil.http.HttpClient; import com.netscape.cmsutil.http.HttpRequest; import com.netscape.cmsutil.http.HttpResponse; @@ -70,9 +68,6 @@ public class TokenAuthentication implements IAuthManager, private String mImplName = null; private IConfigStore mConfig = null; - private IUGSubsystem mUGSub = null; - private ILogger mLogger = CMS.getLogger(); - public TokenAuthentication() { } @@ -90,8 +85,6 @@ public class TokenAuthentication implements IAuthManager, mName = name; mImplName = implName; mConfig = config; - - mUGSub = (IUGSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_UG); } /** diff --git a/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java b/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java index 65cf75651..9e551966c 100644 --- a/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java @@ -133,9 +133,6 @@ public class UidPwdPinDirAuthentication extends DirBasedAuthentication protected MessageDigest mSHADigest = null; protected MessageDigest mMD5Digest = null; - private String mBindDN = null; - private String mBindPassword = null; - private ILdapConnFactory removePinLdapFactory = null; private LDAPConnection removePinLdapConnection = null; private IConfigStore removePinLdapConfigStore = null; diff --git a/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java b/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java index dae24678d..729b017d8 100644 --- a/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java +++ b/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java @@ -47,6 +47,7 @@ public class BasicAclAuthz extends AAclAuthz private String mImplName = null; /* configuration store */ + @SuppressWarnings("unused") private IConfigStore mConfig; /* the system logger */ @@ -54,8 +55,6 @@ public class BasicAclAuthz extends AAclAuthz protected static final String PROP_BASEDN = "basedn"; - private static boolean needsFlush = false; - static { mExtendedPluginInfo.add("nothing for now"); } @@ -174,10 +173,7 @@ public class BasicAclAuthz extends AAclAuthz try { super.updateACLs(id, rights, strACLs, desc); // flushResourceACLs(); - needsFlush = false; } catch (EACLsException ex) { - // flushing failed, set flag - needsFlush = true; log(ILogger.LL_FAILURE, CMS.getLogMessage("AUTHZ_EVALUATOR_FLUSH_RESOURCES", ex.toString())); diff --git a/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java b/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java index d3f004619..65032608c 100644 --- a/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java +++ b/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java @@ -21,7 +21,6 @@ import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.evaluators.IAccessEvaluator; -import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.usrgrp.IUser; import com.netscape.cmsutil.util.Utils; @@ -38,7 +37,6 @@ import com.netscape.cmsutil.util.Utils; public class UserOrigReqAccessEvaluator implements IAccessEvaluator { private String mType = "user_origreq"; private String mDescription = "user origreq matching evaluator"; - private ILogger mLogger = CMS.getLogger(); private final static String ANYBODY = "anybody"; private final static String EVERYBODY = "everybody"; diff --git a/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java b/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java index 2f1d479a4..37c0e918b 100644 --- a/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java +++ b/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java @@ -191,7 +191,6 @@ public class RenewalNotificationJob private long mPreMS = 0; private int mPostDays = 0; private long mPostMS = 0; - private int mMaxNotifyCount = 1; private String[] mProfileId = null; /** diff --git a/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java b/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java index 2f82307f2..21d69e29d 100644 --- a/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java +++ b/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java @@ -33,7 +33,6 @@ import com.netscape.certsrv.ldap.ILdapConnFactory; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestListener; -import com.netscape.certsrv.request.RequestId; /** * This represnets a listener that removes pin from LDAP directory. @@ -56,7 +55,6 @@ public class PinRemovalListener implements IRequestListener { private IConfigStore mConfig = null; private IConfigStore mLdapConfig = null; - private RequestId mReqId = null; private ILdapConnFactory mConnFactory = null; private LDAPConnection mRemovePinLdapConnection = null; @@ -111,8 +109,6 @@ public class PinRemovalListener implements IRequestListener { if (mEnabled != true) return; - mReqId = r.getRequestId(); - String rs = r.getRequestStatus().toString(); CMS.debug("PinRemovalListener: Request status: " + rs); diff --git a/base/common/src/com/netscape/cms/logging/LogFile.java b/base/common/src/com/netscape/cms/logging/LogFile.java index 95d4b34bf..caada0bf5 100644 --- a/base/common/src/com/netscape/cms/logging/LogFile.java +++ b/base/common/src/com/netscape/cms/logging/LogFile.java @@ -685,8 +685,6 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { return mFileName; } - private boolean firstOpen = true; - /** * Record that the signed audit log has been signed * <P> diff --git a/base/common/src/com/netscape/cms/logging/RollingLogFile.java b/base/common/src/com/netscape/cms/logging/RollingLogFile.java index d420f547d..0a7a9f098 100644 --- a/base/common/src/com/netscape/cms/logging/RollingLogFile.java +++ b/base/common/src/com/netscape/cms/logging/RollingLogFile.java @@ -83,11 +83,6 @@ public class RollingLogFile extends LogFile { private Thread mRolloverThread = null; /** - * The incrementing backup number for the log file names - */ - private int mFileNumber = 1; - - /** * The amount of time before a backed up log is removed in milliseconds */ protected long mExpirationTime = 0; @@ -211,13 +206,11 @@ public class RollingLogFile extends LogFile { } /** - * Rotate the log file to a backup file with a incrementing integer - * extension + * Rotate the log file to a backup file with timestamp **/ public synchronized void rotate() throws IOException { - //File backupFile = new File(mFileName + "." + mFileNumber); File backupFile = new File(mFileName + "." + mLogFileDateFormat.format(mDate)); // close, backup, and reopen the log file zeroizing its contents @@ -273,7 +266,6 @@ public class RollingLogFile extends LogFile { + backupFile.toString()); } super.open(); // will reset mBytesWritten - mFileNumber++; } /** diff --git a/base/common/src/com/netscape/cms/ocsp/LDAPStore.java b/base/common/src/com/netscape/cms/ocsp/LDAPStore.java index c9f97c541..e2e5fc493 100644 --- a/base/common/src/com/netscape/cms/ocsp/LDAPStore.java +++ b/base/common/src/com/netscape/cms/ocsp/LDAPStore.java @@ -83,7 +83,6 @@ public class LDAPStore implements IDefStore, IExtendedPluginInfo { private static final int DEF_REFRESH_IN_SEC = 60 * 60 * 24; private static final String PROP_BASE_DN = "baseDN"; private static final String PROP_BY_NAME = "byName"; - private static final String PROP_CONN_INFO = "connInfo"; private static final String PROP_CRL_ATTR = "crlAttr"; private static final String DEF_CRL_ATTR = "certificateRevocationList;binary"; private static final String PROP_CA_CERT_ATTR = "caCertAttr"; 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 06f94d599..e12b8220f 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java @@ -30,7 +30,6 @@ import netscape.ldap.LDAPSearchResults; import netscape.ldap.LDAPv2; import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authority.ICertAuthority; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; @@ -40,7 +39,6 @@ import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.policy.IEnrollmentPolicy; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.request.RequestId; import com.netscape.cms.policy.APolicyRule; /** @@ -63,13 +61,10 @@ public class AttributePresentConstraints extends APolicyRule protected String mName = null; protected String mImplName = null; - private boolean mEnabled = false; private ILogger mLogger = CMS.getLogger(); - private ICertAuthority mSub = null; private IConfigStore mConfig = null; private IConfigStore mLdapConfig = null; - private RequestId mReqId = null; private ILdapConnFactory mConnFactory = null; private LDAPConnection mCheckAttrLdapConnection = null; @@ -271,8 +266,6 @@ public class AttributePresentConstraints extends APolicyRule public PolicyResult apply(IRequest r) { PolicyResult res = PolicyResult.ACCEPTED; - mReqId = r.getRequestId(); - String requestType = r.getRequestType(); if (requestType.equals(IRequest.ENROLLMENT_REQUEST) || 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 b586c8bdf..7f44c8eb0 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java @@ -42,7 +42,8 @@ import com.netscape.cms.policy.APolicyRule; */ public class PresenceExt extends APolicyRule { private static Vector<String> mDefParams = new Vector<String>(); - private IConfigStore mConfig = null; + @SuppressWarnings("unused") + private IConfigStore mConfig; private String mOID = null; private boolean mCritical; private int mVersion = 0; 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 b7588aa4d..eaec5e50f 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java @@ -54,9 +54,6 @@ public class ValidityConstraint extends EnrollConstraint { public static final String CONFIG_CHECK_NOT_AFTER = "notAfterCheck"; public final static long SECS_IN_MS = 1000L; - private Date mDefNotBefore = null; - private Date mDefNotAfter = null; - public ValidityConstraint() { super(); addConfigName(CONFIG_RANGE); 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 cba06023f..2c176593a 100644 --- a/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java @@ -47,7 +47,6 @@ public class InhibitAnyPolicyExtDefault extends EnrollExtDefault { public static final String VAL_SKIP_CERTS = "skipCerts"; private static final String SKIP_CERTS = "Skip Certs"; - private static final String GN_PATTERN = "Pattern"; public InhibitAnyPolicyExtDefault() { super(); 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 cfe35df39..b703f5b47 100644 --- a/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java +++ b/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java @@ -40,7 +40,6 @@ import com.netscape.certsrv.request.RequestStatus; import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.certsrv.usrgrp.IUser; -import com.netscape.cms.profile.common.EnrollProfile; /** * This updater class will create the new user to the subsystem group and @@ -50,19 +49,14 @@ import com.netscape.cms.profile.common.EnrollProfile; */ public class SubsystemGroupUpdater implements IProfileUpdater { - private IProfile mProfile = null; - private EnrollProfile mEnrollProfile = null; + @SuppressWarnings("unused") + private IProfile mProfile; private IConfigStore mConfig = null; private ILogger mSignedAuditLogger = CMS.getSignedAuditLogger(); private Vector<String> mConfigNames = new Vector<String>(); - private Vector<String> mValueNames = new Vector<String>(); private final static String LOGGING_SIGNED_AUDIT_CONFIG_ROLE = "LOGGING_SIGNED_AUDIT_CONFIG_ROLE_3"; - private final static String SIGNED_AUDIT_PASSWORD_VALUE = "********"; - private final static String SIGNED_AUDIT_EMPTY_NAME_VALUE_PAIR = "Unknown"; - private final static String SIGNED_AUDIT_NAME_VALUE_DELIMITER = ";;"; - private final static String SIGNED_AUDIT_NAME_VALUE_PAIRS_DELIMITER = "+"; public SubsystemGroupUpdater() { } @@ -71,7 +65,6 @@ public class SubsystemGroupUpdater implements IProfileUpdater { throws EProfileException { mConfig = config; mProfile = profile; - mEnrollProfile = (EnrollProfile) profile; } public Enumeration<String> getConfigNames() { 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 0dff1da6b..e612c339a 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java +++ b/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java @@ -38,7 +38,6 @@ import netscape.security.x509.Extension; import netscape.security.x509.GeneralName; import netscape.security.x509.GeneralNameInterface; import netscape.security.x509.GeneralNames; -import netscape.security.x509.LdapV3DNStrConverter; import netscape.security.x509.OIDMap; import netscape.security.x509.SubjectAlternativeNameExtension; import netscape.security.x509.X500Name; @@ -103,11 +102,6 @@ class AVAPattern { "IPAddress", "OIDName" }; - private static final char[] endChars = new char[] { '+', ',' }; - - private static final LdapV3DNStrConverter mLdapDNStrConverter = - new LdapV3DNStrConverter(); - /* the list of request attributes needed by this AVA */ protected String[] mReqAttrs = null; 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 cd298bc3b..ea69cc5a1 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java +++ b/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java @@ -121,7 +121,6 @@ class MapAVAPattern { "URIName", "IPAddress", "OIDName" }; - private static final char[] endChars = new char[] { '+', ',' }; private static final LdapV3DNStrConverter mLdapDNStrConverter = new LdapV3DNStrConverter(); 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 cbc77560f..06050480e 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java @@ -61,7 +61,6 @@ public class LdapCaCertPublisher private ILogger mLogger = CMS.getLogger(); private boolean mInited = false; protected IConfigStore mConfig = null; - private String mcrlIssuingPointId; /** * constructor constructs default values. 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 68b1205ad..41a15f93a 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java @@ -63,7 +63,6 @@ public class LdapEncryptCertPublisher implements ILdapPublisher, IExtendedPlugin private ILogger mLogger = CMS.getLogger(); private IConfigStore mConfig = null; private boolean mInited = false; - private boolean mRevokeCert; public LdapEncryptCertPublisher() { } @@ -113,7 +112,6 @@ public class LdapEncryptCertPublisher implements ILdapPublisher, IExtendedPlugin return; mConfig = config; mCertAttr = mConfig.getString("certAttr", LDAP_USERCERT_ATTR); - mRevokeCert = mConfig.getBoolean(PROP_REVOKE_CERT, true); mInited = true; } 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 22c979f28..1244da12c 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java @@ -39,7 +39,6 @@ import com.netscape.certsrv.common.OpDef; import com.netscape.certsrv.common.ScopeDef; import com.netscape.certsrv.evaluators.IAccessEvaluator; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.usrgrp.IUGSubsystem; /** * Manage Access Control List configuration @@ -52,8 +51,6 @@ public class ACLAdminServlet extends AdminServlet { * */ private static final long serialVersionUID = -322237202045924779L; - private IUGSubsystem mUG = null; - private static final String PROP_ACLS = "acls"; private static final String PROP_EVAL = "accessEvaluator"; private final static String INFO = "ACLAdminServlet"; private IAuthzManager mAuthzMgr = null; @@ -62,14 +59,6 @@ public class ACLAdminServlet extends AdminServlet { "LOGGING_SIGNED_AUDIT_CONFIG_ACL_3"; /** - * Constructs servlet. - */ - public ACLAdminServlet() { - super(); - mUG = (IUGSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_UG); - } - - /** * initialize the servlet. * <ul> * <li>http.param OP_TYPE = OP_SEARCH, 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 ee1b53ed5..abb6048eb 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java @@ -92,7 +92,6 @@ public class AdminServlet extends HttpServlet { private static final long serialVersionUID = 7740464244137421542L; private final static String HDR_AUTHORIZATION = "Authorization"; private final static String HDR_LANG = "accept-language"; - private final static String HDR_CONTENT_LEN = "Content-Length"; protected ILogger mLogger = CMS.getLogger(); protected ILogger mSignedAuditLogger = CMS.getSignedAuditLogger(); 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 24e701d7a..71cf8a2ac 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java @@ -64,7 +64,6 @@ public class AuthAdminServlet extends AdminServlet { private final static String PW_PASSWORD_CACHE_ADD = "PASSWORD_CACHE_ADD"; - private final static String VIEW = ";" + Constants.VIEW; private final static String EDIT = ";" + Constants.EDIT; private final static String LOGGING_SIGNED_AUDIT_CONFIG_AUTH = 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 a47c7ae0d..f0aeb2295 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java @@ -100,8 +100,6 @@ public final class CMSAdminServlet extends AdminServlet { private final static String PROP_DB = "dbs"; private final static String PROP_SMTP = "smtp"; - private final static String PROP_RADM = "radm"; - private final static String PROP_GATEWAY = "cmsgateway"; private final static String PROP_INTERNAL_DB = "internaldb"; private ILogger mSignedAuditLogger = CMS.getSignedAuditLogger(); 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 47eeebe92..314a4072f 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java @@ -53,7 +53,6 @@ public class JobsAdminServlet extends AdminServlet { */ private static final long serialVersionUID = 561767449283982015L; // ... remove later - private final static String EDIT = ";edit"; private final static String VISIBLE = ";visible"; private final static String ENABLED = ";enabled"; private final static String DISABLED = ";disabled"; 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 9600c5e56..a9661eedb 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java @@ -63,16 +63,11 @@ public class LogAdminServlet extends AdminServlet { private ILogSubsystem mSys = null; - private final static String VIEW = ";" + Constants.VIEW; - private final static String EDIT = ";" + Constants.EDIT; - private final static String SIGNED_AUDIT_LOG_TYPE = "SignedAudit"; private final static String LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT = "LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT_3"; private final static String LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE = "LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE_4"; - private final static String LOGGING_SIGNED_AUDIT_LOG_EXPIRATION_CHANGE = - "LOGGING_SIGNED_AUDIT_LOG_EXPIRATION_CHANGE_4"; /** * Constructs Log servlet. 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 19677e748..b459d8ad2 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java @@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authority.IAuthority; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.ISubsystem; @@ -70,11 +69,8 @@ public class ProfileAdminServlet extends AdminServlet { public final static String PROP_AUTHORITY = "authority"; private final static String INFO = "ProfileAdminServlet"; - private final static String PW_PASSWORD_CACHE_ADD = - "PASSWORD_CACHE_ADD"; public final static String PROP_PREDICATE = "predicate"; - private IAuthority mAuthority = null; private IPluginRegistry mRegistry = null; private IProfileSubsystem mProfileSub = null; @@ -109,10 +105,7 @@ public class ProfileAdminServlet extends AdminServlet { */ public void init(ServletConfig config) throws ServletException { super.init(config); - String authority = config.getInitParameter(PROP_AUTHORITY); - if (authority != null) - mAuthority = (IAuthority) CMS.getSubsystem(authority); mRegistry = (IPluginRegistry) CMS.getSubsystem(CMS.SUBSYSTEM_REGISTRY); mProfileSub = (IProfileSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_PROFILE); } 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 adbdc8279..0d1ab7eb5 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java @@ -83,15 +83,10 @@ public class PublisherAdminServlet extends AdminServlet { public final static String PROP_AUTHORITY = "authority"; private final static String INFO = "PublisherAdminServlet"; - private final static String PW_TAG_CA_LDAP_PUBLISHING = - "CA LDAP Publishing"; public final static String NOMAPPER = "<NONE>"; private IPublisherProcessor mProcessor = null; private IAuthority mAuth = null; - private final static String VIEW = ";" + Constants.VIEW; - private final static String EDIT = ";" + Constants.EDIT; - public PublisherAdminServlet() { super(); } 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 487fd9f2e..4d47d318f 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java @@ -26,7 +26,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authority.IAuthority; import com.netscape.certsrv.common.Constants; import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.common.OpDef; @@ -52,11 +51,8 @@ public class RegistryAdminServlet extends AdminServlet { public final static String PROP_AUTHORITY = "authority"; private final static String INFO = "RegistryAdminServlet"; - private final static String PW_PASSWORD_CACHE_ADD = - "PASSWORD_CACHE_ADD"; public final static String PROP_PREDICATE = "predicate"; - private IAuthority mAuthority = null; private IPluginRegistry mRegistry = null; // These will be moved to PolicyResources @@ -85,10 +81,6 @@ public class RegistryAdminServlet extends AdminServlet { */ public void init(ServletConfig config) throws ServletException { super.init(config); - String authority = config.getInitParameter(PROP_AUTHORITY); - - if (authority != null) - mAuthority = (IAuthority) CMS.getSubsystem(authority); mRegistry = (IPluginRegistry) CMS.getSubsystem(CMS.SUBSYSTEM_REGISTRY); } 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 97573d877..1c610996f 100644 --- a/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java @@ -129,7 +129,6 @@ public abstract class CMSServlet extends HttpServlet { public final static String PROP_ACL = "ACLinfo"; public final static String AUTHZ_MGR_BASIC = "BasicAclAuthz"; public final static String AUTHZ_MGR_LDAP = "DirAclAuthz"; - 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 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 ceba2fc72..357c901c3 100644 --- a/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java @@ -71,25 +71,24 @@ public class DynamicVariablesServlet extends CMSServlet { private static final String VAR_HTTP_STRING = "http()"; private static final Integer VAR_HTTP = Integer.valueOf(3); - private String VAR_HTTP_VALUE = null; private static final String VAR_AUTHMGRS_STRING = "authmgrs()"; private static final Integer VAR_AUTHMGRS = Integer.valueOf(4); - private String VAR_AUTHMGRS_VALUE = null; private static final String VAR_CLA_CRL_URL_STRING = "clacrlurl()"; private static final Integer VAR_CLA_CRL_URL = Integer.valueOf(6); - private String VAR_CLA_CRL_URL_VALUE = null; private String mAuthMgrCacheString = ""; private long mAuthMgrCacheTime = 0; private final int AUTHMGRCACHE = 10; //number of seconds to cache list of // authmanagers for private Hashtable<Integer, String> dynvars = null; + @SuppressWarnings("unused") private String mGetClientCert = "false"; private String mAuthMgr = null; - private ServletConfig mServletCfg = null; + @SuppressWarnings("unused") + private ServletConfig mServletCfg; private ServletContext mServletCtx = null; private static String mCrlurl = ""; static { 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 b5f94bd19..bdb02cae3 100644 --- a/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java @@ -47,14 +47,6 @@ public class IndexServlet extends CMSServlet { private final static String INFO = "indexServlet"; - // input parameters - - // output parameters - private final static String OUT_TYPE = "type"; - private final static String OUT_ID = "id"; - private final static String OUT_TOTAL_COUNT = "totalCount"; - private final static String OUT_ERROR = "errorDetails"; - private String mTemplateName = null; public IndexServlet() { 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 a0587229a..1e4f0913e 100644 --- a/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java @@ -42,7 +42,6 @@ public class PortsServlet extends CMSServlet { * */ private static final long serialVersionUID = -3750153734073658934L; - private final static String INFO = "ports"; public PortsServlet() { } 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 1e1ee44f1..1b7524e19 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java @@ -81,7 +81,6 @@ public class DisplayBySerial extends CMSServlet { * */ private static final long serialVersionUID = -4143700762995036597L; - private final static String INFO = "DisplayBySerial"; private final static String TPL_FILE1 = "displayBySerial.template"; private final static BigInteger MINUS_ONE = new BigInteger("-1"); 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 af91b1cb3..c3a268d14 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java @@ -61,7 +61,6 @@ public class DisplayCRL extends CMSServlet { * */ private static final long serialVersionUID = 1152016798229054027L; - private final static String INFO = "DisplayCRL"; private final static String TPL_FILE = "displayCRL.template"; //private final static String E_TPL_FILE = "error.template"; //private final static String OUT_ERROR = "errorDetails"; 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 8e5df2c14..aac4315e7 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java @@ -18,13 +18,13 @@ package com.netscape.cms.servlet.cert; import java.io.IOException; +import java.math.BigInteger; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; import java.util.Date; import java.util.Enumeration; import java.util.Locale; import java.util.Vector; -import java.math.BigInteger; import javax.servlet.ServletConfig; import javax.servlet.ServletException; @@ -82,7 +82,6 @@ public class DoRevoke extends CMSServlet { * */ private static final long serialVersionUID = 1693115906265904238L; - private final static String INFO = "DoRevoke"; private final static String TPL_FILE = "revocationResult.template"; private ICertificateRepository mCertDB = null; 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 f16ce2526..35bdd5c8c 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java @@ -19,11 +19,11 @@ package com.netscape.cms.servlet.cert; import java.io.IOException; import java.io.OutputStream; +import java.math.BigInteger; import java.util.Date; import java.util.Enumeration; import java.util.Locale; import java.util.Vector; -import java.math.BigInteger; import javax.servlet.ServletConfig; import javax.servlet.ServletException; @@ -73,7 +73,6 @@ public class DoRevokeTPS extends CMSServlet { * */ private static final long serialVersionUID = -2980600514636454836L; - private final static String INFO = "DoRevoke"; private final static String TPL_FILE = "revocationResult.template"; private ICertificateRepository mCertDB = null; 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 6f1346c68..5605acf6d 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java @@ -67,11 +67,11 @@ public class DoUnrevoke extends CMSServlet { * */ private static final long serialVersionUID = -7978703730006036625L; - private final static String INFO = "DoUnrevoke"; private final static String TPL_FILE = "unrevocationResult.template"; - private final static BigInteger MINUS_ONE = new BigInteger("-1"); - private ICertificateRepository mCertDB = null; + @SuppressWarnings("unused") + private ICertificateRepository mCertDB; + private String mFormPath = null; private IRequestQueue mQueue = null; private IPublisherProcessor mPublisherProcessor = null; 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 de5f075ba..7916887f8 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java @@ -64,12 +64,10 @@ public class DoUnrevokeTPS extends CMSServlet { * */ private static final long serialVersionUID = -6245049221697655642L; - private final static String INFO = "DoUnrevoke"; - private final static String TPL_FILE = "unrevocationResult.template"; - private final static BigInteger MINUS_ONE = new BigInteger("-1"); - private ICertificateRepository mCertDB = null; - private String mFormPath = null; + @SuppressWarnings("unused") + private ICertificateRepository mCertDB; + private IRequestQueue mQueue = null; private IPublisherProcessor mPublisherProcessor = null; private String errorString = "error="; @@ -93,7 +91,6 @@ public class DoUnrevokeTPS extends CMSServlet { */ public void init(ServletConfig sc) throws ServletException { super.init(sc); - mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; if (mAuthority instanceof ICertificateAuthority) { mCertDB = ((ICertificateAuthority) mAuthority).getCertificateRepository(); } 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 90d37f15a..a0f73d33b 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java @@ -112,7 +112,6 @@ public class EnrollServlet extends CMSServlet { private static final String CERT_AUTH_SINGLE = "single"; private static final String CLIENT_ISSUER = "clientIssuer"; - private boolean mAuthTokenOverride = true; private String mEnrollSuccessTemplate = null; private ICMSTemplateFiller mEnrollSuccessFiller = new ImportCertsTemplateFiller(); @@ -1698,7 +1697,8 @@ public class EnrollServlet extends CMSServlet { // key usage extension always ends up being digital signature only // and for rsa-ex ends up having no bits set. - private boolean mIsTestBed = false; + @SuppressWarnings("unused") + private boolean mIsTestBed; private void init_testbed_hack(IConfigStore config) throws EBaseException { 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 6c7aefa4d..51b7f783f 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java @@ -69,8 +69,6 @@ public class GetBySerial extends CMSServlet { */ private static final long serialVersionUID = -2276677839178370838L; - private final static String INFO = "GetBySerial"; - private final static String IMPORT_CERT_TEMPLATE = "ImportCert.template"; private String mImportTemplate = null; private String mIETemplate = null; 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 30f0b0c40..bc9f09976 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java @@ -60,9 +60,6 @@ public class GetInfo extends CMSServlet { */ private static final long serialVersionUID = 1909881831730252799L; - private final static String INFO = "GetInfo"; - - private String mFormPath = null; private ICertificateAuthority mCA = null; /** @@ -80,7 +77,6 @@ public class GetInfo extends CMSServlet { public void init(ServletConfig sc) throws ServletException { super.init(sc); - mFormPath = ""; if (mAuthority instanceof ICertificateAuthority) mCA = (ICertificateAuthority) mAuthority; 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 58ff2383c..66d3b4979 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java @@ -117,7 +117,6 @@ public class HashEnrollServlet extends CMSServlet { private static final String CLIENT_ISSUER = "clientIssuer"; public static final String TPL_ERROR_FILE = "/ra/GenErrorHashDirEnroll.template"; - private boolean mAuthTokenOverride = true; private String mEnrollSuccessTemplate = null; private ICMSTemplateFiller mEnrollSuccessFiller = new ImportCertsTemplateFiller(); @@ -139,7 +138,7 @@ public class HashEnrollServlet extends CMSServlet { mTemplates.remove(CMSRequest.SUCCESS); try { mEnrollSuccessTemplate = sc.getInitParameter( - CMSServlet.PROP_SUCCESS_TEMPLATE); + CMSServlet.PROP_SUCCESS_TEMPLATE); if (mEnrollSuccessTemplate == null) mEnrollSuccessTemplate = ENROLL_SUCCESS_TEMPLATE; String fillername = @@ -334,7 +333,7 @@ public class HashEnrollServlet extends CMSServlet { try { authzToken = authorize(mAclMethod, token, - mAuthzResourceName, "import"); + mAuthzResourceName, "import"); } catch (Exception e) { // do nothing for now } @@ -442,12 +441,9 @@ public class HashEnrollServlet extends CMSServlet { // first, make sure the client cert is indeed a // signing only cert - if ((CMS.isSigningCert(sslClientCert) == - false) || - ((CMS.isSigningCert(sslClientCert) == - true) && - (CMS.isEncryptionCert(sslClientCert) == - true))) { + if ((CMS.isSigningCert(sslClientCert) == false) || + ((CMS.isSigningCert(sslClientCert) == true) && + (CMS.isEncryptionCert(sslClientCert) == true))) { // either it's not a signing cert, or it's a dual cert log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_INVALID_CERT_TYPE")); @@ -478,7 +474,7 @@ public class HashEnrollServlet extends CMSServlet { + "))(certStatus=VALID))"; ICertRecordList list = mCa.getCertificateRepository().findCertRecordsInList(filter, - null, 10); + null, 10); int size = list.getSize(); Enumeration<ICertRecord> en = list.getCertRecords(0, size - 1); boolean gotEncCert = false; @@ -547,12 +543,9 @@ public class HashEnrollServlet extends CMSServlet { } else if (certauthEnrollType.equals(CERT_AUTH_ENCRYPTION)) { // first, make sure the client cert is indeed a // signing only cert - if ((CMS.isSigningCert(sslClientCert) == - false) || - ((CMS.isSigningCert(sslClientCert) == - true) && - (CMS.isEncryptionCert(sslClientCert) == - true))) { + if ((CMS.isSigningCert(sslClientCert) == false) || + ((CMS.isSigningCert(sslClientCert) == true) && + (CMS.isEncryptionCert(sslClientCert) == true))) { // either it's not a signing cert, or it's a dual cert log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_INVALID_CERT_TYPE")); 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 884616fe9..814bd4209 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java +++ b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java @@ -62,7 +62,6 @@ public class Monitor extends CMSServlet { */ private static final long serialVersionUID = -8492837942132357692L; private final static String TPL_FILE = "monitor.template"; - private final static String INFO = "Monitor"; private ICertificateRepository mCertDB = null; private IRequestQueue mQueue = null; 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 2783656ae..c76181aa1 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java @@ -62,7 +62,6 @@ public class RemoteAuthConfig extends CMSServlet { * */ private static final long serialVersionUID = -5803015919915253940L; - private final static String INFO = "RemoteAuthConfig"; private final static String TPL_FILE = "remoteAuthConfig.template"; private final static String ENABLE_REMOTE_CONFIG = "enableRemoteConfiguration"; private final static String REMOTELY_SET_INSTANCES = "remotelySetInstances"; 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 45b02969d..d538ce675 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java +++ b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java @@ -18,7 +18,6 @@ package com.netscape.cms.servlet.cert; import java.io.IOException; -import java.math.BigInteger; import java.security.PublicKey; import java.util.Calendar; import java.util.Date; @@ -72,8 +71,6 @@ public class SrchCerts extends CMSServlet { */ private static final long serialVersionUID = -5876805830088921643L; private final static String TPL_FILE = "srchCert.template"; - private final static String INFO = "SrchCerts"; - private final static BigInteger MINUS_ONE = new BigInteger("-1"); private final static String PROP_MAX_SEARCH_RETURNS = "maxSearchReturns"; private final static String CURRENT_TIME = "currentTime"; 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 6be6d506c..bd12bcfd8 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java +++ b/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java @@ -70,7 +70,6 @@ public class UpdateCRL extends CMSServlet { * */ private static final long serialVersionUID = -1182106454856991246L; - private final static String INFO = "UpdateCRL"; private final static String TPL_FILE = "updateCRL.template"; private static Vector<String> mTesting = new Vector<String>(); 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 3dae379a1..6e580896e 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java +++ b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java @@ -68,7 +68,6 @@ public class UpdateDir extends CMSServlet { * */ private static final long serialVersionUID = 3063889978908136789L; - private final static String INFO = "UpdateDir"; private final static String TPL_FILE = "updateDir.template"; private final static int UPDATE_ALL = 0; private final static int UPDATE_CRL = 1; 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 e56651ed8..dc0b0c474 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 @@ -171,8 +171,6 @@ public class CRSEnrollment extends HttpServlet { private static final String PROP_SUBSTORENAME = "substorename"; private static final String PROP_AUTHORITY = "authority"; - private static final String PROP_CRS = "crs"; - private static final String PROP_CRSCA = "casubsystem"; private static final String PROP_CRSAUTHMGR = "authName"; private static final String PROP_APPENDDN = "appendDN"; private static final String PROP_CREATEENTRY = "createEntry"; @@ -1938,7 +1936,9 @@ public class CRSEnrollment extends HttpServlet { private Enumeration<?> externalTokens = null; private org.mozilla.jss.crypto.X509Certificate signingCert; private org.mozilla.jss.crypto.PrivateKey signingCertPrivKey; - private int signingCertKeySize = 0; + + @SuppressWarnings("unused") + private int signingCertKeySize; class CryptoContextException extends Exception { /** 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 e0716cb70..a27a3dd43 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java @@ -53,6 +53,7 @@ public class CMSFileLoader { private int mClearSize = CLEAR_SIZE; // whether to cache templates and forms only. + @SuppressWarnings("unused") private boolean mCacheTemplatesOnly = true; public CMSFileLoader() { 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 157d5e3d1..8d03ca37c 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java @@ -49,7 +49,6 @@ public class CMSGateway { public final static String PROP_CMSGATEWAY = "cmsgateway"; private final static String PROP_ENABLE_ADMIN_ENROLL = "enableAdminEnroll"; - private final static String PROP_SERVER_XML = "server.xml"; public static final String CERT_ATTR = "javax.servlet.request.X509Certificate"; 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 6d51c8d4c..0188b781a 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java @@ -28,7 +28,6 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.io.UnsupportedEncodingException; import java.math.BigInteger; -import java.util.Date; import java.util.Enumeration; import javax.servlet.ServletOutputStream; @@ -55,11 +54,6 @@ public class CMSTemplate extends CMSFile { * variables *==========================================================*/ - /* private variables */ - private String mTemplateFileName = ""; - private ILogger mLogger = CMS.getLogger(); - private long mTimeStamp; - /* public vaiables */ public String mPreOutput; public String mPostOutput; @@ -120,11 +114,6 @@ public class CMSTemplate extends CMSFile { CMS.getLogMessage("CMSGW_TEMPLATE_NO_CONTENT_1", mAbsPath)); } - /* time stamp */ - Date now = CMS.getCurrentDate(); - - mTimeStamp = now.getTime(); - /* if template file, find template tag substring and set * pre/post output string */ 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 ced916541..53ddc4c88 100644 --- a/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java @@ -37,15 +37,12 @@ import com.netscape.certsrv.base.ISubsystem; */ public class IndexTemplateFiller implements ICMSTemplateFiller { - private final static String INFO = "index"; - // input parameters // output parameters private final static String OUT_TYPE = "type"; private final static String OUT_ID = "id"; private final static String OUT_TOTAL_COUNT = "totalCount"; - private final static String OUT_ERROR = "errorDetails"; public IndexTemplateFiller() { } 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 e8b8f12f8..63a078a84 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java @@ -94,8 +94,6 @@ public class ConnectorServlet extends CMSServlet { protected ILogger mSignedAuditLogger = CMS.getSignedAuditLogger(); private final static String SIGNED_AUDIT_PROTECTION_METHOD_SSL = "ssl"; - private final static String SIGNED_AUDIT_PROTECTION_METHOD_UNKNOWN = - "unknown"; private final static String LOGGING_SIGNED_AUDIT_INTER_BOUNDARY_SUCCESS = "LOGGING_SIGNED_AUDIT_INTER_BOUNDARY_SUCCESS_5"; private final static String LOGGING_SIGNED_AUDIT_PROFILE_CERT_REQUEST = diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java index 634be8748..74d1069eb 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java @@ -55,7 +55,9 @@ import com.netscape.cmsutil.crypto.CryptoUtil; public class CertRequestPanel extends WizardPanelBase { private Vector<Cert> mCerts = null; - private WizardServlet mServlet = null; + + @SuppressWarnings("unused") + private WizardServlet mServlet; public CertRequestPanel() { } 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 9a780cca8..046fb111d 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java @@ -42,7 +42,6 @@ public class CheckIdentity extends CMSServlet { */ private static final long serialVersionUID = 1647682040815275807L; private final static String SUCCESS = "0"; - private final static String FAILED = "1"; public CheckIdentity() { super(); 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 808cfa523..57a1e6202 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java @@ -40,8 +40,6 @@ public class DownloadPKCS12 extends CMSServlet { * */ private static final long serialVersionUID = -7770226137155537526L; - private final static String SUCCESS = "0"; - private final static String FAILED = "1"; private final static String AUTH_FAILURE = "2"; public DownloadPKCS12() { 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 c956e733a..8cc0f85d6 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java @@ -46,7 +46,6 @@ public class GetCertChain extends CMSServlet { */ private static final long serialVersionUID = -356806997334418285L; private final static String SUCCESS = "0"; - private final static String FAILED = "1"; public GetCertChain() { super(); 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 e16f99f4f..c0a57c3d7 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java @@ -52,7 +52,6 @@ public class GetCookie extends CMSServlet { */ private static final long serialVersionUID = 2466968231929541707L; private static Random mRandom = null; - private final static int SESSION_MAX_AGE = 3600; private String mErrorFormPath = null; private String mFormPath = null; 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 21baefcb0..998a4b162 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java @@ -41,8 +41,6 @@ public class GetStatus extends CMSServlet { * */ private static final long serialVersionUID = -2852842030221659847L; - private final static String SUCCESS = "0"; - private final static String FAILED = "1"; public GetStatus() { super(); 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 85f274404..b894971b1 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java @@ -45,7 +45,6 @@ public class GetSubsystemCert extends CMSServlet { */ private static final long serialVersionUID = -5720342238234153488L; private final static String SUCCESS = "0"; - private final static String FAILED = "1"; public GetSubsystemCert() { super(); 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 28c3b242d..2f44ca1b0 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java @@ -43,7 +43,6 @@ public class GetTokenInfo extends CMSServlet { */ private static final long serialVersionUID = -8416582986909026263L; private final static String SUCCESS = "0"; - private final static String FAILED = "1"; public GetTokenInfo() { super(); 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 847ca3486..ae5edf617 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java @@ -52,7 +52,6 @@ public class GetTransportCert extends CMSServlet { */ private static final long serialVersionUID = 2495152202191979339L; private final static String SUCCESS = "0"; - private final static String FAILED = "1"; private final static String AUTH_FAILURE = "2"; public GetTransportCert() { 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 dd648e8c5..859ba845e 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java @@ -51,7 +51,6 @@ public class ImportTransportCert extends CMSServlet { */ private static final long serialVersionUID = 7490067757951541235L; private final static String SUCCESS = "0"; - private final static String FAILED = "1"; private final static String AUTH_FAILURE = "2"; public ImportTransportCert() { diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java index 1d833ca9b..db70d7729 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java @@ -42,8 +42,6 @@ public class MainPageServlet extends CMSServlet { * */ private static final long serialVersionUID = 2425301522251239666L; - private static final String PROP_AUTHORITY_ID = "authorityId"; - private String mAuthorityId = null; private String mFormPath = null; public MainPageServlet() { 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 4ea150ea2..d2cf540c3 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java @@ -63,7 +63,6 @@ public class RegisterUser extends CMSServlet { */ private static final long serialVersionUID = -699307373400031138L; private final static String SUCCESS = "0"; - private final static String FAILED = "1"; private final static String AUTH_FAILURE = "2"; private String mGroupName = null; private final static String LOGGING_SIGNED_AUDIT_CONFIG_ROLE = 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 4c6338751..745962c72 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java @@ -43,7 +43,6 @@ public class TokenAuthenticate extends CMSServlet { */ private static final long serialVersionUID = -9098593390260940853L; private final static String SUCCESS = "0"; - private final static String FAILED = "1"; public TokenAuthenticate() { super(); 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 2698da7d9..240468d03 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java @@ -51,7 +51,6 @@ public class UpdateConnector extends CMSServlet { */ private static final long serialVersionUID = 972871860008509849L; private final static String SUCCESS = "0"; - private final static String FAILED = "1"; private final static String AUTH_FAILURE = "2"; public UpdateConnector() { 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 ff3666f2a..eb88a1c31 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java @@ -51,7 +51,6 @@ public class UpdateNumberRange extends CMSServlet { */ private static final long serialVersionUID = -1584171713024263331L; private final static String SUCCESS = "0"; - private final static String FAILED = "1"; private final static String AUTH_FAILURE = "2"; private final static String LOGGING_SIGNED_AUDIT_CONFIG_SERIAL_NUMBER = "LOGGING_SIGNED_AUDIT_CONFIG_SERIAL_NUMBER_1"; 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 30e0b0fce..e1b33ea6a 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java @@ -47,7 +47,6 @@ public class UpdateOCSPConfig extends CMSServlet { */ private static final long serialVersionUID = 42812270761684404L; private final static String SUCCESS = "0"; - private final static String FAILED = "1"; private final static String AUTH_FAILURE = "2"; public UpdateOCSPConfig() { 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 4ee751f1a..008b372e2 100644 --- a/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java @@ -59,18 +59,8 @@ public class ExamineRecovery extends CMSServlet { private final static String INFO = "examineRecovery"; private final static String TPL_FILE = "examineRecovery.template"; - private final static String IN_SERIALNO = "serialNumber"; - private final static String IN_UID = "uid"; - private final static String IN_PWD = "pwd"; - private final static String IN_PASSWORD = "p12Password"; - private final static String IN_DELIVERY = "p12Delivery"; - private final static String IN_CERT = "cert"; - private final static String OUT_OP = "op"; - private final static String OUT_SERIALNO = IN_SERIALNO; - private final static String OUT_RECOVERY_SUCCESS = "recoverySuccess"; private final static String OUT_SERVICE_URL = "serviceURL"; - private final static String OUT_ERROR = "errorDetails"; private IKeyService mService = null; private String mFormPath = null; 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 4989c1245..5926a5672 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java +++ b/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java @@ -59,9 +59,6 @@ public class GetApprovalStatus extends CMSServlet { private final static String TPL_FILE = "getApprovalStatus.template"; private final static String TPL_FINISH = "finishRecovery.template"; - private final static String IN_DELIVERY = "p12Delivery"; - - private final static String OUT_RECOVERY_SUCCESS = "recoverySuccess"; private final static String OUT_ERROR = "errorDetails"; private final static String OUT_STATUS = "status"; 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 dfc7d4d3b..65f8d2936 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java +++ b/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java @@ -59,11 +59,9 @@ public class GetAsyncPk12 extends CMSServlet { private final static String IN_PASSWORD = "p12Password"; private final static String IN_PASSWORD_AGAIN = "p12PasswordAgain"; - private final static String OUT_RECOVERY_SUCCESS = "recoverySuccess"; private final static String OUT_ERROR = "errorDetails"; private com.netscape.certsrv.kra.IKeyService mService = null; - private final static String OUT_STATUS = "status"; private final static String LOGGING_SIGNED_AUDIT_PRIVATE_KEY_EXPORT_REQUEST_PROCESSED_SUCCESS = "LOGGING_SIGNED_AUDIT_PRIVATE_KEY_EXPORT_REQUEST_PROCESSED_SUCCESS_4"; 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 fdcbf40bc..e22a19b82 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GetPk12.java +++ b/base/common/src/com/netscape/cms/servlet/key/GetPk12.java @@ -58,11 +58,9 @@ public class GetPk12 extends CMSServlet { private final static String TPL_FILE = "finishRecovery.template"; - private final static String OUT_RECOVERY_SUCCESS = "recoverySuccess"; private final static String OUT_ERROR = "errorDetails"; private com.netscape.certsrv.kra.IKeyService mService = null; - private final static String OUT_STATUS = "status"; private final static String LOGGING_SIGNED_AUDIT_PRIVATE_KEY_EXPORT_REQUEST_PROCESSED_SUCCESS = "LOGGING_SIGNED_AUDIT_PRIVATE_KEY_EXPORT_REQUEST_PROCESSED_SUCCESS_4"; 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 fee739f29..5b5aaaf8e 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java @@ -53,14 +53,7 @@ public class GrantAsyncRecovery extends CMSServlet { private final static String INFO = "grantAsyncRecovery"; private final static String TPL_FILE = "grantAsyncRecovery.template"; - private final static String IN_SERIALNO = "serialNumber"; - private final static String IN_REQ_ID = "reqID"; - private final static String IN_UID = "uid"; - private final static String IN_CERT = "cert"; - private final static String OUT_OP = "op"; - private final static String OUT_SERIALNO = IN_SERIALNO; - private final static String OUT_RECOVERY_SUCCESS = "recoverySuccess"; private final static String OUT_SERVICE_URL = "serviceURL"; private final static String OUT_ERROR = "errorDetails"; 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 9c4ccc8be..e75e334ba 100644 --- a/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java @@ -55,16 +55,7 @@ public class GrantRecovery extends CMSServlet { private final static String INFO = "grantRecovery"; private final static String TPL_FILE = "grantRecovery.template"; - private final static String IN_SERIALNO = "serialNumber"; - private final static String IN_UID = "uid"; - private final static String IN_PWD = "pwd"; - private final static String IN_PASSWORD = "p12Password"; - private final static String IN_DELIVERY = "p12Delivery"; - private final static String IN_CERT = "cert"; - private final static String OUT_OP = "op"; - private final static String OUT_SERIALNO = IN_SERIALNO; - private final static String OUT_RECOVERY_SUCCESS = "recoverySuccess"; private final static String OUT_SERVICE_URL = "serviceURL"; private final static String OUT_ERROR = "errorDetails"; 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 bedfa911d..97ae1f4fb 100644 --- a/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java @@ -73,7 +73,6 @@ public class RecoverBySerial extends CMSServlet { private final static String OUT_OP = "op"; private final static String OUT_SERIALNO = IN_SERIALNO; - private final static String OUT_RECOVERY_SUCCESS = "recoverySuccess"; private final static String OUT_SERVICE_URL = "serviceURL"; private final static String OUT_ERROR = "errorDetails"; 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 c3e6bba53..adb201c75 100644 --- a/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java @@ -71,7 +71,6 @@ public class SrchKeyForRecovery extends CMSServlet { private final static String OUT_MAXCOUNT = IN_MAXCOUNT; private final static String OUT_SENTINEL = IN_SENTINEL; private final static String OUT_OP = "op"; - private final static String OUT_ERROR = "errorDetails"; private final static String OUT_ARCHIVER = "archiverName"; private final static String OUT_SERVICE_URL = "serviceURL"; private final static String OUT_TOTAL_COUNT = "totalRecordCount"; 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 4d46e8a75..2fbd55460 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java @@ -63,6 +63,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; */ public class CRMFProcessor extends PKIProcessor { + @SuppressWarnings("unused") private CMSRequest mRequest; private boolean enforcePop = false; 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 fed0b1ee2..6acc1634c 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java @@ -49,10 +49,6 @@ public class ProfileListServlet extends ProfileServlet { */ private static final long serialVersionUID = -5118812083812548395L; - private static final String PROP_AUTHORITY_ID = "authorityId"; - - private String mAuthorityId = null; - public ProfileListServlet() { super(); } @@ -65,7 +61,6 @@ public class ProfileListServlet extends ProfileServlet { */ public void init(ServletConfig sc) throws ServletException { super.init(sc); - mAuthorityId = sc.getInitParameter(PROP_AUTHORITY_ID); } /** 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 9eac8eebd..e975161da 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java @@ -128,7 +128,6 @@ public class ProfileServlet extends CMSServlet { public final static String ARG_OUTPUT_VAL = "outputVal"; private static final String PROP_TEMPLATE = "templatePath"; - private static final String PROP_AUTH_MGR_ID = "authMgrId"; private final static String PROP_AUTHMGR = "AuthMgr"; private final static String PROP_CLIENTAUTH = "GetClientCert"; private static final String PROP_PROFILE_SUB_ID = "profileSubId"; @@ -146,7 +145,6 @@ public class ProfileServlet extends CMSServlet { private final static String HDR_LANG = "accept-language"; private String mTemplate = null; - private String mAuthMgrId = null; protected String mId = null; protected String mGetClientCert = "false"; 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 93e5b6a4b..16fa2a394 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java @@ -77,22 +77,11 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { private static final long serialVersionUID = -8017841111435988197L; private static final String ARG_AUTH_TOKEN = "auth_token"; private static final String PROP_PROFILE_ID = "profileId"; - private static final String PROP_AUTHORITY_ID = "authorityId"; - private String mOutputTemplateClassName = null; private String mProfileId = null; private String mProfileSubId = null; - private String mReqType = null; - private String mAuthorityId = null; - private String requestBinary = null; private String requestB64 = null; - private final static String[] SIGNED_AUDIT_AUTOMATED_REJECTION_REASON = new String[] { - - /* 0 */"automated profile cert request rejection: " - + "indeterminate reason for inability to process " - + "cert request due to an EBaseException" - }; private final static String LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED = "LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED_5"; @@ -111,9 +100,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { */ public void init(ServletConfig sc) throws ServletException { super.init(sc); - mAuthorityId = sc.getInitParameter(PROP_AUTHORITY_ID); mProfileId = sc.getInitParameter(PROP_PROFILE_ID); - mOutputTemplateClassName = sc.getInitParameter("outputTemplateClass"); mRenderResult = false; } 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 7292be519..85ef4fa0f 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java @@ -92,7 +92,6 @@ public class ProfileSubmitServlet extends ProfileServlet { private String mProfileId = null; private String mProfileSubId = null; - private String mReqType = null; private String mAuthorityId = null; private final static String[] SIGNED_AUDIT_AUTOMATED_REJECTION_REASON = new String[] { 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 1733998aa..11716115f 100644 --- a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java +++ b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java @@ -92,16 +92,10 @@ public class CertReqParser extends ReqParser { private static final String EXT_PRETTYPRINT = "ext_prettyprint"; - private static final String DOT = "."; private static final String LB = "["; private static final String RB = "]"; private static final String EQ = " = "; - private static final String HTTP_PARAMS_COUNTER = IRequest.HTTP_PARAMS + LB + "httpParamsCount++" + RB; - private static final String HTTP_HEADERS_COUNTER = IRequest.HTTP_HEADERS + LB + "httpHeadersCount++" + RB; - private static final String AUTH_TOKEN_COUNTER = IRequest.AUTH_TOKEN + LB + "authTokenCount++" + RB; - private static final String SERVER_ATTRS_COUNTER = IRequest.SERVER_ATTRS + LB + "serverAttrsCount++" + RB; - /** * Fills in certificate specific request attributes. */ 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 41e6523a5..fd305add2 100644 --- a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java +++ b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java @@ -21,12 +21,12 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; +import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.cert.X509Certificate; import java.util.Locale; import java.util.StringTokenizer; -import java.math.BigInteger; import javax.servlet.ServletConfig; import javax.servlet.ServletException; @@ -92,13 +92,10 @@ public class CheckRequest extends CMSServlet { private static final long serialVersionUID = 2791195859767119636L; // constants public static String FULL_RESPONSE = "cmcFullEnrollmentResponse"; - private final static String INFO = "CheckRequest"; private final static String REQ_ID = "requestId"; - private final static String REQ_TYPE = "requestType"; private final static String STATUS = "status"; private final static String CREATE_ON = "createdOn"; private final static String UPDATE_ON = "updatedOn"; - private final static String UPDATE_BY = "updatedBy"; private final static String TPL_FILE = "requestStatus.template"; diff --git a/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java b/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java index c324e4a1f..fa33f3eb1 100644 --- a/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java +++ b/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java @@ -77,7 +77,6 @@ import com.netscape.cms.servlet.common.CMSRequest; import com.netscape.cms.servlet.common.CMSTemplate; import com.netscape.cms.servlet.common.CMSTemplateParams; import com.netscape.cms.servlet.common.ECMSGWException; -import com.netscape.cms.servlet.common.ICMSTemplateFiller; import com.netscape.cmsutil.util.Utils; /** @@ -93,9 +92,7 @@ public class ProcessCertReq extends CMSServlet { * */ private static final long serialVersionUID = 812464895240811318L; - private final static String INFO = "processReq"; private final static String SEQNUM = "seqNum"; - private final static String TO_DO = "toDo"; private final static String TPL_FILE = "processCertReq.template"; private IRequestQueue mQueue = null; @@ -108,9 +105,7 @@ public class ProcessCertReq extends CMSServlet { private final static String REQ_COMPLETED_TEMPLATE = "ra/RequestCompleted.template"; private final static String PROP_REQ_COMPLETED_TEMPLATE = "requestCompletedTemplate"; private final static String PROP_EXTRA_AGENT_PARAMS = "extraAgentParams"; - private static ICMSTemplateFiller REQ_COMPLETED_FILLER = new RAReqCompletedFiller(); private String mReqCompletedTemplate = null; - private final static String CERT_TYPE = "certType"; private String auditServiceID = ILogger.UNIDENTIFIED; private final static String AGENT_CA_CLONE_ENROLLMENT_SERVLET = 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 bf8decd69..dc61e1e02 100644 --- a/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java +++ b/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java @@ -18,8 +18,8 @@ package com.netscape.cms.servlet.request; import java.io.IOException; -import java.util.Locale; import java.math.BigInteger; +import java.util.Locale; import javax.servlet.ServletConfig; import javax.servlet.ServletException; @@ -61,11 +61,9 @@ public class ProcessReq extends CMSServlet { * */ private static final long serialVersionUID = -6941843162486565610L; - private final static String INFO = "processReq"; private final static String SEQNUM = "seqNum"; private final static String DO_ASSIGN = "doAssign"; private final static String TPL_FILE = "processReq.template"; - private final static String OUT_ERROR = "errorDetails"; private final static String PROP_PARSER = "parser"; private IRequestQueue mQueue = null; @@ -73,9 +71,6 @@ public class ProcessReq extends CMSServlet { private IReqParser mParser = null; private String[] mSigningAlgorithms = null; - private static String[] DEF_SIGNING_ALGORITHMS = new String[] - { "SHA1withRSA", "SHA256withRSA", "SHA512withRSA", "SHA1withDSA", "MD5withRSA", "MD2withRSA" }; - /** * Process request. */ 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 f18fabc6a..f1e8ec8b1 100644 --- a/base/common/src/com/netscape/cms/servlet/request/QueryReq.java +++ b/base/common/src/com/netscape/cms/servlet/request/QueryReq.java @@ -18,10 +18,10 @@ package com.netscape.cms.servlet.request; import java.io.IOException; +import java.math.BigInteger; import java.util.Enumeration; import java.util.Locale; import java.util.Vector; -import java.math.BigInteger; import javax.servlet.ServletConfig; import javax.servlet.ServletException; @@ -56,7 +56,6 @@ public class QueryReq extends CMSServlet { */ private static final long serialVersionUID = -8729364426329835378L; // constants - private final static String INFO = "QueryReq"; private final static String IN_SHOW_ALL = "showAll"; private final static String IN_SHOW_WAITING = "showWaiting"; private final static String IN_SHOW_IN_SERVICE = "showInService"; @@ -66,35 +65,17 @@ public class QueryReq extends CMSServlet { private final static String IN_SHOW_COMPLETED = "showCompleted"; private final static String IN_MAXCOUNT = "maxCount"; private final static String IN_TOTALCOUNT = "totalRecordCount"; - private final static String ON = "on"; private final static String PROP_PARSER = "parser"; private final static String TPL_FILE = "queryReq.template"; - private final static String OUT_SERVICE_URL = "serviceURL"; - private final static String OUT_OP = "op"; - private final static String OUT_MAXCOUNT = IN_MAXCOUNT; private final static String OUT_TOTALCOUNT = IN_TOTALCOUNT; private final static String OUT_CURRENTCOUNT = "currentRecordCount"; - private final static String OUT_SENTINEL_DOWN = "querySentinelDown"; - private final static String OUT_SHOW_COMPLETED = IN_SHOW_COMPLETED; - private final static String OUT_SEQNUM = "seqNum"; - private final static String OUT_STATUS = "status"; - private final static String OUT_CREATE_ON = "createdOn"; - private final static String OUT_UPDATE_ON = "updatedOn"; - private final static String OUT_UPDATE_BY = "updatedBy"; private final static String OUT_REQUESTING_USER = "requestingUser"; //keeps track of where to begin if page down private final static String OUT_FIRST_ENTRY_ON_PAGE = "firstEntryOnPage"; //keeps track of where to begin if page up private final static String OUT_LAST_ENTRY_ON_PAGE = "lastEntryOnPage"; - private final static String OUT_SUBJECT = "subject"; - private final static String OUT_REQUEST_TYPE = "requestType"; - private final static String OUT_COMMENTS = "requestorComments"; - private final static String OUT_SERIALNO = "serialNumber"; - private final static String OUT_OWNER_NAME = "ownerName"; - private final static String OUT_PUBLIC_KEY_INFO = - "subjectPublicKeyInfo"; private final static String OUT_ERROR = "error"; private final static String OUT_AUTHORITY_ID = "authorityid"; 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 02dac53f9..10daeeb08 100644 --- a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java +++ b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java @@ -18,7 +18,6 @@ package com.netscape.cms.servlet.request; import java.io.IOException; -import java.math.BigInteger; import java.util.Date; import java.util.Locale; @@ -59,19 +58,11 @@ public class SearchReqs extends CMSServlet { */ private static final long serialVersionUID = 2449481964851735051L; private final static String TPL_FILE = "queryReq.template"; - private final static String INFO = "QueryReq"; private final static String PROP_MAX_SEARCH_RETURNS = "maxSearchReqReturns"; private final static String PROP_PARSER = "parser"; private final static String CURRENT_TIME = "currentTime"; - private final static BigInteger MINUS_ONE = new BigInteger("-1"); - private final static String OUT_AUTHORITY_ID = "authorityid"; - private final static String OUT_REQUESTING_USER = "requestingUser"; - private final static String OUT_SEQNUM_FROM = "seqNumFrom"; - private final static String OUT_MAXCOUNT = "maxCount"; private final static String OUT_TOTALCOUNT = "totalRecordCount"; private final static String OUT_CURRENTCOUNT = "currentRecordCount"; - private final static String OUT_SENTINEL = "querySentinel"; - private final static String OUT_ERROR = "error"; private final static int MAX_RESULTS = 1000; private IRequestQueue mQueue = null; 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 ea0b10a67..ee6913acc 100644 --- a/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java +++ b/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java @@ -44,7 +44,6 @@ import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IPrettyPrintFormat; import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.tks.ITKSAuthority; import com.netscape.cms.servlet.base.CMSServlet; import com.netscape.cms.servlet.common.CMSRequest; import com.netscape.symkey.SessionKey; @@ -66,13 +65,8 @@ public class TokenServlet extends CMSServlet { protected static final String TRANSPORT_KEY_NAME = "sharedSecret"; private final static String INFO = "TokenServlet"; public static int ERROR = 1; - private ITKSAuthority mTKS = null; - private String mSelectedToken = null; - private String mNewSelectedToken = null; String mKeyNickName = null; String mNewKeyNickName = null; - private final static String LOGGING_SIGNED_AUDIT_CONFIG_DRM = - "LOGGING_SIGNED_AUDIT_CONFIG_DRM_3"; IPrettyPrintFormat pp = CMS.getPrettyPrintFormat(":"); private final static String LOGGING_SIGNED_AUDIT_COMPUTE_SESSION_KEY_REQUEST = @@ -177,9 +171,6 @@ public class TokenServlet extends CMSServlet { } CMS.debug("keySet selected: " + keySet); - mNewSelectedToken = null; - - mSelectedToken = CMS.getConfigStore().getString("tks.defaultSlot"); String masterKeyPrefix = CMS.getConfigStore().getString("tks.master_key_prefix", null); String temp = req.getParameter("KeyInfo"); //#xx#xx String keyInfoMap = "tks." + keySet + ".mk_mappings." + temp; @@ -190,9 +181,7 @@ public class TokenServlet extends CMSServlet { while (st.hasMoreTokens()) { String currentToken = st.nextToken(); - if (tokenNumber == 0) - mSelectedToken = currentToken; - else if (tokenNumber == 1) + if (tokenNumber == 1) mKeyNickName = currentToken; tokenNumber++; @@ -208,9 +197,7 @@ public class TokenServlet extends CMSServlet { int tokenNumber = 0; while (st.hasMoreTokens()) { String currentToken = st.nextToken(); - if (tokenNumber == 0) - mNewSelectedToken = currentToken; - else if (tokenNumber == 1) + if (tokenNumber == 1) mNewKeyNickName = currentToken; tokenNumber++; @@ -1314,7 +1301,6 @@ public class TokenServlet extends CMSServlet { } String temp = req.getParameter("card_challenge"); - mSelectedToken = CMS.getConfigStore().getString("tks.defaultSlot"); setDefaultSlotAndKeyName(req); if (temp != null) { processComputeSessionKey(req, resp); |