diff options
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/request')
6 files changed, 3 insertions, 50 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java index 1733998aa..11716115f 100644 --- a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java +++ b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java @@ -92,16 +92,10 @@ public class CertReqParser extends ReqParser { private static final String EXT_PRETTYPRINT = "ext_prettyprint"; - private static final String DOT = "."; private static final String LB = "["; private static final String RB = "]"; private static final String EQ = " = "; - private static final String HTTP_PARAMS_COUNTER = IRequest.HTTP_PARAMS + LB + "httpParamsCount++" + RB; - private static final String HTTP_HEADERS_COUNTER = IRequest.HTTP_HEADERS + LB + "httpHeadersCount++" + RB; - private static final String AUTH_TOKEN_COUNTER = IRequest.AUTH_TOKEN + LB + "authTokenCount++" + RB; - private static final String SERVER_ATTRS_COUNTER = IRequest.SERVER_ATTRS + LB + "serverAttrsCount++" + RB; - /** * Fills in certificate specific request attributes. */ diff --git a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java index 41e6523a5..fd305add2 100644 --- a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java +++ b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java @@ -21,12 +21,12 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; +import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.cert.X509Certificate; import java.util.Locale; import java.util.StringTokenizer; -import java.math.BigInteger; import javax.servlet.ServletConfig; import javax.servlet.ServletException; @@ -92,13 +92,10 @@ public class CheckRequest extends CMSServlet { private static final long serialVersionUID = 2791195859767119636L; // constants public static String FULL_RESPONSE = "cmcFullEnrollmentResponse"; - private final static String INFO = "CheckRequest"; private final static String REQ_ID = "requestId"; - private final static String REQ_TYPE = "requestType"; private final static String STATUS = "status"; private final static String CREATE_ON = "createdOn"; private final static String UPDATE_ON = "updatedOn"; - private final static String UPDATE_BY = "updatedBy"; private final static String TPL_FILE = "requestStatus.template"; diff --git a/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java b/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java index c324e4a1f..fa33f3eb1 100644 --- a/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java +++ b/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java @@ -77,7 +77,6 @@ import com.netscape.cms.servlet.common.CMSRequest; import com.netscape.cms.servlet.common.CMSTemplate; import com.netscape.cms.servlet.common.CMSTemplateParams; import com.netscape.cms.servlet.common.ECMSGWException; -import com.netscape.cms.servlet.common.ICMSTemplateFiller; import com.netscape.cmsutil.util.Utils; /** @@ -93,9 +92,7 @@ public class ProcessCertReq extends CMSServlet { * */ private static final long serialVersionUID = 812464895240811318L; - private final static String INFO = "processReq"; private final static String SEQNUM = "seqNum"; - private final static String TO_DO = "toDo"; private final static String TPL_FILE = "processCertReq.template"; private IRequestQueue mQueue = null; @@ -108,9 +105,7 @@ public class ProcessCertReq extends CMSServlet { private final static String REQ_COMPLETED_TEMPLATE = "ra/RequestCompleted.template"; private final static String PROP_REQ_COMPLETED_TEMPLATE = "requestCompletedTemplate"; private final static String PROP_EXTRA_AGENT_PARAMS = "extraAgentParams"; - private static ICMSTemplateFiller REQ_COMPLETED_FILLER = new RAReqCompletedFiller(); private String mReqCompletedTemplate = null; - private final static String CERT_TYPE = "certType"; private String auditServiceID = ILogger.UNIDENTIFIED; private final static String AGENT_CA_CLONE_ENROLLMENT_SERVLET = diff --git a/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java b/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java index bf8decd69..dc61e1e02 100644 --- a/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java +++ b/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java @@ -18,8 +18,8 @@ package com.netscape.cms.servlet.request; import java.io.IOException; -import java.util.Locale; import java.math.BigInteger; +import java.util.Locale; import javax.servlet.ServletConfig; import javax.servlet.ServletException; @@ -61,11 +61,9 @@ public class ProcessReq extends CMSServlet { * */ private static final long serialVersionUID = -6941843162486565610L; - private final static String INFO = "processReq"; private final static String SEQNUM = "seqNum"; private final static String DO_ASSIGN = "doAssign"; private final static String TPL_FILE = "processReq.template"; - private final static String OUT_ERROR = "errorDetails"; private final static String PROP_PARSER = "parser"; private IRequestQueue mQueue = null; @@ -73,9 +71,6 @@ public class ProcessReq extends CMSServlet { private IReqParser mParser = null; private String[] mSigningAlgorithms = null; - private static String[] DEF_SIGNING_ALGORITHMS = new String[] - { "SHA1withRSA", "SHA256withRSA", "SHA512withRSA", "SHA1withDSA", "MD5withRSA", "MD2withRSA" }; - /** * Process request. */ diff --git a/base/common/src/com/netscape/cms/servlet/request/QueryReq.java b/base/common/src/com/netscape/cms/servlet/request/QueryReq.java index f18fabc6a..f1e8ec8b1 100644 --- a/base/common/src/com/netscape/cms/servlet/request/QueryReq.java +++ b/base/common/src/com/netscape/cms/servlet/request/QueryReq.java @@ -18,10 +18,10 @@ package com.netscape.cms.servlet.request; import java.io.IOException; +import java.math.BigInteger; import java.util.Enumeration; import java.util.Locale; import java.util.Vector; -import java.math.BigInteger; import javax.servlet.ServletConfig; import javax.servlet.ServletException; @@ -56,7 +56,6 @@ public class QueryReq extends CMSServlet { */ private static final long serialVersionUID = -8729364426329835378L; // constants - private final static String INFO = "QueryReq"; private final static String IN_SHOW_ALL = "showAll"; private final static String IN_SHOW_WAITING = "showWaiting"; private final static String IN_SHOW_IN_SERVICE = "showInService"; @@ -66,35 +65,17 @@ public class QueryReq extends CMSServlet { private final static String IN_SHOW_COMPLETED = "showCompleted"; private final static String IN_MAXCOUNT = "maxCount"; private final static String IN_TOTALCOUNT = "totalRecordCount"; - private final static String ON = "on"; private final static String PROP_PARSER = "parser"; private final static String TPL_FILE = "queryReq.template"; - private final static String OUT_SERVICE_URL = "serviceURL"; - private final static String OUT_OP = "op"; - private final static String OUT_MAXCOUNT = IN_MAXCOUNT; private final static String OUT_TOTALCOUNT = IN_TOTALCOUNT; private final static String OUT_CURRENTCOUNT = "currentRecordCount"; - private final static String OUT_SENTINEL_DOWN = "querySentinelDown"; - private final static String OUT_SHOW_COMPLETED = IN_SHOW_COMPLETED; - private final static String OUT_SEQNUM = "seqNum"; - private final static String OUT_STATUS = "status"; - private final static String OUT_CREATE_ON = "createdOn"; - private final static String OUT_UPDATE_ON = "updatedOn"; - private final static String OUT_UPDATE_BY = "updatedBy"; private final static String OUT_REQUESTING_USER = "requestingUser"; //keeps track of where to begin if page down private final static String OUT_FIRST_ENTRY_ON_PAGE = "firstEntryOnPage"; //keeps track of where to begin if page up private final static String OUT_LAST_ENTRY_ON_PAGE = "lastEntryOnPage"; - private final static String OUT_SUBJECT = "subject"; - private final static String OUT_REQUEST_TYPE = "requestType"; - private final static String OUT_COMMENTS = "requestorComments"; - private final static String OUT_SERIALNO = "serialNumber"; - private final static String OUT_OWNER_NAME = "ownerName"; - private final static String OUT_PUBLIC_KEY_INFO = - "subjectPublicKeyInfo"; private final static String OUT_ERROR = "error"; private final static String OUT_AUTHORITY_ID = "authorityid"; diff --git a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java index 02dac53f9..10daeeb08 100644 --- a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java +++ b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java @@ -18,7 +18,6 @@ package com.netscape.cms.servlet.request; import java.io.IOException; -import java.math.BigInteger; import java.util.Date; import java.util.Locale; @@ -59,19 +58,11 @@ public class SearchReqs extends CMSServlet { */ private static final long serialVersionUID = 2449481964851735051L; private final static String TPL_FILE = "queryReq.template"; - private final static String INFO = "QueryReq"; private final static String PROP_MAX_SEARCH_RETURNS = "maxSearchReqReturns"; private final static String PROP_PARSER = "parser"; private final static String CURRENT_TIME = "currentTime"; - private final static BigInteger MINUS_ONE = new BigInteger("-1"); - private final static String OUT_AUTHORITY_ID = "authorityid"; - private final static String OUT_REQUESTING_USER = "requestingUser"; - private final static String OUT_SEQNUM_FROM = "seqNumFrom"; - private final static String OUT_MAXCOUNT = "maxCount"; private final static String OUT_TOTALCOUNT = "totalRecordCount"; private final static String OUT_CURRENTCOUNT = "currentRecordCount"; - private final static String OUT_SENTINEL = "querySentinel"; - private final static String OUT_ERROR = "error"; private final static int MAX_RESULTS = 1000; private IRequestQueue mQueue = null; |