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

16 files changed, 22 insertions, 49 deletions

diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
index 1e1ee44f1..1b7524e19 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
@@ -81,7 +81,6 @@ public class DisplayBySerial extends CMSServlet {
      *
      */
     private static final long serialVersionUID = -4143700762995036597L;
-    private final static String INFO = "DisplayBySerial";
     private final static String TPL_FILE1 = "displayBySerial.template";
     private final static BigInteger MINUS_ONE = new BigInteger("-1");
 
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
index af91b1cb3..c3a268d14 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
@@ -61,7 +61,6 @@ public class DisplayCRL extends CMSServlet {
      *
      */
     private static final long serialVersionUID = 1152016798229054027L;
-    private final static String INFO = "DisplayCRL";
     private final static String TPL_FILE = "displayCRL.template";
     //private final static String E_TPL_FILE = "error.template";
     //private final static String OUT_ERROR = "errorDetails";
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
index 8e5df2c14..aac4315e7 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
@@ -18,13 +18,13 @@
 package com.netscape.cms.servlet.cert;
 
 import java.io.IOException;
+import java.math.BigInteger;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Vector;
-import java.math.BigInteger;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -82,7 +82,6 @@ public class DoRevoke extends CMSServlet {
      *
      */
     private static final long serialVersionUID = 1693115906265904238L;
-    private final static String INFO = "DoRevoke";
     private final static String TPL_FILE = "revocationResult.template";
 
     private ICertificateRepository mCertDB = null;
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
index f16ce2526..35bdd5c8c 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
@@ -19,11 +19,11 @@ package com.netscape.cms.servlet.cert;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.math.BigInteger;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Vector;
-import java.math.BigInteger;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -73,7 +73,6 @@ public class DoRevokeTPS extends CMSServlet {
      *
      */
     private static final long serialVersionUID = -2980600514636454836L;
-    private final static String INFO = "DoRevoke";
     private final static String TPL_FILE = "revocationResult.template";
 
     private ICertificateRepository mCertDB = null;
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
index 6f1346c68..5605acf6d 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
@@ -67,11 +67,11 @@ public class DoUnrevoke extends CMSServlet {
      *
      */
     private static final long serialVersionUID = -7978703730006036625L;
-    private final static String INFO = "DoUnrevoke";
     private final static String TPL_FILE = "unrevocationResult.template";
-    private final static BigInteger MINUS_ONE = new BigInteger("-1");
 
-    private ICertificateRepository mCertDB = null;
+    @SuppressWarnings("unused")
+    private ICertificateRepository mCertDB;
+
     private String mFormPath = null;
     private IRequestQueue mQueue = null;
     private IPublisherProcessor mPublisherProcessor = null;
diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
index de5f075ba..7916887f8 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
@@ -64,12 +64,10 @@ public class DoUnrevokeTPS extends CMSServlet {
      *
      */
     private static final long serialVersionUID = -6245049221697655642L;
-    private final static String INFO = "DoUnrevoke";
-    private final static String TPL_FILE = "unrevocationResult.template";
-    private final static BigInteger MINUS_ONE = new BigInteger("-1");
 
-    private ICertificateRepository mCertDB = null;
-    private String mFormPath = null;
+    @SuppressWarnings("unused")
+    private ICertificateRepository mCertDB;
+
     private IRequestQueue mQueue = null;
     private IPublisherProcessor mPublisherProcessor = null;
     private String errorString = "error=";
@@ -93,7 +91,6 @@ public class DoUnrevokeTPS extends CMSServlet {
      */
     public void init(ServletConfig sc) throws ServletException {
         super.init(sc);
-        mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE;
         if (mAuthority instanceof ICertificateAuthority) {
             mCertDB = ((ICertificateAuthority) mAuthority).getCertificateRepository();
         }
diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
index 90d37f15a..a0f73d33b 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
@@ -112,7 +112,6 @@ public class EnrollServlet extends CMSServlet {
     private static final String CERT_AUTH_SINGLE = "single";
     private static final String CLIENT_ISSUER = "clientIssuer";
 
-    private boolean mAuthTokenOverride = true;
     private String mEnrollSuccessTemplate = null;
     private ICMSTemplateFiller mEnrollSuccessFiller = new ImportCertsTemplateFiller();
 
@@ -1698,7 +1697,8 @@ public class EnrollServlet extends CMSServlet {
     // key usage extension always ends up being digital signature only
     // and for rsa-ex ends up having no bits set.
 
-    private boolean mIsTestBed = false;
+    @SuppressWarnings("unused")
+    private boolean mIsTestBed;
 
     private void init_testbed_hack(IConfigStore config)
             throws EBaseException {
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
index 6c7aefa4d..51b7f783f 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
@@ -69,8 +69,6 @@ public class GetBySerial extends CMSServlet {
      */
     private static final long serialVersionUID = -2276677839178370838L;
 
-    private final static String INFO = "GetBySerial";
-
     private final static String IMPORT_CERT_TEMPLATE = "ImportCert.template";
     private String mImportTemplate = null;
     private String mIETemplate = null;
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java b/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
index 30f0b0c40..bc9f09976 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
@@ -60,9 +60,6 @@ public class GetInfo extends CMSServlet {
      */
     private static final long serialVersionUID = 1909881831730252799L;
 
-    private final static String INFO = "GetInfo";
-
-    private String mFormPath = null;
     private ICertificateAuthority mCA = null;
 
     /**
@@ -80,7 +77,6 @@ public class GetInfo extends CMSServlet {
     public void init(ServletConfig sc) throws ServletException {
         super.init(sc);
 
-        mFormPath = "";
         if (mAuthority instanceof ICertificateAuthority)
             mCA = (ICertificateAuthority) mAuthority;
 
diff --git a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
index 58ff2383c..66d3b4979 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
@@ -117,7 +117,6 @@ public class HashEnrollServlet extends CMSServlet {
     private static final String CLIENT_ISSUER = "clientIssuer";
     public static final String TPL_ERROR_FILE = "/ra/GenErrorHashDirEnroll.template";
 
-    private boolean mAuthTokenOverride = true;
     private String mEnrollSuccessTemplate = null;
     private ICMSTemplateFiller mEnrollSuccessFiller = new ImportCertsTemplateFiller();
 
@@ -139,7 +138,7 @@ public class HashEnrollServlet extends CMSServlet {
         mTemplates.remove(CMSRequest.SUCCESS);
         try {
             mEnrollSuccessTemplate = sc.getInitParameter(
-                        CMSServlet.PROP_SUCCESS_TEMPLATE);
+                    CMSServlet.PROP_SUCCESS_TEMPLATE);
             if (mEnrollSuccessTemplate == null)
                 mEnrollSuccessTemplate = ENROLL_SUCCESS_TEMPLATE;
             String fillername =
@@ -334,7 +333,7 @@ public class HashEnrollServlet extends CMSServlet {
 
         try {
             authzToken = authorize(mAclMethod, token,
-                        mAuthzResourceName, "import");
+                    mAuthzResourceName, "import");
         } catch (Exception e) {
             // do nothing for now
         }
@@ -442,12 +441,9 @@ public class HashEnrollServlet extends CMSServlet {
 
                 // first, make sure the client cert is indeed a
                 //				signing only cert
-                if ((CMS.isSigningCert(sslClientCert) ==
-                        false) ||
-                        ((CMS.isSigningCert(sslClientCert) ==
-                            true) &&
-                        (CMS.isEncryptionCert(sslClientCert) ==
-                            true))) {
+                if ((CMS.isSigningCert(sslClientCert) == false) ||
+                        ((CMS.isSigningCert(sslClientCert) == true) &&
+                        (CMS.isEncryptionCert(sslClientCert) == true))) {
                     // either it's not a signing cert, or it's a dual cert
                     log(ILogger.LL_FAILURE,
                             CMS.getLogMessage("CMSGW_INVALID_CERT_TYPE"));
@@ -478,7 +474,7 @@ public class HashEnrollServlet extends CMSServlet {
                                 + "))(certStatus=VALID))";
                 ICertRecordList list =
                         mCa.getCertificateRepository().findCertRecordsInList(filter,
-                        null, 10);
+                                null, 10);
                 int size = list.getSize();
                 Enumeration<ICertRecord> en = list.getCertRecords(0, size - 1);
                 boolean gotEncCert = false;
@@ -547,12 +543,9 @@ public class HashEnrollServlet extends CMSServlet {
             } else if (certauthEnrollType.equals(CERT_AUTH_ENCRYPTION)) {
                 // first, make sure the client cert is indeed a
                 //				signing only cert
-                if ((CMS.isSigningCert(sslClientCert) ==
-                        false) ||
-                        ((CMS.isSigningCert(sslClientCert) ==
-                            true) &&
-                        (CMS.isEncryptionCert(sslClientCert) ==
-                            true))) {
+                if ((CMS.isSigningCert(sslClientCert) == false) ||
+                        ((CMS.isSigningCert(sslClientCert) == true) &&
+                        (CMS.isEncryptionCert(sslClientCert) == true))) {
                     // either it's not a signing cert, or it's a dual cert
                     log(ILogger.LL_FAILURE,
                             CMS.getLogMessage("CMSGW_INVALID_CERT_TYPE"));
diff --git a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java
index 884616fe9..814bd4209 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java
@@ -62,7 +62,6 @@ public class Monitor extends CMSServlet {
      */
     private static final long serialVersionUID = -8492837942132357692L;
     private final static String TPL_FILE = "monitor.template";
-    private final static String INFO = "Monitor";
 
     private ICertificateRepository mCertDB = null;
     private IRequestQueue mQueue = null;
diff --git a/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java b/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
index 2783656ae..c76181aa1 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
@@ -62,7 +62,6 @@ public class RemoteAuthConfig extends CMSServlet {
      *
      */
     private static final long serialVersionUID = -5803015919915253940L;
-    private final static String INFO = "RemoteAuthConfig";
     private final static String TPL_FILE = "remoteAuthConfig.template";
     private final static String ENABLE_REMOTE_CONFIG = "enableRemoteConfiguration";
     private final static String REMOTELY_SET_INSTANCES = "remotelySetInstances";
diff --git a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
index 45b02969d..d538ce675 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
@@ -18,7 +18,6 @@
 package com.netscape.cms.servlet.cert;
 
 import java.io.IOException;
-import java.math.BigInteger;
 import java.security.PublicKey;
 import java.util.Calendar;
 import java.util.Date;
@@ -72,8 +71,6 @@ public class SrchCerts extends CMSServlet {
      */
     private static final long serialVersionUID = -5876805830088921643L;
     private final static String TPL_FILE = "srchCert.template";
-    private final static String INFO = "SrchCerts";
-    private final static BigInteger MINUS_ONE = new BigInteger("-1");
     private final static String PROP_MAX_SEARCH_RETURNS = "maxSearchReturns";
 
     private final static String CURRENT_TIME = "currentTime";
diff --git a/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java b/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java
index 6be6d506c..bd12bcfd8 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java
@@ -70,7 +70,6 @@ public class UpdateCRL extends CMSServlet {
      *
      */
     private static final long serialVersionUID = -1182106454856991246L;
-    private final static String INFO = "UpdateCRL";
     private final static String TPL_FILE = "updateCRL.template";
 
     private static Vector<String> mTesting = new Vector<String>();
diff --git a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
index 3dae379a1..6e580896e 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
@@ -68,7 +68,6 @@ public class UpdateDir extends CMSServlet {
      *
      */
     private static final long serialVersionUID = 3063889978908136789L;
-    private final static String INFO = "UpdateDir";
     private final static String TPL_FILE = "updateDir.template";
     private final static int UPDATE_ALL = 0;
     private final static int UPDATE_CRL = 1;
diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
index e56651ed8..dc0b0c474 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
@@ -171,8 +171,6 @@ public class CRSEnrollment extends HttpServlet {
 
     private static final String PROP_SUBSTORENAME = "substorename";
     private static final String PROP_AUTHORITY = "authority";
-    private static final String PROP_CRS = "crs";
-    private static final String PROP_CRSCA = "casubsystem";
     private static final String PROP_CRSAUTHMGR = "authName";
     private static final String PROP_APPENDDN = "appendDN";
     private static final String PROP_CREATEENTRY = "createEntry";
@@ -1938,7 +1936,9 @@ public class CRSEnrollment extends HttpServlet {
         private Enumeration<?> externalTokens = null;
         private org.mozilla.jss.crypto.X509Certificate signingCert;
         private org.mozilla.jss.crypto.PrivateKey signingCertPrivKey;
-        private int signingCertKeySize = 0;
+
+        @SuppressWarnings("unused")
+        private int signingCertKeySize;
 
         class CryptoContextException extends Exception {
             /**