diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/servlet')
27 files changed, 42 insertions, 82 deletions
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 41f0c248f..b77de59c6 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 @@ -799,7 +799,6 @@ public final class CMSAdminServlet extends AdminServlet { IOException, EBaseException { NameValuePairs params = new NameValuePairs(); Enumeration<ISubsystem> e = CMS.getSubsystems(); - StringBuffer buff = new StringBuffer(); while (e.hasMoreElements()) { String type = ""; 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 b93e6eb0b..bfd5004a2 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 @@ -311,7 +311,7 @@ public class JobsAdminServlet extends AdminServlet { destStore.getSubStore(scope); // Does the class exist? - Class newImpl = null; + Class<?> newImpl = null; try { newImpl = Class.forName(classPath); diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java b/pki/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java index ffd602b25..54e453f30 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java @@ -26,7 +26,6 @@ import javax.servlet.ServletConfig; import javax.servlet.ServletException; import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.logging.ILogger; import com.netscape.cms.servlet.common.CMSRequest; @@ -63,7 +62,7 @@ public class DisplayHtmlServlet extends CMSServlet { public void process(CMSRequest cmsReq) throws EBaseException { CMS.debug("DisplayHtmlServlet about to service "); - IAuthToken authToken = authenticate(cmsReq); + authenticate(cmsReq); try { String realpath = diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/GetStats.java b/pki/base/common/src/com/netscape/cms/servlet/base/GetStats.java index e145ee4db..c21b56835 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/base/GetStats.java +++ b/pki/base/common/src/com/netscape/cms/servlet/base/GetStats.java @@ -106,9 +106,6 @@ public class GetStats extends CMSServlet { return; } - // Construct an ArgBlock - IArgBlock args = cmsReq.getHttpParams(); - CMSTemplate form = null; Locale[] locale = new Locale[1]; diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java b/pki/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java index 0784945ab..41666ab31 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java @@ -59,11 +59,11 @@ public class ProxyServlet extends HttpServlet { private String mDestContext = null; private String mSrcContext = null; private String mAppendPathInfo = null; - private Vector mMatchStrings = new Vector(); + private Vector<String> mMatchStrings = new Vector<String>(); private String mDestServletOnNoMatch = null; private String mAppendPathInfoOnNoMatch = null; - private Map mParamMap = new HashMap(); - private Map mParamValue = new HashMap(); + private Map<String, String> mParamMap = new HashMap<String, String>(); + private Map<String, String[]> mParamValue = new HashMap<String, String[]>(); public ProxyServlet() { } @@ -130,7 +130,7 @@ public class ProxyServlet extends HttpServlet { if (mMatchStrings.size() != 0) { boolean matched = false; for (int i = 0; i < mMatchStrings.size(); i++) { - String t = (String) mMatchStrings.elementAt(i); + String t = mMatchStrings.elementAt(i); if (uri.indexOf(t) != -1) { matched = true; } @@ -171,21 +171,22 @@ public class ProxyServlet extends HttpServlet { } class ProxyWrapper extends HttpServletRequestWrapper { - private Map mMap = null; - private Map mValueMap = null; + private Map<String, String> mMap = null; + private Map<String, String[]> mValueMap = null; public ProxyWrapper(HttpServletRequest req) { super(req); } - public void setParameterMapAndValue(Map m, Map v) { + public void setParameterMapAndValue(Map<String, String> m, Map<String, String[]> v) { if (m != null) mMap = m; if (v != null) mValueMap = v; } - public Map getParameterMap() { + @SuppressWarnings("unchecked") + public Map<String, String[]> getParameterMap() { try { // If we haven't specified any parameter mapping, just // use the regular implementation @@ -193,15 +194,15 @@ class ProxyWrapper extends HttpServletRequestWrapper { return super.getParameterMap(); else { // Make a new Map for us to put stuff in - Map n = new HashMap(); + Map<String, String[]> n = new HashMap<String, String[]>(); // get the HTTP parameters the user supplied. - Map m = super.getParameterMap(); - Set s = m.entrySet(); - Iterator i = s.iterator(); + Map<String, String[]> m = super.getParameterMap(); + Set<Map.Entry<String, String[]>> s = m.entrySet(); + Iterator<Map.Entry<String, String[]>> i = s.iterator(); while (i.hasNext()) { - Map.Entry me = (Map.Entry) i.next(); - String name = (String) me.getKey(); - String[] values = (String[]) (me.getValue()); + Map.Entry<String, String[]> me = i.next(); + String name = me.getKey(); + String[] values = me.getValue(); String newname = null; if (name != null) { newname = (String) mMap.get(name); @@ -223,14 +224,14 @@ class ProxyWrapper extends HttpServletRequestWrapper { } // Now, deal with static values set in the config // which weren't set in the HTTP request - Set s2 = mValueMap.entrySet(); - Iterator i2 = s2.iterator(); + Set<Map.Entry<String, String[]>> s2 = mValueMap.entrySet(); + Iterator<Map.Entry<String, String[]>> i2 = s2.iterator(); // Cycle through all the static values while (i2.hasNext()) { - Map.Entry me2 = (Map.Entry) i2.next(); - String name2 = (String) me2.getKey(); + Map.Entry<String, String[]> me2 = i2.next(); + String name2 = me2.getKey(); if (n.get(name2) == null) { - String[] values2 = (String[]) me2.getValue(); + String[] values2 = me2.getValue(); // If the parameter is not set in the map // Set it now n.put(name2, values2); 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 9815ff687..bf582a82e 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 @@ -109,9 +109,6 @@ public class DisplayHashUserEnroll extends CMSServlet { String reqHost = httpReq.getRemoteHost(); - // Construct an ArgBlock - IArgBlock args = cmsReq.getHttpParams(); - if (!(mAuthority instanceof IRegistrationAuthority)) { log(ILogger.LL_FAILURE, CMS.getLogMessage("ADMIN_SRVLT_ERR_GET_TEMPLATE")); cmsReq.setError(new ECMSGWException( diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java b/pki/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java index 3297c585c..d0dfb8f9a 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java @@ -108,9 +108,6 @@ public class GetEnableStatus extends CMSServlet { String reqHost = httpReq.getRemoteHost(); - // Construct an ArgBlock - IArgBlock args = cmsReq.getHttpParams(); - if (!(mAuthority instanceof IRegistrationAuthority)) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_CA_FROM_RA_NOT_IMP")); cmsReq.setError(new ECMSGWException( diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java b/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java index b8e56b3e7..0f21e1921 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java @@ -245,13 +245,13 @@ public class ReasonToRevoke extends CMSServlet { * revokeAll, null, totalRecordCount); * Enumeration e = list.getCertRecords(0, totalRecordCount - 1); **/ - Enumeration e = mCertDB.searchCertificates(revokeAll, + Enumeration<ICertRecord> e = mCertDB.searchCertificates(revokeAll, totalRecordCount, mTimeLimits); int count = 0; while (e != null && e.hasMoreElements()) { - ICertRecord rec = (ICertRecord) e.nextElement(); + ICertRecord rec = e.nextElement(); if (rec == null) continue; diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java b/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java index 55d8bb04c..478df161d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java @@ -19,7 +19,6 @@ package com.netscape.cms.servlet.cert; import java.io.IOException; import java.util.Calendar; -import java.util.Date; import java.util.Enumeration; import java.util.Locale; import java.util.StringTokenizer; @@ -42,7 +41,6 @@ import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.AuthMgrPlugin; import com.netscape.certsrv.authentication.IAuthManager; import com.netscape.certsrv.authentication.IAuthSubsystem; -import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; @@ -146,7 +144,7 @@ public class RemoteAuthConfig extends CMSServlet { HttpServletRequest req = cmsReq.getHttpReq(); HttpServletResponse resp = cmsReq.getHttpResp(); - IAuthToken authToken = authenticate(cmsReq); + authenticate(cmsReq); IArgBlock header = CMS.createArgBlock(); IArgBlock ctx = CMS.createArgBlock(); diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java b/pki/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java index 8e6d58216..3602515c9 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java @@ -295,7 +295,6 @@ public class SrchCerts extends CMSServlet { private void buildDateFilter(HttpServletRequest req, String prefix, String outStr, long adjustment, StringBuffer filter) { - String queryCertFilter = null; long epoch = 0; try { epoch = Long.parseLong(req.getParameter(prefix)); diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java b/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java index 4625fb79e..50feb0863 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java @@ -111,8 +111,6 @@ public class CMSTemplate extends CMSFile { * @return true if successful */ public boolean init(File template) throws EBaseException, IOException { - StringBuffer buf = new StringBuffer(); - /* load template */ String content = loadFile(template); diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java index a28ae76b3..52a98d540 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java @@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import org.w3c.dom.Node; import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.logging.ILogger; import com.netscape.cms.servlet.base.CMSServlet; @@ -66,13 +65,10 @@ public class CheckIdentity 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; - try { - authToken = authenticate(cmsReq); + authenticate(cmsReq); } catch (Exception e) { CMS.debug("CheckIdentity authentication failed"); log(ILogger.LL_FAILURE, diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java index 4d11af8af..f97d3e5e1 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java @@ -30,7 +30,6 @@ import org.w3c.dom.Node; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; import com.netscape.cms.servlet.base.CMSServlet; import com.netscape.cms.servlet.base.UserInfo; @@ -70,12 +69,8 @@ public class GetTokenInfo 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(); - // Construct an ArgBlock - IArgBlock args = cmsReq.getHttpParams(); - XMLObject xmlObj = null; try { xmlObj = new XMLObject(); diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java b/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java index 15e73179e..59b01f26a 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java @@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.dbs.keydb.IKeyRecord; @@ -112,7 +111,7 @@ public class ConfirmRecoverBySerial extends CMSServlet { HttpServletRequest req = cmsReq.getHttpReq(); HttpServletResponse resp = cmsReq.getHttpResp(); - IAuthToken authToken = authenticate(cmsReq); + authenticate(cmsReq); CMSTemplate form = null; Locale[] locale = new Locale[1]; diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java b/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java index bc23e635b..81ced5290 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java @@ -217,7 +217,7 @@ public class ExamineRecovery extends CMSServlet { req.getRequestURI()); header.addStringValue("keySplitting", CMS.getConfigStore().getString("kra.keySplitting")); - Hashtable params = mService.getRecoveryParams( + Hashtable<String, Object> params = mService.getRecoveryParams( recoveryID); if (params == null) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java b/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java index f27e966d0..96fe7c85d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java @@ -154,7 +154,6 @@ public class GetPk12 extends CMSServlet { IArgBlock header = CMS.createArgBlock(); IArgBlock fixed = CMS.createArgBlock(); CMSTemplateParams argSet = new CMSTemplateParams(header, fixed); - int seq = -1; // get status and populate argSet try { @@ -162,7 +161,7 @@ public class GetPk12 extends CMSServlet { header.addStringValue("recoveryID", recoveryID); - Hashtable params = mService.getRecoveryParams(recoveryID); + Hashtable<String, Object> params = mService.getRecoveryParams(recoveryID); if (params == null) { log(ILogger.LL_FAILURE, diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java b/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java index a7b256e83..9989fafad 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java @@ -244,7 +244,7 @@ public class GrantRecovery extends CMSServlet { header.addStringValue(OUT_SERVICE_URL, req.getRequestURI()); - Hashtable h = mService.getRecoveryParams(recoveryID); + Hashtable<String, Object> h = mService.getRecoveryParams(recoveryID); if (h == null) { header.addStringValue(OUT_ERROR, diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java b/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java index d6bc57fcf..aeee624c0 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.key; -import java.math.BigInteger; import java.util.Date; import com.netscape.certsrv.apps.CMS; diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java b/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java index 6bb013b1c..28ff30803 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java @@ -175,12 +175,9 @@ public class RecoverBySerial extends CMSServlet { fixed.set(PORT, Integer.valueOf(port)); fixed.set(SCHEME, scheme); - int seq = -1; - SessionContext ctx = null; try { - String localAgents = req.getParameter("localAgents"); String initAsyncRecovery = req.getParameter("initAsyncRecovery"); // this information is needed within the server for @@ -367,7 +364,7 @@ public class RecoverBySerial extends CMSServlet { header.addStringValue(OUT_ERROR, "No recovery ID specified"); return null; } - Hashtable params = mService.createRecoveryParams(recoveryID); + Hashtable<String, Object> params = mService.createRecoveryParams(recoveryID); params.put("keyID", req.getParameter(IN_SERIALNO)); @@ -383,7 +380,7 @@ public class RecoverBySerial extends CMSServlet { waitThread.start(); return null; } else { - Vector v = new Vector(); + Vector<Credential> v = new Vector<Credential>(); for (int i = 0; i < mService.getNoOfRequiredAgents(); i++) { String uid = req.getParameter(IN_UID + i); @@ -424,7 +421,7 @@ public class RecoverBySerial extends CMSServlet { header.addStringValue(OUT_ERROR, "No recovery ID specified"); return null; } - Hashtable params = mService.createRecoveryParams(recoveryID); + Hashtable<String, Object> params = mService.createRecoveryParams(recoveryID); params.put("keyID", req.getParameter(IN_SERIALNO)); diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java b/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java index b6693ee6b..bff14e9f2 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java @@ -263,7 +263,7 @@ public class SrchKey extends CMSServlet { timeLimit = mTimeLimits; } CMS.debug("Start searching ... timelimit=" + timeLimit); - Enumeration e = mKeyDB.searchKeys(filter, + Enumeration<IKeyRecord> e = mKeyDB.searchKeys(filter, maxResults, timeLimit); int count = 0; @@ -272,8 +272,7 @@ public class SrchKey extends CMSServlet { null); } else { while (e.hasMoreElements()) { - IKeyRecord rec = (IKeyRecord) - e.nextElement(); + IKeyRecord rec = e.nextElement(); // rec is null when we specify maxResults // DS will return an err=4, which triggers // a LDAPException.SIZE_LIMIT_ExCEEDED diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java b/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java index 828ef0e6c..95c777701 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java @@ -284,7 +284,7 @@ public class SrchKeyForRecovery extends CMSServlet { timeLimit = mTimeLimits; } CMS.debug("Start searching ... timelimit=" + timeLimit); - Enumeration e = mKeyDB.searchKeys(filter, maxResults, timeLimit); + Enumeration<IKeyRecord> e = mKeyDB.searchKeys(filter, maxResults, timeLimit); int count = 0; if (e == null) { @@ -292,8 +292,7 @@ public class SrchKeyForRecovery extends CMSServlet { null); } else { while (e.hasMoreElements()) { - IKeyRecord rec = (IKeyRecord) - e.nextElement(); + IKeyRecord rec = e.nextElement(); // rec is null when we specify maxResults // DS will return an err=4, which triggers // a LDAPException.SIZE_LIMIT_ExCEEDED diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java index 1aaf1d6e5..3dfc1d5f3 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java +++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java @@ -106,9 +106,6 @@ public class GetOCSPInfo extends CMSServlet { return; } - // Construct an ArgBlock - IArgBlock args = cmsReq.getHttpParams(); - if (!(mAuthority instanceof IOCSPService)) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_CA_FROM_RA_NOT_IMP")); cmsReq.setError(new ECMSGWException( 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 2d9daff95..9ca7a8a18 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 @@ -128,14 +128,14 @@ public class ListCAServlet extends CMSServlet { CMSTemplateParams argSet = new CMSTemplateParams(header, fixed); IDefStore defStore = mOCSPAuthority.getDefaultStore(); - Enumeration<Object> recs = defStore.searchAllCRLIssuingPointRecord(100); + Enumeration<ICRLIssuingPointRecord> recs = defStore.searchAllCRLIssuingPointRecord(100); // show the current CRL number if present header.addStringValue("stateCount", Integer.toString(defStore.getStateCount())); while (recs.hasMoreElements()) { - ICRLIssuingPointRecord rec = (ICRLIssuingPointRecord) recs.nextElement(); + ICRLIssuingPointRecord rec = recs.nextElement(); IArgBlock rarg = CMS.createArgBlock(); String thisId = rec.getId(); diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java b/pki/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java index 51655f973..53c13510d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java +++ b/pki/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java @@ -203,7 +203,7 @@ public class CMCProcessor extends PKIProcessor { // verify the signerInfo SET dais = cmcFullReq.getDigestAlgorithmIdentifiers(); int numDig = dais.size(); - Hashtable digs = new Hashtable(); + Hashtable<String, byte[]> digs = new Hashtable<String, byte[]>(); for (int i = 0; i < numDig; i++) { AlgorithmIdentifier dai = diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java b/pki/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java index 641017cc8..2d2f1430e 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java +++ b/pki/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java @@ -177,7 +177,6 @@ public class CRMFProcessor extends PKIProcessor { verifyPOP(certReqMsg); CertRequest certReq = certReqMsg.getCertReq(); - INTEGER certReqId = certReq.getCertReqId(); CertTemplate certTemplate = certReq.getCertTemplate(); X509CertInfo certInfo = CMS.getDefaultX509CertInfo(); diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java index d021ef387..2849e14f3 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java @@ -59,7 +59,6 @@ import com.netscape.certsrv.profile.IProfileSubsystem; import com.netscape.certsrv.request.INotify; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.RequestStatus; -import com.netscape.certsrv.template.ArgSet; import com.netscape.cms.servlet.common.AuthCredentials; import com.netscape.cms.servlet.common.CMCOutputTemplate; import com.netscape.cms.servlet.common.CMSRequest; @@ -231,7 +230,6 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { HttpServletResponse response = cmsReq.getHttpResp(); Locale locale = getLocale(request); - ArgSet args = new ArgSet(); String cert_request_type = mServletConfig.getInitParameter("cert_request_type"); String outputFormat = mServletConfig.getInitParameter("outputFormat"); @@ -645,7 +643,6 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { String auditRequesterID = ILogger.UNIDENTIFIED; String auditInfoCertValue = ILogger.SIGNED_AUDIT_EMPTY_VALUE; - int responseType = 0; try { /////////////////////////////////////////////// // submit request diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java index 4a7d70cc0..1d4cab76b 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java @@ -39,7 +39,6 @@ import org.w3c.dom.Node; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authority.IAuthority; -import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.MetaInfo; import com.netscape.certsrv.base.SessionContext; @@ -1071,7 +1070,7 @@ public class ProfileSubmitServlet extends ProfileServlet { if (acl != null && acl.length() > 0) { try { String resource = profileId + ".authz.acl"; - AuthzToken authzToken = authorize(mAclMethod, resource, authToken, acl); + authorize(mAclMethod, resource, authToken, acl); } catch (Exception e) { CMS.debug("ProfileSubmitServlet authorize: " + e.toString()); if (xmlOutput) { |