Removed unused variables (part 1).

This patch brings down the warnings from 2917 to 2406.

Ticket #103

58 files changed, 72 insertions, 308 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
index e02189142..8f1024723 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
@@ -290,7 +290,6 @@ public class AdminServlet extends HttpServlet {
             IOException {
 
         String auditMessage = null;
-        String auditSubjectID = ILogger.UNIDENTIFIED;
         String auditUID = ILogger.UNIDENTIFIED;
         String authType = "";
 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
index d1924aa93..6a7ad9599 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
@@ -1204,9 +1204,7 @@ public class AuthAdminServlet extends AdminServlet {
             // only remove from memory
             // cannot shutdown because we don't keep track of whether it's
             // being used. 
-            IAuthManager mgrInst = (IAuthManager) mAuths.get(id);
-
-            mAuths.getInstances().remove((Object) id);
+            mAuths.getInstances().remove(id);
 
             // remove the configuration.
             IConfigStore destStore =
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
index 2c6ba3dbc..5bcaa46d2 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
@@ -32,7 +32,6 @@ import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.base.IExtendedPluginInfo;
-import com.netscape.certsrv.base.ISubsystem;
 import com.netscape.certsrv.ca.ICMSCRLExtensions;
 import com.netscape.certsrv.ca.ICRLIssuingPoint;
 import com.netscape.certsrv.ca.ICertificateAuthority;
@@ -348,9 +347,6 @@ public class CAAdminServlet extends AdminServlet {
 
                 if ((!template.exists()) || (!template.canRead())
                         || (template.isDirectory())) {
-                    String error =
-                            "Template: " + val + " does not exist or invalid";
-
                     log(ILogger.LL_FAILURE, CMS.getLogMessage("ADMIN_SRVLT_INVALID_PATH"));
 
                     sendResponse(ERROR,
@@ -404,9 +400,6 @@ public class CAAdminServlet extends AdminServlet {
 
                 if ((!template.exists()) || (!template.canRead())
                         || (template.isDirectory())) {
-                    String error =
-                            "Template: " + val + " does not exist or invalid";
-
                     log(ILogger.LL_FAILURE, CMS.getLogMessage("ADMIN_SRVLT_INVALID_PATH"));
 
                     sendResponse(ERROR,
@@ -1535,16 +1528,12 @@ public class CAAdminServlet extends AdminServlet {
             HttpServletResponse resp) throws ServletException,
             IOException, EBaseException {
 
-        ISubsystem eeGateway = null;
-
         /*
          ISubsystem eeGateway = 
          SubsystemRegistry.getInstance().get("eeGateway");
          */
-        IConfigStore eeConfig = null;
-
-        IConfigStore caConfig = mCA.getConfigStore();
 
+        @SuppressWarnings("unchecked")
         Enumeration<String> enum1 = req.getParameterNames();
         boolean restart = false;
 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
index b77de59c6..6161a20d6 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
@@ -62,7 +62,6 @@ import com.netscape.certsrv.common.Constants;
 import com.netscape.certsrv.common.NameValuePairs;
 import com.netscape.certsrv.common.OpDef;
 import com.netscape.certsrv.common.ScopeDef;
-import com.netscape.certsrv.dbs.IDBSubsystem;
 import com.netscape.certsrv.dbs.certdb.ICertRecord;
 import com.netscape.certsrv.dbs.certdb.ICertificateRepository;
 import com.netscape.certsrv.kra.IKeyRecoveryAuthority;
@@ -357,7 +356,6 @@ public final class CMSAdminServlet extends AdminServlet {
         Enumeration<ISubsystem> e = CMS.getSubsystems();
 
         while (e.hasMoreElements()) {
-            String type = "";
             ISubsystem sys = (ISubsystem) e.nextElement();
 
             //get subsystem type
@@ -386,11 +384,8 @@ public final class CMSAdminServlet extends AdminServlet {
         boolean isCAInstalled = false;
         boolean isRAInstalled = false;
         boolean isKRAInstalled = false;
-        boolean isOCSPInstalled = false;
-        boolean isTKSInstalled = false;
 
         while (e.hasMoreElements()) {
-            String type = "";
             ISubsystem sys = (ISubsystem) e.nextElement();
 
             //get subsystem type
@@ -400,10 +395,6 @@ public final class CMSAdminServlet extends AdminServlet {
                 isRAInstalled = true;
             else if (sys instanceof ICertificateAuthority)
                 isCAInstalled = true;
-            else if (sys instanceof IOCSPAuthority)
-                isOCSPInstalled = true;
-            else if (sys instanceof ITKSAuthority)
-                isTKSInstalled = true;
 
         }
 
@@ -469,10 +460,7 @@ public final class CMSAdminServlet extends AdminServlet {
 
             params.add(Constants.PR_CERT_TRANS, getCertNickname(kraNickname));
         }
-        if (isTKSInstalled) {
-            ITKSAuthority tks = (ITKSAuthority)
-                    CMS.getSubsystem(CMS.SUBSYSTEM_TKS);
-        }
+
         String nickName = CMS.getServerCertNickname();
 
         params.add(Constants.PR_CERT_SERVER, getCertNickname(nickName));
@@ -547,11 +535,8 @@ public final class CMSAdminServlet extends AdminServlet {
             boolean isCAInstalled = false;
             boolean isRAInstalled = false;
             boolean isKRAInstalled = false;
-            boolean isOCSPInstalled = false;
-            boolean isTKSInstalled = false;
 
             while (e.hasMoreElements()) {
-                String type = "";
                 ISubsystem sys = (ISubsystem) e.nextElement();
 
                 //get subsystem type
@@ -561,16 +546,11 @@ public final class CMSAdminServlet extends AdminServlet {
                     isRAInstalled = true;
                 else if (sys instanceof ICertificateAuthority)
                     isCAInstalled = true;
-                else if (sys instanceof IOCSPAuthority)
-                    isOCSPInstalled = true;
-                else if (sys instanceof ITKSAuthority)
-                    isTKSInstalled = true;
             }
 
             ICertificateAuthority ca = null;
             IRegistrationAuthority ra = null;
             IKeyRecoveryAuthority kra = null;
-            ITKSAuthority tks = null;
 
             if (isCAInstalled)
                 ca = (ICertificateAuthority) CMS.getSubsystem(CMS.SUBSYSTEM_CA);
@@ -578,8 +558,6 @@ public final class CMSAdminServlet extends AdminServlet {
                 ra = (IRegistrationAuthority) CMS.getSubsystem(CMS.SUBSYSTEM_RA);
             if (isKRAInstalled)
                 kra = (IKeyRecoveryAuthority) CMS.getSubsystem(CMS.SUBSYSTEM_KRA);
-            if (isTKSInstalled)
-                tks = (ITKSAuthority) CMS.getSubsystem(CMS.SUBSYSTEM_TKS);
 
             boolean isCACert = true;
 
@@ -906,7 +884,7 @@ public final class CMSAdminServlet extends AdminServlet {
 
         }
         if (selectedToken != null && newKeyName != null) {
-            String symKeys = SessionKey.GenMasterKey(selectedToken, newKeyName);
+            SessionKey.GenMasterKey(selectedToken, newKeyName); // check for errors
             CMS.getConfigStore().putString("tks.defaultSlot", selectedToken);
             String masterKeyPrefix = CMS.getConfigStore().getString("tks.master_key_prefix", null);
 
@@ -934,9 +912,6 @@ public final class CMSAdminServlet extends AdminServlet {
             if (name.equals(Constants.PR_TOKEN_LIST)) {
                 String selectedToken = req.getParameter(name);
 
-                int count = 0;
-                int keys_found = 0;
-
                 ICryptoSubsystem jssSubSystem = (ICryptoSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_CRYPTO);
 
                 CryptoToken token = null;
@@ -1125,9 +1100,7 @@ public final class CMSAdminServlet extends AdminServlet {
             String certType = Constants.PR_CA_SIGNING_CERT;
             String dir = "";
             String pathname = "";
-            String serverID = "";
             String otherNickname = "";
-            String certSubType = "";
             String keyCurveName = "";
 
             while (enum1.hasMoreElements()) {
@@ -1145,12 +1118,8 @@ public final class CMSAdminServlet extends AdminServlet {
                     certType = value;
                 } else if (key.equals(Constants.PR_SUBJECT_NAME)) {
                     subjectName = value;
-                } else if (key.equals(Constants.PR_SERVER_ID)) {
-                    serverID = value;
                 } else if (key.equals(Constants.PR_NICKNAME)) {
                     otherNickname = value;
-                } else if (key.equals(Constants.PR_CERTIFICATE_SUBTYPE)) {
-                    certSubType = value;
                 } else if (key.equals(Constants.PR_KEY_CURVENAME)) {
                     keyCurveName = value;
                 }
@@ -1495,27 +1464,17 @@ public final class CMSAdminServlet extends AdminServlet {
         try {
             @SuppressWarnings("unchecked")
             Enumeration<String> enum1 = req.getParameterNames();
-            String pkcs = "";
-            String type = "";
             String tokenName = Constants.PR_INTERNAL_TOKEN_NAME;
             String keyType = "RSA";
-            int keyLength = 512;
-            String subjectName = "";
             KeyCertData properties = new KeyCertData();
-            String pathname = "";
 
-            String configPath = "";
             String newtokenname = null;
 
             while (enum1.hasMoreElements()) {
                 String key = (String) enum1.nextElement();
                 String value = req.getParameter(key);
 
-                if (key.equals("pathname")) {
-                    configPath = mConfig.getString("instanceRoot", "")
-                               + File.separator + "conf" + File.separator;
-                    pathname = configPath + value;
-                } else {
+                if (!key.equals("pathname")) {
                     if (key.equals(Constants.PR_TOKEN_NAME))
                         newtokenname = value;
                     properties.put(key, value);
@@ -1526,8 +1485,6 @@ public final class CMSAdminServlet extends AdminServlet {
 
             ICryptoSubsystem jssSubSystem = (ICryptoSubsystem)
                     CMS.getSubsystem(CMS.SUBSYSTEM_CRYPTO);
-            IDBSubsystem dbs = (IDBSubsystem)
-                    CMS.getSubsystem(CMS.SUBSYSTEM_DBS);
             ICertificateAuthority ca = (ICertificateAuthority)
                     CMS.getSubsystem(CMS.SUBSYSTEM_CA);
             ICertificateRepository repository =
@@ -1633,11 +1590,11 @@ public final class CMSAdminServlet extends AdminServlet {
             } else if (properties.getKeyLength() != null) { //new RSA or DSA
                 keyType = properties.getKeyType();
                 String keyLen = properties.getKeyLength();
-                PQGParams pqgParams = null;
 
                 if (keyType.equals("DSA")) {
-                    pqgParams = jssSubSystem.getCAPQG(Integer.parseInt(keyLen),
-                                                      mConfig);
+                    @SuppressWarnings("unused")
+                    PQGParams pqgParams =
+                            jssSubSystem.getCAPQG(Integer.parseInt(keyLen), mConfig); // check for errors
                     //properties.put(Constants.PR_PQGPARAMS, pqgParams);
                 }
                 pair = jssSubSystem.getKeyPair(properties);
@@ -2342,7 +2299,6 @@ public final class CMSAdminServlet extends AdminServlet {
         // to the signed audit log and stored as failures
         try {
             String b64Cert = "";
-            String certType = "";
             String pathname = "";
             String serverRoot = "";
             String serverID = "";
@@ -2358,8 +2314,6 @@ public final class CMSAdminServlet extends AdminServlet {
                 // really should be PR_CERT_CONTENT
                 if (key.equals(Constants.PR_PKCS10))
                     b64Cert = value;
-                else if (key.equals(Constants.RS_ID))
-                    certType = value;
                 else if (key.equals("pathname"))
                     pathname = value;
                 else if (key.equals(Constants.PR_SERVER_ROOT))
@@ -2724,7 +2678,6 @@ public final class CMSAdminServlet extends AdminServlet {
         String nickname = "";
         String serialno = "";
         String issuername = "";
-        Locale locale = super.getLocale(req);
         NameValuePairs pairs = new NameValuePairs();
 
         while (enum1.hasMoreElements()) {
@@ -2888,31 +2841,7 @@ public final class CMSAdminServlet extends AdminServlet {
     private void validateKeyLength(HttpServletRequest req,
             HttpServletResponse resp) throws ServletException,
             IOException, EBaseException {
-        @SuppressWarnings("unchecked")
-        Enumeration<String> enum1 = req.getParameterNames();
-        String keyType = "RSA";
-        String keyLen = "512";
-        String certType = "";
-
-        while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
-            String value = req.getParameter(key);
-
-            if (key.equals(Constants.PR_CERTIFICATE_TYPE)) {
-                certType = value;
-            } else if (key.equals(Constants.PR_KEY_TYPE)) {
-                keyType = value;
-            } else if (key.equals(Constants.PR_KEY_LENGTH)) {
-                keyLen = value;
-            }
-        }
-        int keyLength = Integer.parseInt(keyLen);
-        int minKey = mConfig.getInteger(
-                ConfigConstants.PR_RSA_MIN_KEYLENGTH, 512);
-        ICryptoSubsystem jssSubSystem = (ICryptoSubsystem)
-                CMS.getSubsystem(CMS.SUBSYSTEM_CRYPTO);
 
-        // jssSubSystem.checkKeyLength(keyType, keyLength, certType, minKey);
         sendResponse(SUCCESS, null, null, resp);
     }
 
@@ -2979,17 +2908,12 @@ public final class CMSAdminServlet extends AdminServlet {
         Enumeration<String> enum1 = req.getParameterNames();
 
         String nickname = "";
-        String keyType = "RSA";
-        String keyLen = "512";
-        String certType = "";
-        String configDir = "";
 
         while (enum1.hasMoreElements()) {
             String key = (String) enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.RS_ID)) {
-                certType = value;
                 nickname = getNickname(value);
                 break;
             }
@@ -3011,10 +2935,6 @@ public final class CMSAdminServlet extends AdminServlet {
         Enumeration<String> enum1 = req.getParameterNames();
 
         String nickname = "";
-        String keyType = "RSA";
-        String keyLen = "512";
-        String certType = "";
-        String configDir = "";
 
         while (enum1.hasMoreElements()) {
             String key = (String) enum1.nextElement();
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
index bfd5004a2..a9baa874c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
@@ -640,9 +640,7 @@ public class JobsAdminServlet extends AdminServlet {
         // only remove from memory
         // cannot shutdown because we don't keep track of whether it's
         // being used. 
-        IJob jobInst = (IJob) mJobsSched.getInstances().get(id);
-
-        mJobsSched.getInstances().remove((Object) id);
+        mJobsSched.getInstances().remove(id);
 
         // remove the configuration.
         IConfigStore destStore =
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
index dadbf4088..ff70a5c53 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
@@ -2352,7 +2352,7 @@ public class LogAdminServlet extends AdminServlet {
                 }
             } else if (key.equals(Constants.PR_DEBUG_LOG_LEVEL)) {
                 try {
-                    int number = Integer.parseInt(value);
+                    Integer.parseInt(value); // check for errors
                     mConfig.putString(Constants.PR_DEBUG_LOG_LEVEL, value);
                 } catch (NumberFormatException e) {
                     CMS.debug("setGeneralConfig: Invalid value for " + Constants.PR_DEBUG_LOG_LEVEL + ": " + value);
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
index cbc406997..8e67c3402 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
@@ -210,7 +210,6 @@ public class ProfileAdminServlet extends AdminServlet {
             throws ServletException, IOException {
         // Get operation type
         String op = req.getParameter(Constants.OP_TYPE);
-        String scope = super.getParameter(req, Constants.OP_SCOPE);
 
         if (op.equals(OpDef.OP_READ)) {
             if (!readAuthorize(req, resp))
@@ -232,7 +231,6 @@ public class ProfileAdminServlet extends AdminServlet {
             throws ServletException, IOException {
         // Get operation type
         String op = req.getParameter(Constants.OP_TYPE);
-        String scope = super.getParameter(req, Constants.OP_SCOPE);
 
         if (op.equals(OpDef.OP_READ)) {
             if (!readAuthorize(req, resp))
@@ -460,8 +458,6 @@ public class ProfileAdminServlet extends AdminServlet {
             String setId = ss.nextToken();
             String pId = ss.nextToken();
 
-            IProfilePolicy policy = null;
-
             try {
                 if (!isValidId(setId)) {
                     sendResponse(ERROR,
@@ -479,7 +475,7 @@ public class ProfileAdminServlet extends AdminServlet {
                             null, resp);
                     return;
                 }
-                policy = profile.createProfilePolicy(setId, pId,
+                profile.createProfilePolicy(setId, pId,
                             defImpl, conImpl);
             } catch (EBaseException e1) {
                 // error
@@ -590,7 +586,6 @@ public class ProfileAdminServlet extends AdminServlet {
                 return;
             }
 
-            IProfileInput input = null;
             @SuppressWarnings("unchecked")
             Enumeration<String> names = req.getParameterNames();
             NameValuePairs nvps = new NameValuePairs();
@@ -608,7 +603,7 @@ public class ProfileAdminServlet extends AdminServlet {
             }
 
             try {
-                input = profile.createProfileInput(inputId, inputImpl, nvps);
+                profile.createProfileInput(inputId, inputImpl, nvps);
             } catch (EBaseException e1) {
                 // error
 
@@ -717,7 +712,6 @@ public class ProfileAdminServlet extends AdminServlet {
                 return;
             }
 
-            IProfileOutput output = null;
             @SuppressWarnings("unchecked")
             Enumeration<String> names = req.getParameterNames();
             NameValuePairs nvps = new NameValuePairs();
@@ -735,7 +729,7 @@ public class ProfileAdminServlet extends AdminServlet {
             }
 
             try {
-                output = profile.createProfileOutput(outputId, outputImpl,
+                profile.createProfileOutput(outputId, outputImpl,
                             nvps);
             } catch (EBaseException e1) {
                 // error
@@ -1207,7 +1201,6 @@ public class ProfileAdminServlet extends AdminServlet {
 
             IProfilePolicy policy = profile.getProfilePolicy(setId, pId);
             IPolicyDefault def = policy.getDefault();
-            IConfigStore defConfig = def.getConfigStore();
 
             @SuppressWarnings("unchecked")
             Enumeration<String> names = req.getParameterNames();
@@ -1345,7 +1338,6 @@ public class ProfileAdminServlet extends AdminServlet {
 
             IProfilePolicy policy = profile.getProfilePolicy(setId, pId);
             IPolicyConstraint con = policy.getConstraint();
-            IConfigStore conConfig = con.getConfigStore();
 
             @SuppressWarnings("unchecked")
             Enumeration<String> names = req.getParameterNames();
@@ -1484,7 +1476,6 @@ public class ProfileAdminServlet extends AdminServlet {
             String pId = ss.nextToken();
             IProfilePolicy policy = profile.getProfilePolicy(setId, pId);
             IPolicyDefault def = policy.getDefault();
-            IConfigStore defConfig = def.getConfigStore();
 
             @SuppressWarnings("unchecked")
             Enumeration<String> names = req.getParameterNames();
@@ -1858,7 +1849,6 @@ public class ProfileAdminServlet extends AdminServlet {
             String pId = ss.nextToken();
             IProfilePolicy policy = profile.getProfilePolicy(setId, pId);
             IPolicyConstraint con = policy.getConstraint();
-            IConfigStore conConfig = con.getConfigStore();
 
             @SuppressWarnings("unchecked")
             Enumeration<String> names = req.getParameterNames();
@@ -2072,9 +2062,7 @@ public class ProfileAdminServlet extends AdminServlet {
             while (policies.hasMoreElements()) {
                 IProfilePolicy policy = (IProfilePolicy) policies.nextElement();
                 IPolicyDefault def = policy.getDefault();
-                IConfigStore defConfig = def.getConfigStore();
                 IPolicyConstraint con = policy.getConstraint();
-                IConfigStore conConfig = con.getConfigStore();
 
                 nvp.add(setId + ":" + policy.getId(),
                         def.getName(getLocale(req)) + ";" +
@@ -2230,13 +2218,6 @@ public class ProfileAdminServlet extends AdminServlet {
 
         while (e.hasMoreElements()) {
             String profileId = e.nextElement();
-            IProfile profile = null;
-
-            try {
-                profile = mProfileSub.getProfile(profileId);
-            } catch (EBaseException e1) {
-                // error
-            }
 
             String status = null;
 
@@ -2480,7 +2461,6 @@ public class ProfileAdminServlet extends AdminServlet {
 
             String impl = req.getParameter("impl");
             String name = req.getParameter("name");
-            String desc = req.getParameter("desc");
             String visible = req.getParameter("visible");
             String auth = req.getParameter("auth");
             String config = null;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java b/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
index a48b8146c..041818d0a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
@@ -1014,7 +1014,7 @@ public abstract class CMSServlet extends HttpServlet {
         Enumeration<String> names = httpParams.elements();
 
         while (names.hasMoreElements()) {
-            String name = (String) names.nextElement();
+            String name = names.nextElement();
             Enumeration<String> params = mDontSaveHttpParams.elements();
             boolean dosave = true;
 
@@ -1049,7 +1049,7 @@ public abstract class CMSServlet extends HttpServlet {
             return null;
         }
         ICertificateRepository certdb =
-                (ICertificateRepository) ((ICertificateAuthority) mAuthority).getCertificateRepository();
+                ((ICertificateAuthority) mAuthority).getCertificateRepository();
 
         if (certdb == null) {
             log(ILogger.LL_WARN, CMS.getLogMessage("CMSGW_CERT_DB_NULL", mAuthority.toString()));
@@ -1104,7 +1104,7 @@ public abstract class CMSServlet extends HttpServlet {
             return null;
         }
         ICertificateRepository certdb =
-                (ICertificateRepository) ((ICertificateAuthority) mAuthority).getCertificateRepository();
+                ((ICertificateAuthority) mAuthority).getCertificateRepository();
 
         if (certdb == null) {
             log(ILogger.LL_WARN, CMS.getLogMessage("CMSGW_CERT_DB_NULL", mAuthority.toString()));
@@ -1443,7 +1443,7 @@ public abstract class CMSServlet extends HttpServlet {
         if (token != null && req != null) {
             Enumeration<String> e = token.getElements();
             while (e.hasMoreElements()) {
-                String n = (String) e.nextElement();
+                String n = e.nextElement();
                 String[] x1 = token.getInStringArray(n);
                 if (x1 != null) {
                     for (int i = 0; i < x1.length; i++) {
@@ -2141,7 +2141,7 @@ public abstract class CMSServlet extends HttpServlet {
      * with the "auditSubjectID()".
      * <P>
      * 
-     * @param id string containing the signed audit log message SubjectID
+     * @param SubjectID string containing the signed audit log message SubjectID
      * @return a delimited string of groups associated
      *         with the "auditSubjectID()"
      */
@@ -2167,7 +2167,7 @@ public abstract class CMSServlet extends HttpServlet {
         StringBuffer membersString = new StringBuffer();
 
         while (groups.hasMoreElements()) {
-            IGroup group = (IGroup) groups.nextElement();
+            IGroup group = groups.nextElement();
 
             if (group.isMember(SubjectID) == true) {
                 if (membersString.length() != 0) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java b/pki/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java
index 58ad4eabc..f883fd373 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java
@@ -68,7 +68,6 @@ public class SystemInfoServlet extends HttpServlet {
     public void service(HttpServletRequest request,
             HttpServletResponse response)
             throws ServletException, IOException {
-        boolean collect = false;
         String op = request.getParameter("op");
 
         response.setContentType("text/html");
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
index 5fd3cd902..95f5ae7b8 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
@@ -159,7 +159,6 @@ public class CMCRevReqServlet extends CMSServlet {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERROR_DISPLAY_TEMPLATE"));
             throw new ECMSGWException(CMS.getLogMessage("CMSGW_ERROR_DISPLAY_TEMPLATE"));
         }
-        EBaseException error = null;
 
         IArgBlock header = CMS.createArgBlock();
         IArgBlock ctx = CMS.createArgBlock();
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java b/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
index a2b501f14..e0978dd21 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
@@ -148,8 +148,6 @@ public class ChallengeRevocationServlet1 extends CMSServlet {
             throw new ECMSGWException(CMS.getLogMessage("CMSGW_ERROR_DISPLAY_TEMPLATE"));
         }
 
-        EBaseException error = null;
-
         IArgBlock header = CMS.createArgBlock();
         IArgBlock ctx = CMS.createArgBlock();
         CMSTemplateParams argSet = new CMSTemplateParams(header, ctx);
@@ -167,7 +165,6 @@ public class ChallengeRevocationServlet1 extends CMSServlet {
         int reasonCode =
                 httpParams.getValueAsInt(REASON_CODE, 0);
         //        header.addIntegerValue("reason", reasonCode);
-        RevocationReason reason = RevocationReason.fromInt(reasonCode);
 
         String comments = req.getParameter(IRequest.REQUESTOR_COMMENTS);
         Date invalidityDate = null;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java b/pki/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java
index 9feddbec8..d17fd959b 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java
@@ -104,8 +104,6 @@ public class CloneRedirect extends CMSServlet {
         HttpServletRequest req = cmsReq.getHttpReq();
         HttpServletResponse resp = cmsReq.getHttpResp();
 
-        EBaseException error = null;
-
         IArgBlock header = CMS.createArgBlock();
         IArgBlock fixed = CMS.createArgBlock();
         CMSTemplateParams argSet = new CMSTemplateParams(header, fixed);
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java
index 03c909cc5..ced92ba85 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java
@@ -198,7 +198,6 @@ public class DirAuthServlet extends CMSServlet {
 
     private void printError(CMSRequest cmsReq, String errorCode)
             throws EBaseException {
-        IArgBlock httpParams = cmsReq.getHttpParams();
         HttpServletRequest httpReq = cmsReq.getHttpReq();
         HttpServletResponse httpResp = cmsReq.getHttpResp();
         IArgBlock header = CMS.createArgBlock();
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
index c34cd2227..f5422c2fc 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
@@ -142,7 +142,6 @@ public class DisplayCRL extends CMSServlet {
         CMSTemplateParams argSet = new CMSTemplateParams(header, fixed);
 
         // Note error is covered in the same template as success.
-        EBaseException error = null;
 
         String crlIssuingPointId = req.getParameter("crlIssuingPoint");
 
@@ -175,8 +174,6 @@ public class DisplayCRL extends CMSServlet {
                          HttpServletResponse resp,
                          String crlIssuingPointId,
                          Locale locale) {
-        boolean updateStatus = true;
-        EBaseException error = null;
         ICRLIssuingPoint crlIP = null;
         X509CRLImpl crl = null;
         boolean clonedCA = false;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java
index bf582a82e..99082d4c5 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java
@@ -184,7 +184,6 @@ public class DisplayHashUserEnroll extends CMSServlet {
 
     private void printError(CMSRequest cmsReq, String errorCode)
             throws EBaseException {
-        IArgBlock httpParams = cmsReq.getHttpParams();
         HttpServletRequest httpReq = cmsReq.getHttpReq();
         HttpServletResponse httpResp = cmsReq.getHttpResp();
         IArgBlock header = CMS.createArgBlock();
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
index 00cca204a..853fa1e45 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
@@ -165,12 +165,12 @@ public class DoRevokeTPS extends CMSServlet {
         int reason = -1;
         boolean authorized = true;
         Date invalidityDate = null;
-        CMSTemplate form = null;
         Locale[] locale = new Locale[1];
 
         CMS.debug("DoRevokeTPS before getTemplate");
         try {
-            form = getTemplate(mFormPath, req, locale);
+            @SuppressWarnings("unused")
+            CMSTemplate form = getTemplate(mFormPath, req, locale); // check for errors
         } catch (IOException e) {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_GET_TEMPLATE", mFormPath, e.toString()));
             throw new ECMSGWException(CMS.getLogMessage("CMSGW_ERROR_DISPLAY_TEMPLATE"));
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
index c48cd8635..b32ce5e11 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
@@ -932,7 +932,6 @@ public class EnrollServlet extends CMSServlet {
 
             X509CertInfo[] certInfoArray = new X509CertInfo[] { certInfo };
 
-            X509CertInfo authCertInfo = null;
             String authMgr = AuditFormat.NOAUTH;
 
             // if authentication
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java b/pki/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
index fca81ff4a..b9a2221f2 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
@@ -215,7 +215,6 @@ public class GetBySerial extends CMSServlet {
 
         X509CertImpl cert = certRecord.getCertificate();
 
-        String browser1 = req.getParameter("browser");
         if (cert != null) {
             // if there's a crmf request id, set that too.
             if (browser != null && browser.equals("ie")) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
index 1ff056ab7..4af8a6a68 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
@@ -173,7 +173,6 @@ public class HashEnrollServlet extends CMSServlet {
             throws EBaseException {
         IArgBlock httpParams = cmsReq.getHttpParams();
         HttpServletRequest httpReq = cmsReq.getHttpReq();
-        HttpServletResponse httpResp = cmsReq.getHttpResp();
         String certType = null;
 
         String reqHost = httpReq.getRemoteHost();
@@ -231,7 +230,6 @@ public class HashEnrollServlet extends CMSServlet {
 
     private void printError(CMSRequest cmsReq, String errorCode)
             throws EBaseException {
-        IArgBlock httpParams = cmsReq.getHttpParams();
         HttpServletRequest httpReq = cmsReq.getHttpReq();
         HttpServletResponse httpResp = cmsReq.getHttpResp();
         IArgBlock header = CMS.createArgBlock();
@@ -294,7 +292,6 @@ public class HashEnrollServlet extends CMSServlet {
 
         String certAuthEnrollOn =
                 httpParams.getValueAsString("certauthEnroll", null);
-        X509CertInfo new_certInfo = null;
 
         if ((certAuthEnrollOn != null) && (certAuthEnrollOn.equals("on"))) {
             certAuthEnroll = true;
@@ -394,7 +391,6 @@ public class HashEnrollServlet extends CMSServlet {
 
         IAuthToken authToken = mgr.getAuthToken(pageID);
 
-        X509CertInfo authCertInfo = null;
         String authMgr = AuditFormat.NOAUTH;
 
         if (authToken == null) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
index fd2454210..223121577 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
@@ -418,9 +418,6 @@ public class RenewalServlet extends CMSServlet {
         // there's no other way to tell
 
         IArgBlock httpParams = cmsReq.getHttpParams();
-        HttpServletRequest httpReq = cmsReq.getHttpReq();
-        String certType = httpParams.getValueAsString(CERT_TYPE, "client");
-        String agent = httpReq.getHeader("user-agent");
 
         if (checkImportCertToNav(cmsReq.getHttpResp(),
                 httpParams, renewed_cert)) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java b/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
index 0491ccef5..707e7ff5f 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
@@ -377,7 +377,6 @@ public class UpdateDir extends CMSServlet {
             } else {
                 ICRLIssuingPoint crlIssuingPoint =
                         mCA.getCRLIssuingPoint(crlIssuingPointId);
-                ICRLIssuingPointRecord crlRecord = null;
 
                 updateCRLIssuingPoint(header, crlIssuingPointId,
                         crlIssuingPoint, locale);
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
index 23793b3f9..99febb4cf 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
@@ -41,7 +41,6 @@ import netscape.ldap.LDAPEntry;
 import netscape.security.pkcs.PKCS10;
 import netscape.security.pkcs.PKCS10Attribute;
 import netscape.security.pkcs.PKCS10Attributes;
-import netscape.security.util.DerOutputStream;
 import netscape.security.util.ObjectIdentifier;
 import netscape.security.x509.AVA;
 import netscape.security.x509.CertAttrSet;
@@ -674,9 +673,6 @@ public class CRSEnrollment extends HttpServlet {
             responseData = responseData +
                     "<RemoteHost>" + httpReq.getRemoteHost() + "</RemoteHost>";
 
-            // Deal with Nonces
-            byte[] sn = req.getSenderNonce();
-
             // Deal with message type
             String mt = req.getMessageType();
             responseData = responseData +
@@ -715,7 +711,6 @@ public class CRSEnrollment extends HttpServlet {
 
                         if (ext.getExtensionId().equals(
                                 OIDMap.getOID(SubjectAlternativeNameExtension.IDENT))) {
-                            DerOutputStream dos = new DerOutputStream();
                             SubjectAlternativeNameExtension sane = new SubjectAlternativeNameExtension(
                                     Boolean.valueOf(false), // noncritical
                                     ext.getExtensionValue());
@@ -985,7 +980,6 @@ public class CRSEnrollment extends HttpServlet {
             return null;
         }
 
-        int count = 0;
         while (rids.hasMoreElements()) {
             RequestId rid = rids.nextElement();
             if (rid == null) {
@@ -1048,8 +1042,11 @@ public class CRSEnrollment extends HttpServlet {
 
         // Get Signed Data
 
-        byte[] reqAAbytes = req.getAA();
-        byte[] reqAAsig = req.getAADigest();
+        @SuppressWarnings("unused")
+        byte[] reqAAbytes = req.getAA(); // check for errors
+
+        @SuppressWarnings("unused")
+        byte[] reqAAsig = req.getAADigest(); // check for errors
 
     }
 
@@ -1155,10 +1152,7 @@ public class CRSEnrollment extends HttpServlet {
     private void getDetailFromRequest(CRSPKIMessage req, CRSPKIMessage crsResp)
             throws CRSFailureException {
 
-        IRequest issueReq = null;
-        X509CertImpl issuedCert = null;
         SubjectAlternativeNameExtension sane = null;
-        CertAttrSet requested_ext = null;
 
         try {
             PKCS10 p10 = req.getP10();
@@ -1171,7 +1165,6 @@ public class CRSEnrollment extends HttpServlet {
 
             AuthCredentials authCreds = new AuthCredentials();
 
-            String challengePassword = null;
             // Here, we make a new CertInfo - it's a new start for a certificate
 
             X509CertInfo certInfo = CMS.getDefaultX509CertInfo();
@@ -1265,7 +1258,6 @@ public class CRSEnrollment extends HttpServlet {
 
                         if (ext.getExtensionId().equals(
                                 OIDMap.getOID(SubjectAlternativeNameExtension.IDENT))) {
-                            DerOutputStream dos = new DerOutputStream();
                             sane = new SubjectAlternativeNameExtension(
                                     new Boolean(false), // noncritical
                                     ext.getExtensionValue());
@@ -1309,7 +1301,8 @@ public class CRSEnrollment extends HttpServlet {
             try {
                 if (mAppendDN != null && !mAppendDN.equals("")) {
 
-                    X500Name newSubject = new X500Name(subject.toString());
+                    new X500Name(subject.toString()); // check for errors
+
                     subject = new X500Name(subject.toString().concat("," + mAppendDN));
                 }
 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java
index b3a0f5651..85f3938b8 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java
@@ -127,16 +127,15 @@ public class ExtensionsRequested implements CertAttrSet {
     private void construct(DerValue dv) throws IOException {
 
         DerInputStream stream = null;
-        DerValue[] dvs;
 
         try { // try decoding as sequence first
 
             stream = dv.toDerInputStream();
 
-            DerValue stream_dv = stream.getDerValue();
+            stream.getDerValue(); // consume stream
             stream.reset();
 
-            dvs = stream.getSequence(2);
+            stream.getSequence(2); // consume stream
         } catch (IOException ioe) {
             // if it failed, the outer sequence may be
             // encapsulated in an octet string, as in the first
@@ -150,7 +149,7 @@ public class ExtensionsRequested implements CertAttrSet {
             dv = new DerValue(octet_string);
 
             stream = dv.toDerInputStream();
-            dvs = stream.getSequence(2);
+            stream.getSequence(2); // consume stream
         }
 
         // now, the stream will be in the correct format
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java b/pki/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java
index aa95b622d..2edfc4f08 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java
@@ -548,7 +548,6 @@ public class CMCOutputTemplate {
                         CMS.debug("CMCOutputTemplate: Issuer names are equal");
                         ICertificateRepository repository =
                                 (ICertificateRepository) ca.getCertificateRepository();
-                        X509CertImpl impl = null;
                         try {
                             repository.getX509Certificate(serialno);
                         } catch (EBaseException ee) {
@@ -839,7 +838,6 @@ public class CMCOutputTemplate {
                         return bpid;
                     }
 
-                    byte[] bv = null;
                     String sharedSecret = null;
                     if (tokenClass != null) {
                         sharedSecret = tokenClass.getSharedToken(revokeSerial);
diff --git a/pki/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java b/pki/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java
index 171aeb64c..0a4ea589e 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java
@@ -33,7 +33,6 @@ import com.netscape.certsrv.authorization.AuthzToken;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.base.IPrettyPrintFormat;
-import com.netscape.certsrv.common.Constants;
 import com.netscape.certsrv.logging.ILogger;
 import com.netscape.certsrv.request.IRequest;
 import com.netscape.certsrv.request.IRequestQueue;
@@ -290,9 +289,6 @@ public class GenerateKeyPairServlet extends CMSServlet {
      */
     public void service(HttpServletRequest req, HttpServletResponse resp)
             throws ServletException, IOException {
-        String scope = req.getParameter(Constants.OP_SCOPE);
-        String op = req.getParameter(Constants.OP_TYPE);
-
         super.service(req, resp);
 
     }
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java
index 8c84f4a21..7912486f5 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java
@@ -87,7 +87,8 @@ public class AdminAuthenticatePanel extends WizardPanelBase {
         IConfigStore cs = CMS.getConfigStore();
         /* clean up if necessary */
         try {
-            boolean done = cs.getBoolean("preop.AdminAuthenticate.done");
+            @SuppressWarnings("unused")
+            boolean done = cs.getBoolean("preop.AdminAuthenticate.done"); // check for errors
             cs.putBoolean("preop.AdminAuthenticate.done", false);
             cs.commit(false);
         } catch (Exception e) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
index 223801d8f..4e73b8369 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
@@ -353,12 +353,9 @@ public class AdminPanel extends WizardPanelBase {
     private void createAdmin(HttpServletRequest request) throws IOException {
         IUGSubsystem system = (IUGSubsystem) (CMS.getSubsystem(IUGSubsystem.ID));
         IConfigStore config = CMS.getConfigStore();
-        String adminName = null;
         String groupName = null;
 
         try {
-            adminName = config.getString(PRE_CONF_ADMIN_NAME,
-                    "Certificate System Administrator");
             groupName = config.getString(PRE_CONF_AGENT_GROUP,
                     "Certificate Manager Agents");
         } catch (Exception e) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java
index 6bda87491..c1e6bffd1 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java
@@ -177,8 +177,11 @@ public class AgentAuthenticatePanel extends WizardPanelBase {
             String pwd = HttpInput.getPassword(request, "__password");
             config.putString("preop.ca.agent.uid", uid);
             config.putString("preop.ca.agent.pwd", pwd);
+
+            /*
             String host = "";
             int httpsport = -1;
+
             try {
                 host = config.getString("preop.ca.hostname");
             } catch (Exception e) {
@@ -195,7 +198,6 @@ public class AgentAuthenticatePanel extends WizardPanelBase {
                 throw new IOException("Missing port");
             }
 
-            /*
                          // Bugzilla Bug #583825 - CC: Obsolete servlets to be removed from
                          //                        web.xml as part of CC interface review
                          boolean authenticated = authenticate(host, httpsport, true,
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java
index c1529f256..d216a9212 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java
@@ -93,7 +93,8 @@ public class BackupKeyCertPanel extends WizardPanelBase {
         IConfigStore cs = CMS.getConfigStore();
         /* clean up if necessary */
         try {
-            boolean done = cs.getBoolean("preop.backupkeycert.done");
+            @SuppressWarnings("unused")
+            boolean done = cs.getBoolean("preop.backupkeycert.done"); // check for errors
             cs.putBoolean("preop.backupkeycert.done", false);
             cs.commit(false);
         } catch (Exception e) {
@@ -307,7 +308,7 @@ public class BackupKeyCertPanel extends WizardPanelBase {
             //String nickname = cacerts[i].getSubjectDN().toString();
             String nickname = null;
             try {
-                byte[] localKeyId = addCertBag(cacerts[i], nickname, safeContents);
+                addCertBag(cacerts[i], nickname, safeContents);
             } catch (IOException e) {
                 throw e;
             } catch (Exception e) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java
index ccaa78e0b..5da169915 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java
@@ -190,7 +190,6 @@ public class CAInfoPanel extends WizardPanelBase {
     public void validate(HttpServletRequest request,
             HttpServletResponse response,
             Context context) throws IOException {
-        IConfigStore config = CMS.getConfigStore();
     }
 
     /**
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
index 43c707fbe..04ab4dac8 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
@@ -122,7 +122,8 @@ public class CertRequestPanel extends WizardPanelBase {
             if (cert == null)
                 return false;
             try {
-                boolean done = cs.getBoolean("preop.CertRequestPanel.done");
+                @SuppressWarnings("unused")
+                boolean done = cs.getBoolean("preop.CertRequestPanel.done"); // check for errors
                 return true;
             } catch (Exception ee) {
                 if (hardware) {
@@ -219,7 +220,8 @@ public class CertRequestPanel extends WizardPanelBase {
         }
 
         try {
-            boolean done = cs.getBoolean("preop.CertRequestPanel.done");
+            @SuppressWarnings("unused")
+            boolean done = cs.getBoolean("preop.CertRequestPanel.done"); // check for errors
             cs.putBoolean("preop.CertRequestPanel.done", false);
             cs.commit(false);
         } catch (Exception e) {
@@ -487,12 +489,6 @@ public class CertRequestPanel extends WizardPanelBase {
         boolean hasErr = false;
         IConfigStore config = CMS.getConfigStore();
 
-        String catype = "";
-        try {
-            catype = config.getString("preop.ca.type", "");
-        } catch (Exception e) {
-        }
-
         if (isPanelDone()) {
             context.put("updateStatus", "success");
             return;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
index 2934b3ebe..e956edebe 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
@@ -256,7 +256,7 @@ public class CertUtil {
                     req.setExtData("cert_request_type", reqType);
                     if (subjectName != null) {
                         req.setExtData("subject", subjectName);
-                        X500Name x5Name = new X500Name(subjectName);
+                        new X500Name(subjectName); // check for errors
                     }
                 }
                 queue.updateRequest(req);
@@ -596,7 +596,6 @@ public class CertUtil {
 
         StringBuffer result = new StringBuffer();
         result.append("Fingerprints:\n");
-        int index = 0;
 
         while (content.length() >= LINE_COUNT) {
             result.append(content.substring(0, LINE_COUNT));
@@ -623,9 +622,7 @@ public class CertUtil {
 
         String fullnickname = nickname;
 
-        boolean hardware = false;
         if (!tokenname.equals("internal") && !tokenname.equals("Internal Key Storage Token")) {
-            hardware = true;
             fullnickname = tokenname + ":" + nickname;
         }
 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
index 6cafe9736..ec3c8657d 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
@@ -170,7 +170,8 @@ public class DatabasePanel extends WizardPanelBase {
         String secure = "false";
         String cloneStartTLS = "false";
         try {
-            String s = cs.getString("preop.database.removeData");
+            @SuppressWarnings("unused")
+            String s = cs.getString("preop.database.removeData"); // check whether it's first time
         } catch (Exception e) {
             context.put("firsttime", "true");
         }
@@ -276,7 +277,8 @@ public class DatabasePanel extends WizardPanelBase {
         IConfigStore cs = CMS.getConfigStore();
         context.put("firsttime", "false");
         try {
-            String s = cs.getString("preop.database.removeData");
+            @SuppressWarnings("unused")
+            String s = cs.getString("preop.database.removeData"); // check whether it's first time
         } catch (Exception e) {
             context.put("firsttime", "true");
         }
@@ -348,10 +350,8 @@ public class DatabasePanel extends WizardPanelBase {
         }
 
         if (portStr != null && portStr.length() > 0) {
-            int port = -1;
-
             try {
-                port = Integer.parseInt(portStr);
+                Integer.parseInt(portStr); // check for errors
             } catch (Exception e) {
                 cs.putString("preop.database.errorString", "Port is invalid");
                 context.put("updateStatus", "validate-failure");
@@ -872,25 +872,21 @@ public class DatabasePanel extends WizardPanelBase {
         IConfigStore cs = CMS.getConfigStore();
         boolean hasErr = false;
 
-        boolean firsttime = false;
         context.put("firsttime", "false");
         try {
-            String v = cs.getString("preop.database.removeData");
+            String s = cs.getString("preop.database.removeData"); // check whether it's first time
         } catch (Exception e) {
             context.put("firsttime", "true");
-            firsttime = true;
         }
 
         String hostname1 = "";
         String portStr1 = "";
         String database1 = "";
-        String basedn1 = "";
 
         try {
             hostname1 = cs.getString("internaldb.ldapconn.host", "");
             portStr1 = cs.getString("internaldb.ldapconn.port", "");
             database1 = cs.getString("internaldb.database", "");
-            basedn1 = cs.getString("internaldb.basedn", "");
         } catch (Exception e) {
         }
 
@@ -1258,7 +1254,7 @@ public class DatabasePanel extends WizardPanelBase {
             attrs.add(new LDAPAttribute("objectclass", "extensibleObject"));
             attrs.add(new LDAPAttribute("cn", "changelog5"));
             attrs.add(new LDAPAttribute("nsslapd-changelogdir", dir));
-            entry = new LDAPEntry("cn=changelog5,cn=config", attrs);
+            entry = new LDAPEntry(dn, attrs);
             conn.add(entry);
         } catch (LDAPException e) {
             if (e.getLDAPResultCode() == LDAPException.ENTRY_ALREADY_EXISTS) {
@@ -1452,7 +1448,6 @@ public class DatabasePanel extends WizardPanelBase {
         String dn = "cn=" + name + "," + replicadn;
         String filter = "(objectclass=*)";
         String[] attrs = { "nsds5replicalastinitstatus" };
-        String status = null;
 
         CMS.debug("DatabasePanel replicationStatus: dn: " + dn);
         try {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
index ffadf5884..174af72c9 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
@@ -368,6 +368,7 @@ public class DonePanel extends WizardPanelBase {
             try {
                 // Fetch the "new" security domain and display it
                 CMS.debug("Dump contents of new Security Domain . . .");
+                @SuppressWarnings("unused")
                 String c = getDomainXML(sd_host, sd_admin_port_int, true);
             } catch (Exception e) {
             }
@@ -422,6 +423,7 @@ public class DonePanel extends WizardPanelBase {
 
                 // Fetch the "updated" security domain and display it
                 CMS.debug("Dump contents of updated Security Domain . . .");
+                @SuppressWarnings("unused")
                 String c = getDomainXML(sd_host, sd_admin_port_int, true);
             } catch (Exception e) {
                 context.put("errorString", "Failed to update the security domain on the domain master.");
@@ -471,12 +473,8 @@ public class DonePanel extends WizardPanelBase {
 
         if (!select.equals("clone")) {
             if (type.equals("CA") || type.equals("KRA")) {
-                String beginRequestNumStr = "";
                 String endRequestNumStr = "";
-                String beginSerialNumStr = "";
                 String endSerialNumStr = "";
-                String requestIncStr = "";
-                String serialIncStr = "";
 
                 try {
                     endRequestNumStr = cs.getString("dbs.endRequestNumber", "");
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java
index 6c286e818..02fbd7643 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java
@@ -71,11 +71,8 @@ public class GetCertChain extends CMSServlet {
      * @param cmsReq the object holding the request and response information
      */
     protected void process(CMSRequest cmsReq) throws EBaseException {
-        HttpServletRequest httpReq = cmsReq.getHttpReq();
         HttpServletResponse httpResp = cmsReq.getHttpResp();
 
-        String outputString = null;
-
         CertificateChain certChain = ((ICertAuthority) mAuthority).getCACertChain();
 
         if (certChain == null) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java
index c9a900a0b..f1a35bac5 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java
@@ -77,7 +77,6 @@ public class GetConfigEntries extends CMSServlet {
      * @param cmsReq the object holding the request and response information
      */
     protected void process(CMSRequest cmsReq) throws EBaseException {
-        HttpServletRequest httpReq = cmsReq.getHttpReq();
         HttpServletResponse httpResp = cmsReq.getHttpResp();
 
         IAuthToken authToken = null;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java
index 2c9cc41f0..8575658ea 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java
@@ -233,7 +233,6 @@ public class GetCookie extends CMSServlet {
                 }
 
                 try {
-                    String sd_url = "https://" + CMS.getEESSLHost() + ":" + CMS.getEESSLPort();
                     if (!url.startsWith("$")) {
                         try {
                             form = getTemplate(mFormPath, httpReq, locale);
@@ -250,7 +249,6 @@ public class GetCookie extends CMSServlet {
                         header.addStringValue("url", url);
                         header.addStringValue("session_id", cookie);
 
-                        EBaseException error = null;
                         try {
                             ServletOutputStream out = httpResp.getOutputStream();
 
@@ -278,7 +276,6 @@ public class GetCookie extends CMSServlet {
     }
 
     private String getGroupName(String uid, String subsystemname) {
-        String groupname = "";
         IUGSubsystem subsystem =
                 (IUGSubsystem) (CMS.getSubsystem(IUGSubsystem.ID));
         if (subsystem.isMemberOf(uid, "Enterprise CA Administrators") &&
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java
index 45c5192aa..999f13815 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java
@@ -23,7 +23,6 @@ import java.util.Enumeration;
 import java.util.Locale;
 
 import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -83,9 +82,7 @@ public class GetDomainXML extends CMSServlet {
     protected void process(CMSRequest cmsReq) throws EBaseException {
         CMS.debug("GetDomainXML: processing...");
 
-        HttpServletRequest httpReq = cmsReq.getHttpReq();
         HttpServletResponse httpResp = cmsReq.getHttpResp();
-        ServletContext context = cmsReq.getServletContext();
 
         String status = SUCCESS;
         String basedn = null;
@@ -108,7 +105,6 @@ public class GetDomainXML extends CMSServlet {
                 LDAPConnection conn = null;
                 try {
                     // get data from ldap
-                    String[] entries = {};
                     String filter = "objectclass=pkiSecurityGroup";
                     LDAPSearchConstraints cons = null;
                     String[] attrs = null;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java
index 28279f04a..4dc6f0ff6 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java
@@ -63,12 +63,9 @@ public class GetStatus extends CMSServlet {
      * @param cmsReq the object holding the request and response information
      */
     protected void process(CMSRequest cmsReq) throws EBaseException {
-        HttpServletRequest httpReq = cmsReq.getHttpReq();
         HttpServletResponse httpResp = cmsReq.getHttpResp();
         IConfigStore config = CMS.getConfigStore();
 
-        String outputString = null;
-
         String state = config.getString("cs.state", "");
         String type = config.getString("cs.type", "");
 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java
index 7beda6620..288cfad60 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java
@@ -64,11 +64,8 @@ public class GetSubsystemCert extends CMSServlet {
      * Process the HTTP request.
      */
     protected void process(CMSRequest cmsReq) throws EBaseException {
-        HttpServletRequest httpReq = cmsReq.getHttpReq();
         HttpServletResponse httpResp = cmsReq.getHttpResp();
 
-        String outputString = null;
-
         IConfigStore cs = CMS.getConfigStore();
         String nickname = "";
         try {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java
index ae55d2fb8..87a1788d6 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java
@@ -33,7 +33,6 @@ import com.netscape.certsrv.authentication.IAuthToken;
 import com.netscape.certsrv.authorization.AuthzToken;
 import com.netscape.certsrv.authorization.EAuthzAccessDenied;
 import com.netscape.certsrv.base.EBaseException;
-import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.kra.IKeyRecoveryAuthority;
 import com.netscape.certsrv.logging.ILogger;
 import com.netscape.certsrv.security.ITransportKeyUnit;
@@ -77,7 +76,6 @@ public class GetTransportCert extends CMSServlet {
     protected void process(CMSRequest cmsReq) throws EBaseException {
         CMS.debug("UpdateUpdater: processing...");
 
-        HttpServletRequest httpReq = cmsReq.getHttpReq();
         HttpServletResponse httpResp = cmsReq.getHttpResp();
 
         IAuthToken authToken = null;
@@ -122,8 +120,6 @@ public class GetTransportCert extends CMSServlet {
             return;
         }
 
-        IConfigStore cs = CMS.getConfigStore();
-
         IKeyRecoveryAuthority kra =
                 (IKeyRecoveryAuthority) mAuthority;
         ITransportKeyUnit tu = kra.getTransportKeyUnit();
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java
index a26b2dc2c..d0ccb58e9 100755
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java
@@ -117,7 +117,6 @@ public class ImportCAChainPanel extends WizardPanelBase {
     public void update(HttpServletRequest request,
             HttpServletResponse response,
             Context context) throws IOException {
-        IConfigStore cs = CMS.getConfigStore();
 
         context.put("errorString", "");
         context.put("title", "Import CA's Certificate Chain");
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
index 760faed4e..1d833ca9b 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
@@ -84,7 +84,6 @@ public class MainPageServlet extends CMSServlet {
 
         process(argSet, header, ctx, request, response);
 
-        EBaseException error = null;
         try {
             ServletOutputStream out = response.getOutputStream();
 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
index da721b29c..f0447170e 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
@@ -17,7 +17,6 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.servlet.csadmin;
 
-import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -109,7 +108,8 @@ public class NamePanel extends WizardPanelBase {
     public void cleanUp() throws IOException {
         IConfigStore cs = CMS.getConfigStore();
         try {
-            boolean done = cs.getBoolean("preop.NamePanel.done");
+            @SuppressWarnings("unused")
+            boolean done = cs.getBoolean("preop.NamePanel.done"); // check for errors
             cs.putBoolean("preop.NamePanel.done", false);
             cs.commit(false);
         } catch (Exception e) {
@@ -253,7 +253,8 @@ public class NamePanel extends WizardPanelBase {
                 }
 
                 try {
-                    boolean done = config.getBoolean("preop.NamePanel.done");
+                    @SuppressWarnings("unused")
+                    boolean done = config.getBoolean("preop.NamePanel.done"); // check for errors
                     c.setDN(dn);
                 } catch (Exception e) {
                     String instanceId = config.getString("service.instanceID", "");
@@ -417,7 +418,6 @@ public class NamePanel extends WizardPanelBase {
             if (!token.equals("Internal Key Storage Token")) {
                 serverCertNickname = token + ":" + nickname;
             }
-            File file = new File(path + "/conf/serverCertNick.conf");
             PrintStream ps = new PrintStream(new FileOutputStream(path + "/conf/serverCertNick.conf"));
             ps.println(serverCertNickname);
             ps.close();
@@ -914,10 +914,8 @@ public class NamePanel extends WizardPanelBase {
                                                        httpsPortStr,
                                                        "CA");
 
-        int httpsport = -1;
-
         try {
-            httpsport = Integer.parseInt(httpsPortStr);
+            Integer.parseInt(httpsPortStr); // check for errors
         } catch (Exception e) {
             CMS.debug(
                     "NamePanel update: Https port is not valid. Exception: "
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
index d1c2b6bfb..1a621d53d 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
@@ -36,7 +36,6 @@ import com.netscape.certsrv.authentication.IAuthToken;
 import com.netscape.certsrv.authorization.AuthzToken;
 import com.netscape.certsrv.authorization.EAuthzAccessDenied;
 import com.netscape.certsrv.base.EBaseException;
-import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.logging.ILogger;
 import com.netscape.certsrv.usrgrp.ICertUserLocator;
 import com.netscape.certsrv.usrgrp.IGroup;
@@ -137,8 +136,6 @@ public class RegisterUser extends CMSServlet {
             return;
         }
 
-        IConfigStore cs = CMS.getConfigStore();
-
         // create user and add certificate
         String uid = httpReq.getParameter("uid");
         String name = httpReq.getParameter("name");
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
index 0ae550707..80a887fd2 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
@@ -122,7 +122,8 @@ public class RestoreKeyCertPanel extends WizardPanelBase {
         IConfigStore cs = CMS.getConfigStore();
         /* clean up if necessary */
         try {
-            boolean done = cs.getBoolean("preop.restorekeycert.done");
+            @SuppressWarnings("unused")
+            boolean done = cs.getBoolean("preop.restorekeycert.done"); // check for errors
             cs.putBoolean("preop.restorekeycert.done", false);
             cs.commit(false);
         } catch (Exception e) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
index 7e45f019c..f3a4169e8 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
@@ -96,13 +96,11 @@ public class SecurityDomainPanel extends WizardPanelBase {
         String errorString = "";
         String default_admin_url = "";
         String name = "";
-        String cstype = "";
         String systemdService = "";
 
         try {
             default_admin_url = config.getString("preop.securitydomain.admin_url", "");
             name = config.getString("preop.securitydomain.name", "");
-            cstype = config.getString("cs.type", "");
             systemdService = config.getString("pkicreate.systemd.servicename", "");
         } catch (Exception e) {
             CMS.debug(e.toString());
@@ -364,12 +362,6 @@ public class SecurityDomainPanel extends WizardPanelBase {
             } catch (EBaseException e) {
             }
 
-            String instanceRoot = "";
-            try {
-                instanceRoot = config.getString("instanceRoot", "");
-            } catch (Exception e) {
-            }
-
         } else if (select.equals("existingdomain")) {
             config.putString("preop.securitydomain.select", "existing");
             config.putString("securitydomain.select", "existing");
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java
index c915d9e85..03f0e186d 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java
@@ -92,7 +92,8 @@ public class SizePanel extends WizardPanelBase {
         IConfigStore cs = CMS.getConfigStore();
         /* clean up if necessary*/
         try {
-            boolean done = cs.getBoolean("preop.SizePanel.done");
+            @SuppressWarnings("unused")
+            boolean done = cs.getBoolean("preop.SizePanel.done"); // check for errors
             cs.putBoolean("preop.SizePanel.done", false);
             cs.commit(false);
         } catch (Exception e) {
@@ -132,7 +133,8 @@ public class SizePanel extends WizardPanelBase {
 
         IConfigStore config = CMS.getConfigStore();
         try {
-            boolean done = config.getBoolean("preop.SizePanel.done");
+            @SuppressWarnings("unused")
+            boolean done = config.getBoolean("preop.SizePanel.done"); // check whether it's first time
         } catch (Exception e) {
             context.put("firsttime", "true");
         }
@@ -233,9 +235,9 @@ public class SizePanel extends WizardPanelBase {
         }
 
         context.put("firsttime", "false");
-        boolean done = false;
         try {
-            done = config.getBoolean("preop.SizePanel.done");
+            @SuppressWarnings("unused")
+            boolean done = config.getBoolean("preop.SizePanel.done"); // check whether it's first time
         } catch (Exception e) {
             context.put("firsttime", "true");
             if (select1.equals("clone")) {
@@ -429,7 +431,6 @@ public class SizePanel extends WizardPanelBase {
 
             try {
                 String keytype = config.getString(PCERT_PREFIX + ct + ".keytype");
-                String keyalgorithm = config.getString(PCERT_PREFIX + ct + ".keyalgorithm");
 
                 if (keytype.equals("rsa")) {
                     int keysize = config.getInteger(
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
index 0476e26d7..a2b6ebc72 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
@@ -314,8 +314,6 @@ public class UpdateDomainXML extends CMSServlet {
             // update in ldap
 
             LDAPEntry entry = null;
-            ILdapConnFactory connFactory = null;
-            LDAPConnection conn = null;
             String listName = type + "List";
             String cn = host + ":";
 
@@ -432,13 +430,13 @@ public class UpdateDomainXML extends CMSServlet {
 
                     for (int i = 0; i < len; i++) {
                         Node nn = (Node) nodeList.item(i);
-                        Vector v_name = parser.getValuesFromContainer(nn, "SubsystemName");
-                        Vector v_host = parser.getValuesFromContainer(nn, "Host");
-                        Vector v_adminport = parser.getValuesFromContainer(nn, "SecureAdminPort");
+                        Vector<String> v_name = parser.getValuesFromContainer(nn, "SubsystemName");
+                        Vector<String> v_host = parser.getValuesFromContainer(nn, "Host");
+                        Vector<String> v_adminport = parser.getValuesFromContainer(nn, "SecureAdminPort");
                         if ((v_name.elementAt(0).equals(name)) && (v_host.elementAt(0).equals(host))
                                 && (v_adminport.elementAt(0).equals(adminsport))) {
                             Node parent = nn.getParentNode();
-                            Node remNode = parent.removeChild(nn);
+                            parent.removeChild(nn);
                             count--;
                             break;
                         }
@@ -480,7 +478,7 @@ public class UpdateDomainXML extends CMSServlet {
                 } catch (Exception ee) {
                 }
 
-                Node nn2 = n.removeChild(countnode);
+                n.removeChild(countnode);
                 parser.addItemToContainer(n, "SubsystemCount", "" + count);
 
                 // recreate domain.xml
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
index a56230c2f..40190c9a7 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
@@ -1088,18 +1088,6 @@ public class WizardPanelBase implements IWizardPanel {
 
             CMS.debug("Getting domain.xml from CA...");
             String c = getDomainXML(hostname, httpsadminport, true);
-            String list = "";
-
-            CMS.debug("Subsystem Type " + type);
-            if (type.equals("CA")) {
-                list = "CAList";
-            } else if (type.equals("KRA")) {
-                list = "KRAList";
-            } else if (type.equals("OCSP")) {
-                list = "OCSPList";
-            } else if (type.equals("TKS")) {
-                list = "TKSList";
-            }
 
             CMS.debug("Getting " + portType + " from Security Domain ...");
             if (!portType.equals("UnSecurePort") &&
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
index 52efb1451..1ef680853 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
@@ -291,7 +291,6 @@ public class AddCAServlet extends CMSServlet {
 
         try {
             ServletOutputStream out = resp.getOutputStream();
-            String error = null;
 
             String xmlOutput = req.getParameter("xml");
             if (xmlOutput != null && xmlOutput.equals("true")) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java
index 8d2c5a28b..dfe796366 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java
@@ -197,7 +197,6 @@ public class CheckCertServlet extends CMSServlet {
 
         try {
             ServletOutputStream out = resp.getOutputStream();
-            String error = null;
 
             String xmlOutput = req.getParameter("xml");
             if (xmlOutput != null && xmlOutput.equals("true")) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
index 9ca7a8a18..a93512ccd 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
@@ -179,7 +179,6 @@ public class ListCAServlet extends CMSServlet {
 
         try {
             ServletOutputStream out = resp.getOutputStream();
-            String error = null;
 
             String xmlOutput = req.getParameter("xml");
             if (xmlOutput != null && xmlOutput.equals("true")) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java
index ab92a7c67..4262940d0 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java
@@ -104,8 +104,6 @@ public class RemoveCAServlet extends CMSServlet {
         HttpServletResponse resp = cmsReq.getHttpResp();
         String auditMessage = null;
         String auditSubjectID = auditSubjectID();
-        String auditCA = ILogger.SIGNED_AUDIT_EMPTY_VALUE;
-        String auditCASubjectDN = ILogger.SIGNED_AUDIT_EMPTY_VALUE;
 
         IAuthToken authToken = authenticate(cmsReq);
 
@@ -197,7 +195,6 @@ public class RemoveCAServlet extends CMSServlet {
 
         try {
             ServletOutputStream out = resp.getOutputStream();
-            String error = null;
 
             String xmlOutput = req.getParameter("xml");
             if (xmlOutput != null && xmlOutput.equals("true")) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java b/pki/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java
index df7b0c3d1..5b78bb42a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java
@@ -77,8 +77,6 @@ public class PKIProcessor implements IPKIProcessor {
 
         mServletId = servlet.getId();
 
-        HttpServletRequest httpReq = mRequest.getHttpReq();
-
     }
 
     public void process(CMSRequest cmsReq)
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java
index 6c2733115..dd0ee7be7 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java
@@ -236,7 +236,6 @@ public class ProfileReviewServlet extends ProfileServlet {
         CMS.debug("ProfileReviewServlet: profileSetId=" + profileSetId);
         Enumeration<String> policyIds = (profileSetId != null && profileSetId.length() > 0) ?
                                  profile.getProfilePolicyIds(profileSetId) : null;
-        int count = 0;
         ArgList list = new ArgList();
 
         if (policyIds != null) {
@@ -251,7 +250,6 @@ public class ProfileReviewServlet extends ProfileServlet {
                 //     http parameters
                 handlePolicy(list, response, locale,
                         id, policy, req);
-                count++;
             }
         }
 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java b/pki/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java
index 623fa941f..8a32f5d8f 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java
@@ -22,9 +22,7 @@ import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.List;
 
-import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java b/pki/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
index fc45395e9..c96a30a85 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
@@ -43,7 +43,6 @@ import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.base.IPrettyPrintFormat;
 import com.netscape.certsrv.base.SessionContext;
-import com.netscape.certsrv.common.Constants;
 import com.netscape.certsrv.logging.ILogger;
 import com.netscape.certsrv.tks.ITKSAuthority;
 import com.netscape.cms.servlet.base.CMSServlet;
@@ -753,7 +752,7 @@ public class TokenServlet extends CMSServlet {
 
     private void processDiversifyKey(HttpServletRequest req,
             HttpServletResponse resp) throws EBaseException {
-        byte[] KeySetData, KeysValues, CUID, xCUID;
+        byte[] KeySetData, CUID, xCUID;
         byte[] xkeyInfo, xnewkeyInfo;
         boolean missingParam = false;
         String errorMsg = "";
@@ -825,7 +824,6 @@ public class TokenServlet extends CMSServlet {
             useSoftToken_s = "false";
 
         KeySetData = null;
-        String outputString = null;
         if (!missingParam) {
             xCUID = com.netscape.cmsutil.util.Utils.SpecialDecode(rCUID);
             if (xCUID == null || xCUID.length != 10) {
@@ -892,10 +890,6 @@ public class TokenServlet extends CMSServlet {
                             + ";to newMasterKeyName=" + newSelectedToken + ":" + newKeyNickName);
 
             resp.setContentType("text/html");
-
-            if (KeySetData != null) {
-                outputString = new String(KeySetData);
-            }
         } // ! missingParam
 
         //CMS.debug("TokenServlet:processDiversifyKey " +outputString);
@@ -1093,7 +1087,6 @@ public class TokenServlet extends CMSServlet {
         String value = "";
         String status = "0";
         if (encryptedData != null && encryptedData.length > 0) {
-            String outputString = new String(encryptedData);
             // sending both the pre-encrypted and encrypted data back
             value = "status=0&" + "data=" +
                          com.netscape.cmsutil.util.Utils.SpecialEncode(data) +
@@ -1342,9 +1335,6 @@ public class TokenServlet extends CMSServlet {
      */
     public void service(HttpServletRequest req, HttpServletResponse resp)
             throws ServletException, IOException {
-        String scope = req.getParameter(Constants.OP_SCOPE);
-        String op = req.getParameter(Constants.OP_TYPE);
-
         super.service(req, resp);
     }
 }