diff options
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/cert/GetCRL.java')
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/cert/GetCRL.java | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java b/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java index 346dd2d34..3ea2297db 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java @@ -39,6 +39,7 @@ import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.ICRLPrettyPrint; import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; import com.netscape.certsrv.logging.ILogger; import com.netscape.cms.servlet.base.CMSServlet; @@ -73,7 +74,7 @@ public class GetCRL extends CMSServlet { public void init(ServletConfig sc) throws ServletException { super.init(sc); - mTemplates.remove(CMSRequest.SUCCESS); + mTemplates.remove(ICMSRequest.SUCCESS); mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; if (mOutputTemplatePath != null) mFormPath = mOutputTemplatePath; @@ -106,7 +107,7 @@ public class GetCRL extends CMSServlet { } if (authzToken == null) { - cmsReq.setStatus(CMSRequest.UNAUTHORIZED); + cmsReq.setStatus(ICMSRequest.UNAUTHORIZED); return; } @@ -117,7 +118,7 @@ public class GetCRL extends CMSServlet { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_CA_FROM_RA_NOT_IMP")); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_NOT_YET_IMPLEMENTED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -132,7 +133,7 @@ public class GetCRL extends CMSServlet { CMS.getLogMessage("CMSGW_ERR_GET_TEMPLATE", mFormPath, e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -150,14 +151,14 @@ public class GetCRL extends CMSServlet { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_NO_OPTIONS_SELECTED")); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_NO_OPTIONS_SELECTED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } if (crlId == null) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_NO_CRL_ISSUING_POINT")); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_NO_CRL_SELECTED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -174,7 +175,7 @@ public class GetCRL extends CMSServlet { CMS.getLogMessage("CMSGW_NO_CRL_ISSUING_POINT_FOUND", crlId)); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_CRL_NOT_FOUND"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } if (crlRecord == null) { @@ -182,7 +183,7 @@ public class GetCRL extends CMSServlet { CMS.getLogMessage("CMSGW_CRL_NOT_YET_UPDATED_1", crlId)); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_CRL_NOT_UPDATED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -207,7 +208,7 @@ public class GetCRL extends CMSServlet { CMS.getUserMessage( ((crlIP != null && crlIP.isCRLCacheEnabled() && crlIP.isCRLCacheEmpty()) ? "CMS_GW_CRL_CACHE_IS_EMPTY" : "CMS_GW_CRL_CACHE_IS_NOT_ENABLED"), crlId)); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } @@ -234,7 +235,7 @@ public class GetCRL extends CMSServlet { CMS.getLogMessage("CMSGW_CRL_NOT_YET_UPDATED_1", crlId)); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_CRL_NOT_UPDATED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } byte[] bytes = crlbytes; @@ -259,7 +260,7 @@ public class GetCRL extends CMSServlet { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_FAILED_DECODE_CRL_1", e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DECODE_CRL_FAILED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } if ((op.equals("importDeltaCRL") || (op.equals("displayCRL") && @@ -273,7 +274,7 @@ public class GetCRL extends CMSServlet { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_NO_DELTA_CRL_1")); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_CRL_NOT_UPDATED"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); return; } } @@ -423,13 +424,13 @@ public class GetCRL extends CMSServlet { httpResp.setContentType("text/html"); form.renderOutput(out, argSet); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); } catch (IOException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_OUT_STREAM_TEMPLATE", e.toString())); cmsReq.setError(new ECMSGWException( CMS.getUserMessage("CMS_GW_DISPLAY_TEMPLATE_ERROR"))); - cmsReq.setStatus(CMSRequest.ERROR); + cmsReq.setStatus(ICMSRequest.ERROR); } return; } else if (op.equals("importCRL") || op.equals("importDeltaCRL")) { @@ -465,7 +466,7 @@ public class GetCRL extends CMSServlet { CMS.getUserMessage("CMS_GW_DISPLAYING_CRLINFO_ERROR")); } // cmsReq.setResult(null); - cmsReq.setStatus(CMSRequest.SUCCESS); + cmsReq.setStatus(ICMSRequest.SUCCESS); return; } |