Formatting

Formatted project according to eclipse project settings

4 files changed, 270 insertions, 257 deletions

diff --git a/pki/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java b/pki/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java
index d238c2792..a6a61c20a 100644
--- a/pki/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java
+++ b/pki/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java
@@ -17,7 +17,6 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.listeners;
 
-
 import java.io.File;
 import java.io.IOException;
 import java.text.DateFormat;
@@ -45,12 +44,11 @@ import com.netscape.certsrv.request.IRequest;
 import com.netscape.certsrv.request.IRequestListener;
 import com.netscape.certsrv.request.RequestId;
 
-
 /**
  * a listener for every completed enrollment request
  * <p>
- * Here is a list of available $TOKENs for email notification
- templates if certificate is successfully issued:
+ * Here is a list of available $TOKENs for email notification templates if
+ * certificate is successfully issued:
  * <UL>
  * <LI>$InstanceID
  * <LI>$SerialNumber
@@ -66,13 +64,13 @@ import com.netscape.certsrv.request.RequestId;
  * <LI>$RecipientEmail
  * </UL>
  * <p>
- * Here is a list of available $TOKENs for email notification
- templates if certificate request is rejected:
+ * Here is a list of available $TOKENs for email notification templates if
+ * certificate request is rejected:
  * <UL>
  * <LI>$RequestId
  * <LI>$InstanceID
  * </UL>
- *
+ * 
  * @version $Revision$, $Date$
  */
 public class CertificateIssuedListener implements IRequestListener {
@@ -107,7 +105,7 @@ public class CertificateIssuedListener implements IRequestListener {
     }
 
     public void init(ISubsystem sub, IConfigStore config)
-        throws EListenersException, EPropertyNotFound, EBaseException {
+            throws EListenersException, EPropertyNotFound, EBaseException {
         mSubsystem = (ICertAuthority) sub;
         mConfig = mSubsystem.getConfigStore();
 
@@ -118,25 +116,24 @@ public class CertificateIssuedListener implements IRequestListener {
 
         mSenderEmail = rc.getString(PROP_SENDER_EMAIL);
         if (mSenderEmail == null) {
-            throw new EListenersException(CMS.getLogMessage("NO_NOTIFY_SENDER_EMAIL_CONFIG_FOUND"));
+            throw new EListenersException(
+                    CMS.getLogMessage("NO_NOTIFY_SENDER_EMAIL_CONFIG_FOUND"));
         }
 
         mFormPath = rc.getString(PROP_EMAIL_TEMPLATE);
         String mDir = null;
 
         // figure out the reject email path: same dir as form path,
-        //		same ending as form path
+        // same ending as form path
         int ridx = mFormPath.lastIndexOf(File.separator);
 
         if (ridx == -1) {
-            CMS.debug("CertificateIssuedListener: file separator: " + File.separator
-                +
-                " not found. Use default /");
+            CMS.debug("CertificateIssuedListener: file separator: "
+                    + File.separator + " not found. Use default /");
             ridx = mFormPath.lastIndexOf("/");
             mDir = mFormPath.substring(0, ridx + 1);
         } else {
-            mDir = mFormPath.substring(0, ridx +
-                            File.separator.length());
+            mDir = mFormPath.substring(0, ridx + File.separator.length());
         }
         CMS.debug("CertificateIssuedListener: template file directory: " + mDir);
         mRejectPath = mDir + REJECT_FILE_NAME;
@@ -154,7 +151,7 @@ public class CertificateIssuedListener implements IRequestListener {
         mDateFormat = DateFormat.getDateTimeInstance();
 
         mSubject_Success = rc.getString(PROP_EMAIL_SUBJECT,
-                    "Your Certificate Request");
+                "Your Certificate Request");
         mSubject = new String(mSubject_Success);
 
         // form the cert retrieval URL for the notification
@@ -166,9 +163,10 @@ public class CertificateIssuedListener implements IRequestListener {
     }
 
     public void accept(IRequest r) {
-        CMS.debug("CertificateIssuedListener: accept " + 
-            r.getRequestId().toString());
-        if (mEnabled != true) return;
+        CMS.debug("CertificateIssuedListener: accept "
+                + r.getRequestId().toString());
+        if (mEnabled != true)
+            return;
 
         mSubject = mSubject_Success;
         mReqId = r.getRequestId();
@@ -190,17 +188,18 @@ public class CertificateIssuedListener implements IRequestListener {
         if (profileId == null) {
             if (r.getExtDataInInteger(IRequest.RESULT) == null)
                 return;
-            if ((r.getExtDataInInteger(IRequest.RESULT)).equals(IRequest.RES_ERROR)) {
-                CMS.debug("CertificateIssuedListener: Request errored. " +
-                    "No need to email notify for enrollment request id " +
-                    mReqId);
+            if ((r.getExtDataInInteger(IRequest.RESULT))
+                    .equals(IRequest.RES_ERROR)) {
+                CMS.debug("CertificateIssuedListener: Request errored. "
+                        + "No need to email notify for enrollment request id "
+                        + mReqId);
                 return;
             }
         }
         String requestType = r.getRequestType();
 
-        if (requestType.equals(IRequest.ENROLLMENT_REQUEST) ||
-            requestType.equals(IRequest.RENEWAL_REQUEST)) {
+        if (requestType.equals(IRequest.ENROLLMENT_REQUEST)
+                || requestType.equals(IRequest.RENEWAL_REQUEST)) {
             CMS.debug("accept() enrollment/renewal request...");
             // Get the certificate from the request
             X509CertImpl issuedCert[] = null;
@@ -210,8 +209,8 @@ public class CertificateIssuedListener implements IRequestListener {
                 issuedCert = r.getExtDataInCertArray(IRequest.ISSUED_CERTS);
             } else {
                 issuedCert = new X509CertImpl[1];
-                issuedCert[0] =
-                        r.getExtDataInCert(IEnrollProfile.REQUEST_ISSUED_CERT);
+                issuedCert[0] = r
+                        .getExtDataInCert(IEnrollProfile.REQUEST_ISSUED_CERT);
             }
 
             if (issuedCert != null) {
@@ -223,11 +222,10 @@ public class CertificateIssuedListener implements IRequestListener {
 
                 try {
                     keys.set(IEmailResolverKeys.KEY_REQUEST, r);
-                    keys.set(IEmailResolverKeys.KEY_CERT,
-                        issuedCert[0]);
+                    keys.set(IEmailResolverKeys.KEY_CERT, issuedCert[0]);
                 } catch (EBaseException e) {
-                    log(ILogger.LL_FAILURE,
-                        CMS.getLogMessage("LISTENERS_CERT_ISSUED_SET_RESOLVER", e.toString()));
+                    log(ILogger.LL_FAILURE, CMS.getLogMessage(
+                            "LISTENERS_CERT_ISSUED_SET_RESOLVER", e.toString()));
                 }
 
                 IEmailResolver er = CMS.getReqCertSANameEmailResolver();
@@ -235,31 +233,29 @@ public class CertificateIssuedListener implements IRequestListener {
                 try {
                     mEmail = er.getEmail(keys);
                 } catch (ENotificationException e) {
-                    log(ILogger.LL_FAILURE,
-                        CMS.getLogMessage("LISTENERS_CERT_ISSUED_EXCEPTION",
-                            e.toString()));
+                    log(ILogger.LL_FAILURE, CMS.getLogMessage(
+                            "LISTENERS_CERT_ISSUED_EXCEPTION", e.toString()));
                 } catch (EBaseException e) {
-                    log(ILogger.LL_FAILURE,
-                        CMS.getLogMessage("LISTENERS_CERT_ISSUED_EXCEPTION",
-                            e.toString()));
+                    log(ILogger.LL_FAILURE, CMS.getLogMessage(
+                            "LISTENERS_CERT_ISSUED_EXCEPTION", e.toString()));
                 } catch (Exception e) {
-                    log(ILogger.LL_FAILURE,
-                        CMS.getLogMessage("LISTENERS_CERT_ISSUED_EXCEPTION",
-                            e.toString()));
+                    log(ILogger.LL_FAILURE, CMS.getLogMessage(
+                            "LISTENERS_CERT_ISSUED_EXCEPTION", e.toString()));
                 }
-				
+
                 // now we can mail
                 if ((mEmail != null) && (!mEmail.equals(""))) {
                     mailIt(mEmail, issuedCert);
                 } else {
-                    log(ILogger.LL_FAILURE,
-                        CMS.getLogMessage("LISTENERS_CERT_ISSUED_NOTIFY_ERROR",
-                            issuedCert[0].getSerialNumber().toString(), mReqId.toString()));
+                    log(ILogger.LL_FAILURE, CMS.getLogMessage(
+                            "LISTENERS_CERT_ISSUED_NOTIFY_ERROR", issuedCert[0]
+                                    .getSerialNumber().toString(), mReqId
+                                    .toString()));
                     // send failure notification to "sender"
                     mSubject = "Certificate Issued notification undeliverable";
                     mailIt(mSenderEmail, issuedCert);
                 }
-            }				
+            }
         }
     }
 
@@ -282,7 +278,7 @@ public class CertificateIssuedListener implements IRequestListener {
             if (!template.init()) {
                 return;
             }
-		
+
             buildContentParams(issuedCert, mEmail);
             IEmailFormProcessor et = CMS.getEmailFormProcessor();
             String c = et.getEmailContent(template.toString(), mContentParams);
@@ -292,22 +288,23 @@ public class CertificateIssuedListener implements IRequestListener {
             }
             mn.setContent(c);
         } else {
-            log(ILogger.LL_FAILURE,
-                CMS.getLogMessage("LISTENERS_CERT_ISSUED_TEMPLATE_ERROR",
-                    issuedCert[0].getSerialNumber().toString(), mReqId.toString()));
+            log(ILogger.LL_FAILURE, CMS.getLogMessage(
+                    "LISTENERS_CERT_ISSUED_TEMPLATE_ERROR", issuedCert[0]
+                            .getSerialNumber().toString(), mReqId.toString()));
 
-            mn.setContent("Serial Number = " +
-                issuedCert[0].getSerialNumber() +
-                "; Request ID = " + mReqId);
+            mn.setContent("Serial Number = " + issuedCert[0].getSerialNumber()
+                    + "; Request ID = " + mReqId);
         }
-		
+
         try {
             mn.sendNotification();
         } catch (ENotificationException e) {
-            log(ILogger.LL_FAILURE, CMS.getLogMessage("OPERATION_ERROR", e.toString()));
-			
+            log(ILogger.LL_FAILURE,
+                    CMS.getLogMessage("OPERATION_ERROR", e.toString()));
+
         } catch (IOException e) {
-            log(ILogger.LL_FAILURE, CMS.getLogMessage("OPERATION_ERROR", e.toString()));
+            log(ILogger.LL_FAILURE,
+                    CMS.getLogMessage("OPERATION_ERROR", e.toString()));
         }
     }
 
@@ -320,7 +317,8 @@ public class CertificateIssuedListener implements IRequestListener {
             keys.set(IEmailResolverKeys.KEY_REQUEST, r);
         } catch (EBaseException e) {
             log(ILogger.LL_FAILURE,
-                CMS.getLogMessage("LISTENERS_CERT_ISSUED_SET_RESOLVER", e.toString()));
+                    CMS.getLogMessage("LISTENERS_CERT_ISSUED_SET_RESOLVER",
+                            e.toString()));
         }
 
         IEmailResolver er = CMS.getReqCertSANameEmailResolver();
@@ -328,11 +326,14 @@ public class CertificateIssuedListener implements IRequestListener {
         try {
             mEmail = er.getEmail(keys);
         } catch (ENotificationException e) {
-            log(ILogger.LL_FAILURE, CMS.getLogMessage("OPERATION_ERROR", e.toString()));
+            log(ILogger.LL_FAILURE,
+                    CMS.getLogMessage("OPERATION_ERROR", e.toString()));
         } catch (EBaseException e) {
-            log(ILogger.LL_FAILURE, CMS.getLogMessage("OPERATION_ERROR", e.toString()));
+            log(ILogger.LL_FAILURE,
+                    CMS.getLogMessage("OPERATION_ERROR", e.toString()));
         } catch (Exception e) {
-            log(ILogger.LL_FAILURE, CMS.getLogMessage("OPERATION_ERROR", e.toString()));
+            log(ILogger.LL_FAILURE,
+                    CMS.getLogMessage("OPERATION_ERROR", e.toString()));
         }
 
         // now we can mail
@@ -352,23 +353,25 @@ public class CertificateIssuedListener implements IRequestListener {
                 if (!template.init()) {
                     return;
                 }
-			
+
                 if (template.isHTML()) {
                     mn.setContentType("text/html");
                 }
 
                 // build some token data
                 mContentParams.put(IEmailFormProcessor.TOKEN_ID,
-                    mConfig.getName());
+                        mConfig.getName());
                 mReqId = r.getRequestId();
                 mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_ID,
-                    (Object) mReqId.toString());
+                        (Object) mReqId.toString());
                 IEmailFormProcessor et = CMS.getEmailFormProcessor();
-                String c = et.getEmailContent(template.toString(), mContentParams);
+                String c = et.getEmailContent(template.toString(),
+                        mContentParams);
 
                 mn.setContent(c);
             } else {
-                log(ILogger.LL_FAILURE, CMS.getLogMessage("LISTENERS_CERT_ISSUED_REJECTION"));
+                log(ILogger.LL_FAILURE,
+                        CMS.getLogMessage("LISTENERS_CERT_ISSUED_REJECTION"));
                 mn.setContent("Your Certificate Request has been rejected.  Please contact your administrator for assistance");
             }
 
@@ -376,49 +379,52 @@ public class CertificateIssuedListener implements IRequestListener {
                 mn.sendNotification();
             } catch (ENotificationException e) {
                 // already logged, lets audit
-                log(ILogger.LL_FAILURE, CMS.getLogMessage("OPERATION_ERROR", e.toString()));
-				
+                log(ILogger.LL_FAILURE,
+                        CMS.getLogMessage("OPERATION_ERROR", e.toString()));
+
             } catch (IOException e) {
-                log(ILogger.LL_FAILURE, CMS.getLogMessage("OPERATION_ERROR", e.toString()));
+                log(ILogger.LL_FAILURE,
+                        CMS.getLogMessage("OPERATION_ERROR", e.toString()));
             }
         } else {
-            log(ILogger.LL_FAILURE,
-                CMS.getLogMessage("LISTENERS_CERT_ISSUED_REJECTION_NOTIFICATION", mReqId.toString()));
+            log(ILogger.LL_FAILURE, CMS.getLogMessage(
+                    "LISTENERS_CERT_ISSUED_REJECTION_NOTIFICATION",
+                    mReqId.toString()));
 
         }
     }
 
     private void buildContentParams(X509CertImpl issuedCert[], String mEmail) {
-        mContentParams.put(IEmailFormProcessor.TOKEN_ID,
-            mConfig.getName());
+        mContentParams.put(IEmailFormProcessor.TOKEN_ID, mConfig.getName());
         mContentParams.put(IEmailFormProcessor.TOKEN_SERIAL_NUM,
-            (Object) issuedCert[0].getSerialNumber().toString());
+                (Object) issuedCert[0].getSerialNumber().toString());
         mContentParams.put(IEmailFormProcessor.TOKEN_HEX_SERIAL_NUM,
-            (Object) Long.toHexString(issuedCert[0].getSerialNumber().longValue()));
+                (Object) Long.toHexString(issuedCert[0].getSerialNumber()
+                        .longValue()));
         mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_ID,
-            (Object) mReqId.toString());
+                (Object) mReqId.toString());
         mContentParams.put(IEmailFormProcessor.TOKEN_HTTP_HOST,
-            (Object) mHttpHost);
+                (Object) mHttpHost);
         mContentParams.put(IEmailFormProcessor.TOKEN_HTTP_PORT,
-            (Object) mHttpPort);
+                (Object) mHttpPort);
         mContentParams.put(IEmailFormProcessor.TOKEN_ISSUER_DN,
-            (Object) issuedCert[0].getIssuerDN().toString());
+                (Object) issuedCert[0].getIssuerDN().toString());
         mContentParams.put(IEmailFormProcessor.TOKEN_SUBJECT_DN,
-            (Object) issuedCert[0].getSubjectDN().toString());
+                (Object) issuedCert[0].getSubjectDN().toString());
 
         Date date = (Date) issuedCert[0].getNotAfter();
 
         mContentParams.put(IEmailFormProcessor.TOKEN_NOT_AFTER,
-            mDateFormat.format(date));
+                mDateFormat.format(date));
 
         date = (Date) issuedCert[0].getNotBefore();
         mContentParams.put(IEmailFormProcessor.TOKEN_NOT_BEFORE,
-            mDateFormat.format(date));
+                mDateFormat.format(date));
 
         mContentParams.put(IEmailFormProcessor.TOKEN_SENDER_EMAIL,
-            (Object) mSenderEmail);
+                (Object) mSenderEmail);
         mContentParams.put(IEmailFormProcessor.TOKEN_RECIPIENT_EMAIL,
-            (Object) mEmail);
+                (Object) mEmail);
         // ... and more
     }
 
@@ -440,15 +446,15 @@ public class CertificateIssuedListener implements IRequestListener {
         } else if (name.equalsIgnoreCase(PROP_EMAIL_TEMPLATE)) {
             mFormPath = val;
         } else {
-            log(ILogger.LL_FAILURE, CMS.getLogMessage("LISTENERS_CERT_ISSUED_SET"));
+            log(ILogger.LL_FAILURE,
+                    CMS.getLogMessage("LISTENERS_CERT_ISSUED_SET"));
         }
     }
 
     private void log(int level, String msg) {
         if (mLogger == null)
             return;
-        mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_OTHER,
-            level, msg);
+        mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_OTHER, level, msg);
     }
 
 }
diff --git a/pki/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java b/pki/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java
index d1cc3d808..9b7fa4c00 100644
--- a/pki/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java
+++ b/pki/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java
@@ -17,7 +17,6 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.listeners;
 
-
 import java.io.File;
 import java.io.IOException;
 import java.security.cert.X509Certificate;
@@ -47,12 +46,11 @@ import com.netscape.certsrv.request.IRequest;
 import com.netscape.certsrv.request.IRequestListener;
 import com.netscape.certsrv.request.RequestId;
 
-
 /**
  * a listener for every completed enrollment request
  * <p>
- * Here is a list of available $TOKENs for email notification
- templates if certificate is successfully issued:
+ * Here is a list of available $TOKENs for email notification templates if
+ * certificate is successfully issued:
  * <UL>
  * <LI>$InstanceID
  * <LI>$SerialNumber
@@ -68,13 +66,13 @@ import com.netscape.certsrv.request.RequestId;
  * <LI>$RecipientEmail
  * </UL>
  * <p>
- * Here is a list of available $TOKENs for email notification
- templates if certificate request is revoked:
+ * Here is a list of available $TOKENs for email notification templates if
+ * certificate request is revoked:
  * <UL>
  * <LI>$RequestId
  * <LI>$InstanceID
  * </UL>
- *
+ * 
  * @version $Revision$, $Date$
  */
 public class CertificateRevokedListener implements IRequestListener {
@@ -109,7 +107,7 @@ public class CertificateRevokedListener implements IRequestListener {
     }
 
     public void init(ISubsystem sub, IConfigStore config)
-        throws EListenersException, EPropertyNotFound, EBaseException {
+            throws EListenersException, EPropertyNotFound, EBaseException {
         mSubsystem = (ICertAuthority) sub;
         mConfig = mSubsystem.getConfigStore();
 
@@ -120,27 +118,27 @@ public class CertificateRevokedListener implements IRequestListener {
 
         mSenderEmail = rc.getString(PROP_SENDER_EMAIL);
         if (mSenderEmail == null) {
-            throw new EListenersException(CMS.getLogMessage("NO_NOTIFY_SENDER_EMAIL_CONFIG_FOUND"));
+            throw new EListenersException(
+                    CMS.getLogMessage("NO_NOTIFY_SENDER_EMAIL_CONFIG_FOUND"));
         }
 
         mFormPath = rc.getString(PROP_EMAIL_TEMPLATE);
         String mDir = null;
 
         // figure out the reject email path: same dir as form path,
-        //		same ending as form path
+        // same ending as form path
         int ridx = mFormPath.lastIndexOf(File.separator);
 
         if (ridx == -1) {
-            CMS.debug("CertificateRevokedListener: file separator: " + File.separator
-                +
-                " not found. Use default /");
+            CMS.debug("CertificateRevokedListener: file separator: "
+                    + File.separator + " not found. Use default /");
             ridx = mFormPath.lastIndexOf("/");
             mDir = mFormPath.substring(0, ridx + 1);
         } else {
-            mDir = mFormPath.substring(0, ridx +
-                            File.separator.length());
+            mDir = mFormPath.substring(0, ridx + File.separator.length());
         }
-        CMS.debug("CertificateRevokedListener: template file directory: " + mDir);
+        CMS.debug("CertificateRevokedListener: template file directory: "
+                + mDir);
         mRejectPath = mDir + REJECT_FILE_NAME;
         if (mFormPath.endsWith(".html"))
             mRejectPath += ".html";
@@ -151,12 +149,13 @@ public class CertificateRevokedListener implements IRequestListener {
         else if (mFormPath.endsWith(".HTM"))
             mRejectPath += ".HTM";
 
-        CMS.debug("CertificateRevokedListener: Reject file path: " + mRejectPath);
+        CMS.debug("CertificateRevokedListener: Reject file path: "
+                + mRejectPath);
 
         mDateFormat = DateFormat.getDateTimeInstance();
 
         mSubject_Success = rc.getString(PROP_EMAIL_SUBJECT,
-                    "Your Certificate Request");
+                "Your Certificate Request");
         mSubject = new String(mSubject_Success);
 
         // form the cert retrieval URL for the notification
@@ -168,7 +167,8 @@ public class CertificateRevokedListener implements IRequestListener {
     }
 
     public void accept(IRequest r) {
-        if (mEnabled != true) return;
+        if (mEnabled != true)
+            return;
 
         mSubject = mSubject_Success;
         mReqId = r.getRequestId();
@@ -180,7 +180,7 @@ public class CertificateRevokedListener implements IRequestListener {
             return;
         if (rs.equals("complete") == false) {
             CMS.debug("CertificateRevokedListener: Request status: " + rs);
-            //revoked(r);
+            // revoked(r);
             return;
         }
 
@@ -189,19 +189,19 @@ public class CertificateRevokedListener implements IRequestListener {
             return;
 
         if ((r.getExtDataInInteger(IRequest.RESULT)).equals(IRequest.RES_ERROR)) {
-            CMS.debug("CertificateRevokedListener: Request errored. " +
-                "No need to email notify for enrollment request id " +
-                mReqId);
+            CMS.debug("CertificateRevokedListener: Request errored. "
+                    + "No need to email notify for enrollment request id "
+                    + mReqId);
             return;
         }
-     
+
         if (requestType.equals(IRequest.REVOCATION_REQUEST)) {
             CMS.debug("CertificateRevokedListener: accept() revocation request...");
             // Get the certificate from the request
-            //X509CertImpl issuedCert[] =
-            //    (X509CertImpl[])
-            RevokedCertImpl crlentries[] =
-                r.getExtDataInRevokedCertArray(IRequest.CERT_INFO);
+            // X509CertImpl issuedCert[] =
+            // (X509CertImpl[])
+            RevokedCertImpl crlentries[] = r
+                    .getExtDataInRevokedCertArray(IRequest.CERT_INFO);
 
             if (crlentries != null) {
                 CMS.debug("CertificateRevokedListener: Sending email notification..");
@@ -212,11 +212,10 @@ public class CertificateRevokedListener implements IRequestListener {
 
                 try {
                     keys.set(IEmailResolverKeys.KEY_REQUEST, r);
-                    keys.set(IEmailResolverKeys.KEY_CERT,
-                        crlentries[0]);
+                    keys.set(IEmailResolverKeys.KEY_CERT, crlentries[0]);
                 } catch (EBaseException e) {
-                    log(ILogger.LL_FAILURE,
-                        CMS.getLogMessage("LISTENERS_CERT_ISSUED_SET_RESOLVER", e.toString()));
+                    log(ILogger.LL_FAILURE, CMS.getLogMessage(
+                            "LISTENERS_CERT_ISSUED_SET_RESOLVER", e.toString()));
                 }
 
                 IEmailResolver er = CMS.getReqCertSANameEmailResolver();
@@ -224,31 +223,29 @@ public class CertificateRevokedListener implements IRequestListener {
                 try {
                     mEmail = er.getEmail(keys);
                 } catch (ENotificationException e) {
-                    log(ILogger.LL_FAILURE,
-                        CMS.getLogMessage("LISTENERS_CERT_ISSUED_EXCEPTION",
-                            e.toString()));
+                    log(ILogger.LL_FAILURE, CMS.getLogMessage(
+                            "LISTENERS_CERT_ISSUED_EXCEPTION", e.toString()));
                 } catch (EBaseException e) {
-                    log(ILogger.LL_FAILURE,
-                        CMS.getLogMessage("LISTENERS_CERT_ISSUED_EXCEPTION",
-                            e.toString()));
+                    log(ILogger.LL_FAILURE, CMS.getLogMessage(
+                            "LISTENERS_CERT_ISSUED_EXCEPTION", e.toString()));
                 } catch (Exception e) {
-                    log(ILogger.LL_FAILURE,
-                        CMS.getLogMessage("LISTENERS_CERT_ISSUED_EXCEPTION",
-                            e.toString()));
+                    log(ILogger.LL_FAILURE, CMS.getLogMessage(
+                            "LISTENERS_CERT_ISSUED_EXCEPTION", e.toString()));
                 }
-				
+
                 // now we can mail
                 if ((mEmail != null) && (!mEmail.equals(""))) {
                     mailIt(mEmail, crlentries);
                 } else {
-                    log(ILogger.LL_FAILURE,
-                        CMS.getLogMessage("LISTENERS_CERT_ISSUED_NOTIFY_ERROR",
-                            crlentries[0].getSerialNumber().toString(), mReqId.toString()));
+                    log(ILogger.LL_FAILURE, CMS.getLogMessage(
+                            "LISTENERS_CERT_ISSUED_NOTIFY_ERROR", crlentries[0]
+                                    .getSerialNumber().toString(), mReqId
+                                    .toString()));
                     // send failure notification to "sender"
                     mSubject = "Certificate Issued notification undeliverable";
                     mailIt(mSenderEmail, crlentries);
                 }
-            }				
+            }
         }
     }
 
@@ -271,7 +268,7 @@ public class CertificateRevokedListener implements IRequestListener {
             if (!template.init()) {
                 return;
             }
-		
+
             buildContentParams(crlentries, mEmail);
             IEmailFormProcessor et = CMS.getEmailFormProcessor();
             String c = et.getEmailContent(template.toString(), mContentParams);
@@ -281,22 +278,23 @@ public class CertificateRevokedListener implements IRequestListener {
             }
             mn.setContent(c);
         } else {
-            log(ILogger.LL_FAILURE,
-                CMS.getLogMessage("LISTENERS_CERT_ISSUED_TEMPLATE_ERROR",
-                    crlentries[0].getSerialNumber().toString(), mReqId.toString()));
+            log(ILogger.LL_FAILURE, CMS.getLogMessage(
+                    "LISTENERS_CERT_ISSUED_TEMPLATE_ERROR", crlentries[0]
+                            .getSerialNumber().toString(), mReqId.toString()));
 
-            mn.setContent("Serial Number = " +
-                crlentries[0].getSerialNumber() +
-                "; Request ID = " + mReqId);
+            mn.setContent("Serial Number = " + crlentries[0].getSerialNumber()
+                    + "; Request ID = " + mReqId);
         }
-		
+
         try {
             mn.sendNotification();
         } catch (ENotificationException e) {
-            log(ILogger.LL_FAILURE, CMS.getLogMessage("OPERATION_ERROR", e.toString()));
-			
+            log(ILogger.LL_FAILURE,
+                    CMS.getLogMessage("OPERATION_ERROR", e.toString()));
+
         } catch (IOException e) {
-            log(ILogger.LL_FAILURE, CMS.getLogMessage("OPERATION_ERROR", e.toString()));
+            log(ILogger.LL_FAILURE,
+                    CMS.getLogMessage("OPERATION_ERROR", e.toString()));
         }
     }
 
@@ -309,7 +307,8 @@ public class CertificateRevokedListener implements IRequestListener {
             keys.set(IEmailResolverKeys.KEY_REQUEST, r);
         } catch (EBaseException e) {
             log(ILogger.LL_FAILURE,
-                CMS.getLogMessage("LISTENERS_CERT_ISSUED_SET_RESOLVER", e.toString()));
+                    CMS.getLogMessage("LISTENERS_CERT_ISSUED_SET_RESOLVER",
+                            e.toString()));
         }
 
         IEmailResolver er = CMS.getReqCertSANameEmailResolver();
@@ -317,11 +316,14 @@ public class CertificateRevokedListener implements IRequestListener {
         try {
             mEmail = er.getEmail(keys);
         } catch (ENotificationException e) {
-            log(ILogger.LL_FAILURE, CMS.getLogMessage("OPERATION_ERROR", e.toString()));
+            log(ILogger.LL_FAILURE,
+                    CMS.getLogMessage("OPERATION_ERROR", e.toString()));
         } catch (EBaseException e) {
-            log(ILogger.LL_FAILURE, CMS.getLogMessage("OPERATION_ERROR", e.toString()));
+            log(ILogger.LL_FAILURE,
+                    CMS.getLogMessage("OPERATION_ERROR", e.toString()));
         } catch (Exception e) {
-            log(ILogger.LL_FAILURE, CMS.getLogMessage("OPERATION_ERROR", e.toString()));
+            log(ILogger.LL_FAILURE,
+                    CMS.getLogMessage("OPERATION_ERROR", e.toString()));
         }
 
         // now we can mail
@@ -341,23 +343,25 @@ public class CertificateRevokedListener implements IRequestListener {
                 if (!template.init()) {
                     return;
                 }
-			
+
                 if (template.isHTML()) {
                     mn.setContentType("text/html");
                 }
 
                 // build some token data
                 mContentParams.put(IEmailFormProcessor.TOKEN_ID,
-                    mConfig.getName());
+                        mConfig.getName());
                 mReqId = r.getRequestId();
                 mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_ID,
-                    (Object) mReqId.toString());
+                        (Object) mReqId.toString());
                 IEmailFormProcessor et = CMS.getEmailFormProcessor();
-                String c = et.getEmailContent(template.toString(), mContentParams);
+                String c = et.getEmailContent(template.toString(),
+                        mContentParams);
 
                 mn.setContent(c);
             } else {
-                log(ILogger.LL_FAILURE, CMS.getLogMessage("LISTENERS_CERT_ISSUED_REJECTION"));
+                log(ILogger.LL_FAILURE,
+                        CMS.getLogMessage("LISTENERS_CERT_ISSUED_REJECTION"));
                 mn.setContent("Your Certificate Request has been revoked.  Please contact your administrator for assistance");
             }
 
@@ -365,55 +369,61 @@ public class CertificateRevokedListener implements IRequestListener {
                 mn.sendNotification();
             } catch (ENotificationException e) {
                 // already logged, lets audit
-                log(ILogger.LL_FAILURE, CMS.getLogMessage("OPERATION_ERROR", e.toString()));
-				
+                log(ILogger.LL_FAILURE,
+                        CMS.getLogMessage("OPERATION_ERROR", e.toString()));
+
             } catch (IOException e) {
-                log(ILogger.LL_FAILURE, CMS.getLogMessage("OPERATION_ERROR", e.toString()));
+                log(ILogger.LL_FAILURE,
+                        CMS.getLogMessage("OPERATION_ERROR", e.toString()));
             }
         } else {
-            log(ILogger.LL_FAILURE,
-                CMS.getLogMessage("LISTENERS_CERT_ISSUED_REJECTION_NOTIFICATION", mReqId.toString()));
+            log(ILogger.LL_FAILURE, CMS.getLogMessage(
+                    "LISTENERS_CERT_ISSUED_REJECTION_NOTIFICATION",
+                    mReqId.toString()));
 
         }
     }
 
     private void buildContentParams(RevokedCertImpl crlentries[], String mEmail) {
-        mContentParams.put(IEmailFormProcessor.TOKEN_ID,
-            mConfig.getName());
+        mContentParams.put(IEmailFormProcessor.TOKEN_ID, mConfig.getName());
         mContentParams.put(IEmailFormProcessor.TOKEN_SERIAL_NUM,
-            (Object) crlentries[0].getSerialNumber().toString());
+                (Object) crlentries[0].getSerialNumber().toString());
         mContentParams.put(IEmailFormProcessor.TOKEN_HEX_SERIAL_NUM,
-            (Object) Long.toHexString(crlentries[0].getSerialNumber().longValue()));
+                (Object) Long.toHexString(crlentries[0].getSerialNumber()
+                        .longValue()));
         mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_ID,
-            (Object) mReqId.toString());
+                (Object) mReqId.toString());
         mContentParams.put(IEmailFormProcessor.TOKEN_HTTP_HOST,
-            (Object) mHttpHost);
+                (Object) mHttpHost);
         mContentParams.put(IEmailFormProcessor.TOKEN_HTTP_PORT,
-            (Object) mHttpPort);
-        
+                (Object) mHttpPort);
+
         try {
             RevokedCertImpl revCert = (RevokedCertImpl) crlentries[0];
-            ICertificateAuthority ca = (ICertificateAuthority) CMS.getSubsystem(CMS.SUBSYSTEM_CA);
+            ICertificateAuthority ca = (ICertificateAuthority) CMS
+                    .getSubsystem(CMS.SUBSYSTEM_CA);
             ICertificateRepository certDB = ca.getCertificateRepository();
-            X509Certificate cert = certDB.getX509Certificate(revCert.getSerialNumber());
+            X509Certificate cert = certDB.getX509Certificate(revCert
+                    .getSerialNumber());
 
             mContentParams.put(IEmailFormProcessor.TOKEN_ISSUER_DN,
-                (Object) cert.getIssuerDN().toString());
+                    (Object) cert.getIssuerDN().toString());
             mContentParams.put(IEmailFormProcessor.TOKEN_SUBJECT_DN,
-                (Object) cert.getSubjectDN().toString());
+                    (Object) cert.getSubjectDN().toString());
             Date date = (Date) crlentries[0].getRevocationDate();
-            
+
             mContentParams.put(IEmailFormProcessor.TOKEN_REVOCATION_DATE,
-                mDateFormat.format(date));
+                    mDateFormat.format(date));
         } catch (EBaseException e) {
             log(ILogger.LL_FAILURE,
-                CMS.getLogMessage("LISTENERS_CERT_ISSUED_SET_RESOLVER", e.toString()));
+                    CMS.getLogMessage("LISTENERS_CERT_ISSUED_SET_RESOLVER",
+                            e.toString()));
         }
 
         mContentParams.put(IEmailFormProcessor.TOKEN_SENDER_EMAIL,
-            (Object) mSenderEmail);
+                (Object) mSenderEmail);
         mContentParams.put(IEmailFormProcessor.TOKEN_RECIPIENT_EMAIL,
-            (Object) mEmail);
+                (Object) mEmail);
         // ... and more
     }
 
@@ -435,15 +445,15 @@ public class CertificateRevokedListener implements IRequestListener {
         } else if (name.equalsIgnoreCase(PROP_EMAIL_TEMPLATE)) {
             mFormPath = val;
         } else {
-            log(ILogger.LL_FAILURE, CMS.getLogMessage("LISTENERS_CERT_ISSUED_SET"));
+            log(ILogger.LL_FAILURE,
+                    CMS.getLogMessage("LISTENERS_CERT_ISSUED_SET"));
         }
     }
 
     private void log(int level, String msg) {
         if (mLogger == null)
             return;
-        mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_OTHER,
-            level, msg);
+        mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_OTHER, level, msg);
     }
 
 }
diff --git a/pki/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java b/pki/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java
index 2f02774d0..57368b76b 100644
--- a/pki/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java
+++ b/pki/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java
@@ -17,7 +17,6 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.listeners;
 
-
 import java.util.Hashtable;
 
 import netscape.ldap.LDAPAttribute;
@@ -39,10 +38,9 @@ import com.netscape.certsrv.request.IRequest;
 import com.netscape.certsrv.request.IRequestListener;
 import com.netscape.certsrv.request.RequestId;
 
-
 /**
  * This represnets a listener that removes pin from LDAP directory.
- *
+ * 
  * @version $Revision$, $Date$
  */
 public class PinRemovalListener implements IRequestListener {
@@ -87,18 +85,17 @@ public class PinRemovalListener implements IRequestListener {
 
     protected String[] configParams = { "a" };
 
-    public String[] getConfigParams() 
-        throws EBaseException {
+    public String[] getConfigParams() throws EBaseException {
 
         return configParams;
     }
 
     public void init(ISubsystem sub, IConfigStore config) throws EBaseException {
-	init(null, null, config);
+        init(null, null, config);
     }
 
     public void init(String name, String ImplName, IConfigStore config)
-        throws EBaseException {
+            throws EBaseException {
         mName = name;
         mImplName = ImplName;
         mConfig = config;
@@ -115,7 +112,8 @@ public class PinRemovalListener implements IRequestListener {
     }
 
     public void accept(IRequest r) {
-        if (mEnabled != true) return;
+        if (mEnabled != true)
+            return;
 
         mReqId = r.getRequestId();
 
@@ -128,37 +126,37 @@ public class PinRemovalListener implements IRequestListener {
         }
         String requestType = r.getRequestType();
 
-        if (requestType.equals(IRequest.ENROLLMENT_REQUEST) ||
-            requestType.equals(IRequest.RENEWAL_REQUEST)) {
+        if (requestType.equals(IRequest.ENROLLMENT_REQUEST)
+                || requestType.equals(IRequest.RENEWAL_REQUEST)) {
 
-            String uid = r.getExtDataInString(
-                    IRequest.HTTP_PARAMS, "uid");
+            String uid = r.getExtDataInString(IRequest.HTTP_PARAMS, "uid");
 
             if (uid == null) {
-                log(ILogger.LL_INFO, "did not find UID parameter in this request");
+                log(ILogger.LL_INFO,
+                        "did not find UID parameter in this request");
                 return;
             }
 
             String userdn = null;
 
             try {
-                LDAPSearchResults res = mRemovePinLdapConnection.search(mBaseDN,
-                        LDAPv2.SCOPE_SUB, "(uid=" + uid + ")", null, false);
-			
+                LDAPSearchResults res = mRemovePinLdapConnection.search(
+                        mBaseDN, LDAPv2.SCOPE_SUB, "(uid=" + uid + ")", null,
+                        false);
+
                 if (!res.hasMoreElements()) {
-                    log(ILogger.LL_SECURITY, "uid " + uid + " does not exist in the ldap " +
-                        " server. Could not remove pin");
+                    log(ILogger.LL_SECURITY, "uid " + uid
+                            + " does not exist in the ldap "
+                            + " server. Could not remove pin");
                     return;
                 }
 
                 LDAPEntry entry = (LDAPEntry) res.nextElement();
 
                 userdn = entry.getDN();
-	
-                mRemovePinLdapConnection.modify(userdn,
-                    new LDAPModification(
-                        LDAPModification.DELETE,
-                        new LDAPAttribute(mPinAttr)));
+
+                mRemovePinLdapConnection.modify(userdn, new LDAPModification(
+                        LDAPModification.DELETE, new LDAPAttribute(mPinAttr)));
 
                 log(ILogger.LL_INFO, "Removed pin for user \"" + userdn + "\"");
 
@@ -172,11 +170,10 @@ public class PinRemovalListener implements IRequestListener {
     private void log(int level, String msg) {
         if (mLogger == null)
             return;
-        mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_OTHER,
-            level, "PinRemovalListener: " + msg);
+        mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_OTHER, level,
+                "PinRemovalListener: " + msg);
     }
 
     public void set(String name, String val) {
     }
 }
-
diff --git a/pki/base/common/src/com/netscape/cms/listeners/RequestInQListener.java b/pki/base/common/src/com/netscape/cms/listeners/RequestInQListener.java
index f5810a460..4100b465f 100644
--- a/pki/base/common/src/com/netscape/cms/listeners/RequestInQListener.java
+++ b/pki/base/common/src/com/netscape/cms/listeners/RequestInQListener.java
@@ -17,7 +17,6 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.listeners;
 
-
 import java.io.IOException;
 import java.util.Hashtable;
 
@@ -39,7 +38,6 @@ import com.netscape.certsrv.request.RequestId;
 import com.netscape.cms.profile.input.SubjectNameInput;
 import com.netscape.cms.profile.input.SubmitterInfoInput;
 
-
 /**
  * a listener for every request gets into the request queue.
  * <p>
@@ -54,7 +52,7 @@ import com.netscape.cms.profile.input.SubmitterInfoInput;
  * <LI>$SenderEmail
  * <LI>$RecipientEmail
  * </UL>
- *
+ * 
  */
 public class RequestInQListener implements IRequestListener {
     protected static final String PROP_ENABLED = "enabled";
@@ -89,8 +87,8 @@ public class RequestInQListener implements IRequestListener {
      * initializes the listener from the configuration
      */
     public void init(ISubsystem sub, IConfigStore config)
-        throws EListenersException, EPropertyNotFound, EBaseException {
-		
+            throws EListenersException, EPropertyNotFound, EBaseException {
+
         mSubsystem = (ICertAuthority) sub;
         mConfig = mSubsystem.getConfigStore();
 
@@ -101,11 +99,13 @@ public class RequestInQListener implements IRequestListener {
 
         mSenderEmail = rq.getString(PROP_SENDER_EMAIL);
         if (mSenderEmail == null) {
-            throw new EListenersException(CMS.getLogMessage("NO_NOTIFY_SENDER_EMAIL_CONFIG_FOUND"));
+            throw new EListenersException(
+                    CMS.getLogMessage("NO_NOTIFY_SENDER_EMAIL_CONFIG_FOUND"));
         }
         mRecipientEmail = rq.getString(PROP_RECVR_EMAIL);
         if (mRecipientEmail == null) {
-            throw new EListenersException(CMS.getLogMessage("NO_NOTIFY_RECVR_EMAIL_CONFIG_FOUND"));
+            throw new EListenersException(
+                    CMS.getLogMessage("NO_NOTIFY_RECVR_EMAIL_CONFIG_FOUND"));
         }
 
         mEmailSubject = rq.getString(PROP_EMAIL_SUBJECT);
@@ -118,32 +118,34 @@ public class RequestInQListener implements IRequestListener {
         // make available http host and port for forming url in templates
         mHttpHost = CMS.getAgentHost();
         mAgentPort = CMS.getAgentPort();
-        if (mAgentPort == null) 
-            log(ILogger.LL_FAILURE, CMS.getLogMessage("LISTENERS_REQUEST_PORT_NOT_FOUND"));
+        if (mAgentPort == null)
+            log(ILogger.LL_FAILURE,
+                    CMS.getLogMessage("LISTENERS_REQUEST_PORT_NOT_FOUND"));
         else
             CMS.debug("RequestInQuListener: agentport = " + mAgentPort);
 
-            // register for this event listener
+        // register for this event listener
         mSubsystem.registerPendingListener(this);
     }
 
     /**
      * carries out the operation when the listener is triggered.
+     * 
      * @param r IRequest structure holding the request information
      * @see com.netscape.certsrv.request.IRequest
      */
     public void accept(IRequest r) {
 
-        if (mEnabled != true) return;
+        if (mEnabled != true)
+            return;
 
-            // regardless of type of request...notify for everything
-            // no need for email resolver here...
+        // regardless of type of request...notify for everything
+        // no need for email resolver here...
         IMailNotification mn = CMS.getMailNotification();
 
         mn.setFrom(mSenderEmail);
         mn.setTo(mRecipientEmail);
-        mn.setSubject(mEmailSubject + " (request id: " +
-            r.getRequestId() + ")");
+        mn.setSubject(mEmailSubject + " (request id: " + r.getRequestId() + ")");
 
         /*
          * get form file from disk
@@ -155,10 +157,11 @@ public class RequestInQListener implements IRequestListener {
          */
         if (template != null) {
             if (!template.init()) {
-                log(ILogger.LL_FAILURE, CMS.getLogMessage("LISTENERS_TEMPLATE_NOT_INIT"));
+                log(ILogger.LL_FAILURE,
+                        CMS.getLogMessage("LISTENERS_TEMPLATE_NOT_INIT"));
                 return;
             }
-		
+
             buildContentParams(r);
             IEmailFormProcessor et = CMS.getEmailFormProcessor();
             String c = et.getEmailContent(template.toString(), mContentParams);
@@ -169,8 +172,8 @@ public class RequestInQListener implements IRequestListener {
             mn.setContent(c);
         } else {
             // log and mail
-            log(ILogger.LL_FAILURE, 
-                CMS.getLogMessage("LISTENERS_TEMPLATE_NOT_GET"));
+            log(ILogger.LL_FAILURE,
+                    CMS.getLogMessage("LISTENERS_TEMPLATE_NOT_GET"));
             mn.setContent("Template not retrievable for Request in Queue notification");
         }
 
@@ -178,79 +181,77 @@ public class RequestInQListener implements IRequestListener {
             mn.sendNotification();
         } catch (ENotificationException e) {
             // already logged, lets audit
-            mLogger.log(ILogger.EV_AUDIT, null,
-                ILogger.S_OTHER,
-                ILogger.LL_FAILURE, CMS.getLogMessage("OPERATION_ERROR", e.toString()));
-			
-            mLogger.log(ILogger.EV_SYSTEM, ILogger.S_OTHER,
-                ILogger.LL_FAILURE,
-                CMS.getLogMessage("LISTENERS_SEND_FAILED", e.toString()));
+            mLogger.log(ILogger.EV_AUDIT, null, ILogger.S_OTHER,
+                    ILogger.LL_FAILURE,
+                    CMS.getLogMessage("OPERATION_ERROR", e.toString()));
+
+            mLogger.log(ILogger.EV_SYSTEM, ILogger.S_OTHER, ILogger.LL_FAILURE,
+                    CMS.getLogMessage("LISTENERS_SEND_FAILED", e.toString()));
 
         } catch (IOException e) {
             log(ILogger.LL_FAILURE,
-                CMS.getLogMessage("LISTENERS_SEND_FAILED", e.toString()));
+                    CMS.getLogMessage("LISTENERS_SEND_FAILED", e.toString()));
         }
     }
 
     private void buildContentParams(IRequest r) {
         mContentParams.clear();
-        mContentParams.put(IEmailFormProcessor.TOKEN_ID,
-            mConfig.getName());
+        mContentParams.put(IEmailFormProcessor.TOKEN_ID, mConfig.getName());
         Object val = null;
 
         String profileId = r.getExtDataInString("profileId");
 
         if (profileId == null) {
-          val = r.getExtDataInString(IRequest.HTTP_PARAMS, "csrRequestorEmail");
+            val = r.getExtDataInString(IRequest.HTTP_PARAMS,
+                    "csrRequestorEmail");
         } else {
-          // use the submitter info if available, otherwise, use the 
-          // subject name input email 
-          val = r.getExtDataInString(SubmitterInfoInput.EMAIL);
+            // use the submitter info if available, otherwise, use the
+            // subject name input email
+            val = r.getExtDataInString(SubmitterInfoInput.EMAIL);
 
-          if ((val == null) || (((String) val).compareTo("") == 0)) {
-              val = r.getExtDataInString(SubjectNameInput.VAL_EMAIL);
-          }
+            if ((val == null) || (((String) val).compareTo("") == 0)) {
+                val = r.getExtDataInString(SubjectNameInput.VAL_EMAIL);
+            }
         }
         if (val != null)
-            mContentParams.put(IEmailFormProcessor.TOKEN_REQUESTOR_EMAIL,
-                val);
+            mContentParams.put(IEmailFormProcessor.TOKEN_REQUESTOR_EMAIL, val);
 
         if (profileId == null) {
-          val = r.getExtDataInString(IRequest.HTTP_PARAMS, IRequest.CERT_TYPE);
+            val = r.getExtDataInString(IRequest.HTTP_PARAMS, IRequest.CERT_TYPE);
         } else {
-          val = profileId;
+            val = profileId;
         }
         if (val != null) {
-            mContentParams.put(IEmailFormProcessor.TOKEN_CERT_TYPE,
-                val);
+            mContentParams.put(IEmailFormProcessor.TOKEN_CERT_TYPE, val);
         }
 
         RequestId reqId = r.getRequestId();
 
         mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_ID,
-            (Object) reqId.toString());
+                (Object) reqId.toString());
 
         mContentParams.put(IEmailFormProcessor.TOKEN_ID, mId);
 
         val = r.getRequestType();
         if (val != null)
-            mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_TYPE,
-                val);
+            mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_TYPE, val);
 
         mContentParams.put(IEmailFormProcessor.TOKEN_HTTP_HOST,
-            (Object) mHttpHost);
+                (Object) mHttpHost);
         mContentParams.put(IEmailFormProcessor.TOKEN_HTTP_PORT,
-            (Object) mAgentPort);
+                (Object) mAgentPort);
 
         mContentParams.put(IEmailFormProcessor.TOKEN_SENDER_EMAIL,
-            (Object) mSenderEmail);
+                (Object) mSenderEmail);
         mContentParams.put(IEmailFormProcessor.TOKEN_RECIPIENT_EMAIL,
-            (Object) mRecipientEmail);
+                (Object) mRecipientEmail);
     }
 
     /**
      * sets the configurable parameters
-     * @param name a String represents the name of the configuration parameter to be set
+     * 
+     * @param name a String represents the name of the configuration parameter
+     *            to be set
      * @param val a String containing the value to be set for name
      */
     public void set(String name, String val) {
@@ -269,15 +270,14 @@ public class RequestInQListener implements IRequestListener {
         } else if (name.equalsIgnoreCase(PROP_EMAIL_TEMPLATE)) {
             mFormPath = val;
         } else {
-            log(ILogger.LL_FAILURE, CMS.getLogMessage("LISTENERS_CERT_ISSUED_SET"));
+            log(ILogger.LL_FAILURE,
+                    CMS.getLogMessage("LISTENERS_CERT_ISSUED_SET"));
         }
     }
 
     private void log(int level, String msg) {
         if (mLogger == null)
             return;
-        mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_OTHER,
-            level, msg);
+        mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_OTHER, level, msg);
     }
 }
-