Added CertRequestProcessedEvent.

A new CertRequestProcessedEvent class of has been added to
encapsulate the CERT_REQUEST_PROCESSED events.

https://pagure.io/dogtagpki/issue/2636

Change-Id: Ia79e6ae13d09a3ec6509c60435fc24d5a2fee38f

6 files changed, 95 insertions, 205 deletions

diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java
index c16d8e0fa..2a60cb06d 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java
@@ -32,8 +32,8 @@ import com.netscape.certsrv.authentication.IAuthToken;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.EPropertyNotFound;
 import com.netscape.certsrv.cert.CertEnrollmentRequest;
-import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
+import com.netscape.certsrv.logging.event.CertRequestProcessedEvent;
 import com.netscape.certsrv.profile.EDeferException;
 import com.netscape.certsrv.profile.ERejectException;
 import com.netscape.certsrv.profile.IEnrollProfile;
@@ -217,7 +217,6 @@ public class CertProcessor extends CAProcessor {
     }
 
     protected String submitRequests(Locale locale, IProfile profile, IAuthToken authToken, IRequest[] reqs) {
-        String auditMessage = null;
         String auditSubjectID = auditSubjectID();
         String auditRequesterID = ILogger.UNIDENTIFIED;
         String errorCode = null;
@@ -252,16 +251,13 @@ public class CertProcessor extends CAProcessor {
                 if (auditInfoCertValue != null) {
                     if (!(auditInfoCertValue.equals(
                             ILogger.SIGNED_AUDIT_EMPTY_VALUE))) {
-                        // store a message in the signed audit log file
-                        auditMessage = CMS.getLogMessage(
-                                AuditEvent.CERT_REQUEST_PROCESSED,
+
+                        audit(new CertRequestProcessedEvent(
                                 auditSubjectID,
                                 ILogger.SUCCESS,
                                 auditRequesterID,
                                 ILogger.SIGNED_AUDIT_ACCEPTANCE,
-                                auditInfoCertValue);
-
-                        audit(auditMessage);
+                                auditInfoCertValue));
                     }
                 }
             } catch (EDeferException e) {
@@ -288,16 +284,13 @@ public class CertProcessor extends CAProcessor {
                 req.setExtData(IRequest.ERROR, e.toString());
                 req.setExtData(IRequest.ERROR_CODE, errorCode);
 
-                // store a message in the signed audit log file
-                auditMessage = CMS.getLogMessage(
-                        AuditEvent.CERT_REQUEST_PROCESSED,
+                audit(new CertRequestProcessedEvent(
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditRequesterID,
                         ILogger.SIGNED_AUDIT_REJECTION,
-                        codeToReason(locale, errorCode, e.toString(), req.getRequestId()));
+                        codeToReason(locale, errorCode, e.toString(), req.getRequestId())));
 
-                audit(auditMessage);
             } catch (Throwable e) {
                 // return error to the user
                 CMS.debug(e);
@@ -307,15 +300,12 @@ public class CertProcessor extends CAProcessor {
                 req.setExtData(IRequest.ERROR, errorReason);
                 req.setExtData(IRequest.ERROR_CODE, errorCode);
 
-                auditMessage = CMS.getLogMessage(
-                        AuditEvent.CERT_REQUEST_PROCESSED,
+                audit(new CertRequestProcessedEvent(
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditRequesterID,
                         ILogger.SIGNED_AUDIT_REJECTION,
-                        errorReason);
-
-                audit(auditMessage);
+                        errorReason));
             }
 
             try {
diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/EnrollServlet.java b/base/server/cms/src/com/netscape/cms/servlet/cert/EnrollServlet.java
index 6f01d2aa4..cb2b76fbe 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/cert/EnrollServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/EnrollServlet.java
@@ -53,6 +53,7 @@ import com.netscape.certsrv.dbs.certdb.ICertificateRepository;
 import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.AuditFormat;
 import com.netscape.certsrv.logging.ILogger;
+import com.netscape.certsrv.logging.event.CertRequestProcessedEvent;
 import com.netscape.certsrv.request.IRequest;
 import com.netscape.certsrv.request.RequestStatus;
 import com.netscape.certsrv.usrgrp.IGroup;
@@ -1368,29 +1369,23 @@ public class EnrollServlet extends CMSServlet {
                     for (int i = 0; i < issuedCerts.length; i++) {
                         // (automated "agent" cert request processed
                         //  - "accepted")
-                        auditMessage = CMS.getLogMessage(
-                                    AuditEvent.CERT_REQUEST_PROCESSED,
+                        audit(new CertRequestProcessedEvent(
                                     auditSubjectID,
                                     ILogger.SUCCESS,
                                     auditRequesterID,
                                     ILogger.SIGNED_AUDIT_ACCEPTANCE,
-                                    auditInfoCertValue(issuedCerts[i]));
-
-                        audit(auditMessage);
+                                    auditInfoCertValue(issuedCerts[i])));
                     }
                 } catch (IOException ex) {
                     cmsReq.setStatus(ICMSRequest.ERROR);
 
                     // (automated "agent" cert request processed - "rejected")
-                    auditMessage = CMS.getLogMessage(
-                                AuditEvent.CERT_REQUEST_PROCESSED,
+                    audit(new CertRequestProcessedEvent(
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditRequesterID,
                                 ILogger.SIGNED_AUDIT_REJECTION,
-                                SIGNED_AUDIT_AUTOMATED_REJECTION_REASON[0]);
-
-                    audit(auditMessage);
+                                SIGNED_AUDIT_AUTOMATED_REJECTION_REASON[0]));
                 }
 
                 return;
@@ -1402,15 +1397,12 @@ public class EnrollServlet extends CMSServlet {
 
             if (completed == false) {
                 // (automated "agent" cert request processed - "rejected")
-                auditMessage = CMS.getLogMessage(
-                            AuditEvent.CERT_REQUEST_PROCESSED,
+                audit(new CertRequestProcessedEvent(
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditRequesterID,
                             ILogger.SIGNED_AUDIT_REJECTION,
-                            SIGNED_AUDIT_AUTOMATED_REJECTION_REASON[1]);
-
-                audit(auditMessage);
+                            SIGNED_AUDIT_AUTOMATED_REJECTION_REASON[1]));
 
                 return;
             }
@@ -1458,15 +1450,12 @@ public class EnrollServlet extends CMSServlet {
 
                 for (int i = 0; i < issuedCerts.length; i++) {
                     // (automated "agent" cert request processed - "accepted")
-                    auditMessage = CMS.getLogMessage(
-                                AuditEvent.CERT_REQUEST_PROCESSED,
+                    audit(new CertRequestProcessedEvent(
                                 auditSubjectID,
                                 ILogger.SUCCESS,
                                 auditRequesterID,
                                 ILogger.SIGNED_AUDIT_ACCEPTANCE,
-                                auditInfoCertValue(issuedCerts[i]));
-
-                    audit(auditMessage);
+                                auditInfoCertValue(issuedCerts[i])));
                 }
 
                 return;
@@ -1481,15 +1470,12 @@ public class EnrollServlet extends CMSServlet {
 
                 for (int i = 0; i < issuedCerts.length; i++) {
                     // (automated "agent" cert request processed - "accepted")
-                    auditMessage = CMS.getLogMessage(
-                                AuditEvent.CERT_REQUEST_PROCESSED,
+                    audit(new CertRequestProcessedEvent(
                                 auditSubjectID,
                                 ILogger.SUCCESS,
                                 auditRequesterID,
                                 ILogger.SIGNED_AUDIT_ACCEPTANCE,
-                                auditInfoCertValue(issuedCerts[i]));
-
-                    audit(auditMessage);
+                                auditInfoCertValue(issuedCerts[i])));
                 }
             } catch (IOException e) {
                 log(ILogger.LL_FAILURE,
@@ -1498,15 +1484,12 @@ public class EnrollServlet extends CMSServlet {
                                 e.toString()));
 
                 // (automated "agent" cert request processed - "rejected")
-                auditMessage = CMS.getLogMessage(
-                            AuditEvent.CERT_REQUEST_PROCESSED,
+                audit(new CertRequestProcessedEvent(
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditRequesterID,
                             ILogger.SIGNED_AUDIT_REJECTION,
-                            SIGNED_AUDIT_AUTOMATED_REJECTION_REASON[2]);
-
-                audit(auditMessage);
+                            SIGNED_AUDIT_AUTOMATED_REJECTION_REASON[2]));
 
                 throw new ECMSGWException(
                         CMS.getUserMessage("CMS_GW_RETURNING_RESULT_ERROR"));
@@ -1514,15 +1497,12 @@ public class EnrollServlet extends CMSServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             // (automated "agent" cert request processed - "rejected")
-            auditMessage = CMS.getLogMessage(
-                        AuditEvent.CERT_REQUEST_PROCESSED,
+            audit(new CertRequestProcessedEvent(
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditRequesterID,
                         ILogger.SIGNED_AUDIT_REJECTION,
-                        SIGNED_AUDIT_AUTOMATED_REJECTION_REASON[3]);
-
-            audit(auditMessage);
+                        SIGNED_AUDIT_AUTOMATED_REJECTION_REASON[3]));
 
             throw eAudit1;
         }
diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/RequestProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RequestProcessor.java
index 474a2e5d7..66fe58c27 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/cert/RequestProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/cert/RequestProcessor.java
@@ -25,8 +25,6 @@ import java.util.Locale;
 
 import javax.servlet.http.HttpServletRequest;
 
-import netscape.security.x509.X509CertImpl;
-
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.authentication.IAuthToken;
 import com.netscape.certsrv.authorization.AuthzToken;
@@ -40,8 +38,8 @@ import com.netscape.certsrv.ca.AuthorityID;
 import com.netscape.certsrv.ca.CANotFoundException;
 import com.netscape.certsrv.ca.ICertificateAuthority;
 import com.netscape.certsrv.cert.CertReviewResponse;
-import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
+import com.netscape.certsrv.logging.event.CertRequestProcessedEvent;
 import com.netscape.certsrv.profile.EDeferException;
 import com.netscape.certsrv.profile.EProfileException;
 import com.netscape.certsrv.profile.ERejectException;
@@ -62,6 +60,8 @@ import com.netscape.certsrv.request.RequestStatus;
 import com.netscape.cms.servlet.common.CMSRequest;
 import com.netscape.cms.servlet.profile.ProfileOutputFactory;
 
+import netscape.security.x509.X509CertImpl;
+
 public class RequestProcessor extends CertProcessor {
 
     public RequestProcessor(String id, Locale locale) throws EPropertyNotFound, EBaseException {
@@ -275,23 +275,18 @@ public class RequestProcessor extends CertProcessor {
      *                occurred
      */
     private void cancelRequest(IRequest req) throws EProfileException {
-        String auditMessage = null;
         String auditSubjectID = auditSubjectID();
         String auditRequesterID = auditRequesterID(req);
         String auditInfoValue = auditInfoValue(req);
 
         req.setRequestStatus(RequestStatus.CANCELED);
 
-        // store a message in the signed audit log file
-        auditMessage = CMS.getLogMessage(
-                AuditEvent.CERT_REQUEST_PROCESSED,
+        audit(new CertRequestProcessedEvent(
                 auditSubjectID,
                 ILogger.SUCCESS,
                 auditRequesterID,
                 ILogger.SIGNED_AUDIT_CANCELLATION,
-                auditInfoValue);
-
-        audit(auditMessage);
+                auditInfoValue));
     }
 
     /**
@@ -311,23 +306,18 @@ public class RequestProcessor extends CertProcessor {
      *                occurred
      */
     private void rejectRequest(IRequest req) throws EProfileException {
-        String auditMessage = null;
         String auditSubjectID = auditSubjectID();
         String auditRequesterID = auditRequesterID(req);
         String auditInfoValue = auditInfoValue(req);
 
         req.setRequestStatus(RequestStatus.REJECTED);
 
-        // store a message in the signed audit log file
-        auditMessage = CMS.getLogMessage(
-                AuditEvent.CERT_REQUEST_PROCESSED,
+        audit(new CertRequestProcessedEvent(
                 auditSubjectID,
                 ILogger.SUCCESS,
                 auditRequesterID,
                 ILogger.SIGNED_AUDIT_REJECTION,
-                auditInfoValue);
-
-        audit(auditMessage);
+                auditInfoValue));
     }
 
     /**
@@ -374,7 +364,6 @@ public class RequestProcessor extends CertProcessor {
      */
     private void approveRequest(IRequest req, CertReviewResponse data, IProfile profile, Locale locale)
             throws EBaseException {
-        String auditMessage = null;
         String auditSubjectID = auditSubjectID();
         String auditRequesterID = auditRequesterID(req);
 
@@ -398,28 +387,21 @@ public class RequestProcessor extends CertProcessor {
             X509CertImpl theCert = req.getExtDataInCert(
                     IEnrollProfile.REQUEST_ISSUED_CERT);
 
-            // store a message in the signed audit log file
-            auditMessage = CMS.getLogMessage(
-                    AuditEvent.CERT_REQUEST_PROCESSED,
+            audit(new CertRequestProcessedEvent(
                     auditSubjectID,
                     ILogger.SUCCESS,
                     auditRequesterID,
                     ILogger.SIGNED_AUDIT_ACCEPTANCE,
-                    auditInfoCertValue(theCert));
-
-            audit(auditMessage);
+                    auditInfoCertValue(theCert)));
 
         } catch (EProfileException eAudit1) {
-            // store a message in the signed audit log file
-            auditMessage = CMS.getLogMessage(
-                    AuditEvent.CERT_REQUEST_PROCESSED,
+
+            audit(new CertRequestProcessedEvent(
                     auditSubjectID,
                     ILogger.FAILURE,
                     auditRequesterID,
                     ILogger.SIGNED_AUDIT_ACCEPTANCE,
-                    ILogger.SIGNED_AUDIT_EMPTY_VALUE);
-
-            audit(auditMessage);
+                    ILogger.SIGNED_AUDIT_EMPTY_VALUE));
 
             CMS.debug("CertRequestExecutor: about to throw EProfileException because of bad profile execute.");
             throw eAudit1;
diff --git a/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java b/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
index 6732e9286..ee60187e2 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
@@ -52,6 +52,7 @@ import com.netscape.certsrv.connector.IRequestEncoder;
 import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.AuditFormat;
 import com.netscape.certsrv.logging.ILogger;
+import com.netscape.certsrv.logging.event.CertRequestProcessedEvent;
 import com.netscape.certsrv.profile.EProfileException;
 import com.netscape.certsrv.profile.IEnrollProfile;
 import com.netscape.certsrv.profile.IProfileSubsystem;
@@ -626,16 +627,13 @@ public class ConnectorServlet extends CMSServlet {
                     if (auditInfoCertValue != null) {
                         if (!(auditInfoCertValue.equals(
                                    ILogger.SIGNED_AUDIT_EMPTY_VALUE))) {
-                            // store a message in the signed audit log file
-                            auditMessage = CMS.getLogMessage(
-                                    AuditEvent.CERT_REQUEST_PROCESSED,
+
+                            audit(new CertRequestProcessedEvent(
                                     auditSubjectID,
                                     ILogger.SUCCESS,
                                     auditRequesterID,
                                     ILogger.SIGNED_AUDIT_ACCEPTANCE,
-                                    auditInfoCertValue);
-
-                            audit(auditMessage);
+                                    auditInfoCertValue));
                         }
                     }
                 }
@@ -648,16 +646,13 @@ public class ConnectorServlet extends CMSServlet {
                     if (auditInfoCertValue != null) {
                         if (!(auditInfoCertValue.equals(
                                    ILogger.SIGNED_AUDIT_EMPTY_VALUE))) {
-                            // store a message in the signed audit log file
-                            auditMessage = CMS.getLogMessage(
-                                    AuditEvent.CERT_REQUEST_PROCESSED,
+
+                            audit(new CertRequestProcessedEvent(
                                     auditSubjectID,
                                     ILogger.FAILURE,
                                     auditRequesterID,
                                     ILogger.SIGNED_AUDIT_ACCEPTANCE,
-                                    auditInfoCertValue);
-
-                            audit(auditMessage);
+                                    auditInfoCertValue));
                         }
                     }
                 }
diff --git a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
index c3ada9a68..28f777b81 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
@@ -44,8 +44,8 @@ import com.netscape.certsrv.authentication.IAuthToken;
 import com.netscape.certsrv.authorization.AuthzToken;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.SessionContext;
-import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
+import com.netscape.certsrv.logging.event.CertRequestProcessedEvent;
 import com.netscape.certsrv.profile.EDeferException;
 import com.netscape.certsrv.profile.EProfileException;
 import com.netscape.certsrv.profile.ERejectException;
@@ -639,7 +639,6 @@ public class ProfileSubmitCMCServlet extends ProfileServlet {
             }
         } //for
 
-        String auditMessage = null;
         String auditSubjectID = auditSubjectID();
         String auditRequesterID = ILogger.UNIDENTIFIED;
 
@@ -677,16 +676,13 @@ public class ProfileSubmitCMCServlet extends ProfileServlet {
                     if (auditInfoCertValue != null) {
                         if (!(auditInfoCertValue.equals(
                                     ILogger.SIGNED_AUDIT_EMPTY_VALUE))) {
-                            // store a message in the signed audit log file
-                            auditMessage = CMS.getLogMessage(
-                                        AuditEvent.CERT_REQUEST_PROCESSED,
+
+                            audit(new CertRequestProcessedEvent(
                                         auditSubjectID,
                                         ILogger.SUCCESS,
                                         auditRequesterID,
                                         ILogger.SIGNED_AUDIT_ACCEPTANCE,
-                                        auditInfoCertValue);
-
-                            audit(auditMessage);
+                                        auditInfoCertValue));
                         }
                     }
                 } catch (EDeferException e) {
@@ -733,31 +729,26 @@ public class ProfileSubmitCMCServlet extends ProfileServlet {
 
                 if (errorCode != null) {
                     if (errorCode.equals("1")) {
-                        // store a message in the signed audit log file
-                        auditMessage = CMS.getLogMessage(
-                                    AuditEvent.CERT_REQUEST_PROCESSED,
+
+                        audit(new CertRequestProcessedEvent(
                                     auditSubjectID,
                                     ILogger.FAILURE,
                                     auditRequesterID,
                                     ILogger.SIGNED_AUDIT_REJECTION,
-                                    errorReason);
+                                    errorReason));
 
-                        audit(auditMessage);
                     } else if (errorCode.equals("2")) {
                         // do NOT store a message in the signed audit log file
                         // as this errorCode indicates that a process has been
                         // deferred for manual acceptance/cancellation/rejection
                     } else if (errorCode.equals("3")) {
-                        // store a message in the signed audit log file
-                        auditMessage = CMS.getLogMessage(
-                                    AuditEvent.CERT_REQUEST_PROCESSED,
+
+                        audit(new CertRequestProcessedEvent(
                                     auditSubjectID,
                                     ILogger.FAILURE,
                                     auditRequesterID,
                                     ILogger.SIGNED_AUDIT_REJECTION,
-                                    errorReason);
-
-                        audit(auditMessage);
+                                    errorReason));
                     }
                     error_codes[k] = Integer.parseInt(errorCode);
                 } else
@@ -782,16 +773,13 @@ public class ProfileSubmitCMCServlet extends ProfileServlet {
                     if (auditInfoCertValue != null) {
                         if (!(auditInfoCertValue.equals(
                                 ILogger.SIGNED_AUDIT_EMPTY_VALUE))) {
-                            // store a message in the signed audit log file
-                            auditMessage = CMS.getLogMessage(
-                                    AuditEvent.CERT_REQUEST_PROCESSED,
+
+                            audit(new CertRequestProcessedEvent(
                                     auditSubjectID,
                                     ILogger.SUCCESS,
                                     auditRequesterID,
                                     ILogger.SIGNED_AUDIT_ACCEPTANCE,
-                                    auditInfoCertValue);
-
-                            audit(auditMessage);
+                                    auditInfoCertValue));
                         }
                     }
                 } catch (ERejectException e) {
diff --git a/base/server/cms/src/com/netscape/cms/servlet/request/ProcessCertReq.java b/base/server/cms/src/com/netscape/cms/servlet/request/ProcessCertReq.java
index 9d0da4804..2bcc8ad1c 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/request/ProcessCertReq.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/request/ProcessCertReq.java
@@ -50,6 +50,7 @@ import com.netscape.certsrv.common.ICMSRequest;
 import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.AuditFormat;
 import com.netscape.certsrv.logging.ILogger;
+import com.netscape.certsrv.logging.event.CertRequestProcessedEvent;
 import com.netscape.certsrv.publish.IPublisherProcessor;
 import com.netscape.certsrv.request.IRequest;
 import com.netscape.certsrv.request.IRequestQueue;
@@ -463,37 +464,31 @@ public class ProcessCertReq extends CMSServlet {
                         audit(auditMessage);
                     } else if (toDo.equals(SIGNED_AUDIT_ACCEPTANCE)) {
                         // (manual "agent" cert request processed - "accepted")
-                        auditMessage = CMS.getLogMessage(
-                                    AuditEvent.CERT_REQUEST_PROCESSED,
+
+                        audit(new CertRequestProcessedEvent(
                                     auditSubjectID,
                                     ILogger.FAILURE,
                                     auditRequesterID,
                                     auditInfoName,
-                                    ILogger.SIGNED_AUDIT_EMPTY_VALUE);
+                                    ILogger.SIGNED_AUDIT_EMPTY_VALUE));
 
-                        audit(auditMessage);
                     } else if (toDo.equals(SIGNED_AUDIT_CANCELLATION)) {
                         // (manual "agent" cert request processed - "cancelled")
-                        auditMessage = CMS.getLogMessage(
-                                    AuditEvent.CERT_REQUEST_PROCESSED,
+                        audit(new CertRequestProcessedEvent(
                                     auditSubjectID,
                                     ILogger.FAILURE,
                                     auditRequesterID,
                                     auditInfoName,
-                                    SIGNED_AUDIT_MANUAL_CANCELLATION_REASON[0]);
+                                    SIGNED_AUDIT_MANUAL_CANCELLATION_REASON[0]));
 
-                        audit(auditMessage);
                     } else if (toDo.equals(SIGNED_AUDIT_REJECTION)) {
                         // (manual "agent" cert request processed - "rejected")
-                        auditMessage = CMS.getLogMessage(
-                                    AuditEvent.CERT_REQUEST_PROCESSED,
+                        audit(new CertRequestProcessedEvent(
                                     auditSubjectID,
                                     ILogger.FAILURE,
                                     auditRequesterID,
                                     auditInfoName,
-                                    SIGNED_AUDIT_MANUAL_REJECTION_REASON[0]);
-
-                        audit(auditMessage);
+                                    SIGNED_AUDIT_MANUAL_REJECTION_REASON[0]));
                     }
 
                     return;
@@ -935,15 +930,12 @@ public class ProcessCertReq extends CMSServlet {
                                 // store a message in the signed audit log file
                                 // (one for each manual "agent"
                                 //  cert request processed - "accepted")
-                                auditMessage = CMS.getLogMessage(
-                                            AuditEvent.CERT_REQUEST_PROCESSED,
+                                audit(new CertRequestProcessedEvent(
                                             auditSubjectID,
                                             ILogger.SUCCESS,
                                             auditRequesterID,
                                             auditInfoName,
-                                            auditInfoCertValue(issuedCerts[i]));
-
-                                audit(auditMessage);
+                                            auditInfoCertValue(issuedCerts[i])));
                             }
                             header.addStringValue(
                                     "serialNumber", sbuf.toString());
@@ -979,15 +971,12 @@ public class ProcessCertReq extends CMSServlet {
                             // store a message in the signed audit log file
                             // (manual "agent" cert request processed
                             //  - "accepted")
-                            auditMessage = CMS.getLogMessage(
-                                        AuditEvent.CERT_REQUEST_PROCESSED,
+                            audit(new CertRequestProcessedEvent(
                                         auditSubjectID,
                                         ILogger.SUCCESS,
                                         auditRequesterID,
                                         auditInfoName,
-                                        ILogger.SIGNED_AUDIT_EMPTY_VALUE);
-
-                            audit(auditMessage);
+                                        ILogger.SIGNED_AUDIT_EMPTY_VALUE));
                         }
 
                         // grant trusted manager or agent privileges
@@ -1104,15 +1093,12 @@ public class ProcessCertReq extends CMSServlet {
 
                     // store a message in the signed audit log file
                     // (manual "agent" cert request processed - "rejected")
-                    auditMessage = CMS.getLogMessage(
-                                AuditEvent.CERT_REQUEST_PROCESSED,
+                    audit(new CertRequestProcessedEvent(
                                 auditSubjectID,
                                 ILogger.SUCCESS,
                                 auditRequesterID,
                                 auditInfoName,
-                                SIGNED_AUDIT_MANUAL_REJECTION_REASON[1]);
-
-                    audit(auditMessage);
+                                SIGNED_AUDIT_MANUAL_REJECTION_REASON[1]));
 
                 } else if (toDo.equals("cancel")) {
                     mQueue.cancelRequest(r);
@@ -1166,15 +1152,12 @@ public class ProcessCertReq extends CMSServlet {
 
                     // store a message in the signed audit log file
                     // (manual "agent" cert request processed - "cancelled")
-                    auditMessage = CMS.getLogMessage(
-                                AuditEvent.CERT_REQUEST_PROCESSED,
+                    audit(new CertRequestProcessedEvent(
                                 auditSubjectID,
                                 ILogger.SUCCESS,
                                 auditRequesterID,
                                 auditInfoName,
-                                SIGNED_AUDIT_MANUAL_CANCELLATION_REASON[1]);
-
-                    audit(auditMessage);
+                                SIGNED_AUDIT_MANUAL_CANCELLATION_REASON[1]));
 
                 } else if (toDo.equals("clone")) {
                     IRequest clonedRequest = mQueue.cloneAndMarkPending(r);
@@ -1277,37 +1260,30 @@ public class ProcessCertReq extends CMSServlet {
                     audit(auditMessage);
                 } else if (toDo.equals(SIGNED_AUDIT_ACCEPTANCE)) {
                     // (manual "agent" cert request processed - "accepted")
-                    auditMessage = CMS.getLogMessage(
-                                AuditEvent.CERT_REQUEST_PROCESSED,
+                    audit(new CertRequestProcessedEvent(
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditRequesterID,
                                 auditInfoName,
-                                ILogger.SIGNED_AUDIT_EMPTY_VALUE);
+                                ILogger.SIGNED_AUDIT_EMPTY_VALUE));
 
-                    audit(auditMessage);
                 } else if (toDo.equals(SIGNED_AUDIT_CANCELLATION)) {
                     // (manual "agent" cert request processed - "cancelled")
-                    auditMessage = CMS.getLogMessage(
-                                AuditEvent.CERT_REQUEST_PROCESSED,
+                    audit(new CertRequestProcessedEvent(
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditRequesterID,
                                 auditInfoName,
-                                SIGNED_AUDIT_MANUAL_CANCELLATION_REASON[2]);
+                                SIGNED_AUDIT_MANUAL_CANCELLATION_REASON[2]));
 
-                    audit(auditMessage);
                 } else if (toDo.equals(SIGNED_AUDIT_REJECTION)) {
                     // (manual "agent" cert request processed - "rejected")
-                    auditMessage = CMS.getLogMessage(
-                                AuditEvent.CERT_REQUEST_PROCESSED,
+                    audit(new CertRequestProcessedEvent(
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditRequesterID,
                                 auditInfoName,
-                                SIGNED_AUDIT_MANUAL_REJECTION_REASON[2]);
-
-                    audit(auditMessage);
+                                SIGNED_AUDIT_MANUAL_REJECTION_REASON[2]));
                 }
             }
 
@@ -1330,37 +1306,30 @@ public class ProcessCertReq extends CMSServlet {
                     audit(auditMessage);
                 } else if (toDo.equals(SIGNED_AUDIT_ACCEPTANCE)) {
                     // (manual "agent" cert request processed - "accepted")
-                    auditMessage = CMS.getLogMessage(
-                                AuditEvent.CERT_REQUEST_PROCESSED,
+                    audit(new CertRequestProcessedEvent(
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditRequesterID,
                                 auditInfoName,
-                                ILogger.SIGNED_AUDIT_EMPTY_VALUE);
+                                ILogger.SIGNED_AUDIT_EMPTY_VALUE));
 
-                    audit(auditMessage);
                 } else if (toDo.equals(SIGNED_AUDIT_CANCELLATION)) {
                     // (manual "agent" cert request processed - "cancelled")
-                    auditMessage = CMS.getLogMessage(
-                                AuditEvent.CERT_REQUEST_PROCESSED,
+                    audit(new CertRequestProcessedEvent(
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditRequesterID,
                                 auditInfoName,
-                                SIGNED_AUDIT_MANUAL_CANCELLATION_REASON[3]);
+                                SIGNED_AUDIT_MANUAL_CANCELLATION_REASON[3]));
 
-                    audit(auditMessage);
                 } else if (toDo.equals(SIGNED_AUDIT_REJECTION)) {
                     // (manual "agent" cert request processed - "rejected")
-                    auditMessage = CMS.getLogMessage(
-                                AuditEvent.CERT_REQUEST_PROCESSED,
+                    audit(new CertRequestProcessedEvent(
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditRequesterID,
                                 auditInfoName,
-                                SIGNED_AUDIT_MANUAL_REJECTION_REASON[3]);
-
-                    audit(auditMessage);
+                                SIGNED_AUDIT_MANUAL_REJECTION_REASON[3]));
                 }
             }
 
@@ -1384,37 +1353,30 @@ public class ProcessCertReq extends CMSServlet {
                     audit(auditMessage);
                 } else if (toDo.equals(SIGNED_AUDIT_ACCEPTANCE)) {
                     // (manual "agent" cert request processed - "accepted")
-                    auditMessage = CMS.getLogMessage(
-                                AuditEvent.CERT_REQUEST_PROCESSED,
+                    audit(new CertRequestProcessedEvent(
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditRequesterID,
                                 auditInfoName,
-                                ILogger.SIGNED_AUDIT_EMPTY_VALUE);
+                                ILogger.SIGNED_AUDIT_EMPTY_VALUE));
 
-                    audit(auditMessage);
                 } else if (toDo.equals(SIGNED_AUDIT_CANCELLATION)) {
                     // (manual "agent" cert request processed - "cancelled")
-                    auditMessage = CMS.getLogMessage(
-                                AuditEvent.CERT_REQUEST_PROCESSED,
+                    audit(new CertRequestProcessedEvent(
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditRequesterID,
                                 auditInfoName,
-                                SIGNED_AUDIT_MANUAL_CANCELLATION_REASON[4]);
+                                SIGNED_AUDIT_MANUAL_CANCELLATION_REASON[4]));
 
-                    audit(auditMessage);
                 } else if (toDo.equals(SIGNED_AUDIT_REJECTION)) {
                     // (manual "agent" cert request processed - "rejected")
-                    auditMessage = CMS.getLogMessage(
-                                AuditEvent.CERT_REQUEST_PROCESSED,
+                    audit(new CertRequestProcessedEvent(
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditRequesterID,
                                 auditInfoName,
-                                SIGNED_AUDIT_MANUAL_REJECTION_REASON[4]);
-
-                    audit(auditMessage);
+                                SIGNED_AUDIT_MANUAL_REJECTION_REASON[4]));
                 }
             }
 
@@ -1438,37 +1400,30 @@ public class ProcessCertReq extends CMSServlet {
                     audit(auditMessage);
                 } else if (toDo.equals(SIGNED_AUDIT_ACCEPTANCE)) {
                     // (manual "agent" cert request processed - "accepted")
-                    auditMessage = CMS.getLogMessage(
-                                AuditEvent.CERT_REQUEST_PROCESSED,
+                    audit(new CertRequestProcessedEvent(
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditRequesterID,
                                 auditInfoName,
-                                ILogger.SIGNED_AUDIT_EMPTY_VALUE);
+                                ILogger.SIGNED_AUDIT_EMPTY_VALUE));
 
-                    audit(auditMessage);
                 } else if (toDo.equals(SIGNED_AUDIT_CANCELLATION)) {
                     // (manual "agent" cert request processed - "cancelled")
-                    auditMessage = CMS.getLogMessage(
-                                AuditEvent.CERT_REQUEST_PROCESSED,
+                    audit(new CertRequestProcessedEvent(
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditRequesterID,
                                 auditInfoName,
-                                SIGNED_AUDIT_MANUAL_CANCELLATION_REASON[5]);
+                                SIGNED_AUDIT_MANUAL_CANCELLATION_REASON[5]));
 
-                    audit(auditMessage);
                 } else if (toDo.equals(SIGNED_AUDIT_REJECTION)) {
                     // (manual "agent" cert request processed - "rejected")
-                    auditMessage = CMS.getLogMessage(
-                                AuditEvent.CERT_REQUEST_PROCESSED,
+                    audit(new CertRequestProcessedEvent(
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditRequesterID,
                                 auditInfoName,
-                                SIGNED_AUDIT_MANUAL_REJECTION_REASON[5]);
-
-                    audit(auditMessage);
+                                SIGNED_AUDIT_MANUAL_REJECTION_REASON[5]));
                 }
             }