From 3aca1361a007f83c7d4778545c8ec6eaabf13079 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Mon, 9 Apr 2012 13:56:59 -0500
Subject: [PATCH] Removed unused private fields.

Most of unused private fields have been removed because they generate
warnings in Eclipse. Some are kept because it might be useful later.

Ticket #139
---
 base/ca/src/com/netscape/ca/CMSCRLExtensions.java  |    3 +-
 base/ca/src/com/netscape/ca/CRLIssuingPoint.java   |   11 ++----
 base/ca/src/com/netscape/ca/SigningUnit.java       |    3 +-
 .../src/com/netscape/certsrv/base/ASubsystem.java  |    1 +
 .../netscape/certsrv/request/ARequestNotifier.java |    1 -
 .../netscape/cms/authentication/AVAPattern.java    |    2 -
 .../authentication/AgentCertAuthentication.java    |    5 ---
 .../cms/authentication/HashAuthentication.java     |    7 +---
 .../SSLclientCertAuthentication.java               |    6 ---
 .../cms/authentication/TokenAuthentication.java    |    7 ----
 .../authentication/UidPwdPinDirAuthentication.java |    3 --
 .../netscape/cms/authorization/BasicAclAuthz.java  |    6 +---
 .../cms/evaluators/UserOrigReqAccessEvaluator.java |    2 -
 .../netscape/cms/jobs/RenewalNotificationJob.java  |    1 -
 .../netscape/cms/listeners/PinRemovalListener.java |    4 --
 .../src/com/netscape/cms/logging/LogFile.java      |    2 -
 .../com/netscape/cms/logging/RollingLogFile.java   |   10 +-----
 .../src/com/netscape/cms/ocsp/LDAPStore.java       |    1 -
 .../constraints/AttributePresentConstraints.java   |    7 ----
 .../cms/policy/extensions/PresenceExt.java         |    3 +-
 .../cms/profile/constraint/ValidityConstraint.java |    3 --
 .../profile/def/InhibitAnyPolicyExtDefault.java    |    1 -
 .../cms/profile/updater/SubsystemGroupUpdater.java |   11 +-----
 .../netscape/cms/publish/mappers/AVAPattern.java   |    6 ---
 .../cms/publish/mappers/MapAVAPattern.java         |    1 -
 .../publish/publishers/LdapCaCertPublisher.java    |    1 -
 .../publishers/LdapEncryptCertPublisher.java       |    2 -
 .../cms/servlet/admin/ACLAdminServlet.java         |   11 ------
 .../netscape/cms/servlet/admin/AdminServlet.java   |    1 -
 .../cms/servlet/admin/AuthAdminServlet.java        |    1 -
 .../cms/servlet/admin/CMSAdminServlet.java         |    2 -
 .../cms/servlet/admin/JobsAdminServlet.java        |    1 -
 .../cms/servlet/admin/LogAdminServlet.java         |    5 ---
 .../cms/servlet/admin/ProfileAdminServlet.java     |    7 ----
 .../cms/servlet/admin/PublisherAdminServlet.java   |    5 ---
 .../cms/servlet/admin/RegistryAdminServlet.java    |    8 -----
 .../com/netscape/cms/servlet/base/CMSServlet.java  |    1 -
 .../cms/servlet/base/DynamicVariablesServlet.java  |    7 ++--
 .../netscape/cms/servlet/base/IndexServlet.java    |    8 -----
 .../netscape/cms/servlet/base/PortsServlet.java    |    1 -
 .../netscape/cms/servlet/cert/DisplayBySerial.java |    1 -
 .../com/netscape/cms/servlet/cert/DisplayCRL.java  |    1 -
 .../com/netscape/cms/servlet/cert/DoRevoke.java    |    3 +-
 .../com/netscape/cms/servlet/cert/DoRevokeTPS.java |    3 +-
 .../com/netscape/cms/servlet/cert/DoUnrevoke.java  |    6 ++--
 .../netscape/cms/servlet/cert/DoUnrevokeTPS.java   |    9 ++---
 .../netscape/cms/servlet/cert/EnrollServlet.java   |    4 +-
 .../com/netscape/cms/servlet/cert/GetBySerial.java |    2 -
 .../src/com/netscape/cms/servlet/cert/GetInfo.java |    4 --
 .../cms/servlet/cert/HashEnrollServlet.java        |   25 +++++---------
 .../src/com/netscape/cms/servlet/cert/Monitor.java |    1 -
 .../cms/servlet/cert/RemoteAuthConfig.java         |    1 -
 .../com/netscape/cms/servlet/cert/SrchCerts.java   |    3 --
 .../com/netscape/cms/servlet/cert/UpdateCRL.java   |    1 -
 .../com/netscape/cms/servlet/cert/UpdateDir.java   |    1 -
 .../cms/servlet/cert/scep/CRSEnrollment.java       |    6 ++--
 .../netscape/cms/servlet/common/CMSFileLoader.java |    1 +
 .../netscape/cms/servlet/common/CMSGateway.java    |    1 -
 .../netscape/cms/servlet/common/CMSTemplate.java   |   11 ------
 .../cms/servlet/common/IndexTemplateFiller.java    |    3 --
 .../cms/servlet/connector/ConnectorServlet.java    |    2 -
 .../cms/servlet/csadmin/CertRequestPanel.java      |    4 ++-
 .../cms/servlet/csadmin/CheckIdentity.java         |    1 -
 .../cms/servlet/csadmin/DownloadPKCS12.java        |    2 -
 .../netscape/cms/servlet/csadmin/GetCertChain.java |    1 -
 .../netscape/cms/servlet/csadmin/GetCookie.java    |    1 -
 .../netscape/cms/servlet/csadmin/GetStatus.java    |    2 -
 .../cms/servlet/csadmin/GetSubsystemCert.java      |    1 -
 .../netscape/cms/servlet/csadmin/GetTokenInfo.java |    1 -
 .../cms/servlet/csadmin/GetTransportCert.java      |    1 -
 .../cms/servlet/csadmin/ImportTransportCert.java   |    1 -
 .../cms/servlet/csadmin/MainPageServlet.java       |    2 -
 .../netscape/cms/servlet/csadmin/RegisterUser.java |    1 -
 .../cms/servlet/csadmin/TokenAuthenticate.java     |    1 -
 .../cms/servlet/csadmin/UpdateConnector.java       |    1 -
 .../cms/servlet/csadmin/UpdateNumberRange.java     |    1 -
 .../cms/servlet/csadmin/UpdateOCSPConfig.java      |    1 -
 .../netscape/cms/servlet/key/ExamineRecovery.java  |   10 ------
 .../cms/servlet/key/GetApprovalStatus.java         |    3 --
 .../com/netscape/cms/servlet/key/GetAsyncPk12.java |    2 -
 .../src/com/netscape/cms/servlet/key/GetPk12.java  |    2 -
 .../cms/servlet/key/GrantAsyncRecovery.java        |    7 ----
 .../netscape/cms/servlet/key/GrantRecovery.java    |    9 -----
 .../netscape/cms/servlet/key/RecoverBySerial.java  |    1 -
 .../cms/servlet/key/SrchKeyForRecovery.java        |    1 -
 .../cms/servlet/processors/CRMFProcessor.java      |    1 +
 .../cms/servlet/profile/ProfileListServlet.java    |    5 ---
 .../cms/servlet/profile/ProfileServlet.java        |    2 -
 .../servlet/profile/ProfileSubmitCMCServlet.java   |   13 --------
 .../cms/servlet/profile/ProfileSubmitServlet.java  |    1 -
 .../cms/servlet/request/CertReqParser.java         |    6 ---
 .../netscape/cms/servlet/request/CheckRequest.java |    5 +--
 .../cms/servlet/request/ProcessCertReq.java        |    5 ---
 .../netscape/cms/servlet/request/ProcessReq.java   |    7 +---
 .../com/netscape/cms/servlet/request/QueryReq.java |   21 +------------
 .../netscape/cms/servlet/request/SearchReqs.java   |    9 -----
 .../com/netscape/cms/servlet/tks/TokenServlet.java |   18 +---------
 .../src/com/netscape/cmscore/apps/CMSEngine.java   |    4 ++-
 .../authentication/CertUserDBAuthentication.java   |    1 -
 .../ChallengePhraseAuthentication.java             |    4 --
 .../SSLClientCertAuthentication.java               |    2 -
 .../netscape/cmscore/base/SimpleProperties.java    |    7 ----
 .../cmscore/connector/HttpConnFactory.java         |    9 +----
 .../netscape/cmscore/connector/HttpConnector.java  |    1 +
 .../cmscore/connector/RequestTransfer.java         |    2 -
 .../cmscore/dbs/CertificateRepository.java         |    5 ++-
 .../src/com/netscape/cmscore/dbs/DBSubsystem.java  |   17 ----------
 .../src/com/netscape/cmscore/dbs/Repository.java   |    1 -
 .../cmscore/extensions/CMSExtensionsMap.java       |    3 +-
 .../com/netscape/cmscore/extensions/KeyUsage.java  |    7 +---
 .../cmscore/ldapconn/LdapBoundConnection.java      |    3 +-
 .../netscape/cmscore/profile/ProfileSubsystem.java |    3 +-
 .../netscape/cmscore/registry/PluginRegistry.java  |    3 +-
 .../netscape/cmscore/request/RequestSubsystem.java |    3 +-
 .../netscape/cmscore/security/JssSubsystem.java    |    6 ---
 .../cmscore/security/KRATransportCert.java         |    6 ---
 .../com/netscape/cmscore/security/KeyCertUtil.java |    4 --
 .../netscape/cmscore/security/RASigningCert.java   |    6 ---
 .../src/com/netscape/cmscore/security/SSLCert.java |    6 ---
 .../cmscore/security/SSLSelfSignedCert.java        |    6 ---
 .../cmscore/selftests/SelfTestSubsystem.java       |    3 +-
 .../src/com/netscape/cmscore/usrgrp/Group.java     |    3 +-
 .../com/netscape/cmscore/usrgrp/UGSubsystem.java   |    4 --
 .../src/com/netscape/cmscore/usrgrp/User.java      |    3 +-
 .../netscape/cmscore/util/ProfileSubsystem.java    |    2 -
 .../src/com/netscape/cmstools/CMCEnroll.java       |    2 -
 .../src/com/netscape/cmstools/CMCRequest.java      |    2 -
 .../src/com/netscape/cmstools/CMCRevoke.java       |    2 -
 .../src/com/netscape/cmstools/DRMTool.java         |    6 ---
 .../src/com/netscape/cmstools/PasswordCache.java   |    3 --
 .../servlet/test/GeneratePKIArchiveOptions.java    |    1 -
 base/kra/src/com/netscape/kra/EncryptionUnit.java  |    1 -
 .../src/com/netscape/kra/EnrollmentService.java    |   33 ++-----------------
 base/kra/src/com/netscape/kra/KRANotify.java       |    3 +-
 .../src/com/netscape/kra/KeyRecoveryAuthority.java |    1 -
 base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java |    2 -
 base/ocsp/src/com/netscape/ocsp/SigningUnit.java   |    3 +-
 .../src/com/netscape/pkisilent/common/CMSLDAP.java |    2 +-
 .../src/com/netscape/pkisilent/common/CMSTask.java |    1 -
 .../com/netscape/pkisilent/common/ComCrypto.java   |    6 ++-
 .../com/netscape/pkisilent/common/Con2Agent.java   |    7 ++--
 .../com/netscape/pkisilent/common/DirEnroll.java   |    9 +----
 .../src/com/netscape/pkisilent/common/Request.java |   32 +++++++++++++++++--
 .../com/netscape/pkisilent/common/ServerInfo.java  |    1 -
 .../com/netscape/pkisilent/common/TestClient.java  |    2 +-
 .../com/netscape/pkisilent/common/UserEnroll.java  |    2 +-
 .../netscape/pkisilent/common/checkRequest.java    |    5 +--
 base/tks/src/com/netscape/tks/TKSAuthority.java    |    1 +
 .../com/netscape/cmsutil/crypto/CryptoUtil.java    |    4 --
 .../src/com/netscape/cmsutil/ocsp/UnknownInfo.java |    2 -
 .../cmsutil/radius/CHAPPasswordAttribute.java      |    2 -
 .../cmsutil/radius/CallbackIdAttribute.java        |    2 -
 .../cmsutil/radius/CallbackNumberAttribute.java    |    2 -
 .../cmsutil/radius/CallerStationIdAttribute.java   |    2 -
 .../cmsutil/radius/CallingStationIdAttribute.java  |    2 -
 .../netscape/cmsutil/radius/FilterIdAttribute.java |    2 -
 .../radius/FramedAppleTalkLinkAttribute.java       |    2 -
 .../radius/FramedAppleTalkNetworkAttribute.java    |    2 -
 .../radius/FramedAppleTalkZoneAttribute.java       |    2 -
 .../cmsutil/radius/FramedCompressionAttribute.java |    2 -
 .../cmsutil/radius/FramedIPAddressAttribute.java   |    2 -
 .../cmsutil/radius/FramedIPNetmaskAttribute.java   |    2 -
 .../cmsutil/radius/FramedIPXNetworkAttribute.java  |    2 -
 .../cmsutil/radius/FramedMTUAttribute.java         |    2 -
 .../cmsutil/radius/FramedProtocolAttribute.java    |    2 -
 .../cmsutil/radius/FramedRouteAttribute.java       |    2 -
 .../cmsutil/radius/FramedRoutingAttribute.java     |    2 -
 .../cmsutil/radius/LoginIPHostAttribute.java       |    2 -
 .../cmsutil/radius/LoginLATGroupAttribute.java     |    2 -
 .../cmsutil/radius/LoginLATNodeAttribute.java      |    2 -
 .../cmsutil/radius/LoginLATPortAttribute.java      |    2 -
 .../cmsutil/radius/LoginLATServiceAttribute.java   |    2 -
 .../cmsutil/radius/LoginServiceAttribute.java      |    2 -
 .../netscape/cmsutil/radius/NASClassAttribute.java |    2 -
 .../cmsutil/radius/NASIPAddressAttribute.java      |    2 -
 .../cmsutil/radius/NASIdentifierAttribute.java     |    2 -
 .../cmsutil/radius/PortLimitAttribute.java         |    3 --
 .../cmsutil/radius/ProxyStateAttribute.java        |    2 -
 .../com/netscape/cmsutil/radius/RadiusConn.java    |    3 +-
 .../cmsutil/radius/ReplyMessageAttribute.java      |    2 -
 .../cmsutil/radius/ServiceTypeAttribute.java       |    2 -
 .../netscape/cmsutil/radius/StateAttribute.java    |    2 -
 .../cmsutil/radius/VendorSpecificAttribute.java    |    2 -
 .../com/netscape/cmsutil/scep/CRSPKIMessage.java   |    6 +--
 .../extensions/PresenceServerExtension.java        |    1 -
 base/util/src/netscape/security/provider/DSA.java  |    1 +
 .../security/provider/DSAKeyPairGenerator.java     |    8 -----
 .../security/provider/DSAParameterGenerator.java   |    1 -
 base/util/src/netscape/security/provider/MD5.java  |    2 -
 .../netscape/security/util/CertPrettyPrint.java    |    1 -
 .../src/netscape/security/util/ExtPrettyPrint.java |    1 -
 .../src/netscape/security/x509/AlgorithmId.java    |    3 --
 .../src/netscape/security/x509/X500Signer.java     |    2 -
 193 files changed, 134 insertions(+), 624 deletions(-)

diff --git a/base/ca/src/com/netscape/ca/CMSCRLExtensions.java b/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
index bbb4e5f19a4571ba2707bf96cc267639354a3a34..507faa8e892f8df78b806778e81130556c3431a1 100644
--- a/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
+++ b/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
@@ -65,7 +65,8 @@ public class CMSCRLExtensions implements ICMSCRLExtensions {
 
     private ICRLIssuingPoint mCRLIssuingPoint = null;
 
-    private IConfigStore mConfig = null;
+    @SuppressWarnings("unused")
+    private IConfigStore mConfig;
     private IConfigStore mCRLExtConfig = null;
 
     private Vector<String> mCRLExtensionNames = new Vector<String>();
diff --git a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
index f2ca2026cd03f63fdcd62fc144ea7a9cfc881ced..f93e6e31b7f1d0c31631f4f903caf01d25c06935 100644
--- a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
+++ b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
@@ -277,7 +277,6 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
      */
     private Date mLastUpdate;
     private Date mLastFullUpdate;
-    private long mLastScheduledUpdate = 0;
 
     /**
      * Next scheduled CRL update date
@@ -1904,7 +1903,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                 Debug.trace("recoverCRLCache  size=" + list.getSize() + "  index=" + list.getCurrentIndex());
             }
 
-            CertRecProcessor cp = new CertRecProcessor(mCRLCerts, this, mLogger, mAllowExtensions);
+            CertRecProcessor cp = new CertRecProcessor(mCRLCerts, this, mAllowExtensions);
             boolean includeCert = true;
 
             int s = list.getSize() - list.getCurrentIndex();
@@ -2117,7 +2116,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
     public void addRevokedCert(BigInteger serialNumber, RevokedCertImpl revokedCert,
                                String requestId) {
 
-        CertRecProcessor cp = new CertRecProcessor(mCRLCerts, this, mLogger, mAllowExtensions);
+        CertRecProcessor cp = new CertRecProcessor(mCRLCerts, this, mAllowExtensions);
         boolean includeCert = true;
         if (cp != null)
             includeCert = cp.checkRevokedCertExtensions(revokedCert.getExtensions());
@@ -2405,7 +2404,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
             if (statsSub != null) {
                 statsSub.startTiming("generation");
             }
-            CertRecProcessor cp = new CertRecProcessor(mCRLCerts, this, mLogger, mAllowExtensions);
+            CertRecProcessor cp = new CertRecProcessor(mCRLCerts, this, mAllowExtensions);
             processRevokedCerts(cp);
 
             if (statsSub != null) {
@@ -2956,17 +2955,15 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
 class CertRecProcessor implements IElementProcessor {
     private Hashtable<BigInteger, RevokedCertificate> mCRLCerts = null;
     private boolean mAllowExtensions = false;
-    private ILogger mLogger;
     private CRLIssuingPoint mIP = null;
 
     private boolean mIssuingDistPointAttempted = false;
     private boolean mIssuingDistPointEnabled = false;
     private BitArray mOnlySomeReasons = null;
 
-    public CertRecProcessor(Hashtable<BigInteger, RevokedCertificate> crlCerts, CRLIssuingPoint ip, ILogger logger,
+    public CertRecProcessor(Hashtable<BigInteger, RevokedCertificate> crlCerts, CRLIssuingPoint ip,
             boolean allowExtensions) {
         mCRLCerts = crlCerts;
-        mLogger = logger;
         mIP = ip;
         mAllowExtensions = allowExtensions;
         mIssuingDistPointAttempted = false;
diff --git a/base/ca/src/com/netscape/ca/SigningUnit.java b/base/ca/src/com/netscape/ca/SigningUnit.java
index 85ee1d48211d839a7e9ce9702d8a532f39f67161..2466fb652a46a3b5faede616cb397d18e592f5a0 100644
--- a/base/ca/src/com/netscape/ca/SigningUnit.java
+++ b/base/ca/src/com/netscape/ca/SigningUnit.java
@@ -77,7 +77,8 @@ public final class SigningUnit implements ISigningUnit {
     private ILogger mLogger = CMS.getLogger();
     private IConfigStore mConfig;
 
-    private ISubsystem mOwner = null;
+    @SuppressWarnings("unused")
+    private ISubsystem mOwner;
 
     private String mDefSigningAlgname = null;
     private SignatureAlgorithm mDefSigningAlgorithm = null;
diff --git a/base/common/src/com/netscape/certsrv/base/ASubsystem.java b/base/common/src/com/netscape/certsrv/base/ASubsystem.java
index 2751089266457106f2495520033c5e4598a73fa4..dfaba5a61321a3780d9884ffc8e376b384a6f0f4 100644
--- a/base/common/src/com/netscape/certsrv/base/ASubsystem.java
+++ b/base/common/src/com/netscape/certsrv/base/ASubsystem.java
@@ -26,6 +26,7 @@ package com.netscape.certsrv.base;
  */
 public abstract class ASubsystem implements ISubsystem {
 
+    @SuppressWarnings("unused")
     private ISubsystem mParent;
     private IConfigStore mCfg;
     private String mId;
diff --git a/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java b/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
index ac57c131322947778d5a136606e33c06130b8f49..ba3d9f2939f5ce96f0ea8b921785d1b5986c958e 100644
--- a/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
+++ b/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
@@ -45,7 +45,6 @@ public class ARequestNotifier implements IRequestNotifier {
     private ICertificateAuthority mCA = null;
     private boolean mIsPublishingQueueEnabled = false;
     private int mPublishingQueuePriority = 0;
-    private int mMaxPublishingQueuePageSize = 1;
     private IRequestQueue mRequestQueue = null;
     private String mPublishingStatus = null;
     private int mSavePublishingStatus = 0;
diff --git a/base/common/src/com/netscape/cms/authentication/AVAPattern.java b/base/common/src/com/netscape/cms/authentication/AVAPattern.java
index 823b396e9c51272323129b8b20b85148b2ef8d0f..3e984c0ccb9d6167effbc96729eb41c7854b4373 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 b8216d6bc564ef4b6e9a1f2ce93740fc1d60cc61..c65dd397148c989fd9aa4d0e1e4ae7faf735342d 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 b9808e639baf6773a046fe8387bd59d957eb03e8..9ebf8a7c0e3953f3d3b7ab305087d3f413a87609 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 dbae4a1ca483026486bca67241b70bfada0d812a..2bec1b68d183b6a40a25ab0b797b851ff25ab44f 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 10cb942995e21d011de81c9943b40d4098a0be7c..923b0501996bc68f3fce10159e7391c3a6989856 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 65cf756518bab1e59487d8b210bdf988b4ec00c7..9e551966c3307f9b4a358c7ebd7dc60ed15b1f38 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 dae24678d3cebd1e17d604deb4375cf2cb265195..729b017d80af31b91a7bde1675ce4602f7fbe5da 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 d3f004619c3b5710fb450610a3b172678575b453..65032608c31f098357bcbe5165cdda78543df0c7 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 2f1d479a4dff865ceb311c46697f6dab0c57f3f2..37c0e918b6a94599ae0af5bc02f0e36f20c61893 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 2f82307f21a3a646413d22cd70789b9421748d98..21d69e29d21ce6c7d238a061b29569834bcb3670 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 95d4b34bf0383ae50d22eee05a628c1da8ec3fb8..caada0bf5177f147a329550b5c45f1540a90427e 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 d420f547dd6c0b4c614ab0d3cdcb836fcd27e94a..0a7a9f0986a6052877178ecc1b09b0043155d868 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 c9f97c5416485c2377d87b85f8d7d4596ba9db84..e2e5fc4937d626d70a15946bb6a839c43440ce29 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 06f94d599e23b241441b19577566b3ac1f04f680..e12b8220fa35ec5d341535d21f8eeab9fc520a9b 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 b586c8bdf4819cc6a0609d42369450db3b4daedb..7f44c8eb039c254cb75ac8efdb705a53ff9b6eae 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 b7588aa4d7acaf40c102f0ae3e18d08599fe52b7..eaec5e50f13cbbd6fd6bb08ffa0ffdeebb61d1ce 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 cba06023f6da3eae765c264e1ec4177c919d0efe..2c176593a947ad24f83fae1de90195a092939080 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 cfe35df39b4dcac796926554503bcb5a385d3b57..b703f5b47fa4b535af05cd371ec4255bed84ba41 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 0dff1da6b0901e5a737a729de936d5907bef7f06..e612c339a5335ea3af81dc6a2f54a2a82c08bc43 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 cd298bc3bd8e67ee06173fbc97b00439c4248d4e..ea69cc5a12b6a43645aea33d1c1fe5985d0cf349 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 cbc77560f2fbcd8a505ed47954ca695338398abc..06050480e913997f1d934a41506776efcb24551f 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 68b1205ada77259d8076fb9a42ff3aebdadca1b7..41a15f93a6be6b9f45fc1e9db7d2a175c9f056ea 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 22c979f2866af5060320978b7d24c70a928a5b89..1244da12c1037efe6336664c80dc2815da8ac2cd 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 ee1b53ed5adf46ff0a0782d5cd285e0a838c5149..abb6048eb03de7e2b06f77593e96ef1fb19f2e50 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 24e701d7a2932f58259015eadfe105e5ff1cfa42..71cf8a2ac6d38aecc249a218d4f7d2c9a2c888ea 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 a47c7ae0d2400c67f5a399f74ef08dd9af0f72ac..f0aeb22959f06cb3a1ea6d403e6ec306425fd4ca 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 47eeebe9264ba5161c40fc81a38fc473f537a5f2..314a4072fb4fa4846119d0fbba601912d5faa2db 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 9600c5e56c296d0304950ec38a91561a42df11dd..a9661eedb80147d45fa6d90e04186f6bf76afa63 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 19677e748ea3949e53d287d1f7050ce1c981a02f..b459d8ad2909b5758d06e97c456ea9e6b77c915e 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 adbdc82797e8c953550fd121eacafe36baa639a5..0d1ab7eb5cc2b0301dd855f4b6d8134f1625bbd9 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 487fd9f2e62cd3cf6dac5bb0b2c7dfb1b08297ba..4d47d318f9d87db1d8a8da7fc390bcfa4d5bef23 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 97573d8777308add0601d541d91590929507d693..1c610996f4dd251b0ef557e6ab0de69a7b8e7c35 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 ceba2fc72705bc87475b794dfe2da39fad73450b..357c901c39c8e0fa104fd5bfe1fa9ae19d4e3e85 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 b5f94bd19a6601e441aa0744099d5b2c661308f8..bdb02cae3d85369df9524a7944474f2676deee62 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 a0587229a6919203de67909c5998ab207be3a870..1e4f0913e5cfc0be477d8f9d14c258d0f64ee196 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 1e1ee44f186dbfeccfbe1b927592b0fcf12dfb54..1b7524e198ddb91be6c3d0134c97e393fb0ec86a 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 af91b1cb3e2d2de4f9e1b533e134b7fe0a84d593..c3a268d148e50c2d728f5f92fd218a4476e7f84f 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 8e5df2c14dce769bfa78e4f2d9c17f293c492b36..aac4315e720696ebddc5c886f7e863eb663a927f 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 f16ce2526f44c91c198572e204c7e98014b815b0..35bdd5c8cddba895c11ce2449dae05fefbe719d2 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 6f1346c6881ee58655cece85bfe54d1f3ed7516c..5605acf6d7cdea26b7ea22fd7e9a8c94556f1129 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 de5f075bafa139e110c96f16ec5ab632d005e8b1..7916887f8ebbb8c49a90598c4581c60e77532451 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 90d37f15a5ae0a565aa1f4d88c09ab869a9941e6..a0f73d33be7bfa32d50ce83f46a5b3f356ffbfec 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 6c7aefa4d30212de2c760d5666840f88443e7d3d..51b7f783fda5910eac788c3ee79928d48a89f759 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 30f0b0c4008a0b4635b4bd43758c4cd9a1583aaa..bc9f099762ec6a5470d2c02f5bc0adb03c2e3c5f 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 58ff2383cd653a986f64afc0f558bc52183ebd9c..66d3b49795874b1484a64f58778d8ac7a70c9cdd 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 884616fe9e6420421a61288319d7a7a5cf4b8f07..814bd420935749d58fd9be9443814d6c06b30e0d 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 2783656aec842e6620bf61bdded3a5d2cf1112ab..c76181aa16467fe1ef7b7eb78d0528a9480d703f 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 45b02969dd2ae47740865584ca37ca7d766e25b5..d538ce675fe41272fef435272bc67ad164830eb0 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 6be6d506c638d27bb205ad92b4c8a47ea2b0a6bf..bd12bcfd8f9199f4bec306d5e1fc388f03a87367 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 3dae379a1bd582d076948cfc5d254c02f608d1c9..6e580896e7bd967941a73ce9c3b3bdb13b7b1660 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 e56651ed8264aa50ef7690cf14dbafbc84c1e1e2..dc0b0c4741254ecd1710b907eb49f46e63899471 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 e0716cb70510924e31a34fe4e4da2d8ea5147cc2..a27a3dd43fbb79eca13a9504aff4ec103234410e 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 157d5e3d1b6bdaa9f8e85b77707f7d88bbe4ee20..8d03ca37c5fa35937041c90f09daaa735d60446d 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 6d51c8d4ca489bafe89e376a6a65b119533c842a..0188b781ae228bf121a94088a75b5691ca501f86 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 ced916541e8f7e6ab5a792592d285e8d24c0279b..53ddc4c88fe8ca66a5e2a1df80cb5e11adb75e4a 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 e8b8f12f82a148659cfaa4020c44a442d6c7f0db..63a078a845c0e4f83d16837796881045922d77a2 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 634be87489d5d24b67b339ca5eaa580c502a4758..74d1069ebc5e13ba8f4bf47c2aed0df3d3ef49fa 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 9a780cca835300c0e4dc1b9a0c4e50a9ba9511ed..046fb111db1401297649a7e9e48a4749abb24ff2 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 808cfa523dc848e34d6c185080d7de45ab73c2ab..57a1e620225019e00b74aabf5ab08b8a61a0c9ed 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 c956e733adb92171e374989f2a7071df61fe2678..8cc0f85d6eff9eff7e04288f4f1c705a434887cf 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 e16f99f4f7db7860f8690ccf930eab543bb05fcb..c0a57c3d70b6fde135f73304a7520271a226e31c 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 21baefcb0fbf1357db2f6beec198e81cf4bd2a4d..998a4b162de33071b19cac11f647339d92bc4a40 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 85f27440439f5c43d801cf6001547f10a7dbbe48..b894971b174b0634601d9fcfc50e88ef6a7511ff 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 28c3b242d6867cea54dac68df65ae4f42ef3a0be..2f44ca1b0d20d21aea228dd0692878fc219e1866 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 847ca3486e0987b5c667a86862b8b8e62cdbe906..ae5edf6176d3ce0ee02d278949333ffc24c0c79a 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 dd648e8c5388940859a72db41ca5e208dcdd55c5..859ba845edc015b0efa229c134a77cc655daaac4 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 1d833ca9ba0eeeade0e23249810bf30f1243fe8b..db70d7729e7a7654f2da3ec3b15ffb601864f6fc 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 4ea150ea2fc49791e82cfa09261af5c312732d96..d2cf540c307ccab7170bec0171693107149131fc 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 4c6338751b4b2a20ba2be74e0c654ac0b241de39..745962c7226973ff72c7b4e8c2fff58365b5b583 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 2698da7d92f2358f964bab9f6f71699af62461b9..240468d03789adf4277020053b5960f657162f4b 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 ff3666f2af6f93752ff26d60c642dd572b7da947..eb88a1c3138793d19589087271a2dd2e2e553c22 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 30e0b0fce2e00da5f63aad374979bd2309174b5a..e1b33ea6ac4b2c961af9840fe847ea0f8328eb2b 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 4ee751f1a5aef0cb9245144e22a51c1a3cec71a7..008b372e2c49bb0d88cc75cb74c59ec26001956b 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 4989c1245410d75967158ec8ce5f3fd9fec47add..5926a5672e1ef8fb0edd5397f877e94c7574a409 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 dfc7d4d3b94bea8c6afe021da742451addaac4ff..65f8d293672994304872e6366da12a71ce3510b5 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 fdcbf40bc710dfbb359c2c7059801858f108b031..e22a19b82f8345503e4fd983a7c408457b39d117 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 fee739f29361c268e01ae27f7e244677a6dfd9bd..5b5aaaf8ea961c0b686640fbb2e8145b83c648e3 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 9c4ccc8bedc14a70b68a2a1ab57d88bad892abd5..e75e334ba7604b457992c66914c3c09eb2051ffb 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 bedfa911d72932c242ea0f7783f1b52dd2561ff2..97ae1f4fb8ef48b94b93d3cf204be173658af04d 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 c3e6bba53fa95b6b8a04b5601c69ef036df1a14a..adb201c755720be2a29db7ebce20cb9e94d4d0af 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 4d46e8a75b0ff043170731156660f0d4f3a95ccd..2fbd5546041423411db135a4b9d1e91da5ee11b0 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 fed0b1ee2d239cb693d11ed5c4542fbbcbe38f21..6acc1634cd822ccdd05c8dfde6994d366ee35c7f 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 9eac8eebd45bba7f60b86990bd2febf4bdd3d7f8..e975161da166ee2ace50d7adfd4330f811a6e7a5 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 93e5b6a4bbb1a35a1250b4e902ead6974a087a1c..16fa2a3949bf26218c4a8682de83cc260b468cab 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 7292be519dd9bf5d75ce7c5db0891becfa9cb096..85ef4fa0fe93f078ec84c9073a31900ad8c1d27a 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 1733998aa6698a09da51e6d4e256bf8164a6549c..11716115f6e47eea5b82562ccc0f1bd072fa10ba 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 41e6523a5ae77b9343a74cd3f77b5607a855b4ab..fd305add29211e7b807e6b03d5b68580509e4abf 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 c324e4a1fa3f11f14ad826ee1319c8e2b66c37aa..fa33f3eb13d520deb07c6ce2a5dc166dbd1c395d 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 bf8decd693366bb72340c72c85efc3a04b0734d8..dc61e1e02b02528a81c4723d740605f539f9736f 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 f18fabc6a3a38091dee8ac0ebab4713a8db79961..f1e8ec8b1de8977eb8f4368814a7395b28dd02f9 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 02dac53f9c37f60a0ceecb3294020b6200fbb769..10daeeb08a7d18cb3bbd06f765f558f5e9e266d2 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 ea0b10a678a9f9dd9d9d819cf1536acf1491818e..ee6913acc20e93dc2512890e1eb121f5690e4852 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);
diff --git a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
index 4c808132cf1b4b5813c0093d57b4c5a3c1afa1e5..19fc5162b0f4ff43b1bec1ff6dc9004a2f6748ec 100644
--- a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
+++ b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
@@ -188,7 +188,8 @@ public class CMSEngine implements ICMSEngine {
     private int pid;
 
     private IConfigStore mConfig = null;
-    private ISubsystem mOwner = null;
+    @SuppressWarnings("unused")
+    private ISubsystem mOwner;
     private long mStartupTime = 0;
     private boolean isStarted = false;
     private StringBuffer mWarning = new StringBuffer();
@@ -239,6 +240,7 @@ public class CMSEngine implements ICMSEngine {
 
     private static final int IP = 0;
     private static final int PORT = 1;
+    @SuppressWarnings("unused")
     private static final int HOST = 2;
     private static final int AGENT = 0;
     private static final int ADMIN = 1;
diff --git a/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
index d8db16ad01edde1795732e6bc641eb2b0350a8a0..fab9c18129573f05012c7cc1757bca359d2f6b63 100644
--- a/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
+++ b/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
@@ -71,7 +71,6 @@ public class CertUserDBAuthentication implements IAuthManager {
 
     private boolean mRevocationCheckingEnabled = false;
     private IConfigStore mRevocationChecking = null;
-    private String mRequestor = null;
 
     public CertUserDBAuthentication() {
     }
diff --git a/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
index 1040e6034058ab1d81a860b384f927294f3c69e6..f5bde0b54731c46d0ccff2dbc64d435995b23915 100644
--- a/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
+++ b/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
@@ -40,7 +40,6 @@ import com.netscape.certsrv.ra.IRegistrationAuthority;
 import com.netscape.certsrv.request.IRequest;
 import com.netscape.certsrv.request.IRequestQueue;
 import com.netscape.certsrv.request.RequestStatus;
-import com.netscape.certsrv.usrgrp.ICertUserLocator;
 import com.netscape.cmscore.base.SubsystemRegistry;
 import com.netscape.cmscore.dbs.CertRecord;
 import com.netscape.cmscore.util.Debug;
@@ -75,9 +74,7 @@ public class ChallengePhraseAuthentication implements IAuthManager {
     private String mImplName = null;
     private IConfigStore mConfig = null;
 
-    private ICertUserLocator mCULocator = null;
     private ILogger mLogger = CMS.getLogger();
-    private String mRequestor = null;
     private MessageDigest mSHADigest = null;
 
     // request attributes hacks
@@ -390,7 +387,6 @@ public class ChallengePhraseAuthentication implements IAuthManager {
 
             if (ra != null) {
                 queue = ra.getRequestQueue();
-                mRequestor = IRequest.REQUESTOR_RA;
             }
         } catch (Exception e) {
             log(ILogger.LL_FAILURE,
diff --git a/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
index 4906d5c5004681101d210830dbf68250e37bce55..235362395ed5f903e4df1789d8909c767614f487 100644
--- a/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
+++ b/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
@@ -67,7 +67,6 @@ public class SSLClientCertAuthentication implements IAuthManager {
     private String mName = null;
     private String mImplName = null;
     private IConfigStore mConfig = null;
-    private String mRequestor = null;
 
     /* Holds configuration parameters accepted by this implementation.
      * This list is passed to the configuration console so configuration
@@ -256,7 +255,6 @@ public class SSLClientCertAuthentication implements IAuthManager {
 
             if (ra != null) {
                 queue = ra.getRequestQueue();
-                mRequestor = IRequest.REQUESTOR_RA;
             }
         } catch (Exception e) {
             log(ILogger.LL_FAILURE,
diff --git a/base/common/src/com/netscape/cmscore/base/SimpleProperties.java b/base/common/src/com/netscape/cmscore/base/SimpleProperties.java
index cc1bd62015cbe0bbfb184e941119b69dece9575e..f8a5cf4d065322a1aabb923268d603efb2d9a8b2 100644
--- a/base/common/src/com/netscape/cmscore/base/SimpleProperties.java
+++ b/base/common/src/com/netscape/cmscore/base/SimpleProperties.java
@@ -92,8 +92,6 @@ public class SimpleProperties extends Hashtable<String, String> {
 
     private static final String strictKeyValueSeparators = "=:";
 
-    private static final String specialSaveChars = "=: \t\r\n\f#!";
-
     private static final String whiteSpaceChars = " \t\r\n\f";
 
     /**
@@ -455,9 +453,4 @@ public class SimpleProperties extends Hashtable<String, String> {
             h.put(key, get(key));
         }
     }
-
-    /** A table of hex digits */
-    private static final char[] hexDigit = {
-            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
-        };
 }
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java b/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
index 6e4ec113fc7ed45d2ed4fa897a608cae7e8ca462..c5e3312e14e767b3255a6ee1f00a70546969b23b 100644
--- a/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
+++ b/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
@@ -38,19 +38,14 @@ public class HttpConnFactory {
 
     private int mNumConns = 0; // number of available conns in array
     private int mTotal = 0; // total num conns
-    private IHttpConnection mMasterConn = null; // master connection object.
     private IHttpConnection mConns[];
-    private IAuthority mSource = null;
+    @SuppressWarnings("unused")
+    private IAuthority mSource;
     private IRemoteAuthority mDest = null;
     private String mNickname = "";
     private int mTimeout = 0;
 
     /**
-     * default value for the above at init time.
-     */
-    private boolean mDefErrorIfDown = false;
-
-    /**
      * Constructor for initializing from the config store.
      * must be followed by init(IConfigStore)
      */
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpConnector.java b/base/common/src/com/netscape/cmscore/connector/HttpConnector.java
index 90979f87097b9f27a73a74e9e83268b140ae5495..f947164d96c999893f953c6af8f34962c8927beb 100644
--- a/base/common/src/com/netscape/cmscore/connector/HttpConnector.java
+++ b/base/common/src/com/netscape/cmscore/connector/HttpConnector.java
@@ -45,6 +45,7 @@ public class HttpConnector implements IConnector {
     protected IHttpConnection mConn = null;
     private Thread mResendThread = null;
     private IResender mResender = null;
+    @SuppressWarnings("unused")
     private int mTimeout;
 
     private HttpConnFactory mConnFactory = null;
diff --git a/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java b/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java
index 33a2d7d7138b37ae1786796d64bac37bb5930527..baf076422628b3d9b82be4396170df126d596a69 100644
--- a/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java
+++ b/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java
@@ -26,8 +26,6 @@ import com.netscape.cmscore.authentication.ChallengePhraseAuthentication;
 
 public class RequestTransfer {
 
-    private static final String DOT = ".";
-
     private static String[] transferAttributes = {
             IRequest.HTTP_PARAMS,
             IRequest.AGENT_PARAMS,
diff --git a/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java b/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
index ebcd6cc5cde8222db0e697aab0e523d40f55f176..0872d1f4050551495adb54d2ee9af17a83d23d2e 100644
--- a/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
+++ b/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
@@ -77,9 +77,10 @@ public class CertificateRepository extends Repository
     private String mBaseDN;
     private String mRequestBaseDN;
     private boolean mConsistencyCheck = false;
-    private boolean mSkipIfInconsistent = false;
 
-    private int mCertStatusUpdateInterval = 0;
+    @SuppressWarnings("unused")
+    private boolean mSkipIfInconsistent;
+
     private Hashtable<String, ICRLIssuingPoint> mCRLIssuingPoints = new Hashtable<String, ICRLIssuingPoint>();
 
     private int mTransitMaxRecords = 1000000;
diff --git a/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java b/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
index ece755fc36ed0ec2e6869e81363dfdb26b2b6914..304f5aa94830e1d24fb24ca486407b2efa92cb45 100644
--- a/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
@@ -79,23 +79,6 @@ public class DBSubsystem implements IDBSubsystem {
     private BigInteger mNextSerialConfig = null;
     private boolean mEnableSerialMgmt = false;
 
-    private static final String PEOPLE_DN = "ou=people";
-    private static final String GROUPS_DN = "ou=groups";
-    private static final String REQUESTS_DN = "ou=requests";
-    private static final String XCERTS_DN = "cn=crossCerts";
-    private static final String BASEDN = "o=netscapeCertificateServer";
-    private static final String DEFAULT_DATABASE = "userRoot";
-    private static final String AT_OC = "objectclass";
-    private static final String AT_O = "o";
-    private static final String AT_OU = "ou";
-    private static final String CA_DN = "ou=ca";
-    private static final String CR_DN = "ou=certificateRepository, ou=ca";
-    private static final String CRL_DN = "ou=crlIssuingPoints, ou=ca";
-    private static final String CA_REQUESTS_DN = "ou=ca, ou=requests";
-    private static final String KRA_DN = "ou=kra";
-    private static final String KR_DN = "ou=keyRepository, ou=kra";
-    private static final String KRA_REQUESTS_DN = "ou=kra, ou=requests";
-    private static final String REPLICA_DN = "ou=replica";
     private static final String PROP_ENABLE_SERIAL_NUMBER_RECOVERY =
             "enableSerialNumberRecovery";
     // This value is only equal to the next Serial number that the CA's
diff --git a/base/common/src/com/netscape/cmscore/dbs/Repository.java b/base/common/src/com/netscape/cmscore/dbs/Repository.java
index 2cfe320f6bf55096fa2d4415f72f31d500454358..4a438c07c8cb0d039577535257ddfc0fdc92314a 100644
--- a/base/common/src/com/netscape/cmscore/dbs/Repository.java
+++ b/base/common/src/com/netscape/cmscore/dbs/Repository.java
@@ -51,7 +51,6 @@ public abstract class Repository implements IRepository {
 
     private static final BigInteger BI_ONE = new BigInteger("1");
     private BigInteger BI_INCREMENT = null;
-    private static final BigInteger BI_ZERO = new BigInteger("0");
     // (the next serialNo to be issued) - 1
     private BigInteger mSerialNo = null;
     // the serialNo attribute stored in db
diff --git a/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java b/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java
index 0d3ab35f7a00c26395f4660e56f3996c3a703fb4..3322ca9b02e3a6c6dbace3ecbe49d86e0ed2b7c2 100644
--- a/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java
+++ b/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java
@@ -49,7 +49,8 @@ public class CMSExtensionsMap implements ISubsystem {
 
     private Hashtable<String, ICMSExtension> mName2Ext = new Hashtable<String, ICMSExtension>();
     private Hashtable<String, ICMSExtension> mOID2Ext = new Hashtable<String, ICMSExtension>();
-    private ISubsystem mOwner = null;
+    @SuppressWarnings("unused")
+    private ISubsystem mOwner;
     private IConfigStore mConfig = null;
 
     /**
diff --git a/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java b/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java
index dc4423357b079babf0ef1cb44fc65f9431d0bc07..41038d898d5ec9b8db045f35f5c9b5af59734406 100644
--- a/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java
+++ b/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java
@@ -31,21 +31,18 @@ import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.base.ISubsystem;
 import com.netscape.certsrv.extensions.EExtensionsException;
 import com.netscape.certsrv.extensions.ICMSExtension;
-import com.netscape.certsrv.logging.ILogger;
 import com.netscape.cmscore.util.Debug;
 
 public class KeyUsage implements ICMSExtension {
     private final static String NAME = "KeyUsageExtension";
     private final static ObjectIdentifier OID = PKIXExtensions.KeyUsage_Id;
 
-    private IConfigStore mConfig = null;
+    @SuppressWarnings("unused")
+    private IConfigStore mConfig;
     private boolean mSetDefault = false;
 
-    private ILogger mLogger;
-
     public KeyUsage(boolean setDefault) {
         mSetDefault = setDefault;
-        mLogger = CMS.getLogger();
     }
 
     public void init(ISubsystem owner, IConfigStore config)
diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java
index ca4bb440cca01a5c9582cca992cea4d3db28df19..1ce2eeefba971ec18ac8ba36e1ec997dc35c87e6 100644
--- a/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java
+++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java
@@ -43,7 +43,8 @@ public class LdapBoundConnection extends LDAPConnection {
     private static final long serialVersionUID = -2242077674357271559L;
     // LDAPConnection calls authenticate so must set this for first
     // authenticate call.
-    private boolean mAuthenticated = false;
+    @SuppressWarnings("unused")
+    private boolean mAuthenticated;
 
     /**
      * Instantiates a connection to a ldap server, secure or non-secure
diff --git a/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java b/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java
index 6fecf88103b187e6d411016470fbc006ac2661f1..c5a12447a637b57178887dda97b6823839940f58 100644
--- a/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java
@@ -43,7 +43,8 @@ public class ProfileSubsystem implements IProfileSubsystem {
     private static final String PROP_ENABLE_BY = "enableBy";
 
     private IConfigStore mConfig = null;
-    private ISubsystem mOwner = null;
+    @SuppressWarnings("unused")
+    private ISubsystem mOwner;
     private Vector<String> mProfileIds = new Vector<String>();
     private Hashtable<String, IProfile> mProfiles = new Hashtable<String, IProfile>();
     private Hashtable<String, String> mProfileClassIds = new Hashtable<String, String>();
diff --git a/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java b/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java
index 747fe9ce7169b09f2352c601a8583a1a3e0b0372..1c014622279ce908b19de28a5e6ebd1eebd03713 100644
--- a/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java
+++ b/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java
@@ -41,7 +41,8 @@ public class PluginRegistry implements IPluginRegistry {
 
     private IConfigStore mConfig = null;
     private IConfigStore mFileConfig = null;
-    private ISubsystem mOwner = null;
+    @SuppressWarnings("unused")
+    private ISubsystem mOwner;
     private Hashtable<String, Hashtable<String, IPluginInfo>> mTypes =
             new Hashtable<String, Hashtable<String, IPluginInfo>>();
 
diff --git a/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java b/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java
index 69c0d0ce97507101ca1686476368cfd73537452b..78d312851f13563a47d3f7480a2660a836fe2ff8 100644
--- a/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java
@@ -139,7 +139,6 @@ public class RequestSubsystem
     }
 
     public void shutdown() {
-        mRequestQueue = null;
 
         if (mLogger != null) {
             mLogger.log(ILogger.EV_SYSTEM, ILogger.S_REQQUEUE, ILogger.LL_INFO,
@@ -179,9 +178,9 @@ public class RequestSubsystem
     // Instance variables
 
     private IConfigStore mConfig;
+    @SuppressWarnings("unused")
     private ISubsystem mParent;
     private String mId = IRequestSubsystem.SUB_ID;
-    private IRequestQueue mRequestQueue;
 
     protected ILogger mLogger;
 }
diff --git a/base/common/src/com/netscape/cmscore/security/JssSubsystem.java b/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
index 7c16c6f432831f2d9f86494aebe7ee26282eaee9..42249e324999bf3fcd11a49b8db82a88264ad9ad 100644
--- a/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
@@ -110,15 +110,9 @@ public final class JssSubsystem implements ICryptoSubsystem {
     public static final String ID = "jss";
 
     private static final String CONFIG_DIR = "configDir";
-    private static final String CERTPREFIX_ALIAS = "certPrefix";
-    private static final String KEYPREFIX_ALIAS = "keyPrefix";
-    private static final String CONFIGDIR_ALIAS = "configDir";
-    private static final String SECMODNAME_ALIAS = "secmodName";
     private static final String PROP_ENABLE = "enable";
-    private static final String PROP_OCSP_ENABLE = "ocspcheck.enable";
     private static final String PASSWORD_ALIAS = "password";
     private static final String mId = ID;
-    private IConfigStore mSSLSubStore;
     protected IConfigStore mConfig = null;
     private boolean mInited = false;
     private ILogger mLogger = null;
diff --git a/base/common/src/com/netscape/cmscore/security/KRATransportCert.java b/base/common/src/com/netscape/cmscore/security/KRATransportCert.java
index 7f6632e09c91ce7241c5f03993796fce8f6ce955..7e2e2f90d50010c95bc8abfcbcee54f4dfc52d7d 100644
--- a/base/common/src/com/netscape/cmscore/security/KRATransportCert.java
+++ b/base/common/src/com/netscape/cmscore/security/KRATransportCert.java
@@ -37,7 +37,6 @@ import com.netscape.certsrv.security.KeyCertData;
 public class KRATransportCert extends CertificateInfo {
     public static final String SUBJECT_NAME =
             "CN=Data Recovery Manager, O=Netscape Communications, C=US";
-    private String mTokenname = Constants.PR_INTERNAL_TOKEN_NAME;
 
     public KRATransportCert(KeyCertData properties) {
         this(properties, null);
@@ -45,11 +44,6 @@ public class KRATransportCert extends CertificateInfo {
 
     public KRATransportCert(KeyCertData properties, KeyPair pair) {
         super(properties, pair);
-        String tmp = (String) mProperties.get(Constants.PR_TOKEN_NAME);
-
-        if ((tmp != null) &&
-                (!tmp.equals(Constants.PR_INTERNAL_TOKEN)))
-            mTokenname = tmp;
         mProperties.put(Constants.PR_AKI, Constants.TRUE);
     }
 
diff --git a/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java b/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
index 2bb31ba1a1c38e60ee31646ce6ed9aa73d07941b..ccbb004ce098e6e4775dd7dd345f32c47a8700d5 100644
--- a/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
+++ b/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
@@ -125,10 +125,6 @@ import com.netscape.cmsutil.util.Utils;
 public class KeyCertUtil {
 
     public static final String CA_SIGNINGCERT_NICKNAME = "caSigningCert";
-    private static final int MAX_DOMESTIC_SSL_KEY_LEN = 4096;
-    private static final int MAX_EXPORT_SSL_KEY_LEN = 512;
-    private static final int MIN_DSA_KEY_LEN = 512;
-    private static final int MAX_DSA_KEY_LEN = 1024;
 
     public static void checkCertificateExt(String ext) throws EBaseException {
         byte[] b = null;
diff --git a/base/common/src/com/netscape/cmscore/security/RASigningCert.java b/base/common/src/com/netscape/cmscore/security/RASigningCert.java
index ac47055b667f86b0e267cf23fe8b1ec664a86f72..cf1de4203a1c46ea9aa663868a944df68f16879a 100644
--- a/base/common/src/com/netscape/cmscore/security/RASigningCert.java
+++ b/base/common/src/com/netscape/cmscore/security/RASigningCert.java
@@ -37,7 +37,6 @@ import com.netscape.certsrv.security.KeyCertData;
 public class RASigningCert extends CertificateInfo {
     public static final String SUBJECT_NAME =
             "CN=Registration Authority, O=Netscape Communications, C=US";
-    private String mTokenname = Constants.PR_INTERNAL_TOKEN_NAME;
 
     public RASigningCert(KeyCertData properties) {
         this(properties, null);
@@ -45,11 +44,6 @@ public class RASigningCert extends CertificateInfo {
 
     public RASigningCert(KeyCertData properties, KeyPair pair) {
         super(properties, pair);
-        String tmp = (String) mProperties.get(Constants.PR_TOKEN_NAME);
-
-        if ((tmp != null) &&
-                (!tmp.equals(Constants.PR_INTERNAL_TOKEN)))
-            mTokenname = tmp;
         try {
             if (mProperties.get(Constants.PR_AKI) == null) {
                 mProperties.put(Constants.PR_AKI, Constants.FALSE);
diff --git a/base/common/src/com/netscape/cmscore/security/SSLCert.java b/base/common/src/com/netscape/cmscore/security/SSLCert.java
index b4fea7f897d32f96fff9e8b733e24fe320a3eaa4..9dbec8abbac1bf7f047cf074c7cf1ac4c806d9be 100644
--- a/base/common/src/com/netscape/cmscore/security/SSLCert.java
+++ b/base/common/src/com/netscape/cmscore/security/SSLCert.java
@@ -37,7 +37,6 @@ import com.netscape.certsrv.security.KeyCertData;
 public class SSLCert extends CertificateInfo {
     public static final String SUBJECT_NAME =
             "CN=SSL, O=Netscape Communications, C=US";
-    private String mTokenname = Constants.PR_INTERNAL_TOKEN_NAME;
 
     public SSLCert(KeyCertData properties) {
         this(properties, null);
@@ -45,11 +44,6 @@ public class SSLCert extends CertificateInfo {
 
     public SSLCert(KeyCertData properties, KeyPair pair) {
         super(properties, pair);
-        String tmp = (String) mProperties.get(Constants.PR_TOKEN_NAME);
-
-        if ((tmp != null) &&
-                (!tmp.equals(Constants.PR_INTERNAL_TOKEN)))
-            mTokenname = tmp;
         try {
             if (mProperties.get(Constants.PR_AKI) == null) {
                 mProperties.put(Constants.PR_AKI, Constants.FALSE);
diff --git a/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java b/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
index 8d8e7dfcc53100703b4a4c0c8a9fa884a40a514e..328f6a86cf3bf518527af6b4de19a2d348576bc6 100644
--- a/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
+++ b/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
@@ -37,7 +37,6 @@ import com.netscape.certsrv.security.KeyCertData;
 public class SSLSelfSignedCert extends CertificateInfo {
     public static final String SUBJECT_NAME =
             "CN=SSL, O=Netscape Communications, C=US";
-    private String mTokenname = Constants.PR_INTERNAL_TOKEN_NAME;
 
     public SSLSelfSignedCert(KeyCertData properties) {
         this(properties, null);
@@ -45,11 +44,6 @@ public class SSLSelfSignedCert extends CertificateInfo {
 
     public SSLSelfSignedCert(KeyCertData properties, KeyPair pair) {
         super(properties, pair);
-        String tmp = (String) mProperties.get(Constants.PR_TOKEN_NAME);
-
-        if ((tmp != null) &&
-                (!tmp.equals(Constants.PR_INTERNAL_TOKEN)))
-            mTokenname = tmp;
         mProperties.remove(Constants.PR_AKI);
 
         // 020599: This SSL server bit has to be turned on. Otherwise, it
diff --git a/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java b/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
index c51aa0d46e433dcb8dd72e0cf27ebb6641b9b676..0ae6af0c31d0e31aa4183869727fb7d458d6b310 100644
--- a/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
@@ -74,7 +74,8 @@ public class SelfTestSubsystem
     // SelfTestSubsystem parameters //
     //////////////////////////////////
 
-    private ISubsystem mOwner = null;
+    @SuppressWarnings("unused")
+    private ISubsystem mOwner;
     private IConfigStore mConfig = null;
     private ILogEventListener mLogger = null;
     private ILogger mErrorLogger = CMS.getLogger();
diff --git a/base/common/src/com/netscape/cmscore/usrgrp/Group.java b/base/common/src/com/netscape/cmscore/usrgrp/Group.java
index 608348dfb5948b5680bf579d668729b80bf0ac6c..25917e901da5b2993cf844d723627ef800c80bbf 100644
--- a/base/common/src/com/netscape/cmscore/usrgrp/Group.java
+++ b/base/common/src/com/netscape/cmscore/usrgrp/Group.java
@@ -36,7 +36,8 @@ public class Group implements IGroup {
      *
      */
     private static final long serialVersionUID = -1264387079578766750L;
-    private IUsrGrp mBase = null;
+    @SuppressWarnings("unused")
+    private IUsrGrp mBase;
     private String mName = null;
     private Vector<String> mMembers = new Vector<String>();
     private String mDescription = null;
diff --git a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java
index ee9fa575e0133c394be5df519acc883bd1f71c86..e48fd620a9545bcd19efd82e6f2c208cfd7f92d4 100644
--- a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java
@@ -64,7 +64,6 @@ import com.netscape.cmscore.util.Debug;
 public final class UGSubsystem implements IUGSubsystem {
 
     public static final String ID = "usrgrp";
-    private ICertUserLocator mCertUserLocator = null;
     private String mId = ID;
 
     protected static final String OBJECTCLASS_ATTR = "objectclass";
@@ -81,9 +80,6 @@ public final class UGSubsystem implements IUGSubsystem {
     protected LdapBoundConnFactory mLdapConnFactory = null;
     protected String mBaseDN = null;
     protected static UGSubsystem mUG = null;
-    private static final String PROP_IMPL = "impl";
-    private static final String PROP_CLASS = "class";
-    private static final String PROP_PASSWORD_CHECKER = "PasswordChecker";
 
     private ILogger mLogger = null;
 
diff --git a/base/common/src/com/netscape/cmscore/usrgrp/User.java b/base/common/src/com/netscape/cmscore/usrgrp/User.java
index 77f9bade424024cb124e73f09952817959032588..53347750107f871fa448ccb0b546bcabd8f05ff0 100644
--- a/base/common/src/com/netscape/cmscore/usrgrp/User.java
+++ b/base/common/src/com/netscape/cmscore/usrgrp/User.java
@@ -39,7 +39,8 @@ public class User implements IUser {
      */
     private static final long serialVersionUID = -7407288327775546979L;
     public static final String ATTR_X509_CERTIFICATES = "userCertificates";
-    private IUsrGrp mBase = null;
+    @SuppressWarnings("unused")
+    private IUsrGrp mBase;
     private String mUserid = null;
     private String mUserDN = null;
     private String mFullName = null;
diff --git a/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java b/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java
index 9e9d9fc6cb5307d079ad9134e1e13dc9d0a8ecad..5822542a3805764171ae9bf379c15a7892cc4898 100644
--- a/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java
@@ -25,7 +25,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.util.Vector;
 
-import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -58,7 +57,6 @@ public class ProfileSubsystem extends Frame implements ISubsystem, Runnable {
     private TextArea mTextArea = null;
     private JScrollPane mThreads = null;
     private JTable mThreadTable = null;
-    private JButton mGC = null;
     private ThreadTableModel mThreadModel = null;
 
     /**
diff --git a/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
index b7955d70b7000a6a2e8bf9b6ba8f226a26d1aaf5..bed5d8334fa5da7e4047c3e56e9395eba8789e17 100644
--- a/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
+++ b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
@@ -79,8 +79,6 @@ public class CMCEnroll {
     public static final String PR_REQUEST_PKCS10 = "PKCS10";
 
     public static final int ARGC = 4;
-    private static final String CERTDB = "cert8.db";
-    private static final String KEYDB = "key3.db";
     public static final String HEADER = "-----BEGIN NEW CERTIFICATE REQUEST-----";
     public static final String TRAILER = "-----END NEW CERTIFICATE REQUEST-----";
 
diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
index 1dfb36fb2b7d272cac80b52ab2b5c2cbae92f187..f2205ed5c4aa7cf9e20fac19e4c838a773a5dbd2 100644
--- a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
+++ b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
@@ -97,8 +97,6 @@ public class CMCRequest {
     public static final String PR_REQUEST_CRMF = "CRMF";
 
     public static final int ARGC = 1;
-    private static final String CERTDB = "cert8.db";
-    private static final String KEYDB = "key3.db";
     public static final String HEADER = "-----BEGIN NEW CERTIFICATE REQUEST-----";
     public static final String TRAILER = "-----END NEW CERTIFICATE REQUEST-----";
 
diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java b/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
index d0cc3077e77b9e620855ba043e5cf62cb6a534d9..8dffa13e36fa769684f2fe8f650ab238828fda06 100644
--- a/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
+++ b/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
@@ -69,8 +69,6 @@ import com.netscape.cmsutil.util.Utils;
  */
 public class CMCRevoke {
     public static final int ARGC = 7;
-    private static final String CERTDB = "cert8.db";
-    private static final String KEYDB = "key3.db";
     public static final String HEADER = "-----BEGIN NEW CERTIFICATE REQUEST-----";
     public static final String TRAILER = "-----END NEW CERTIFICATE REQUEST-----";
     static String dValue = null, nValue = null, iValue = null, sValue = null, mValue = null, hValue = null,
diff --git a/base/java-tools/src/com/netscape/cmstools/DRMTool.java b/base/java-tools/src/com/netscape/cmstools/DRMTool.java
index be6b10afc7b2b715be4202b1f6fffd61fab2c53d..c6b2c575f55c15af4334d15bf1982401e72d6f44 100644
--- a/base/java-tools/src/com/netscape/cmstools/DRMTool.java
+++ b/base/java-tools/src/com/netscape/cmstools/DRMTool.java
@@ -507,7 +507,6 @@ public class DRMTool {
     private static final String COMMA = ",";
     private static final String DOT = ".";
     private static final String EQUAL_SIGN = "=";
-    private static final String HASH = "#";
     private static final String LEFT_BRACE = "[";
     private static final String NEWLINE = "\n";
     private static final String PLUS = "+";
@@ -862,7 +861,6 @@ public class DRMTool {
     // Constants:  Target Certificate Information
     private static final String HEADER = "-----BEGIN";
     private static final String TRAILER = "-----END";
-    private static final String X509_INFO = "x509.INFO";
 
     // Constants:  DRM LDIF Record Fields
     private static final String DRM_LDIF_ARCHIVED_BY = "archivedBy:";
@@ -925,7 +923,6 @@ public class DRMTool {
     private static String mDateOfModify = null;
 
     // Variables: Command-Line Options
-    private static boolean mMandatoryFlag = false;
     private static boolean mRewrapFlag = false;
     private static boolean mPwdfileFlag = false;
     private static boolean mAppendIdOffsetFlag = false;
@@ -4582,9 +4579,6 @@ public class DRMTool {
                 printUsage();
                 System.exit(0);
             }
-
-            // Mark the 'Mandatory' flag true
-            mMandatoryFlag = true;
         }
 
         // Check to see that if the 'Rewrap' command-line options were
diff --git a/base/java-tools/src/com/netscape/cmstools/PasswordCache.java b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
index dbd8a21f3572f4de6cb2961c3023492a508af560..c9e36585ef6afe30c59ba29354594418abc68e54 100644
--- a/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
+++ b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
@@ -59,9 +59,6 @@ public class PasswordCache {
      */
     public static final String PROP_PWC_NICKNAME = "sso_key";
     public static final String PW_TAG_INTERNAL_LDAP_DB = "Internal LDAP Database";
-    private static final String WRONG_NUM_ARGS = "Error: wrong number of arguments";
-    private static final String CERTDB = "cert8.db";
-    private static final String KEYDB = "key3.db";
 
     private static void usage() {
         System.out.println(
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 ee6668a2556e4114e3a3d9124ea31c926704a78a..e1d5124fa3d0a52d3c334388542d466f57a71ebb 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
@@ -38,7 +38,6 @@ import org.mozilla.jss.util.Password;
 import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.cmsutil.util.Utils;
 
-@SuppressWarnings("deprecation")
 public class GeneratePKIArchiveOptions {
 
     public static void usage(Options options) {
diff --git a/base/kra/src/com/netscape/kra/EncryptionUnit.java b/base/kra/src/com/netscape/kra/EncryptionUnit.java
index 7d67a7b12478b99a7e0201b5c6b82c3346cc20e1..c6023e6c55a1887635ed22c24e55119ecb23d1b1 100644
--- a/base/kra/src/com/netscape/kra/EncryptionUnit.java
+++ b/base/kra/src/com/netscape/kra/EncryptionUnit.java
@@ -54,7 +54,6 @@ import com.netscape.cmscore.util.Debug;
  * @author thomask
  * @version $Revision$, $Date$
  */
-@SuppressWarnings("deprecation")
 public abstract class EncryptionUnit implements IEncryptionUnit {
 
     /* Establish one constant IV for base class, to be used for
diff --git a/base/kra/src/com/netscape/kra/EnrollmentService.java b/base/kra/src/com/netscape/kra/EnrollmentService.java
index 2f3e1dd7a3d70fc76b95d3069085bfebfdfd7c3d..22400cf6730d12bdaf2aa313bef3d57e0170bb68 100644
--- a/base/kra/src/com/netscape/kra/EnrollmentService.java
+++ b/base/kra/src/com/netscape/kra/EnrollmentService.java
@@ -21,8 +21,8 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.security.InvalidKeyException;
-import java.security.cert.CertificateException;
 import java.security.PublicKey;
+import java.security.cert.CertificateException;
 import java.util.Arrays;
 import java.util.StringTokenizer;
 import java.util.Vector;
@@ -37,15 +37,11 @@ import netscape.security.x509.CertificateX509Key;
 import netscape.security.x509.X509CertInfo;
 import netscape.security.x509.X509Key;
 
-import org.mozilla.jss.CryptoManager;
 import org.mozilla.jss.asn1.ASN1Util;
 import org.mozilla.jss.asn1.ASN1Value;
 import org.mozilla.jss.asn1.InvalidBERException;
 import org.mozilla.jss.asn1.OBJECT_IDENTIFIER;
 import org.mozilla.jss.asn1.SEQUENCE;
-import org.mozilla.jss.crypto.PrivateKey;
-import org.mozilla.jss.pkcs11.PK11ECPublicKey;
-import org.mozilla.jss.pkcs11.PK11ParameterSpec;
 import org.mozilla.jss.pkix.crmf.CertReqMsg;
 import org.mozilla.jss.pkix.crmf.CertRequest;
 import org.mozilla.jss.pkix.crmf.PKIArchiveOptions;
@@ -57,8 +53,8 @@ import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.base.MetaInfo;
 import com.netscape.certsrv.base.SessionContext;
-import com.netscape.certsrv.dbs.keydb.IKeyRepository;
 import com.netscape.certsrv.dbs.keydb.IKeyRecord;
+import com.netscape.certsrv.dbs.keydb.IKeyRepository;
 import com.netscape.certsrv.kra.EKRAException;
 import com.netscape.certsrv.kra.IKeyRecoveryAuthority;
 import com.netscape.certsrv.kra.ProofOfArchival;
@@ -73,7 +69,6 @@ import com.netscape.certsrv.util.IStatsSubsystem;
 import com.netscape.cms.servlet.key.KeyRecordParser;
 import com.netscape.cmscore.crmf.CRMFParser;
 import com.netscape.cmscore.crmf.PKIArchiveOptionsContainer;
-import com.netscape.kra.ArchiveOptions;
 import com.netscape.cmscore.dbs.KeyRecord;
 import com.netscape.cmsutil.util.Utils;
 
@@ -106,15 +101,10 @@ public class EnrollmentService implements IService {
     private IStorageKeyUnit mStorageUnit = null;
     private ILogger mSignedAuditLogger = CMS.getSignedAuditLogger();
 
-    private final static byte EOL[] = { Character.LINE_SEPARATOR };
     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 =
             "LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST_PROCESSED_3";
-    private final static String LOGGING_SIGNED_AUDIT_KEY_RECOVERY_REQUEST =
-            "LOGGING_SIGNED_AUDIT_KEY_RECOVERY_REQUEST_4";
-    private final static String LOGGING_SIGNED_AUDIT_KEY_RECOVERY_REQUEST_PROCESSED =
-            "LOGGING_SIGNED_AUDIT_KEY_RECOVERY_REQUEST_PROCESSED_4";
 
     /**
      * Constructs request processor.
@@ -151,12 +141,10 @@ public class EnrollmentService implements IService {
      */
     public boolean serviceRequest(IRequest request)
             throws EBaseException {
-        CryptoManager cm = null;
         IConfigStore config = null;
         Boolean allowEncDecrypt_archival = false;
 
         try {
-            cm = CryptoManager.getInstance();
             config = CMS.getConfigStore();
             allowEncDecrypt_archival = config.getBoolean("kra.allowEncDecrypt.archival", false);
         } catch (Exception e) {
@@ -307,7 +295,7 @@ public class EnrollmentService implements IService {
                         opts.getSymmAlgOID(),
                         opts.getSymmAlgParams(),
                         opts.getEncValue(),
-                        (PublicKey) pubkey);
+                        pubkey);
             } // !allowEncDecrypt_archival
 
             /* Bugscape #54948 - verify public and private key before archiving key */
@@ -398,19 +386,6 @@ public class EnrollmentService implements IService {
                     privateKeyData, owner,
                     publicKey.getAlgorithmId().getOID().toString(), agentId);
 
-            if (rec == null) {
-
-                auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST,
-                        auditSubjectID,
-                        ILogger.FAILURE,
-                        auditRequesterID,
-                        auditArchiveID);
-
-                audit(auditMessage);
-                throw new EKRAException(CMS.getUserMessage("CMS_KRA_INVALID_KEYRECORD"));
-            }
-
             if (keyAlg.equals("RSA")) {
                 try {
                     RSAPublicKey rsaPublicKey = new RSAPublicKey(publicKeyData);
@@ -458,7 +433,7 @@ public class EnrollmentService implements IService {
                     oidDescription);
 
                 rec.set(IKeyRecord.ATTR_META_INFO, metaInfo);
-                // key size does not apply to EC; 
+                // key size does not apply to EC;
                 rec.setKeySize(-1);
             }
 
diff --git a/base/kra/src/com/netscape/kra/KRANotify.java b/base/kra/src/com/netscape/kra/KRANotify.java
index ccf8e664f53498b4c16cca300c4b510b60869902..a97724e6f4a6f93b5891b45406465641fc0f4c60 100644
--- a/base/kra/src/com/netscape/kra/KRANotify.java
+++ b/base/kra/src/com/netscape/kra/KRANotify.java
@@ -29,7 +29,8 @@ import com.netscape.certsrv.request.ARequestNotifier;
  * @version $Revision$, $Date$
  */
 public class KRANotify extends ARequestNotifier {
-    private IKeyRecoveryAuthority mKRA = null;
+    @SuppressWarnings("unused")
+    private IKeyRecoveryAuthority mKRA;
 
     /**
      * default constructor
diff --git a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
index 09f7658775399da890ec0bcfa664602085262853..6579261f6e37aeebe77ce4b6d497a4e07bb0f34d 100644
--- a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
+++ b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
@@ -96,7 +96,6 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove
     private static final String PARAM_LOCK = "lock";
     private static final String PARAM_PK12 = "pk12";
     private static final String PARAM_ERROR = "error";
-    private static final String PARAM_AGENT = "agent";
 
     private final static String KEY_RESP_NAME = "keyRepository";
     private static final String PROP_REPLICAID_DN = "dbs.replicadn";
diff --git a/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java b/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java
index 348a1b2f84cc2e83be0db9d48283e7d39a009de3..836907dac66c52f6f539c57585e9daadf7e0812b 100644
--- a/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java
+++ b/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java
@@ -76,7 +76,6 @@ import com.netscape.cmsutil.ocsp.ResponseData;
  */
 public class OCSPAuthority implements IOCSPAuthority, IOCSPService, ISubsystem, IAuthority {
 
-    private long mServedRequests = 0;
     private long mServedTime = 0;
 
     public final static OBJECT_IDENTIFIER OCSP_NONCE = new OBJECT_IDENTIFIER("1.3.6.1.5.5.7.48.1.2");
@@ -361,7 +360,6 @@ public class OCSPAuthority implements IOCSPAuthority, IOCSPService, ISubsystem,
         OCSPResponse response = mDefStore.validate(request);
         long endTime = (CMS.getCurrentDate()).getTime();
 
-        mServedRequests++;
         mServedTime = mServedTime + (endTime - startTime);
         return response;
     }
diff --git a/base/ocsp/src/com/netscape/ocsp/SigningUnit.java b/base/ocsp/src/com/netscape/ocsp/SigningUnit.java
index 4b6e7da75c5017fd320f23b9b7931519d588c525..0413f0c5c221781d7990a214ebf5f981808eb48f 100644
--- a/base/ocsp/src/com/netscape/ocsp/SigningUnit.java
+++ b/base/ocsp/src/com/netscape/ocsp/SigningUnit.java
@@ -73,7 +73,8 @@ public final class SigningUnit implements ISigningUnit {
     private ILogger mLogger = CMS.getLogger();
     private IConfigStore mConfig;
 
-    private ISubsystem mOwner = null;
+    @SuppressWarnings("unused")
+    private ISubsystem mOwner;
 
     private String mDefSigningAlgname = null;
     private SignatureAlgorithm mDefSigningAlgorithm = null;
diff --git a/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java b/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java
index c74cd94c61b7c2a516c69826d10a80ff380f9308..cddb630da1fe993114384d1292c3c39fe6746c8e 100644
--- a/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java
+++ b/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java
@@ -41,7 +41,7 @@ import netscape.ldap.LDAPv2;
 
 public class CMSLDAP {
 
-    private String HOST, DN, BASEDN, PASSWORD;
+    private String HOST, DN, PASSWORD;
     private int PORT;
 
     private LDAPConnection conn = new LDAPConnection();
diff --git a/base/silent/src/com/netscape/pkisilent/common/CMSTask.java b/base/silent/src/com/netscape/pkisilent/common/CMSTask.java
index 948076fd6c2b1791d4cbd50555406cce97f0cda0..953dcd25d987428cb5338f172120c4de7ea8684d 100644
--- a/base/silent/src/com/netscape/pkisilent/common/CMSTask.java
+++ b/base/silent/src/com/netscape/pkisilent/common/CMSTask.java
@@ -33,7 +33,6 @@ import com.netscape.pkisilent.argparser.StringHolder;
 public class CMSTask {
 
     private static String operation;
-    private static String debug;
     private static String serverRoot;
     private Process p = null;
 
diff --git a/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java b/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java
index d1941ca30de8ca3eb46e777ae3b3533e50050b9f..e36966de18b17b391723b495ecb5b406bc58e881 100644
--- a/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java
+++ b/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java
@@ -57,6 +57,7 @@ import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier;
 import org.mozilla.jss.pkix.primitive.Name;
 import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo;
 import org.mozilla.jss.util.Password;
+
 import com.netscape.cmsutil.util.Utils;
 
 /**
@@ -67,7 +68,9 @@ import com.netscape.cmsutil.util.Utils;
 public class ComCrypto {
 
     private String cdir, certnickname, keysize, keytype, tokenpwd;
-    private String certpackage, pkcs10request;
+    @SuppressWarnings("unused")
+    private String certpackage;
+    private String pkcs10request;
     private boolean debug = true;
     private boolean DBlogin = false;
     private boolean generaterequest = false;
@@ -82,7 +85,6 @@ public class ComCrypto {
     public static CryptoManager manager;
     public static CryptoToken token;
     private CryptoStore store;
-    private Password pass1 = null, pass2 = null;
 
     private String bstr = "-----BEGIN NEW CERTIFICATE REQUEST-----";
     private String blob, Blob1 = null;
diff --git a/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java b/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java
index bfaf1eb34e2da786b4aa20d54b0675b35809536a..6d02fcd339dd1ded7a2a6af46f3afbc63f479e64 100644
--- a/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java
+++ b/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java
@@ -42,11 +42,12 @@ import org.mozilla.jss.util.Password;
 public class Con2Agent implements SSLClientCertificateSelectionCallback,
         SSLCertificateApprovalCallback {
 
-    private int i, port;
-    private String host, certdir, certnickname, tokenpwd, certname, query;
+    private int port;
+    @SuppressWarnings("unused")
+    private String certname;
+    private String host, certdir, certnickname, tokenpwd, query;
     private String ACTIONURL;
 
-    private BufferedReader stdin = null;
     private StringBuffer stdout = new StringBuffer();
 
     public Con2Agent() {
diff --git a/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java b/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java
index de331989b7697231ab5ff706f4e5e67bb0e2034a..809a65c5be0ee4ec6c55b1691333eb4fd9aa517c 100644
--- a/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java
+++ b/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java
@@ -38,13 +38,12 @@ import org.mozilla.jss.ssl.SSLSocket;
 
 public class DirEnroll extends TestClient {
 
-    private int i;
     private String Authenticator = "UserDir";
     private int port;
+    @SuppressWarnings("unused")
     private long elapsedTime;
 
     private String importcert = "false";
-    private boolean impStatus = false;
 
     // Constructors
 
@@ -323,11 +322,7 @@ public class DirEnroll extends TestClient {
                         baseCert = baseCert.substring(n);
                         String tmp = baseCert.substring(0, baseCert.length() - 2);
 
-                        if (importCert(tmp)) {
-                            impStatus = true;
-                        }
-                    } else {
-                        impStatus = true;
+                        importCert(tmp);
                     }
                 }
 
diff --git a/base/silent/src/com/netscape/pkisilent/common/Request.java b/base/silent/src/com/netscape/pkisilent/common/Request.java
index 7ee443f16139aed9a60e1e37c0f7274412da61ae..e0255ef59e771a0e42900ee83f274aba8bcc1a74 100644
--- a/base/silent/src/com/netscape/pkisilent/common/Request.java
+++ b/base/silent/src/com/netscape/pkisilent/common/Request.java
@@ -52,9 +52,35 @@ public class Request extends TestClient {
 
     // Cert Detail variables
 
-    private String csrRequestorName, csrRequestorPhone, csrRequestorEmail, subject, subjectdn, reqStatus, certType;
-    private String requestType, requestID, sslclient, clientcert, servercert, emailcert, objectsigningcert, sslcacert,
-            objectsigningcacert, emailcacert, sigAlgo, totalRecord, validitylength, trustedManager;
+    private String csrRequestorName;
+    private String csrRequestorPhone;
+    private String csrRequestorEmail;
+    private String subject;
+    private String subjectdn;
+    private String reqStatus;
+    @SuppressWarnings("unused")
+    private String certType;
+    @SuppressWarnings("unused")
+    private String requestType;
+    private String requestID;
+    @SuppressWarnings("unused")
+    private String sslclient;
+    private String clientcert;
+    private String servercert;
+    private String emailcert;
+    private String objectsigningcert;
+    @SuppressWarnings("unused")
+    private String sslcacert;
+    @SuppressWarnings("unused")
+    private String objectsigningcacert;
+    @SuppressWarnings("unused")
+    private String emailcacert;
+    private String sigAlgo;
+    @SuppressWarnings("unused")
+    private String totalRecord;
+    @SuppressWarnings("unused")
+    private String validitylength;
+    private String trustedManager;
 
     private int totalNumApproved = 0;
 
diff --git a/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java b/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java
index 5eccb1601fda6e192dfd688c0d6ad5d374234144..7ff7617206f6b50660ab5b94accda6b7ec97c9e2 100644
--- a/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java
+++ b/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java
@@ -42,7 +42,6 @@ public class ServerInfo {
     public static CMSProperties CMSprops = null;
 
     // Private variables
-    private int i;
     public String CMSConfigFile, AdminConfigFile;
 
     public ServerInfo() {
diff --git a/base/silent/src/com/netscape/pkisilent/common/TestClient.java b/base/silent/src/com/netscape/pkisilent/common/TestClient.java
index a58e88bd1a9fa06e72aa34724d9331008343a35a..f3d96085df64db2653085b1e49e66a291d0bfa07 100644
--- a/base/silent/src/com/netscape/pkisilent/common/TestClient.java
+++ b/base/silent/src/com/netscape/pkisilent/common/TestClient.java
@@ -48,7 +48,6 @@ public class TestClient implements SSLCertificateApprovalCallback {
     public String query;
     public boolean debug = false;
     // Certificate nicknames to be used by Test Clients
-    private int i;
     private String testConfigFile;
 
     public String caAgentCertName = "ca-agent";
@@ -62,6 +61,7 @@ public class TestClient implements SSLCertificateApprovalCallback {
     private String admDN = "admin";
     private String admDNPW = "admin";
     private String TmpDir;
+    @SuppressWarnings("unused")
     private String TestLogFile;
     private String startupTests, cleanupTests;
 
diff --git a/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java b/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java
index 123054503776ca9f6ca8068e4c65ed27700572f0..3f7f9279129199893dd378056e26932512dd7470 100644
--- a/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java
+++ b/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java
@@ -38,9 +38,9 @@ import org.mozilla.jss.ssl.SSLSocket;
 
 public class UserEnroll extends TestClient {
 
-    private int i;
     private String requestorName, requestorEmail, requestorPhone, requestorComments, requestId, certType, ssl_client;
     private int port;
+    @SuppressWarnings("unused")
     private long elapsedTime;
 
     // Constructor
diff --git a/base/silent/src/com/netscape/pkisilent/common/checkRequest.java b/base/silent/src/com/netscape/pkisilent/common/checkRequest.java
index 8acbf1ca7c4b953aa7f5962342f981576b390dc4..e785657c083f98a3c8ddb6bcf14c62f35a3f9b4f 100644
--- a/base/silent/src/com/netscape/pkisilent/common/checkRequest.java
+++ b/base/silent/src/com/netscape/pkisilent/common/checkRequest.java
@@ -38,16 +38,15 @@ import org.mozilla.jss.ssl.SSLSocket;
 
 public class checkRequest extends TestClient {
 
-    private int i;
     private String certfile, importcert = "false", certnickname, serialNumber, ldapformat;
 
     private String requestId;
     private String reqStatus = "false";
     private String pkcsCert, baseCert, ACTION_STRING, issuer, subject, AUTH = "ca";
     private int port;
-    private boolean impStatus = false;
     private int type = 1;
 
+    @SuppressWarnings("unused")
     private long elapsedTime;
 
     private String host;
@@ -438,8 +437,6 @@ public class checkRequest extends TestClient {
 
             GregorianCalendar begin = new GregorianCalendar();
 
-            impStatus = false;
-
             // SSLSocket socket = new SSLSocket(host,port);
             SSLSocket socket = new SSLSocket(host, port, null, 0, this, null);
 
diff --git a/base/tks/src/com/netscape/tks/TKSAuthority.java b/base/tks/src/com/netscape/tks/TKSAuthority.java
index 836dc7959ba1016172634124d41944ef52beef93..cfb1b1fdfa82eccb5f7ce96f306356c98722e9c0 100644
--- a/base/tks/src/com/netscape/tks/TKSAuthority.java
+++ b/base/tks/src/com/netscape/tks/TKSAuthority.java
@@ -29,6 +29,7 @@ import com.netscape.certsrv.request.IRequestQueue;
 public class TKSAuthority implements IAuthority, ISubsystem {
     protected ILogger mLogger = CMS.getLogger();
     private String mNickname = null;
+    @SuppressWarnings("unused")
     private ISubsystem mOwner;
     private IConfigStore mConfig = null;
     protected String mId = null;
diff --git a/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
index 82a98c08287a7831740a829d8fad18b95c291d02..c8402b2ca69ece9801fa14399f3b7b1a1e18ca3d 100644
--- a/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
+++ b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
@@ -1215,7 +1215,6 @@ public class CryptoUtil {
         return certs;
     }
 
-    @SuppressWarnings("deprecation")
     public static String unwrapUsingPassphrase(String wrappedRecoveredKey, String recoveryPassphrase)
             throws IOException, InvalidBERException, InvalidKeyException, IllegalStateException,
             NoSuchAlgorithmException, InvalidAlgorithmParameterException, NotInitializedException, TokenException,
@@ -1244,7 +1243,6 @@ public class CryptoUtil {
         return unwrappedData;
     }
 
-    @SuppressWarnings("deprecation")
     public static String unwrapUsingSymmetricKey(CryptoToken token, IVParameterSpec IV, byte[] wrappedRecoveredKey,
             SymmetricKey recoveryKey, EncryptionAlgorithm alg) throws NoSuchAlgorithmException, TokenException,
             BadPaddingException,
@@ -1258,7 +1256,6 @@ public class CryptoUtil {
         return unwrappedS;
     }
 
-    @SuppressWarnings("deprecation")
     public static byte[] wrapPassphrase(CryptoToken token, String passphrase, IVParameterSpec IV, SymmetricKey sk,
             EncryptionAlgorithm alg)
             throws NoSuchAlgorithmException, TokenException, InvalidKeyException,
@@ -1289,7 +1286,6 @@ public class CryptoUtil {
         return session_data;
     }
 
-    @SuppressWarnings("deprecation")
     public static byte[] createPKIArchiveOptions(CryptoManager manager, CryptoToken token, String transportCert,
             SymmetricKey vek, String passphrase, KeyGenAlgorithm keyGenAlg, IVParameterSpec IV) throws TokenException,
             CharConversionException,
diff --git a/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java b/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java
index 6343fd805a1fc2c2c8eb5fc93e0bae910ec11d46..7a9afec616a0b78174a2ea0ce84eb6b21f238947 100644
--- a/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java
@@ -66,8 +66,6 @@ public class UnknownInfo implements CertStatus {
      */
     public static class Template implements ASN1Template {
 
-        private SEQUENCE.Template seqt;
-
         public Template() {
             //                     seqt = new SEQUENCE.Template();
             //                    seqt.addElement(new NULL.Template() );
diff --git a/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java
index 3f0ef1793089117ca3f4da84ab034b052a266c6c..11cdd001e59a68e982b953b4f80d11e8630b05a8 100644
--- a/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java
@@ -20,7 +20,6 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class CHAPPasswordAttribute extends Attribute {
-    private byte _value[] = null;
     private int _ident = 0;
     private String _str = null;
 
@@ -33,7 +32,6 @@ public class CHAPPasswordAttribute extends Attribute {
         _t = CHAP_PASSWORD;
         _ident = value[2];
         _str = new String(value, 2, 16);
-        _value = value;
     }
 
     public int getIdent() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java
index 5fd8060037b0aa7ee488f8cb98720e675e506df7..0e1ae66a63b07294817e893e775958d788f8c8b1 100644
--- a/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class CallbackIdAttribute extends Attribute {
-    private byte _value[] = null;
     private String _str = null;
 
     public CallbackIdAttribute(byte value[]) {
         super();
         _t = CALLBACK_ID;
         _str = new String(value, 2, value.length - 2);
-        _value = value;
     }
 
     public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java
index d6e45cecde637b092d7f8bd0338124778cfc3488..bcaf234846670ca01e0e90eda739f82533637f87 100644
--- a/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class CallbackNumberAttribute extends Attribute {
-    private byte _value[] = null;
     private String _str = null;
 
     public CallbackNumberAttribute(byte value[]) {
         super();
         _t = CALLBACK_NUMBER;
         _str = new String(value, 2, value.length - 2);
-        _value = value;
     }
 
     public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java
index 3b5eec8043e2258b77d88388a0db66f69f8d182f..8ce1272eb3a69afb7d6b1c83028955877db9d348 100644
--- a/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class CallerStationIdAttribute extends Attribute {
-    private byte _value[] = null;
     private String _str = null;
 
     public CallerStationIdAttribute(byte value[]) {
         super();
         _t = CALLER_STATION_ID;
         _str = new String(value, 2, value.length - 2);
-        _value = value;
     }
 
     public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java
index 9a57f808999e03abcd4e65744541bd7ee4f7c42c..cb562afdafd4698c3739b0b5a0ef1be922130652 100644
--- a/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class CallingStationIdAttribute extends Attribute {
-    private byte _value[] = null;
     private String _str = null;
 
     public CallingStationIdAttribute(byte value[]) {
         super();
         _t = CALLING_STATION_ID;
         _str = new String(value, 2, value.length - 2);
-        _value = value;
     }
 
     public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java
index 879d7d5c784675b1d4319998d98b58fc9926b783..c80562ea8f0f4e8b2f758f6f548daad457a8f1c2 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class FilterIdAttribute extends Attribute {
-    private byte _value[] = null;
     private String _str = null;
 
     public FilterIdAttribute(byte value[]) {
         super();
         _t = CHAP_PASSWORD;
         _str = new String(value, 2, value.length - 2);
-        _value = value;
     }
 
     public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java
index 05273780f8d20075b1fe3f0201e3cb969d219912..3e66120f5653fa0571c1f8f0107032f65daa265f 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java
@@ -22,13 +22,11 @@ import java.io.IOException;
 public class FramedAppleTalkLinkAttribute extends Attribute {
     public static int UN_NUMBERED = 0;
 
-    private byte _value[] = null;
     private int _type = 0;
 
     public FramedAppleTalkLinkAttribute(byte value[]) {
         super();
         _t = FRAMED_APPLETALK_LINK;
-        _value = value;
         _type = value[5] & 0xFF;
         _type |= ((value[4] << 8) & 0xFF00);
         _type |= ((value[3] << 16) & 0xFF0000);
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java
index cea0d936a135a2ef99754e1d4f4f6b9336572512..fc9a8b2f5b2de09b8bb064976ce5ce16ade9c67d 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java
@@ -20,13 +20,11 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class FramedAppleTalkNetworkAttribute extends Attribute {
-    private byte _value[] = null;
     private int _type = 0;
 
     public FramedAppleTalkNetworkAttribute(byte value[]) {
         super();
         _t = FRAMED_APPLETALK_NETWORK;
-        _value = value;
         _type = value[5] & 0xFF;
         _type |= ((value[4] << 8) & 0xFF00);
         _type |= ((value[3] << 16) & 0xFF0000);
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java
index 54ee47c451f71baaee25998a0f831138f3fb6638..45011f54565902f8672a15b24cd2d0b637f7f148 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class FramedAppleTalkZoneAttribute extends Attribute {
-    private byte _value[] = null;
     private String _str = null;
 
     public FramedAppleTalkZoneAttribute(byte value[]) {
         super();
         _t = FRAMED_APPLETALK_ZONE;
         _str = new String(value, 2, value.length - 2);
-        _value = value;
     }
 
     public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java
index b57c030b5c4725d7a57bddbb6cef9be01dc4da27..6cd3779145e387c34b90984acb10802617d9a669 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java
@@ -25,7 +25,6 @@ public class FramedCompressionAttribute extends Attribute {
     public static final int IPX_HEADER = 2;
     public static final int STAC_LZS = 3;
 
-    private byte _value[] = null;
     private int _type = 0;
 
     public FramedCompressionAttribute(byte value[]) {
@@ -35,7 +34,6 @@ public class FramedCompressionAttribute extends Attribute {
         _type |= ((value[4] << 8) & 0xFF00);
         _type |= ((value[3] << 16) & 0xFF0000);
         _type |= ((value[2] << 24) & 0xFF000000);
-        _value = value;
     }
 
     public int getType() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java
index 2f66ee8c258aaa8d809a345ee8ea0887df4c3b78..7e0b5685df0f818f84bd4f13afef701d575b19f2 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java
@@ -20,7 +20,6 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class FramedIPAddressAttribute extends Attribute {
-    private byte _value[] = null;
     private byte _addr[] = new byte[4];
 
     public FramedIPAddressAttribute(byte value[]) {
@@ -30,7 +29,6 @@ public class FramedIPAddressAttribute extends Attribute {
         _addr[1] = value[3];
         _addr[2] = value[4];
         _addr[3] = value[5];
-        _value = value;
     }
 
     public byte[] getValue() throws IOException {
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java
index f8e1980c7e0f192ca0b307f6220a4c7486cd519c..2d957f954922e4ab3935315d2f31875ee1affd5d 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java
@@ -20,7 +20,6 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class FramedIPNetmaskAttribute extends Attribute {
-    private byte _value[] = null;
     private byte _mask[] = new byte[4];
 
     public FramedIPNetmaskAttribute(byte value[]) {
@@ -30,7 +29,6 @@ public class FramedIPNetmaskAttribute extends Attribute {
         _mask[1] = value[3];
         _mask[2] = value[4];
         _mask[3] = value[5];
-        _value = value;
     }
 
     public byte[] getValue() throws IOException {
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java
index 92f47eec183175379068477f827880916d1347d3..8f8d25fd62a47f50784d45b43818f7db9eb58902 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java
@@ -20,7 +20,6 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class FramedIPXNetworkAttribute extends Attribute {
-    private byte _value[] = null;
     private byte _net[] = new byte[4];
 
     public FramedIPXNetworkAttribute(byte value[]) {
@@ -30,7 +29,6 @@ public class FramedIPXNetworkAttribute extends Attribute {
         _net[1] = value[3];
         _net[2] = value[4];
         _net[3] = value[5];
-        _value = value;
     }
 
     public byte[] getValue() throws IOException {
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java
index 5cd9551a298c7e902e6912c4adec1e437cebf9d8..5211d533fd5a729fba9693b17815552d2b955848 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java
@@ -20,13 +20,11 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class FramedMTUAttribute extends Attribute {
-    private byte _value[] = null;
     private int _type = 0;
 
     public FramedMTUAttribute(byte value[]) {
         super();
         _t = FRAMED_IP_ADDRESS;
-        _value = value;
         _type = value[5] & 0xFF;
         _type |= ((value[4] << 8) & 0xFF00);
         _type |= ((value[3] << 16) & 0xFF0000);
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java
index 5af219b9a752e0273eb6ded456f7f8c4eb97aefb..c1265419ee43354427cf556fb5c98e32952033a4 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java
@@ -27,7 +27,6 @@ public class FramedProtocolAttribute extends Attribute {
     public static final int XYLOGICS = 5;
     public static final int X_75 = 6;
 
-    private byte _value[] = null;
     private int _type = 0;
 
     public FramedProtocolAttribute(byte value[]) {
@@ -37,7 +36,6 @@ public class FramedProtocolAttribute extends Attribute {
         _type |= ((value[4] << 8) & 0xFF00);
         _type |= ((value[3] << 16) & 0xFF0000);
         _type |= ((value[2] << 24) & 0xFF000000);
-        _value = value;
     }
 
     public int getType() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java
index 9b123fe2a2e891b208a59795dd605f667e149dfc..8ed45e42fc7c92e8ae36f615e01b0cd33e49751c 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class FramedRouteAttribute extends Attribute {
-    private byte _value[] = null;
     private String _str = null;
 
     public FramedRouteAttribute(byte value[]) {
         super();
         _t = FRAMED_ROUTE;
         _str = new String(value, 2, value.length - 2);
-        _value = value;
     }
 
     public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java
index 14d2b0cc8cb28bdad485fa0c7601e16bf32cee46..f75ba4ed98d6bf158c954dc88ae25f8692ea83e6 100644
--- a/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java
@@ -25,7 +25,6 @@ public class FramedRoutingAttribute extends Attribute {
     public static final int LISTEN_FOR_ROUTING_PACKETS = 2;
     public static final int SEND_AND_LISTEN = 3;
 
-    private byte _value[] = null;
     private int _type = 0;
 
     public FramedRoutingAttribute(byte value[]) {
@@ -35,7 +34,6 @@ public class FramedRoutingAttribute extends Attribute {
         _type |= ((value[4] << 8) & 0xFF00);
         _type |= ((value[3] << 16) & 0xFF0000);
         _type |= ((value[2] << 24) & 0xFF000000);
-        _value = value;
     }
 
     public int getType() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java
index 0d1c0565a75c234289a9c64c5d219399a7afa9af..d14fe8ec37672f5b6317916cd9cc0fe28cb6e309 100644
--- a/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java
@@ -23,7 +23,6 @@ public class LoginIPHostAttribute extends Attribute {
     public static final int NAS_ALLOW_SELECT = 0xFFFFFFFF;
     public static final int NAS_SELECT = 0;
 
-    private byte _value[] = null;
     private int _type = 0;
 
     public LoginIPHostAttribute(byte value[]) {
@@ -33,7 +32,6 @@ public class LoginIPHostAttribute extends Attribute {
         _type |= ((value[4] << 8) & 0xFF00);
         _type |= ((value[3] << 16) & 0xFF0000);
         _type |= ((value[2] << 24) & 0xFF000000);
-        _value = value;
     }
 
     public int getType() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java
index 4cee6bc3a115e3b08b571e87371ad5402b863128..bf3532e972bc689427054935b6a7d7f96c20da19 100644
--- a/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class LoginLATGroupAttribute extends Attribute {
-    private byte _value[] = null;
     private String _str = null;
 
     public LoginLATGroupAttribute(byte value[]) {
         super();
         _t = LOGIN_LAT_GROUP;
         _str = new String(value, 2, value.length - 2);
-        _value = value;
     }
 
     public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java
index 2c2d3411e7fe50a176c1e92a80221f449e1db590..f58a52853025fc8c53542dc88de0c565abdbc858 100644
--- a/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class LoginLATNodeAttribute extends Attribute {
-    private byte _value[] = null;
     private String _str = null;
 
     public LoginLATNodeAttribute(byte value[]) {
         super();
         _t = LOGIN_LAT_NODE;
         _str = new String(value, 2, value.length - 2);
-        _value = value;
     }
 
     public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java
index 330161ec8333f65ed896149e9e0f6bf61b6ec314..aa4b86952cfaf65c8fb2c409d1a2bcb9ed9c9b65 100644
--- a/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class LoginLATPortAttribute extends Attribute {
-    private byte _value[] = null;
     private String _str = null;
 
     public LoginLATPortAttribute(byte value[]) {
         super();
         _t = PROXY_STATE;
         _str = new String(value, 2, value.length - 2);
-        _value = value;
     }
 
     public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java
index 158630d279de717ef4235da0af59cbc0d4c26408..1fdbb6927513bcd9cc3204dbab755657ac35fc13 100644
--- a/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class LoginLATServiceAttribute extends Attribute {
-    private byte _value[] = null;
     private String _str = null;
 
     public LoginLATServiceAttribute(byte value[]) {
         super();
         _t = LOGIN_LAT_SERVICE;
         _str = new String(value, 2, value.length - 2);
-        _value = value;
     }
 
     public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java
index 73f49d39f9c210734dd4ecd42969a17aa15696af..e312ab80d3825dbe8764c67d3081be9c4764d60c 100644
--- a/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java
@@ -29,7 +29,6 @@ public class LoginServiceAttribute extends Attribute {
     public static final int X25_T3POS = 6;
     public static final int TCP_CLEAR_QUIET = 8;
 
-    private byte _value[] = null;
     private int _type = 0;
 
     public LoginServiceAttribute(byte value[]) {
@@ -39,7 +38,6 @@ public class LoginServiceAttribute extends Attribute {
         _type |= ((value[4] << 8) & 0xFF00);
         _type |= ((value[3] << 16) & 0xFF0000);
         _type |= ((value[2] << 24) & 0xFF000000);
-        _value = value;
     }
 
     public int getType() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java b/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java
index 57b983028e7f78b88524455d624ed88354194035..ac8a29dd2e29376a9d9a6bb4444e1d9284275dd5 100644
--- a/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class NASClassAttribute extends Attribute {
-    private byte _value[] = null;
     private String _str = null;
 
     public NASClassAttribute(byte value[]) {
         super();
         _t = NAS_CLASS;
         _str = new String(value, 2, value.length - 2);
-        _value = value;
     }
 
     public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java b/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java
index d4022b3dd553487a35f970bd3ddc2cc09ec78b4d..6ab01562a016e8d53989a612cc530fb9d8618fbf 100644
--- a/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java
@@ -22,12 +22,10 @@ import java.net.InetAddress;
 
 public class NASIPAddressAttribute extends Attribute {
     private InetAddress _ip = null;
-    private byte _value[] = null;
 
     public NASIPAddressAttribute(byte value[]) {
         super();
         _t = NAS_IP_ADDRESS;
-        _value = value;
     }
 
     public NASIPAddressAttribute(InetAddress ip) {
diff --git a/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java b/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java
index 0a3a62cd8caac8ac9f05565f0b4223c6d480f1f9..3870dda4b492b169c4dec17fcd3081dc29094744 100644
--- a/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class NASIdentifierAttribute extends Attribute {
-    private byte _value[] = null;
     private String _str = null;
 
     public NASIdentifierAttribute(byte value[]) {
         super();
         _t = NAS_IDENTIFIER;
         _str = new String(value, 2, value.length - 2);
-        _value = value;
     }
 
     public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java b/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java
index 7903bb1fdb751a3cc5f8e0630421788ee041c8be..9bc045a1572ea07518e9a78dba81e26c494cc2ad 100644
--- a/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java
@@ -22,12 +22,9 @@ import java.io.IOException;
 public class PortLimitAttribute extends Attribute {
     private int _port = 0;
 
-    private byte _value[] = null;
-
     public PortLimitAttribute(byte value[]) {
         super();
         _t = FRAMED_IP_ADDRESS;
-        _value = value;
         _port = value[5] & 0xFF;
         _port |= ((value[4] << 8) & 0xFF00);
         _port |= ((value[3] << 16) & 0xFF0000);
diff --git a/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java b/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java
index 83831b65212c9613c44dac9794b567e47286b273..cf019f6141f06b1eb3de0a2847a03af8452a068b 100644
--- a/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class ProxyStateAttribute extends Attribute {
-    private byte _value[] = null;
     private String _str = null;
 
     public ProxyStateAttribute(byte value[]) {
         super();
         _t = PROXY_STATE;
         _str = new String(value, 2, value.length - 2);
-        _value = value;
     }
 
     public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java b/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java
index b22807a5d8cbc6b7bab37434257f09509664fab4..95d6bfecd0a8628fa31dc5f74591fa748295ff02 100644
--- a/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java
+++ b/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java
@@ -39,7 +39,8 @@ public class RadiusConn {
 
     public static String OPTION_DEBUG = "OPTION_DEBUG";
 
-    private Properties _options = null;
+    @SuppressWarnings("unused")
+    private Properties _options;
     private boolean _traceOn = true;
     private String _host[] = new String[2];
     private int _port[] = new int[2];
diff --git a/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java b/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java
index 5ec4ea052859963413ef8fa34b3365dff6659df2..7f84fd0b78b366b99819a7533cee36fed3c23a91 100644
--- a/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java
@@ -20,14 +20,12 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class ReplyMessageAttribute extends Attribute {
-    private byte _value[] = null;
     private String _str = null;
 
     public ReplyMessageAttribute(byte value[]) {
         super();
         _t = REPLY_MESSAGE;
         _str = new String(value, 2, value.length - 2);
-        _value = value;
     }
 
     public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java b/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java
index f31c74f9a932e62ef61875fce5cec52dfe300fd9..63082ba50fdba2518d86b0416c88b111c4a0dea3 100644
--- a/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java
@@ -32,7 +32,6 @@ public class ServiceTypeAttribute extends Attribute {
     public static final int CALL_CHECK = 10;
     public static final int CALLBACK_ADMINISTRATIVE = 11;
 
-    private byte _value[] = null;
     private int _type = 0;
 
     public ServiceTypeAttribute(byte value[]) {
@@ -42,7 +41,6 @@ public class ServiceTypeAttribute extends Attribute {
         _type |= ((value[4] << 8) & 0xFF00);
         _type |= ((value[3] << 16) & 0xFF0000);
         _type |= ((value[2] << 24) & 0xFF000000);
-        _value = value;
     }
 
     public int getType() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java b/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java
index 027f9562098c33d69b2706a92182f1df34356def..4f286dd3c46c02ebc632470ca5886cfe5ab9a1fb 100644
--- a/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java
@@ -20,7 +20,6 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class StateAttribute extends Attribute {
-    private byte _value[] = null;
     private String _str = null;
 
     public StateAttribute(String str) {
@@ -32,7 +31,6 @@ public class StateAttribute extends Attribute {
         super();
         _t = STATE;
         _str = new String(value, 2, value.length - 2);
-        _value = value;
     }
 
     public String getString() {
diff --git a/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java b/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java
index 5f3d9f170523935bf82d00a326464d77230c7314..c25e71187a939498a07899610f7a6502177a78b3 100644
--- a/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java
@@ -20,7 +20,6 @@ package com.netscape.cmsutil.radius;
 import java.io.IOException;
 
 public class VendorSpecificAttribute extends Attribute {
-    private byte _value[] = null;
     private String _id = null;
     private String _str = null;
 
@@ -29,7 +28,6 @@ public class VendorSpecificAttribute extends Attribute {
         _t = VENDOR_SPECIFIC;
         _id = new String(value, 2, 4);
         _str = new String(value, 6, value.length - 6);
-        _value = value;
     }
 
     public String getId() {
diff --git a/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java b/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java
index baf66e71053a952189a328925d94c198008e9768..834e21088033904010edce6a6f99b6cc55ee57af 100644
--- a/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java
+++ b/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java
@@ -151,7 +151,6 @@ public class CRSPKIMessage {
     private SignedData sd;
 
     // In the signed data, we have:
-    private int sdv; // Version
     private ContentInfo data; // The data to be digested
     private EnvelopedData sded; // Enveloped data inside of signed data
     private byte[] signerCertBytes;
@@ -160,7 +159,6 @@ public class CRSPKIMessage {
     private SET sis; // set of SignerInfos
     private SignerInfo si; // First SignerInfo
     private AlgorithmIdentifier digestAlgorithmId = null;
-    private int siv; // Version
     private SET aa; // Authenticated Attributes
     private SET aa_old; // Authenticated Attributes
     private IssuerAndSerialNumber sgnIASN; // Signer's Issuer Name and Serialnum
@@ -179,18 +177,18 @@ public class CRSPKIMessage {
     private int riv; // Version
     private AlgorithmIdentifier riAlgid; // alg that the bulk key is wrapped with
     private byte[] riKey; // bulk key, wrapped with above algorithm
-    private byte[] cKey; // * 'clear', unwrapped key (not in ASN.1) *
     private IssuerAndSerialNumber rcpIASN; // Recipient's Issuer Name and Serial Number
 
     private EncryptedContentInfo eci;
     private byte[] iv; // initialization vector for above key
     private byte[] ec; // encrypted content (P10, in case of request)
-    private byte[] cc; // * 'clear' content (not in ASN.1) *
     private String encryptionAlgorithm = null;
 
     // For the CertRep, the enveloped content is another signed Data:
     private SignedData crsd;
+    @SuppressWarnings("unused")
     private int rsdVersion;
+    @SuppressWarnings("unused")
     private byte[] rsdCert; // certificate to send in response
 
     private PKCS10 myP10;
diff --git a/base/util/src/netscape/security/extensions/PresenceServerExtension.java b/base/util/src/netscape/security/extensions/PresenceServerExtension.java
index 1e78ecc94493356295dd918ab843ca416eefe285..e8fab049ee4a203354b66037dd9f6ea5568a7c5f 100644
--- a/base/util/src/netscape/security/extensions/PresenceServerExtension.java
+++ b/base/util/src/netscape/security/extensions/PresenceServerExtension.java
@@ -39,7 +39,6 @@ public class PresenceServerExtension extends Extension implements CertAttrSet {
      */
     private static final long serialVersionUID = -6333109673043357921L;
     private boolean mCritical;
-    private String mOID = null;
     private int mVersion = 0;
     private String mStreetAddress = null;
     private String mTelephoneNumber = null;
diff --git a/base/util/src/netscape/security/provider/DSA.java b/base/util/src/netscape/security/provider/DSA.java
index c9dc6c5462167b43d9355e0138b4b34c59a50878..64575b870b2d9af46863bdd391a7c3cf8c25cbcf 100644
--- a/base/util/src/netscape/security/provider/DSA.java
+++ b/base/util/src/netscape/security/provider/DSA.java
@@ -55,6 +55,7 @@ public final class DSA extends Signature {
     private static boolean debug = false;
 
     /* The parameter object */
+    @SuppressWarnings("unused")
     private DSAParams params;
 
     /* algorithm parameters */
diff --git a/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java b/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java
index dca206d0c5c93c876d4d6aed7917d84043cf4a3c..66c1460be1c00c5a59da7185a4c3fac99d1314d2 100644
--- a/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java
+++ b/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java
@@ -305,14 +305,6 @@ public class DSAKeyPairGenerator extends KeyPairGenerator
         }
     }
 
-    /* Test vectors from the DSA specs. */
-
-    private static int[] testXSeed = { 0xbd029bbe, 0x7f51960b, 0xcf9edb2b,
-                       0x61f06f0f, 0xeb5a38b6 };
-
-    private int[] x_t = { 0x67452301, 0xefcdab89, 0x98badcfe,
-              0x10325476, 0xc3d2e1f0 };
-
     /**
      * Generate the private key component of the key pair using the
      * provided source of random bits. This method uses the random but
diff --git a/base/util/src/netscape/security/provider/DSAParameterGenerator.java b/base/util/src/netscape/security/provider/DSAParameterGenerator.java
index 3a316cac5cac4ce51ccc6174212699a044a25dd5..1e544d021bb39e505d4540891042534e884b5b7e 100755
--- a/base/util/src/netscape/security/provider/DSAParameterGenerator.java
+++ b/base/util/src/netscape/security/provider/DSAParameterGenerator.java
@@ -54,7 +54,6 @@ public class DSAParameterGenerator extends AlgorithmParameterGeneratorSpi {
     private SecureRandom random;
 
     // useful constants
-    private static final BigInteger ZERO = BigInteger.valueOf(0);
     private static final BigInteger ONE = BigInteger.valueOf(1);
     private static final BigInteger TWO = BigInteger.valueOf(2);
 
diff --git a/base/util/src/netscape/security/provider/MD5.java b/base/util/src/netscape/security/provider/MD5.java
index 47b99eb1b857e84f63556c31490098dade06c8a3..e64873942c9cd4fb4406d3779bd0d7bd434450ad 100644
--- a/base/util/src/netscape/security/provider/MD5.java
+++ b/base/util/src/netscape/security/provider/MD5.java
@@ -35,8 +35,6 @@ public final class MD5 extends MessageDigestSpi implements Cloneable {
     /** contains the computed message digest */
     private byte[] digestBits;
 
-    private String algorithm;
-
     private int state[];
     private long count; // bit count AND buffer[] index aid
     private byte buffer[];
diff --git a/base/util/src/netscape/security/util/CertPrettyPrint.java b/base/util/src/netscape/security/util/CertPrettyPrint.java
index 1d159aa9a818f90c93180fdb08ae54351881bd2a..6e2f953e43a2c29c1fc628e39ae5d45f1a1d9170 100644
--- a/base/util/src/netscape/security/util/CertPrettyPrint.java
+++ b/base/util/src/netscape/security/util/CertPrettyPrint.java
@@ -55,7 +55,6 @@ public class CertPrettyPrint {
      * variables
      *==========================================================*/
     private X509CertImpl mX509Cert = null;
-    private Certificate mCert = null;
     private PrettyPrintFormat pp = null;
     private byte[] mCert_b = null;
 
diff --git a/base/util/src/netscape/security/util/ExtPrettyPrint.java b/base/util/src/netscape/security/util/ExtPrettyPrint.java
index c69f70ebcbd462ffa6a903e73d5cd4676f41416a..d40379e7da44d0785385b15882ccbb0b60c6d736 100644
--- a/base/util/src/netscape/security/util/ExtPrettyPrint.java
+++ b/base/util/src/netscape/security/util/ExtPrettyPrint.java
@@ -91,7 +91,6 @@ public class ExtPrettyPrint {
      *==========================================================*/
     private Extension mExt = null;
     private ResourceBundle mResource = null;
-    private ResourceBundle resource = null;
     private PrettyPrintFormat pp = null;
     private int mIndentSize = 0;
 
diff --git a/base/util/src/netscape/security/x509/AlgorithmId.java b/base/util/src/netscape/security/x509/AlgorithmId.java
index 947853a42cc0a34b8df8e016c63a63d4a0d5816a..4b108ac4bcdb2fe1c9b6663bfebd528829c52ed3 100644
--- a/base/util/src/netscape/security/x509/AlgorithmId.java
+++ b/base/util/src/netscape/security/x509/AlgorithmId.java
@@ -57,9 +57,6 @@ public class AlgorithmId implements Serializable, DerEncoder {
     /** use serialVersionUID from JDK 1.1. for interoperability */
     private static final long serialVersionUID = 7205873507486557157L;
 
-    /* Are we debugging? */
-    private static boolean debug = false;
-
     /**
      * The object identitifer being used for this algorithm.
      */
diff --git a/base/util/src/netscape/security/x509/X500Signer.java b/base/util/src/netscape/security/x509/X500Signer.java
index 746795527c53493a79fd9cc104f3d68ebb62b71e..7d429cd9551a0e68b040de70d1d22d5a68888d3e 100644
--- a/base/util/src/netscape/security/x509/X500Signer.java
+++ b/base/util/src/netscape/security/x509/X500Signer.java
@@ -42,8 +42,6 @@ import java.security.SignatureException;
  */
 public final class X500Signer {
 
-    private static final long serialVersionUID = -3148659822293810158L;
-
     private Signature sig;
     private X500Name agent; // XXX should be X509CertChain
     private AlgorithmId algid;
-- 
1.7.7.4

