From 7c7b9d023cd466c1771068badc020dab36beb553 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Thu, 5 Apr 2012 14:49:11 -0500 Subject: Removed whitespaces from Java code. Whitespaces in Java code have been removed with the following command: find . -not -path .git -name *.java -exec sed -i 's/[[:blank:]]\+$//' {} \; Ticket #134 --- .../cms/servlet/profile/ProfileApproveServlet.java | 16 ++++----- .../cms/servlet/profile/ProfileListServlet.java | 6 ++-- .../cms/servlet/profile/ProfileProcessServlet.java | 34 +++++++++--------- .../cms/servlet/profile/ProfileReviewServlet.java | 6 ++-- .../cms/servlet/profile/ProfileSelectServlet.java | 4 +-- .../cms/servlet/profile/ProfileServlet.java | 4 +-- .../servlet/profile/ProfileSubmitCMCServlet.java | 30 ++++++++-------- .../cms/servlet/profile/ProfileSubmitServlet.java | 40 +++++++++++----------- 8 files changed, 70 insertions(+), 70 deletions(-) (limited to 'base/common/src/com/netscape/cms/servlet/profile') diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java index 48848695f..7b5343000 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.CMSRequest; /** * Toggle the approval state of a profile - * + * * @version $Revision$, $Date$ */ public class ProfileApproveServlet extends ProfileServlet { @@ -71,7 +71,7 @@ public class ProfileApproveServlet extends ProfileServlet { /** * initialize the servlet. This servlet uses the template file * "ImportCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -82,13 +82,13 @@ public class ProfileApproveServlet extends ProfileServlet { /** * Process the HTTP request. *

- * + * *

- * + * * @param cmsReq the object holding the request and response information * @exception EBaseException an error has occurred */ @@ -460,11 +460,11 @@ public class ProfileApproveServlet extends ProfileServlet { /** * Signed Audit Log Profile ID - * + * * This method is called to obtain the "ProfileID" for * a signed audit log message. *

- * + * * @param req HTTP request * @return id string containing the signed audit log message ProfileID */ @@ -490,11 +490,11 @@ public class ProfileApproveServlet extends ProfileServlet { /** * Signed Audit Log Profile Operation - * + * * This method is called to obtain the "Profile Operation" for * a signed audit log message. *

- * + * * @param req HTTP request * @return operation string containing either OP_APPROVE, OP_DISAPPROVE, * or SIGNED_AUDIT_EMPTY_VALUE diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java index 2ca5f0a5c..9556da8e3 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java @@ -39,7 +39,7 @@ import com.netscape.cms.servlet.common.CMSRequest; /** * List all enabled profiles. - * + * * @version $Revision$, $Date$ */ public class ProfileListServlet extends ProfileServlet { @@ -60,7 +60,7 @@ public class ProfileListServlet extends ProfileServlet { /** * initialize the servlet. This servlet uses the template file * "ImportCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -70,7 +70,7 @@ public class ProfileListServlet extends ProfileServlet { /** * Process the HTTP request. - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java index e482b67da..996b65d78 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java @@ -66,7 +66,7 @@ import com.netscape.cmsutil.util.Utils; /** * This servlet approves profile-based request. - * + * * @version $Revision$, $Date$ */ public class ProfileProcessServlet extends ProfileServlet { @@ -359,7 +359,7 @@ public class ProfileProcessServlet extends ProfileServlet { if (op.equals("assign")) { String owner = req.getRequestOwner(); - // assigned owner + // assigned owner if (owner != null && owner.length() > 0) { if (!grantPermission(req, authToken)) { CMS.debug("ProfileProcessServlet: Permission not granted to assign request."); @@ -548,15 +548,15 @@ public class ProfileProcessServlet extends ProfileServlet { /** * Cancel request *

- * + * * (Certificate Request Processed - a manual "agent" profile based cert cancellation) *

- * + * *

- * + * * @param request the servlet request * @param args argument set * @param req the certificate request @@ -605,15 +605,15 @@ public class ProfileProcessServlet extends ProfileServlet { /** * Reject request *

- * + * * (Certificate Request Processed - a manual "agent" profile based cert rejection) *

- * + * *

- * + * * @param request the servlet request * @param args argument set * @param req the certificate request @@ -662,15 +662,15 @@ public class ProfileProcessServlet extends ProfileServlet { /** * Approve request *

- * + * * (Certificate Request Processed - a manual "agent" profile based cert acceptance) *

- * + * *

- * + * * @param request the servlet request * @param args argument set * @param req the certificate request @@ -835,11 +835,11 @@ public class ProfileProcessServlet extends ProfileServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. *

- * + * * @param request the actual request * @return id string containing the signed audit log message RequesterID */ @@ -865,11 +865,11 @@ public class ProfileProcessServlet extends ProfileServlet { /** * Signed Audit Log Info Value - * + * * This method is called to obtain the "reason" for * a signed audit log message. *

- * + * * @param request the actual request * @return reason string containing the signed audit log message reason */ @@ -901,11 +901,11 @@ public class ProfileProcessServlet extends ProfileServlet { /** * Signed Audit Log Info Certificate Value - * + * * This method is called to obtain the certificate from the passed in * "X509CertImpl" for a signed audit log message. *

- * + * * @param x509cert an X509CertImpl * @return cert string containing the certificate */ diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java index dd0ee7be7..61a04a630 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java @@ -55,7 +55,7 @@ import com.netscape.cms.servlet.common.CMSRequest; /** * This servlet allows reviewing of profile-based request. - * + * * @version $Revision$, $Date$ */ public class ProfileReviewServlet extends ProfileServlet { @@ -77,7 +77,7 @@ public class ProfileReviewServlet extends ProfileServlet { /** * initialize the servlet. This servlet uses the template file * "ImportCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -99,7 +99,7 @@ public class ProfileReviewServlet extends ProfileServlet { *

- * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java index 5b07951f8..a4213e3a1 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java @@ -49,7 +49,7 @@ import com.netscape.cms.servlet.common.CMSRequest; /** * Retrieve detailed information of a particular profile. - * + * * @version $Revision$, $Date$ */ public class ProfileSelectServlet extends ProfileServlet { @@ -74,7 +74,7 @@ public class ProfileSelectServlet extends ProfileServlet { * - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java index 457b8422b..9eac8eebd 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.ServletUtils; /** * This servlet is the base class of all profile servlets. - * + * * @version $Revision$, $Date$ */ public class ProfileServlet extends CMSServlet { @@ -168,7 +168,7 @@ public class ProfileServlet extends CMSServlet { * initialize the servlet. Servlets implementing this method * must specify the template to use as a parameter called * "templatePath" in the servletConfig - * + * * @param sc servlet configuration, read from the web.xml file */ diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java index 16451f6dd..93e5b6a4b 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java @@ -66,7 +66,7 @@ import com.netscape.cmsutil.util.Utils; /** * This servlet submits end-user request into the profile framework. - * + * * @version $Revision$, $Date$ */ public class ProfileSubmitCMCServlet extends ProfileServlet { @@ -104,9 +104,9 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { * be set up to always issue certificates against a certain profile * by setting the 'profileId' configuration in the servletConfig * If not, the user must specify the profileID when submitting the request - * + * * "ImportCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -212,17 +212,17 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { /** * Process the HTTP request *

- * + * * (Certificate Request Processed - either an automated "EE" profile based cert acceptance, or an automated "EE" * profile based cert rejection) *

- * + * *

- * + * * @param cmsReq the object holding the request and response information * @exception EBaseException an error has occurred */ @@ -267,7 +267,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { while (paramNames.hasMoreElements()) { String paramName = paramNames.nextElement(); // added this facility so that password can be hidden, - // all sensitive parameters should be prefixed with + // all sensitive parameters should be prefixed with // __ (double underscores); however, in the event that // a security parameter slips through, we perform multiple // additional checks to insure that it is NOT displayed @@ -526,7 +526,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { Integer nums = (Integer) (context.get("numOfControls")); CMCOutputTemplate template = new CMCOutputTemplate(); // if there is only one control GetCert, then simple response - // must be returned. + // must be returned. if (nums != null && nums.intValue() == 1) { TaggedAttribute attr1 = (TaggedAttribute) (context.get(OBJECT_IDENTIFIER.id_cmc_getCert)); if (attr1 != null) { @@ -623,7 +623,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { return; } catch (Throwable e) { CMS.debug("ProfileSubmitCMCServlet: populate " + e.toString()); - // throw new IOException("Profile " + profileId + + // throw new IOException("Profile " + profileId + // " cannot populate"); CMCOutputTemplate template = new CMCOutputTemplate(); SEQUENCE seq = new SEQUENCE(); @@ -704,7 +704,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { "CMS_PROFILE_DEFERRED", e.toString()); } catch (ERejectException e) { - // return error to the user + // return error to the user reqs[k].setRequestStatus(RequestStatus.REJECTED); CMS.debug("ProfileSubmitCMCServlet: submit " + e.toString()); errorCode = "3"; @@ -772,7 +772,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { } /////////////////////////////////////////////// - // output output list + // output output list /////////////////////////////////////////////// CMS.debug("ProfileSubmitCMCServlet: done serving"); @@ -812,11 +812,11 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. *

- * + * * @param request the actual request * @return id string containing the signed audit log message RequesterID */ @@ -842,11 +842,11 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { /** * Signed Audit Log Info Certificate Value - * + * * This method is called to obtain the certificate from the passed in * "X509CertImpl" for a signed audit log message. *

- * + * * @param request request containing an X509CertImpl * @return cert string containing the certificate */ diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java index eb3b93eb8..64ab5f82d 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java @@ -73,7 +73,7 @@ import com.netscape.cmsutil.xml.XMLObject; /** * This servlet submits end-user request into the profile framework. - * + * * @author Christina Fu (renewal support) * @version $Revision$, $Date$ */ @@ -117,9 +117,9 @@ public class ProfileSubmitServlet extends ProfileServlet { * be set up to always issue certificates against a certain profile * by setting the 'profileId' configuration in the servletConfig * If not, the user must specify the profileID when submitting the request - * + * * "ImportCert.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -154,7 +154,7 @@ public class ProfileSubmitServlet extends ProfileServlet { } - /* + /* * fill input info from "request" to context. * This is expected to be used by renewal where the request * is retrieved from request record @@ -356,7 +356,7 @@ public class ProfileSubmitServlet extends ProfileServlet { } } - /* + /* * fill input info from orig request to the renew request. * This is expected to be used by renewal where the request * is retrieved from request record @@ -439,17 +439,17 @@ public class ProfileSubmitServlet extends ProfileServlet { /** * Process the HTTP request *

- * + * * (Certificate Request Processed - either an automated "EE" profile based cert acceptance, or an automated "EE" * profile based cert rejection) *

- * + * *

- * + * * @param cmsReq the object holding the request and response information * @exception EBaseException an error has occurred */ @@ -488,7 +488,7 @@ public class ProfileSubmitServlet extends ProfileServlet { while (paramNames.hasMoreElements()) { String paramName = paramNames.nextElement(); // added this facility so that password can be hidden, - // all sensitive parameters should be prefixed with + // all sensitive parameters should be prefixed with // __ (double underscores); however, in the event that // a security parameter slips through, we perform multiple // additional checks to insure that it is NOT displayed @@ -548,7 +548,7 @@ public class ProfileSubmitServlet extends ProfileServlet { * Framework. The authentication and authorization are taken from * the renewal profile, while the input (with requests) and grace * period constraint are taken from the original cert's request record. - * + * * Things to note: * * the renew request will contain the original profile instead * of the new @@ -614,7 +614,7 @@ public class ProfileSubmitServlet extends ProfileServlet { String serial = request.getParameter("serial_num"); BigInteger certSerial = null; // if serial number is sent with request, then the authentication - // method is not ssl client auth. In this case, an alternative + // method is not ssl client auth. In this case, an alternative // authentication method is used (default: ldap based) if (serial != null) { CMS.debug("ProfileSubmitServlet: renewal: found serial_num"); @@ -1199,7 +1199,7 @@ public class ProfileSubmitServlet extends ProfileServlet { // no profile set found CMS.debug("ProfileSubmitServlet: no profile policy set found"); if (xmlOutput) { - outputError(response, FAILED, CMS.getUserMessage("CMS_PROFILE_NO_POLICY_SET_FOUND"), + outputError(response, FAILED, CMS.getUserMessage("CMS_PROFILE_NO_POLICY_SET_FOUND"), reqs[k].getRequestId().toString()); } else { args.set(ARG_ERROR_CODE, "1"); @@ -1246,10 +1246,10 @@ public class ProfileSubmitServlet extends ProfileServlet { return; } catch (Throwable e) { CMS.debug("ProfileSubmitServlet: populate " + e.toString()); - // throw new IOException("Profile " + profileId + + // throw new IOException("Profile " + profileId + // " cannot populate"); if (xmlOutput) { - outputError(response, FAILED, CMS.getUserMessage(locale, "CMS_INTERNAL_ERROR"), + outputError(response, FAILED, CMS.getUserMessage(locale, "CMS_INTERNAL_ERROR"), reqs[k].getRequestId().toString()); } else { args.set(ARG_ERROR_CODE, "1"); @@ -1332,7 +1332,7 @@ public class ProfileSubmitServlet extends ProfileServlet { "CMS_PROFILE_DEFERRED", e.toString()); } catch (ERejectException e) { - // return error to the user + // return error to the user reqs[k].setRequestStatus(RequestStatus.REJECTED); CMS.debug("ProfileSubmitServlet: submit " + e.toString()); errorCode = "3"; @@ -1415,7 +1415,7 @@ public class ProfileSubmitServlet extends ProfileServlet { } /////////////////////////////////////////////// - // output output list + // output output list /////////////////////////////////////////////// if (xmlOutput) { xmlOutput(response, profile, locale, reqs); @@ -1538,11 +1538,11 @@ public class ProfileSubmitServlet extends ProfileServlet { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. *

- * + * * @param request the actual request * @return id string containing the signed audit log message RequesterID */ @@ -1568,11 +1568,11 @@ public class ProfileSubmitServlet extends ProfileServlet { /** * Signed Audit Log Info Certificate Value - * + * * This method is called to obtain the certificate from the passed in * "X509CertImpl" for a signed audit log message. *

- * + * * @param request request containing an X509CertImpl * @return cert string containing the certificate */ -- cgit