>From 20a307e4683e62b033f7662ed4aa2f18dfad6226 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Wed, 12 Apr 2017 05:23:15 +0200
Subject: [PATCH] Reorganized audit event constants for configuration.

Change-Id: Ie05572677de0e8eb1244dc6caf2b4a48514a2542
---
 .../dogtagpki/server/ca/rest/ProfileService.java   |   5 +-
 .../com/netscape/certsrv/logging/AuditEvent.java   |  37 ++++++
 .../src/com/netscape/certsrv/logging/IAuditor.java |   3 -
 .../cms/src/com/netscape/cms/logging/LogFile.java  |  10 +-
 .../com/netscape/cms/logging/RollingLogFile.java   |   8 +-
 .../cms/profile/updater/SubsystemGroupUpdater.java |  14 +--
 .../cms/servlet/admin/ACLAdminServlet.java         |  38 +++----
 .../netscape/cms/servlet/admin/AdminServlet.java   |  10 +-
 .../cms/servlet/admin/AuthAdminServlet.java        |  96 ++++++++--------
 .../netscape/cms/servlet/admin/CAAdminServlet.java |  50 ++++-----
 .../cms/servlet/admin/CMSAdminServlet.java         |  86 +++++++-------
 .../cms/servlet/admin/GroupMemberProcessor.java    |   4 +-
 .../cms/servlet/admin/KRAAdminServlet.java         |   8 +-
 .../cms/servlet/admin/LogAdminServlet.java         | 113 +++++++++----------
 .../cms/servlet/admin/OCSPAdminServlet.java        |  22 ++--
 .../cms/servlet/admin/PolicyAdminServlet.java      |  62 +++++------
 .../cms/servlet/admin/ProfileAdminServlet.java     | 124 ++++++++++-----------
 .../cms/servlet/admin/UsrGrpAdminServlet.java      | 120 ++++++++++----------
 .../com/netscape/cms/servlet/base/CMSServlet.java  |  17 ++-
 .../netscape/cms/servlet/csadmin/RegisterUser.java |  14 +--
 .../servlet/csadmin/SecurityDomainProcessor.java   |   4 +-
 .../cms/servlet/csadmin/UpdateDomainXML.java       |  11 +-
 .../cms/servlet/processors/CAProcessor.java        |  14 +--
 .../org/dogtagpki/server/rest/AuditService.java    |   3 +-
 .../org/dogtagpki/server/rest/GroupService.java    |   4 +-
 .../src/org/dogtagpki/server/rest/UserService.java |   6 +-
 .../src/com/netscape/cmscore/cert/CertUtils.java   |  18 ++-
 .../cmscore/selftests/SelfTestSubsystem.java       |   9 +-
 28 files changed, 445 insertions(+), 465 deletions(-)

diff --git a/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java b/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java
index eae68ef78cd0bebc49267df8fc0e7f45bbb1f509..be6189215a4b160cd62b8d7c96db4f5a32b44f43 100644
--- a/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java
+++ b/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java
@@ -90,9 +90,6 @@ public class ProfileService extends SubsystemService implements ProfileResource
     private IProfileSubsystem ps = (IProfileSubsystem) CMS.getSubsystem(IProfileSubsystem.ID);
     private IPluginRegistry registry = (IPluginRegistry) CMS.getSubsystem(CMS.SUBSYSTEM_REGISTRY);
 
-    private final static String LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE =
-            "LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE_3";
-
     @Override
     public Response listProfiles(Integer start, Integer size) {
 
@@ -1198,7 +1195,7 @@ public class ProfileService extends SubsystemService implements ProfileResource
 
     public void auditProfileChange(String scope, String type, String id, String status, Map<String, String> params) {
         String msg = CMS.getLogMessage(
-                LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                AuditEvent.CONFIG_CERT_PROFILE,
                 auditor.getSubjectID(),
                 status,
                 auditor.getParamString(scope, type, id, params));
diff --git a/base/common/src/com/netscape/certsrv/logging/AuditEvent.java b/base/common/src/com/netscape/certsrv/logging/AuditEvent.java
index dc434fa57c5be448dea0e70496506519985e1c08..716e0d4d4d90bab866fca97ed3aac1d40db6f847 100644
--- a/base/common/src/com/netscape/certsrv/logging/AuditEvent.java
+++ b/base/common/src/com/netscape/certsrv/logging/AuditEvent.java
@@ -35,6 +35,43 @@ import com.netscape.certsrv.base.MessageFormatter;
  */
 public class AuditEvent implements IBundleLogEvent {
 
+    public final static String AUDIT_LOG_STARTUP =
+            "LOGGING_SIGNED_AUDIT_AUDIT_LOG_STARTUP_2";
+    public final static String AUDIT_LOG_SHUTDOWN =
+            "LOGGING_SIGNED_AUDIT_AUDIT_LOG_SHUTDOWN_2";
+    public final static String CIMC_CERT_VERIFICATION =
+            "LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION_3";
+    public final static String ROLE_ASSUME =
+            "LOGGING_SIGNED_AUDIT_ROLE_ASSUME_3";
+    public final static String CONFIG_CERT_POLICY =
+            "LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY_3";
+    public final static String CONFIG_CERT_PROFILE =
+            "LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE_3";
+    public final static String CONFIG_CRL_PROFILE =
+            "LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE_3";
+    public final static String CONFIG_OCSP_PROFILE =
+            "LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE_3";
+    public final static String CONFIG_AUTH =
+            "LOGGING_SIGNED_AUDIT_CONFIG_AUTH_3";
+    public final static String CONFIG_ROLE =
+            "LOGGING_SIGNED_AUDIT_CONFIG_ROLE_3";
+    public final static String CONFIG_ACL =
+            "LOGGING_SIGNED_AUDIT_CONFIG_ACL_3";
+    public final static String CONFIG_SIGNED_AUDIT =
+            "LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT_3";
+    public final static String CONFIG_ENCRYPTION =
+            "LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION_3";
+    public final static String CONFIG_TRUSTED_PUBLIC_KEY =
+            "LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY_3";
+    public final static String CONFIG_DRM =
+            "LOGGING_SIGNED_AUDIT_CONFIG_DRM_3";
+    public final static String SELFTESTS_EXECUTION =
+            "LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION_2";
+    public final static String AUDIT_LOG_DELETE =
+            "LOGGING_SIGNED_AUDIT_LOG_DELETE_3";
+    public final static String LOG_PATH_CHANGE =
+            "LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE_4";
+
     public final static String PRIVATE_KEY_ARCHIVE_REQUEST =
             "LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST_4";
     public final static String PRIVATE_KEY_ARCHIVE_REQUEST_PROCESSED =
diff --git a/base/common/src/com/netscape/certsrv/logging/IAuditor.java b/base/common/src/com/netscape/certsrv/logging/IAuditor.java
index 1d31a8c2afd585611f06d93674abd8108d08faee..216015fc0ece5111dec4cb3076b4d14b69c133d5 100644
--- a/base/common/src/com/netscape/certsrv/logging/IAuditor.java
+++ b/base/common/src/com/netscape/certsrv/logging/IAuditor.java
@@ -25,9 +25,6 @@ import java.util.Map;
  */
 public interface IAuditor {
 
-    public final static String LOGGING_SIGNED_AUDIT_CONFIG_ROLE =
-            "LOGGING_SIGNED_AUDIT_CONFIG_ROLE_3";
-
     public final static String SIGNED_AUDIT_SCOPE = "Scope";
     public final static String SIGNED_AUDIT_OPERATION = "Operation";
     public final static String SIGNED_AUDIT_RESOURCE = "Resource";
diff --git a/base/server/cms/src/com/netscape/cms/logging/LogFile.java b/base/server/cms/src/com/netscape/cms/logging/LogFile.java
index fdf3f836dbb75e97ca7c71f183cade5b196c76ef..989fece2e78b70c4e6c0b7b789b1d264fcecb219 100644
--- a/base/server/cms/src/com/netscape/cms/logging/LogFile.java
+++ b/base/server/cms/src/com/netscape/cms/logging/LogFile.java
@@ -102,10 +102,6 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo {
     static final String PROP_BUFFER_SIZE = "bufferSize";
     static final String PROP_FLUSH_INTERVAL = "flushInterval";
 
-    private final static String LOGGING_SIGNED_AUDIT_AUDIT_LOG_STARTUP =
-                               "LOGGING_SIGNED_AUDIT_AUDIT_LOG_STARTUP_2";
-    private final static String LOGGING_SIGNED_AUDIT_AUDIT_LOG_SHUTDOWN =
-                               "LOGGING_SIGNED_AUDIT_AUDIT_LOG_SHUTDOWN_2";
     private final static String LOG_SIGNED_AUDIT_EXCEPTION =
                                "LOG_SIGNED_AUDIT_EXCEPTION_1";
 
@@ -647,12 +643,12 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo {
             try {
                 setupSigning();
                 audit(CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_AUDIT_LOG_STARTUP,
+                        AuditEvent.AUDIT_LOG_STARTUP,
                         ILogger.SYSTEM_UID,
                         ILogger.SUCCESS));
             } catch (EBaseException e) {
                 audit(CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_AUDIT_LOG_STARTUP,
+                        AuditEvent.AUDIT_LOG_STARTUP,
                         ILogger.SYSTEM_UID,
                         ILogger.FAILURE));
                 throw e;
@@ -872,7 +868,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo {
 
         // log signed audit shutdown success
         auditMessage = CMS.getLogMessage(
-                           LOGGING_SIGNED_AUDIT_AUDIT_LOG_SHUTDOWN,
+                           AuditEvent.AUDIT_LOG_SHUTDOWN,
                            ILogger.SYSTEM_UID,
                            ILogger.SUCCESS);
 
diff --git a/base/server/cms/src/com/netscape/cms/logging/RollingLogFile.java b/base/server/cms/src/com/netscape/cms/logging/RollingLogFile.java
index fb70f46c1b337187c70715017cb9aa9fb94ec63f..5d2cdd94f2c233b7dddaff416b30f32a33f7d8d1 100644
--- a/base/server/cms/src/com/netscape/cms/logging/RollingLogFile.java
+++ b/base/server/cms/src/com/netscape/cms/logging/RollingLogFile.java
@@ -34,6 +34,7 @@ import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.base.IExtendedPluginInfo;
 import com.netscape.certsrv.common.Constants;
 import com.netscape.certsrv.common.NameValuePairs;
+import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ConsoleError;
 import com.netscape.certsrv.logging.ELogException;
 import com.netscape.certsrv.logging.ILogEvent;
@@ -95,9 +96,6 @@ public class RollingLogFile extends LogFile {
      */
     private Object mExpLock = new Object();
 
-    private final static String LOGGING_SIGNED_AUDIT_LOG_DELETE =
-            "LOGGING_SIGNED_AUDIT_LOG_DELETE_3";
-
     /**
      * Construct a RollingLogFile
      */
@@ -351,14 +349,14 @@ public class RollingLogFile extends LogFile {
                 if (file.exists()) {
                     // log failure in deleting an expired signed audit log file
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_LOG_DELETE,
+                                AuditEvent.AUDIT_LOG_DELETE,
                                 ILogger.SYSTEM_UID,
                                 ILogger.FAILURE,
                                 fullname);
                 } else {
                     // log success in deleting an expired signed audit log file
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_LOG_DELETE,
+                                AuditEvent.AUDIT_LOG_DELETE,
                                 ILogger.SYSTEM_UID,
                                 ILogger.SUCCESS,
                                 fullname);
diff --git a/base/server/cms/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java b/base/server/cms/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java
index b1da188923e2ea2a0613c7c1dd34b85bcf152f1a..2f47efad9fa10c2746364ebb8fe89dca114475c7 100644
--- a/base/server/cms/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java
+++ b/base/server/cms/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java
@@ -28,6 +28,7 @@ import com.netscape.certsrv.base.ConflictingOperationException;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.base.SessionContext;
+import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
 import com.netscape.certsrv.profile.EProfileException;
 import com.netscape.certsrv.profile.IEnrollProfile;
@@ -55,9 +56,6 @@ public class SubsystemGroupUpdater implements IProfileUpdater {
     private ILogger mSignedAuditLogger = CMS.getSignedAuditLogger();
     private Vector<String> mConfigNames = new Vector<String>();
 
-    private final static String LOGGING_SIGNED_AUDIT_CONFIG_ROLE =
-            "LOGGING_SIGNED_AUDIT_CONFIG_ROLE_3";
-
     public SubsystemGroupUpdater() {
     }
 
@@ -166,7 +164,7 @@ public class SubsystemGroupUpdater implements IProfileUpdater {
             system.addUser(user);
             CMS.debug("SubsystemGroupUpdater update: successfully add the user");
             auditMessage = CMS.getLogMessage(
-                               LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                               AuditEvent.CONFIG_ROLE,
                                auditSubjectID,
                                ILogger.SUCCESS,
                                auditParams);
@@ -196,7 +194,7 @@ public class SubsystemGroupUpdater implements IProfileUpdater {
             system.addUserCert(user);
             CMS.debug("SubsystemGroupUpdater update: successfully add the user certificate");
             auditMessage = CMS.getLogMessage(
-                               LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                               AuditEvent.CONFIG_ROLE,
                                auditSubjectID,
                                ILogger.SUCCESS,
                                auditParams);
@@ -209,7 +207,7 @@ public class SubsystemGroupUpdater implements IProfileUpdater {
         } catch (Exception e) {
             CMS.debug("UpdateSubsystemGroup: update addUser " + e.toString());
             auditMessage = CMS.getLogMessage(
-                               LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                               AuditEvent.CONFIG_ROLE,
                                auditSubjectID,
                                ILogger.FAILURE,
                                auditParams);
@@ -240,7 +238,7 @@ public class SubsystemGroupUpdater implements IProfileUpdater {
                 system.modifyGroup(group);
 
                 auditMessage = CMS.getLogMessage(
-                               LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                               AuditEvent.CONFIG_ROLE,
                                auditSubjectID,
                                ILogger.SUCCESS,
                                auditParams);
@@ -253,7 +251,7 @@ public class SubsystemGroupUpdater implements IProfileUpdater {
         } catch (Exception e) {
             CMS.debug("UpdateSubsystemGroup update: modifyGroup " + e.toString());
             auditMessage = CMS.getLogMessage(
-                               LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                               AuditEvent.CONFIG_ROLE,
                                auditSubjectID,
                                ILogger.FAILURE,
                                auditParams);
diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
index 1244da12c1037efe6336664c80dc2815da8ac2cd..8c5da18e41a2adaee0cfabb8329be83c9dd7cabf 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
@@ -38,6 +38,7 @@ import com.netscape.certsrv.common.NameValuePairs;
 import com.netscape.certsrv.common.OpDef;
 import com.netscape.certsrv.common.ScopeDef;
 import com.netscape.certsrv.evaluators.IAccessEvaluator;
+import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
 
 /**
@@ -55,9 +56,6 @@ public class ACLAdminServlet extends AdminServlet {
     private final static String INFO = "ACLAdminServlet";
     private IAuthzManager mAuthzMgr = null;
 
-    private final static String LOGGING_SIGNED_AUDIT_CONFIG_ACL =
-            "LOGGING_SIGNED_AUDIT_CONFIG_ACL_3";
-
     /**
      * initialize the servlet.
      * <ul>
@@ -338,7 +336,7 @@ public class ACLAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ACL,
+                            AuditEvent.CONFIG_ACL,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -363,7 +361,7 @@ public class ACLAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ACL,
+                            AuditEvent.CONFIG_ACL,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -377,7 +375,7 @@ public class ACLAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ACL,
+                            AuditEvent.CONFIG_ACL,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -404,7 +402,7 @@ public class ACLAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ACL,
+                        AuditEvent.CONFIG_ACL,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -502,7 +500,7 @@ public class ACLAdminServlet extends AdminServlet {
             if (type == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ACL,
+                            AuditEvent.CONFIG_ACL,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -544,7 +542,7 @@ public class ACLAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ACL,
+                            AuditEvent.CONFIG_ACL,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -567,7 +565,7 @@ public class ACLAdminServlet extends AdminServlet {
 
                     // store a message in the signed audit log file
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_ACL,
+                                AuditEvent.CONFIG_ACL,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -587,7 +585,7 @@ public class ACLAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ACL,
+                            AuditEvent.CONFIG_ACL,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -612,7 +610,7 @@ public class ACLAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ACL,
+                            AuditEvent.CONFIG_ACL,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -635,7 +633,7 @@ public class ACLAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ACL,
+                            AuditEvent.CONFIG_ACL,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -660,7 +658,7 @@ public class ACLAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ACL,
+                        AuditEvent.CONFIG_ACL,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -683,7 +681,7 @@ public class ACLAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ACL,
+                        AuditEvent.CONFIG_ACL,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -741,7 +739,7 @@ public class ACLAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ACL,
+                            AuditEvent.CONFIG_ACL,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -762,7 +760,7 @@ public class ACLAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ACL,
+                            AuditEvent.CONFIG_ACL,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -797,7 +795,7 @@ public class ACLAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ACL,
+                            AuditEvent.CONFIG_ACL,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -812,7 +810,7 @@ public class ACLAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ACL,
+                        AuditEvent.CONFIG_ACL,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -836,7 +834,7 @@ public class ACLAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ACL,
+                        AuditEvent.CONFIG_ACL,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java
index 0350e388b6bc6f93bf04e5bae8c732ad6ab847e6..089fcbe454e6d5fb054e62b9c6b2e9db9e8fe4a5 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java
@@ -122,8 +122,6 @@ public class AdminServlet extends HttpServlet {
     public static final String CERT_ATTR =
             "javax.servlet.request.X509Certificate";
 
-    private final static String LOGGING_SIGNED_AUDIT_ROLE_ASSUME =
-            "LOGGING_SIGNED_AUDIT_ROLE_ASSUME_3";
     private final static String CERTUSERDB =
             IAuthSubsystem.CERTUSERDB_AUTHMGR_ID;
     private final static String PASSWDUSERDB =
@@ -657,7 +655,7 @@ public class AdminServlet extends HttpServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                        AuditEvent.ROLE_ASSUME,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditGroups(auditSubjectID));
@@ -680,7 +678,7 @@ public class AdminServlet extends HttpServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                        AuditEvent.ROLE_ASSUME,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditGroups(auditSubjectID));
@@ -701,7 +699,7 @@ public class AdminServlet extends HttpServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                        AuditEvent.ROLE_ASSUME,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditGroups(auditSubjectID));
@@ -723,7 +721,7 @@ public class AdminServlet extends HttpServlet {
 
         // store a message in the signed audit log file
         auditMessage = CMS.getLogMessage(
-                    LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                    AuditEvent.ROLE_ASSUME,
                     auditSubjectID,
                     ILogger.SUCCESS,
                     auditGroups(auditSubjectID));
diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
index 71cf8a2ac6d38aecc249a218d4f7d2c9a2c888ea..253a9cd530a21cac7644bc0e11996d7d80507d72 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
@@ -43,6 +43,7 @@ import com.netscape.certsrv.common.NameValuePairs;
 import com.netscape.certsrv.common.OpDef;
 import com.netscape.certsrv.common.ScopeDef;
 import com.netscape.certsrv.ldap.ILdapAuthInfo;
+import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
 
 /**
@@ -66,9 +67,6 @@ public class AuthAdminServlet extends AdminServlet {
             "PASSWORD_CACHE_ADD";
     private final static String EDIT = ";" + Constants.EDIT;
 
-    private final static String LOGGING_SIGNED_AUDIT_CONFIG_AUTH =
-            "LOGGING_SIGNED_AUDIT_CONFIG_AUTH_3";
-
     public AuthAdminServlet() {
         super();
     }
@@ -382,7 +380,7 @@ public class AuthAdminServlet extends AdminServlet {
             if (id == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -399,7 +397,7 @@ public class AuthAdminServlet extends AdminServlet {
             if (mAuths.getPlugins().containsKey(id)) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -419,7 +417,7 @@ public class AuthAdminServlet extends AdminServlet {
             if (classPath == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -436,7 +434,7 @@ public class AuthAdminServlet extends AdminServlet {
                     classPath.equals("com.netscape.cmscore.authentication.CertUserDBAuthentication")) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -464,7 +462,7 @@ public class AuthAdminServlet extends AdminServlet {
             } catch (ClassNotFoundException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -478,7 +476,7 @@ public class AuthAdminServlet extends AdminServlet {
             } catch (IllegalArgumentException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -496,7 +494,7 @@ public class AuthAdminServlet extends AdminServlet {
                 if (IAuthManager.class.isAssignableFrom(newImpl) == false) {
                     // store a message in the signed audit log file
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                                AuditEvent.CONFIG_AUTH,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -511,7 +509,7 @@ public class AuthAdminServlet extends AdminServlet {
             } catch (NullPointerException e) { // unlikely, only if newImpl null.
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -534,7 +532,7 @@ public class AuthAdminServlet extends AdminServlet {
             } catch (EBaseException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -559,7 +557,7 @@ public class AuthAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                        AuditEvent.CONFIG_AUTH,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -583,7 +581,7 @@ public class AuthAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                        AuditEvent.CONFIG_AUTH,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -638,7 +636,7 @@ public class AuthAdminServlet extends AdminServlet {
             if (id == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -655,7 +653,7 @@ public class AuthAdminServlet extends AdminServlet {
             if (mAuths.getInstances().containsKey(id)) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -676,7 +674,7 @@ public class AuthAdminServlet extends AdminServlet {
             if (implname == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -703,7 +701,7 @@ public class AuthAdminServlet extends AdminServlet {
             if (plugin == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -756,7 +754,7 @@ public class AuthAdminServlet extends AdminServlet {
             } catch (ClassNotFoundException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -774,7 +772,7 @@ public class AuthAdminServlet extends AdminServlet {
             } catch (InstantiationException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -791,7 +789,7 @@ public class AuthAdminServlet extends AdminServlet {
             } catch (IllegalAccessException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -813,7 +811,7 @@ public class AuthAdminServlet extends AdminServlet {
             } catch (EBaseException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -832,7 +830,7 @@ public class AuthAdminServlet extends AdminServlet {
             } catch (EBaseException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -859,7 +857,7 @@ public class AuthAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                        AuditEvent.CONFIG_AUTH,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -871,7 +869,7 @@ public class AuthAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                        AuditEvent.CONFIG_AUTH,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -883,7 +881,7 @@ public class AuthAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                        AuditEvent.CONFIG_AUTH,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -986,7 +984,7 @@ public class AuthAdminServlet extends AdminServlet {
             if (id == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1011,7 +1009,7 @@ public class AuthAdminServlet extends AdminServlet {
             if (mAuths.getPlugins().containsKey(id) == false) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1034,7 +1032,7 @@ public class AuthAdminServlet extends AdminServlet {
                 if (authMgr.getImplName() == id) {
                     // store a message in the signed audit log file
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                                AuditEvent.CONFIG_AUTH,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -1063,7 +1061,7 @@ public class AuthAdminServlet extends AdminServlet {
             } catch (EBaseException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1078,7 +1076,7 @@ public class AuthAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                        AuditEvent.CONFIG_AUTH,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -1102,7 +1100,7 @@ public class AuthAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                        AuditEvent.CONFIG_AUTH,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1158,7 +1156,7 @@ public class AuthAdminServlet extends AdminServlet {
             if (id == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1183,7 +1181,7 @@ public class AuthAdminServlet extends AdminServlet {
             if (mAuths.getInstances().containsKey(id) == false) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1216,7 +1214,7 @@ public class AuthAdminServlet extends AdminServlet {
             } catch (EBaseException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1238,7 +1236,7 @@ public class AuthAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                        AuditEvent.CONFIG_AUTH,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -1262,7 +1260,7 @@ public class AuthAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                        AuditEvent.CONFIG_AUTH,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1409,7 +1407,7 @@ public class AuthAdminServlet extends AdminServlet {
             if (id == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1434,7 +1432,7 @@ public class AuthAdminServlet extends AdminServlet {
             if (!mAuths.getInstances().containsKey(id)) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1453,7 +1451,7 @@ public class AuthAdminServlet extends AdminServlet {
             if (implname == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1472,7 +1470,7 @@ public class AuthAdminServlet extends AdminServlet {
             if (plugin == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1548,7 +1546,7 @@ public class AuthAdminServlet extends AdminServlet {
             } catch (ClassNotFoundException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1566,7 +1564,7 @@ public class AuthAdminServlet extends AdminServlet {
             } catch (InstantiationException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1583,7 +1581,7 @@ public class AuthAdminServlet extends AdminServlet {
             } catch (IllegalAccessException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1606,7 +1604,7 @@ public class AuthAdminServlet extends AdminServlet {
             } catch (EBaseException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1625,7 +1623,7 @@ public class AuthAdminServlet extends AdminServlet {
             } catch (EBaseException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                            AuditEvent.CONFIG_AUTH,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1652,7 +1650,7 @@ public class AuthAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                        AuditEvent.CONFIG_AUTH,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -1664,7 +1662,7 @@ public class AuthAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                        AuditEvent.CONFIG_AUTH,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1676,7 +1674,7 @@ public class AuthAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
+                        AuditEvent.CONFIG_AUTH,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/CAAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
index 09c77e5578dc028bad351be32d72cabdffc44c58..5ece2c8d5f96ed2ef9122187aea48996efc62e1c 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
@@ -39,6 +39,7 @@ import com.netscape.certsrv.common.Constants;
 import com.netscape.certsrv.common.NameValuePairs;
 import com.netscape.certsrv.common.OpDef;
 import com.netscape.certsrv.common.ScopeDef;
+import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
 import com.netscape.certsrv.request.IRequestListener;
 import com.netscape.cmsutil.util.Utils;
@@ -62,9 +63,6 @@ public class CAAdminServlet extends AdminServlet {
 
     private final static String INFO = "CAAdminServlet";
 
-    private final static String LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE =
-            "LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE_3";
-
     private ICertificateAuthority mCA = null;
     protected static final String PROP_ENABLED = "enabled";
 
@@ -537,7 +535,7 @@ public class CAAdminServlet extends AdminServlet {
             if (ipId == null || ipId.length() == 0) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                            AuditEvent.CONFIG_CRL_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -554,7 +552,7 @@ public class CAAdminServlet extends AdminServlet {
             if (desc == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                            AuditEvent.CONFIG_CRL_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -587,7 +585,7 @@ public class CAAdminServlet extends AdminServlet {
                 if (ipId.equals(name)) {
                     // store a message in the signed audit log file
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                                AuditEvent.CONFIG_CRL_PROFILE,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -601,7 +599,7 @@ public class CAAdminServlet extends AdminServlet {
             if (!mCA.addCRLIssuingPoint(crlSubStore, ipId, enable, desc)) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                            AuditEvent.CONFIG_CRL_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -615,7 +613,7 @@ public class CAAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                        AuditEvent.CONFIG_CRL_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -626,7 +624,7 @@ public class CAAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                        AuditEvent.CONFIG_CRL_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -638,7 +636,7 @@ public class CAAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                        AuditEvent.CONFIG_CRL_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -693,7 +691,7 @@ public class CAAdminServlet extends AdminServlet {
             if (ipId == null || ipId.length() == 0) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                            AuditEvent.CONFIG_CRL_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -710,7 +708,7 @@ public class CAAdminServlet extends AdminServlet {
             if (desc == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                            AuditEvent.CONFIG_CRL_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -762,7 +760,7 @@ public class CAAdminServlet extends AdminServlet {
             if (!done) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                            AuditEvent.CONFIG_CRL_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -776,7 +774,7 @@ public class CAAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                        AuditEvent.CONFIG_CRL_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -787,7 +785,7 @@ public class CAAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                        AuditEvent.CONFIG_CRL_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -799,7 +797,7 @@ public class CAAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                        AuditEvent.CONFIG_CRL_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -869,7 +867,7 @@ public class CAAdminServlet extends AdminServlet {
                 if (!done) {
                     // store a message in the signed audit log file
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                                AuditEvent.CONFIG_CRL_PROFILE,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -884,7 +882,7 @@ public class CAAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                        AuditEvent.CONFIG_CRL_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -895,7 +893,7 @@ public class CAAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                        AuditEvent.CONFIG_CRL_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -907,7 +905,7 @@ public class CAAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                        AuditEvent.CONFIG_CRL_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1039,7 +1037,7 @@ public class CAAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                        AuditEvent.CONFIG_CRL_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -1050,7 +1048,7 @@ public class CAAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                        AuditEvent.CONFIG_CRL_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1062,7 +1060,7 @@ public class CAAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                        AuditEvent.CONFIG_CRL_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1246,7 +1244,7 @@ public class CAAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                        AuditEvent.CONFIG_CRL_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -1260,7 +1258,7 @@ public class CAAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                        AuditEvent.CONFIG_CRL_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1272,7 +1270,7 @@ public class CAAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE,
+                        AuditEvent.CONFIG_CRL_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
index 3e73dc6e1c234787126bf9f2c33c6dcb28c667f3..229c3779a9e359c0ab9171157a7c73962dc612a3 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
@@ -106,14 +106,6 @@ public final class CMSAdminServlet extends AdminServlet {
 
     private ILogger mSignedAuditLogger = CMS.getSignedAuditLogger();
     private final static byte EOL[] = { Character.LINE_SEPARATOR };
-    private final static String LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION =
-            "LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION_3";
-    private final static String LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY =
-            "LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY_3";
-    private final static String LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION =
-            "LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION_2";
-    private final static String LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION =
-            "LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION_3";
 
     // CMS must be instantiated before this admin servlet.
 
@@ -574,7 +566,7 @@ public final class CMSAdminServlet extends AdminServlet {
                         if (tokenizer.countTokens() != 2) {
                             // store a message in the signed audit log file
                             auditMessage = CMS.getLogMessage(
-                                        LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION,
+                                        AuditEvent.CONFIG_ENCRYPTION,
                                         auditSubjectID,
                                         ILogger.FAILURE,
                                         auditParams(req));
@@ -599,7 +591,7 @@ public final class CMSAdminServlet extends AdminServlet {
                         } else
                             // store a message in the signed audit log file
                             auditMessage = CMS.getLogMessage(
-                                        LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION,
+                                        AuditEvent.CONFIG_ENCRYPTION,
                                         auditSubjectID,
                                         ILogger.FAILURE,
                                         auditParams(req));
@@ -636,7 +628,7 @@ public final class CMSAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION,
+                        AuditEvent.CONFIG_ENCRYPTION,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -648,7 +640,7 @@ public final class CMSAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION,
+                        AuditEvent.CONFIG_ENCRYPTION,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -660,7 +652,7 @@ public final class CMSAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION,
+                        AuditEvent.CONFIG_ENCRYPTION,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1494,7 +1486,7 @@ public final class CMSAdminServlet extends AdminServlet {
             } else {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                            AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1514,7 +1506,7 @@ public final class CMSAdminServlet extends AdminServlet {
             } else {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                            AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1534,7 +1526,7 @@ public final class CMSAdminServlet extends AdminServlet {
             if (nickname.equals("")) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                            AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1781,7 +1773,7 @@ public final class CMSAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                        AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -1794,7 +1786,7 @@ public final class CMSAdminServlet extends AdminServlet {
             CMS.debug("CMSAdminServlet: issueImportCert: EBaseException thrown: " + eAudit1.toString());
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                        AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1807,7 +1799,7 @@ public final class CMSAdminServlet extends AdminServlet {
             CMS.debug("CMSAdminServlet: issueImportCert: IOException thrown: " + eAudit2.toString());
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                        AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1900,7 +1892,7 @@ public final class CMSAdminServlet extends AdminServlet {
                     if (certpath == null || certpath.equals("")) {
                         // store a message in the signed audit log file
                         auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                                AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -1934,7 +1926,7 @@ public final class CMSAdminServlet extends AdminServlet {
             } catch (IOException ee) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                            AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1964,7 +1956,7 @@ public final class CMSAdminServlet extends AdminServlet {
             } else {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                            AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -2193,7 +2185,7 @@ public final class CMSAdminServlet extends AdminServlet {
                 verified = true;
 
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION,
+                        AuditEvent.CIMC_CERT_VERIFICATION,
                         auditSubjectID,
                         ILogger.SUCCESS,
                                 nickname);
@@ -2203,7 +2195,7 @@ public final class CMSAdminServlet extends AdminServlet {
             } catch (Exception e) {
                 CMS.debug(e);
                 auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION,
+                                AuditEvent.CIMC_CERT_VERIFICATION,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 nickname);
@@ -2213,7 +2205,7 @@ public final class CMSAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                        AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -2230,7 +2222,7 @@ public final class CMSAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                        AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -2242,7 +2234,7 @@ public final class CMSAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                        AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -2319,7 +2311,7 @@ public final class CMSAdminServlet extends AdminServlet {
                     if (certpath == null || certpath.equals("")) {
                         // store a message in the signed audit log file
                         auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                                AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -2352,7 +2344,7 @@ public final class CMSAdminServlet extends AdminServlet {
             } catch (IOException ee) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                            AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -2386,7 +2378,7 @@ public final class CMSAdminServlet extends AdminServlet {
             } catch (Exception e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                            AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -2405,7 +2397,7 @@ public final class CMSAdminServlet extends AdminServlet {
             } catch (EBaseException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                            AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -2426,7 +2418,7 @@ public final class CMSAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                        AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -2437,7 +2429,7 @@ public final class CMSAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                        AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -2449,7 +2441,7 @@ public final class CMSAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                        AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -2952,7 +2944,7 @@ public final class CMSAdminServlet extends AdminServlet {
             jssSubSystem.setRootCertTrust(nickname, serialno, issuername, trust);
         } catch (EBaseException e) {
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                        AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -2964,7 +2956,7 @@ public final class CMSAdminServlet extends AdminServlet {
 
         // store a message in the signed audit log file
         auditMessage = CMS.getLogMessage(
-                    LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                    AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                     auditSubjectID,
                     ILogger.SUCCESS,
                     auditParams(req));
@@ -3020,7 +3012,7 @@ public final class CMSAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                        AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -3032,7 +3024,7 @@ public final class CMSAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                        AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -3044,7 +3036,7 @@ public final class CMSAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY,
+                        AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -3132,7 +3124,7 @@ public final class CMSAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION,
+                            AuditEvent.SELFTESTS_EXECUTION,
                             auditSubjectID,
                             ILogger.FAILURE);
 
@@ -3185,7 +3177,7 @@ public final class CMSAdminServlet extends AdminServlet {
 
                         // store a message in the signed audit log file
                         auditMessage = CMS.getLogMessage(
-                                    LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION,
+                                    AuditEvent.SELFTESTS_EXECUTION,
                                     auditSubjectID,
                                     ILogger.FAILURE);
 
@@ -3215,7 +3207,7 @@ public final class CMSAdminServlet extends AdminServlet {
 
                         // store a message in the signed audit log file
                         auditMessage = CMS.getLogMessage(
-                                    LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION,
+                                    AuditEvent.SELFTESTS_EXECUTION,
                                     auditSubjectID,
                                     ILogger.FAILURE);
 
@@ -3268,7 +3260,7 @@ public final class CMSAdminServlet extends AdminServlet {
 
                             // store a message in the signed audit log file
                             auditMessage = CMS.getLogMessage(
-                                        LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION,
+                                        AuditEvent.SELFTESTS_EXECUTION,
                                         auditSubjectID,
                                         ILogger.FAILURE);
 
@@ -3316,7 +3308,7 @@ public final class CMSAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION,
+                        AuditEvent.SELFTESTS_EXECUTION,
                         auditSubjectID,
                         ILogger.SUCCESS);
 
@@ -3336,7 +3328,7 @@ public final class CMSAdminServlet extends AdminServlet {
         } catch (EMissingSelfTestException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION,
+                        AuditEvent.SELFTESTS_EXECUTION,
                         auditSubjectID,
                         ILogger.FAILURE);
 
@@ -3347,7 +3339,7 @@ public final class CMSAdminServlet extends AdminServlet {
         } catch (ESelfTestException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION,
+                        AuditEvent.SELFTESTS_EXECUTION,
                         auditSubjectID,
                         ILogger.FAILURE);
 
@@ -3358,7 +3350,7 @@ public final class CMSAdminServlet extends AdminServlet {
         } catch (IOException eAudit3) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION,
+                        AuditEvent.SELFTESTS_EXECUTION,
                         auditSubjectID,
                         ILogger.FAILURE);
 
diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java
index f974db4250b0692f48ed65c557948c7b19dac06c..00f960e8e5b1484254949d58f882f869f239f663 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java
@@ -43,8 +43,8 @@ import com.netscape.certsrv.group.GroupMemberCollection;
 import com.netscape.certsrv.group.GroupMemberData;
 import com.netscape.certsrv.group.GroupNotFoundException;
 import com.netscape.certsrv.group.GroupResource;
+import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.AuditFormat;
-import com.netscape.certsrv.logging.IAuditor;
 import com.netscape.certsrv.logging.ILogger;
 import com.netscape.certsrv.usrgrp.IGroup;
 import com.netscape.certsrv.usrgrp.IUGSubsystem;
@@ -388,6 +388,6 @@ public class GroupMemberProcessor extends Processor {
     }
 
     public void audit(String type, String id, Map<String, String> params, String status) {
-        audit(IAuditor.LOGGING_SIGNED_AUDIT_CONFIG_ROLE, ScopeDef.SC_GROUP_MEMBERS, type, id, params, status);
+        audit(AuditEvent.CONFIG_ROLE, ScopeDef.SC_GROUP_MEMBERS, type, id, params, status);
     }
 }
diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
index 3f9f558e086266fdec35fd8b6111b828ebdb0d78..5583d126ca1766d87248b5c03aee2cd99641b031 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
@@ -32,6 +32,7 @@ import com.netscape.certsrv.common.NameValuePairs;
 import com.netscape.certsrv.common.OpDef;
 import com.netscape.certsrv.common.ScopeDef;
 import com.netscape.certsrv.kra.IKeyRecoveryAuthority;
+import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
 
 /**
@@ -54,9 +55,6 @@ public class KRAAdminServlet extends AdminServlet {
 
     private IKeyRecoveryAuthority mKRA = null;
 
-    private final static String LOGGING_SIGNED_AUDIT_CONFIG_DRM =
-            "LOGGING_SIGNED_AUDIT_CONFIG_DRM_3";
-
     /**
      * Constructs KRA servlet.
      */
@@ -204,7 +202,7 @@ public class KRAAdminServlet extends AdminServlet {
                     mKRA.setNoOfRequiredAgents(number);
                 } catch (NumberFormatException e) {
                     auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_DRM,
+                            AuditEvent.CONFIG_DRM,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -218,7 +216,7 @@ public class KRAAdminServlet extends AdminServlet {
         commit(true);
 
         auditMessage = CMS.getLogMessage(
-                LOGGING_SIGNED_AUDIT_CONFIG_DRM,
+                AuditEvent.CONFIG_DRM,
                 auditSubjectID,
                 ILogger.SUCCESS,
                 auditParams(req));
diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/LogAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
index 13ba52c15ecf4ece453eec6f029e35125f640875..c4245205efa511a835e3d7aed99e0f038443cb37 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
@@ -36,6 +36,7 @@ import com.netscape.certsrv.common.Constants;
 import com.netscape.certsrv.common.NameValuePairs;
 import com.netscape.certsrv.common.OpDef;
 import com.netscape.certsrv.common.ScopeDef;
+import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ELogException;
 import com.netscape.certsrv.logging.ELogNotFound;
 import com.netscape.certsrv.logging.ELogPluginNotFound;
@@ -64,10 +65,6 @@ public class LogAdminServlet extends AdminServlet {
     private ILogSubsystem mSys = null;
 
     private final static String SIGNED_AUDIT_LOG_TYPE = "SignedAudit";
-    private final static String LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT =
-            "LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT_3";
-    private final static String LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE =
-            "LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE_4";
 
     /**
      * Constructs Log servlet.
@@ -439,7 +436,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -458,7 +455,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -479,7 +476,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -508,7 +505,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -524,7 +521,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -544,7 +541,7 @@ public class LogAdminServlet extends AdminServlet {
                     // store a message in the signed audit log file
                     if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                         auditMessage = CMS.getLogMessage(
-                                    LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                    AuditEvent.CONFIG_SIGNED_AUDIT,
                                     auditSubjectID,
                                     ILogger.FAILURE,
                                     auditParams(req));
@@ -561,7 +558,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -588,7 +585,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -612,7 +609,7 @@ public class LogAdminServlet extends AdminServlet {
             // store a message in the signed audit log file
             if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                            AuditEvent.CONFIG_SIGNED_AUDIT,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -637,7 +634,7 @@ public class LogAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                        AuditEvent.CONFIG_SIGNED_AUDIT,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -709,7 +706,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -727,7 +724,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -744,7 +741,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -766,7 +763,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -789,7 +786,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -849,7 +846,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -868,7 +865,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -887,7 +884,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -912,7 +909,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -928,7 +925,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -950,7 +947,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -974,7 +971,7 @@ public class LogAdminServlet extends AdminServlet {
             // store a message in the signed audit log file
             if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                            AuditEvent.CONFIG_SIGNED_AUDIT,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -999,7 +996,7 @@ public class LogAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                        AuditEvent.CONFIG_SIGNED_AUDIT,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1103,7 +1100,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -1122,7 +1119,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -1158,7 +1155,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -1175,7 +1172,7 @@ public class LogAdminServlet extends AdminServlet {
             // store a message in the signed audit log file
             if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                            AuditEvent.CONFIG_SIGNED_AUDIT,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -1200,7 +1197,7 @@ public class LogAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                        AuditEvent.CONFIG_SIGNED_AUDIT,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1265,7 +1262,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -1283,7 +1280,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -1308,7 +1305,7 @@ public class LogAdminServlet extends AdminServlet {
                     // store a message in the signed audit log file
                     if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                         auditMessage = CMS.getLogMessage(
-                                    LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                    AuditEvent.CONFIG_SIGNED_AUDIT,
                                     auditSubjectID,
                                     ILogger.FAILURE,
                                     auditParams(req));
@@ -1339,7 +1336,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -1356,7 +1353,7 @@ public class LogAdminServlet extends AdminServlet {
             // store a message in the signed audit log file
             if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                            AuditEvent.CONFIG_SIGNED_AUDIT,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -1381,7 +1378,7 @@ public class LogAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                        AuditEvent.CONFIG_SIGNED_AUDIT,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1472,7 +1469,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -1491,7 +1488,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -1512,7 +1509,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -1534,7 +1531,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -1673,7 +1670,7 @@ public class LogAdminServlet extends AdminServlet {
                                     // file (regardless of logType)
                                     if (!(newLogPath.equals(origLogPath))) {
                                         auditMessage = CMS.getLogMessage(
-                                                    LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE,
+                                                    AuditEvent.LOG_PATH_CHANGE,
                                                     auditSubjectID,
                                                     ILogger.FAILURE,
                                                     logType,
@@ -1686,7 +1683,7 @@ public class LogAdminServlet extends AdminServlet {
                                     // file
                                     if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                                         auditMessage = CMS.getLogMessage(
-                                                    LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                                    AuditEvent.CONFIG_SIGNED_AUDIT,
                                                     auditSubjectID,
                                                     ILogger.FAILURE,
                                                     auditParams(req));
@@ -1775,7 +1772,7 @@ public class LogAdminServlet extends AdminServlet {
                 // (regardless of logType)
                 if (!(newLogPath.equals(origLogPath))) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE,
+                                AuditEvent.LOG_PATH_CHANGE,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 logType,
@@ -1801,7 +1798,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -1827,7 +1824,7 @@ public class LogAdminServlet extends AdminServlet {
                 // (regardless of logType)
                 if (!(newLogPath.equals(origLogPath))) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE,
+                                AuditEvent.LOG_PATH_CHANGE,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 logType,
@@ -1852,7 +1849,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -1878,7 +1875,7 @@ public class LogAdminServlet extends AdminServlet {
                 // (regardless of logType)
                 if (!(newLogPath.equals(origLogPath))) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE,
+                                AuditEvent.LOG_PATH_CHANGE,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 logType,
@@ -1903,7 +1900,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -1937,7 +1934,7 @@ public class LogAdminServlet extends AdminServlet {
                 // (regardless of logType)
                 if (!(newLogPath.equals(origLogPath))) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE,
+                                AuditEvent.LOG_PATH_CHANGE,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 logType,
@@ -1962,7 +1959,7 @@ public class LogAdminServlet extends AdminServlet {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                                AuditEvent.CONFIG_SIGNED_AUDIT,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -1996,7 +1993,7 @@ public class LogAdminServlet extends AdminServlet {
             // (regardless of logType)
             if (!(newLogPath.equals(origLogPath))) {
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE,
+                            AuditEvent.LOG_PATH_CHANGE,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             logType,
@@ -2021,7 +2018,7 @@ public class LogAdminServlet extends AdminServlet {
             // store a message in the signed audit log file
             if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                            AuditEvent.CONFIG_SIGNED_AUDIT,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -2042,7 +2039,7 @@ public class LogAdminServlet extends AdminServlet {
             // (regardless of logType)
             if (!(newLogPath.equals(origLogPath))) {
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE,
+                            AuditEvent.LOG_PATH_CHANGE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             logType,
@@ -2067,7 +2064,7 @@ public class LogAdminServlet extends AdminServlet {
             // store a message in the signed audit log file
             if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                            AuditEvent.CONFIG_SIGNED_AUDIT,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -2088,7 +2085,7 @@ public class LogAdminServlet extends AdminServlet {
             // (regardless of logType)
             if (!(newLogPath.equals(origLogPath))) {
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE,
+                            AuditEvent.LOG_PATH_CHANGE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             logType,
@@ -2113,7 +2110,7 @@ public class LogAdminServlet extends AdminServlet {
             // store a message in the signed audit log file
             if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT,
+                            AuditEvent.CONFIG_SIGNED_AUDIT,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
index a7ff9227492f1915a203c67d23b935240071bbde..ee1c3a260a085c04f531bf7cb67c8248985cf6d5 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
@@ -34,6 +34,7 @@ import com.netscape.certsrv.common.Constants;
 import com.netscape.certsrv.common.NameValuePairs;
 import com.netscape.certsrv.common.OpDef;
 import com.netscape.certsrv.common.ScopeDef;
+import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
 import com.netscape.certsrv.ocsp.IOCSPAuthority;
 import com.netscape.certsrv.ocsp.IOCSPStore;
@@ -57,9 +58,6 @@ public class OCSPAdminServlet extends AdminServlet {
 
     private final static String INFO = "OCSPAdminServlet";
 
-    private final static String LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE =
-            "LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE_3";
-
     private IOCSPAuthority mOCSP = null;
 
     public OCSPAdminServlet() {
@@ -256,7 +254,7 @@ public class OCSPAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE,
+                        AuditEvent.CONFIG_OCSP_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -267,7 +265,7 @@ public class OCSPAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE,
+                        AuditEvent.CONFIG_OCSP_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -279,7 +277,7 @@ public class OCSPAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE,
+                        AuditEvent.CONFIG_OCSP_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -368,7 +366,7 @@ public class OCSPAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE,
+                        AuditEvent.CONFIG_OCSP_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -379,7 +377,7 @@ public class OCSPAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE,
+                        AuditEvent.CONFIG_OCSP_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -391,7 +389,7 @@ public class OCSPAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE,
+                        AuditEvent.CONFIG_OCSP_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -503,7 +501,7 @@ public class OCSPAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE,
+                        AuditEvent.CONFIG_OCSP_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -514,7 +512,7 @@ public class OCSPAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE,
+                        AuditEvent.CONFIG_OCSP_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -526,7 +524,7 @@ public class OCSPAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE,
+                        AuditEvent.CONFIG_OCSP_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java
index 1fe9c870cbcca0175b6d2fa58f8de1056a86ff5e..7a09e832503ad6b692e4888a4dc944ee4ce6bac8 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java
@@ -41,6 +41,7 @@ import com.netscape.certsrv.common.NameValuePairs;
 import com.netscape.certsrv.common.OpDef;
 import com.netscape.certsrv.common.ScopeDef;
 import com.netscape.certsrv.kra.IKeyRecoveryAuthority;
+import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
 import com.netscape.certsrv.ra.IRegistrationAuthority;
 
@@ -83,9 +84,6 @@ public class PolicyAdminServlet extends AdminServlet {
     public static String COMMA = ",";
     public static String MISSING_POLICY_ORDERING = "Missing policy ordering";
 
-    private final static String LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY =
-            "LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY_3";
-
     /**
      * Constructs administration servlet.
      */
@@ -506,7 +504,7 @@ public class PolicyAdminServlet extends AdminServlet {
             if (id == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -522,7 +520,7 @@ public class PolicyAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -535,7 +533,7 @@ public class PolicyAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -547,7 +545,7 @@ public class PolicyAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                        AuditEvent.CONFIG_CERT_POLICY,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -628,7 +626,7 @@ public class PolicyAdminServlet extends AdminServlet {
             if (id == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -644,7 +642,7 @@ public class PolicyAdminServlet extends AdminServlet {
             if (classPath == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -659,7 +657,7 @@ public class PolicyAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -670,7 +668,7 @@ public class PolicyAdminServlet extends AdminServlet {
             } catch (Exception e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -682,7 +680,7 @@ public class PolicyAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                        AuditEvent.CONFIG_CERT_POLICY,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -735,7 +733,7 @@ public class PolicyAdminServlet extends AdminServlet {
             if (id == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -751,7 +749,7 @@ public class PolicyAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -764,7 +762,7 @@ public class PolicyAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -776,7 +774,7 @@ public class PolicyAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                        AuditEvent.CONFIG_CERT_POLICY,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -875,7 +873,7 @@ public class PolicyAdminServlet extends AdminServlet {
             if (id == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -892,7 +890,7 @@ public class PolicyAdminServlet extends AdminServlet {
             if (implName == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -925,7 +923,7 @@ public class PolicyAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -956,7 +954,7 @@ public class PolicyAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -967,7 +965,7 @@ public class PolicyAdminServlet extends AdminServlet {
             } catch (Exception e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -979,7 +977,7 @@ public class PolicyAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                        AuditEvent.CONFIG_CERT_POLICY,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1032,7 +1030,7 @@ public class PolicyAdminServlet extends AdminServlet {
             if (policyOrder == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1047,7 +1045,7 @@ public class PolicyAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -1058,7 +1056,7 @@ public class PolicyAdminServlet extends AdminServlet {
             } catch (Exception e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1070,7 +1068,7 @@ public class PolicyAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                        AuditEvent.CONFIG_CERT_POLICY,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1123,7 +1121,7 @@ public class PolicyAdminServlet extends AdminServlet {
             if (id == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1140,7 +1138,7 @@ public class PolicyAdminServlet extends AdminServlet {
             if (implName == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1172,7 +1170,7 @@ public class PolicyAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1208,7 +1206,7 @@ public class PolicyAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -1219,7 +1217,7 @@ public class PolicyAdminServlet extends AdminServlet {
             } catch (Exception e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                            AuditEvent.CONFIG_CERT_POLICY,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1231,7 +1229,7 @@ public class PolicyAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY,
+                        AuditEvent.CONFIG_CERT_POLICY,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
index b418baf41a0f84ce5d5ac9da56efd191e1a20316..c4b40c094d916f43e668c9faab007f90a0c16090 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
@@ -34,6 +34,7 @@ import com.netscape.certsrv.common.Constants;
 import com.netscape.certsrv.common.NameValuePairs;
 import com.netscape.certsrv.common.OpDef;
 import com.netscape.certsrv.common.ScopeDef;
+import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
 import com.netscape.certsrv.profile.EProfileException;
 import com.netscape.certsrv.profile.IPolicyConstraint;
@@ -88,9 +89,6 @@ public class ProfileAdminServlet extends AdminServlet {
     public static String MISSING_POLICY_ORDERING = "Missing policy ordering";
     public static String BAD_CONFIGURATION_VAL = "Invalid configuration value.";
 
-    private final static String LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE =
-            "LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE_3";
-
     /**
      * Constructs administration servlet.
      */
@@ -425,7 +423,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -475,7 +473,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -492,7 +490,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -503,7 +501,7 @@ public class ProfileAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -566,7 +564,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -599,7 +597,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -617,7 +615,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -628,7 +626,7 @@ public class ProfileAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -691,7 +689,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -725,7 +723,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -743,7 +741,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -754,7 +752,7 @@ public class ProfileAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -826,7 +824,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -848,7 +846,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -863,7 +861,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -874,7 +872,7 @@ public class ProfileAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -948,7 +946,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -965,7 +963,7 @@ public class ProfileAdminServlet extends AdminServlet {
             } catch (EBaseException e1) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -980,7 +978,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -991,7 +989,7 @@ public class ProfileAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1065,7 +1063,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1082,7 +1080,7 @@ public class ProfileAdminServlet extends AdminServlet {
             } catch (EBaseException e1) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1097,7 +1095,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -1108,7 +1106,7 @@ public class ProfileAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1170,7 +1168,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1219,7 +1217,7 @@ public class ProfileAdminServlet extends AdminServlet {
             } catch (Exception e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1233,7 +1231,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -1244,7 +1242,7 @@ public class ProfileAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1306,7 +1304,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1356,7 +1354,7 @@ public class ProfileAdminServlet extends AdminServlet {
             } catch (Exception e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1371,7 +1369,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -1382,7 +1380,7 @@ public class ProfileAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1444,7 +1442,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1488,7 +1486,7 @@ public class ProfileAdminServlet extends AdminServlet {
             } catch (Exception e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1502,7 +1500,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -1513,7 +1511,7 @@ public class ProfileAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1575,7 +1573,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1607,7 +1605,7 @@ public class ProfileAdminServlet extends AdminServlet {
             } catch (Exception e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1621,7 +1619,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -1632,7 +1630,7 @@ public class ProfileAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1694,7 +1692,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1727,7 +1725,7 @@ public class ProfileAdminServlet extends AdminServlet {
             } catch (Exception e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1741,7 +1739,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -1752,7 +1750,7 @@ public class ProfileAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1814,7 +1812,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1861,7 +1859,7 @@ public class ProfileAdminServlet extends AdminServlet {
             } catch (Exception e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1876,7 +1874,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -1887,7 +1885,7 @@ public class ProfileAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -2278,7 +2276,7 @@ public class ProfileAdminServlet extends AdminServlet {
             if (id == null) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -2294,7 +2292,7 @@ public class ProfileAdminServlet extends AdminServlet {
             } catch (EProfileException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -2307,7 +2305,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -2318,7 +2316,7 @@ public class ProfileAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -2391,7 +2389,7 @@ public class ProfileAdminServlet extends AdminServlet {
             if (id == null || id.trim().equals("") || !isValidId(id)) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -2441,7 +2439,7 @@ public class ProfileAdminServlet extends AdminServlet {
             } catch (EBaseException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -2480,7 +2478,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -2493,7 +2491,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -2504,7 +2502,7 @@ public class ProfileAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -2563,7 +2561,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                            AuditEvent.CONFIG_CERT_PROFILE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -2591,7 +2589,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -2607,7 +2605,7 @@ public class ProfileAdminServlet extends AdminServlet {
         } catch (IOException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE,
+                        AuditEvent.CONFIG_CERT_PROFILE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
index cce1ce3f41748bd03ea07ac857e23265f8ff70f3..1c38b887f64e1cfe0e93615af11050141d3865c9 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
@@ -48,6 +48,7 @@ import com.netscape.certsrv.common.Constants;
 import com.netscape.certsrv.common.NameValuePairs;
 import com.netscape.certsrv.common.OpDef;
 import com.netscape.certsrv.common.ScopeDef;
+import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.AuditFormat;
 import com.netscape.certsrv.logging.ILogger;
 import com.netscape.certsrv.password.IPasswordCheck;
@@ -87,9 +88,6 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
     private final static String BACK_SLASH = "\\";
 
-    private final static String LOGGING_SIGNED_AUDIT_CONFIG_ROLE =
-            "LOGGING_SIGNED_AUDIT_CONFIG_ROLE_3";
-
     private IUGSubsystem mMgr = null;
 
     private static String[] mMultiRoleGroupEnforceList = null;
@@ -682,7 +680,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -701,7 +699,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -720,7 +718,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -743,7 +741,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -770,7 +768,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
                 if (!passwdCheck.isGoodPassword(pword)) {
                     // store a message in the signed audit log file
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                                AuditEvent.CONFIG_ROLE,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -823,7 +821,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                         // store a message in the signed audit log file
                         auditMessage = CMS.getLogMessage(
-                                    LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                                    AuditEvent.CONFIG_ROLE,
                                     auditSubjectID,
                                     ILogger.FAILURE,
                                     auditParams(req));
@@ -846,7 +844,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                             // store a message in the signed audit log file
                             auditMessage = CMS.getLogMessage(
-                                        LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                                        AuditEvent.CONFIG_ROLE,
                                         auditSubjectID,
                                         ILogger.FAILURE,
                                         auditParams(req));
@@ -872,7 +870,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -886,7 +884,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -907,7 +905,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -921,7 +919,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                        AuditEvent.CONFIG_ROLE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -933,7 +931,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                        AuditEvent.CONFIG_ROLE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -993,7 +991,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1016,7 +1014,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -1056,7 +1054,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
                     if (p7certs.length == 0) {
                         // store a message in the signed audit log file
                         auditMessage = CMS.getLogMessage(
-                                    LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                                    AuditEvent.CONFIG_ROLE,
                                     auditSubjectID,
                                     ILogger.FAILURE,
                                     auditParams(req));
@@ -1091,7 +1089,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                         // store a message in the signed audit log file
                         auditMessage = CMS.getLogMessage(
-                                    LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                                    AuditEvent.CONFIG_ROLE,
                                     auditSubjectID,
                                     ILogger.FAILURE,
                                     auditParams(req));
@@ -1157,7 +1155,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                     // store a message in the signed audit log file
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                                AuditEvent.CONFIG_ROLE,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -1173,7 +1171,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1195,7 +1193,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -1211,7 +1209,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1227,7 +1225,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1241,7 +1239,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
             } catch (ConflictingOperationException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1257,7 +1255,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1283,7 +1281,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                        AuditEvent.CONFIG_ROLE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1346,7 +1344,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1368,7 +1366,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -1386,7 +1384,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -1400,7 +1398,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1426,7 +1424,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                        AuditEvent.CONFIG_ROLE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1497,7 +1495,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1519,7 +1517,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1539,7 +1537,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
                     } else {
                         // store a message in the signed audit log file
                         auditMessage = CMS.getLogMessage(
-                                    LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                                    AuditEvent.CONFIG_ROLE,
                                     auditSubjectID,
                                     ILogger.FAILURE,
                                     auditParams(req));
@@ -1561,7 +1559,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -1573,7 +1571,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
             } catch (Exception ex) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1587,7 +1585,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                        AuditEvent.CONFIG_ROLE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1599,7 +1597,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                        AuditEvent.CONFIG_ROLE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1660,7 +1658,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1698,7 +1696,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -1710,7 +1708,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
             } catch (Exception e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1725,7 +1723,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                        AuditEvent.CONFIG_ROLE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1737,7 +1735,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                        AuditEvent.CONFIG_ROLE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1798,7 +1796,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1817,7 +1815,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                        AuditEvent.CONFIG_ROLE,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditParams(req));
@@ -1828,7 +1826,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                        AuditEvent.CONFIG_ROLE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1840,7 +1838,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                        AuditEvent.CONFIG_ROLE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -1903,7 +1901,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -1956,7 +1954,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
                             } else {
                                 // store a message in the signed audit log file
                                 auditMessage = CMS.getLogMessage(
-                                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                                            AuditEvent.CONFIG_ROLE,
                                             auditSubjectID,
                                             ILogger.FAILURE,
                                             auditParams(req));
@@ -1980,7 +1978,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -1993,7 +1991,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -2008,7 +2006,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                        AuditEvent.CONFIG_ROLE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -2020,7 +2018,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                        AuditEvent.CONFIG_ROLE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -2152,7 +2150,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -2176,7 +2174,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -2201,7 +2199,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
                 if (!passwdCheck.isGoodPassword(pword)) {
                     // store a message in the signed audit log file
                     auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                                AuditEvent.CONFIG_ROLE,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams(req));
@@ -2232,7 +2230,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditParams(req));
@@ -2246,7 +2244,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                            AuditEvent.CONFIG_ROLE,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditParams(req));
@@ -2260,7 +2258,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
         } catch (EBaseException eAudit1) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                        AuditEvent.CONFIG_ROLE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
@@ -2272,7 +2270,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
         } catch (IOException eAudit2) {
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                        AuditEvent.CONFIG_ROLE,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditParams(req));
diff --git a/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java
index 01f9f07fd70ac03cecdfde47ea376de4c96bf6aa..c7fc03b440fb6f5fcaef61f5f2071b8723f41a07 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java
@@ -245,9 +245,6 @@ public abstract class CMSServlet extends HttpServlet {
     private IUGSubsystem mUG = (IUGSubsystem)
             CMS.getSubsystem(CMS.SUBSYSTEM_UG);
 
-    private final static String LOGGING_SIGNED_AUDIT_ROLE_ASSUME =
-            "LOGGING_SIGNED_AUDIT_ROLE_ASSUME_3";
-
     public CMSServlet() {
     }
 
@@ -1840,7 +1837,7 @@ public abstract class CMSServlet extends HttpServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                            AuditEvent.ROLE_ASSUME,
                             auditSubjectID,
                             ILogger.SUCCESS,
                             auditGroupID);
@@ -1857,7 +1854,7 @@ public abstract class CMSServlet extends HttpServlet {
                 audit(auditMessage);
 
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                            AuditEvent.ROLE_ASSUME,
                             auditSubjectID,
                             ILogger.FAILURE,
                             auditGroupID);
@@ -1876,7 +1873,7 @@ public abstract class CMSServlet extends HttpServlet {
             audit(auditMessage);
 
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                        AuditEvent.ROLE_ASSUME,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditGroupID);
@@ -1974,7 +1971,7 @@ public abstract class CMSServlet extends HttpServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                            AuditEvent.ROLE_ASSUME,
                             auditID,
                             ILogger.SUCCESS,
                             auditGroups(auditSubjectID));
@@ -1993,7 +1990,7 @@ public abstract class CMSServlet extends HttpServlet {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                            AuditEvent.ROLE_ASSUME,
                             auditID,
                             ILogger.FAILURE,
                             auditGroups(auditSubjectID));
@@ -2015,7 +2012,7 @@ public abstract class CMSServlet extends HttpServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                        AuditEvent.ROLE_ASSUME,
                         auditID,
                         ILogger.FAILURE,
                         auditGroups(auditSubjectID));
@@ -2036,7 +2033,7 @@ public abstract class CMSServlet extends HttpServlet {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                        AuditEvent.ROLE_ASSUME,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditGroups(auditSubjectID));
diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/RegisterUser.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
index 74197a4a806d4b35a1a45f96f2799e0065105094..f02932e2baf434cf9b1b13902fb7bd02d34845cf 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
@@ -36,6 +36,7 @@ import com.netscape.certsrv.authentication.IAuthToken;
 import com.netscape.certsrv.authorization.AuthzToken;
 import com.netscape.certsrv.authorization.EAuthzAccessDenied;
 import com.netscape.certsrv.base.EBaseException;
+import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
 import com.netscape.certsrv.usrgrp.ICertUserLocator;
 import com.netscape.certsrv.usrgrp.IGroup;
@@ -65,9 +66,6 @@ public class RegisterUser extends CMSServlet {
     private final static String SUCCESS = "0";
     private final static String AUTH_FAILURE = "2";
     private String mGroupName = null;
-    private final static String LOGGING_SIGNED_AUDIT_CONFIG_ROLE =
-            "LOGGING_SIGNED_AUDIT_CONFIG_ROLE_3";
-
     public RegisterUser() {
         super();
     }
@@ -202,7 +200,7 @@ public class RegisterUser extends CMSServlet {
                 ugsys.addUser(user);
                 CMS.debug("RegisterUser created user " + uid);
                 auditMessage = CMS.getLogMessage(
-                              LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                              AuditEvent.CONFIG_ROLE,
                               auditSubjectID,
                               ILogger.SUCCESS,
                               auditParams);
@@ -227,7 +225,7 @@ public class RegisterUser extends CMSServlet {
                 ugsys.addUserCert(user);
                 CMS.debug("RegisterUser added user certificate");
                 auditMessage = CMS.getLogMessage(
-                              LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                              AuditEvent.CONFIG_ROLE,
                               auditSubjectID,
                               ILogger.SUCCESS,
                               auditParams);
@@ -237,7 +235,7 @@ public class RegisterUser extends CMSServlet {
         } catch (Exception eee) {
             CMS.debug("RegisterUser error " + eee.toString());
             auditMessage = CMS.getLogMessage(
-                                LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                                AuditEvent.CONFIG_ROLE,
                                 auditSubjectID,
                                 ILogger.FAILURE,
                                 auditParams);
@@ -270,7 +268,7 @@ public class RegisterUser extends CMSServlet {
                 CMS.debug("RegisterUser modified group");
 
                 auditMessage = CMS.getLogMessage(
-                               LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                               AuditEvent.CONFIG_ROLE,
                                auditSubjectID,
                                ILogger.SUCCESS,
                                auditParams);
@@ -279,7 +277,7 @@ public class RegisterUser extends CMSServlet {
             }
         } catch (Exception e) {
             auditMessage = CMS.getLogMessage(
-                               LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                               AuditEvent.CONFIG_ROLE,
                                auditSubjectID,
                                ILogger.FAILURE,
                                auditParams);
diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainProcessor.java
index 69e76fcb98ea62ce38e5150a2834f92eaa375f07..cd769db15c8c078bbffb541ddff926fc769b54f5 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainProcessor.java
@@ -90,7 +90,7 @@ public class SecurityDomainProcessor extends CAProcessor {
 
         if (!ugSubsystem.isMemberOf(user, group)) {
             String message = CMS.getLogMessage(
-                    LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                    AuditEvent.ROLE_ASSUME,
                     user,
                     ILogger.FAILURE,
                     group);
@@ -100,7 +100,7 @@ public class SecurityDomainProcessor extends CAProcessor {
         }
 
         String message = CMS.getLogMessage(
-                LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                AuditEvent.ROLE_ASSUME,
                 user,
                 ILogger.SUCCESS,
                 group);
diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
index bed43573bba884c04f465cd85baf812dccd3c793..5872ab03123ef3833347a7ee991d22cdb0a5ec27 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
@@ -63,9 +63,6 @@ public class UpdateDomainXML extends CMSServlet {
     private static final long serialVersionUID = 4059169588555717548L;
     private final static String SUCCESS = "0";
     private final static String FAILED = "1";
-    private final static String LOGGING_SIGNED_AUDIT_CONFIG_ROLE =
-            "LOGGING_SIGNED_AUDIT_CONFIG_ROLE_3";
-
     public UpdateDomainXML() {
         super();
     }
@@ -372,7 +369,7 @@ public class UpdateDomainXML extends CMSServlet {
                     status2 = remove_from_ldap(adminUserDN);
                     if (status2.equals(SUCCESS)) {
                         auditMessage = CMS.getLogMessage(
-                                               LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                                               AuditEvent.CONFIG_ROLE,
                                                auditSubjectID,
                                                ILogger.SUCCESS,
                                                userAuditParams);
@@ -388,13 +385,13 @@ public class UpdateDomainXML extends CMSServlet {
                         status2 = modify_ldap(dn, mod);
                         if (status2.equals(SUCCESS)) {
                             auditMessage = CMS.getLogMessage(
-                                                   LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                                                   AuditEvent.CONFIG_ROLE,
                                                    auditSubjectID,
                                                    ILogger.SUCCESS,
                                                    userAuditParams);
                         } else {
                             auditMessage = CMS.getLogMessage(
-                                                   LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                                                   AuditEvent.CONFIG_ROLE,
                                                    auditSubjectID,
                                                    ILogger.FAILURE,
                                                    userAuditParams);
@@ -402,7 +399,7 @@ public class UpdateDomainXML extends CMSServlet {
                         audit(auditMessage);
                     } else { // error deleting user
                         auditMessage = CMS.getLogMessage(
-                                               LOGGING_SIGNED_AUDIT_CONFIG_ROLE,
+                                               AuditEvent.CONFIG_ROLE,
                                                auditSubjectID,
                                                ILogger.FAILURE,
                                                userAuditParams);
diff --git a/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java
index 566923325833100f9d5a106a9653be7308f0f6ac..ad79cbbf0952cea922db370f865d0dd7eaa55fe3 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java
@@ -117,8 +117,6 @@ public class CAProcessor extends Processor {
     public static final String ACL_INFO = "ACLinfo";
     public static final String PROFILE_SUB_ID = "profileSubId";
 
-    public final static String LOGGING_SIGNED_AUDIT_ROLE_ASSUME =
-            "LOGGING_SIGNED_AUDIT_ROLE_ASSUME_3";
     public final static String SIGNED_AUDIT_CERT_REQUEST_REASON =
             "requestNotes";
 
@@ -731,7 +729,7 @@ public class CAProcessor extends Processor {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                        AuditEvent.ROLE_ASSUME,
                         auditSubjectID,
                         ILogger.SUCCESS,
                         auditGroupID);
@@ -748,7 +746,7 @@ public class CAProcessor extends Processor {
                 audit(auditMessage);
 
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                        AuditEvent.ROLE_ASSUME,
                         auditSubjectID,
                         ILogger.FAILURE,
                         auditGroupID);
@@ -767,7 +765,7 @@ public class CAProcessor extends Processor {
             audit(auditMessage);
 
             auditMessage = CMS.getLogMessage(
-                    LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                    AuditEvent.ROLE_ASSUME,
                     auditSubjectID,
                     ILogger.FAILURE,
                     auditGroupID);
@@ -864,7 +862,7 @@ public class CAProcessor extends Processor {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                        AuditEvent.ROLE_ASSUME,
                         auditID,
                         ILogger.SUCCESS,
                         auditGroups(auditSubjectID));
@@ -883,7 +881,7 @@ public class CAProcessor extends Processor {
 
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                        AuditEvent.ROLE_ASSUME,
                         auditID,
                         ILogger.FAILURE,
                         auditGroups(auditSubjectID));
@@ -905,7 +903,7 @@ public class CAProcessor extends Processor {
 
             // store a message in the signed audit log file
             auditMessage = CMS.getLogMessage(
-                    LOGGING_SIGNED_AUDIT_ROLE_ASSUME,
+                    AuditEvent.ROLE_ASSUME,
                     auditID,
                     ILogger.FAILURE,
                     auditGroups(auditSubjectID));
diff --git a/base/server/cms/src/org/dogtagpki/server/rest/AuditService.java b/base/server/cms/src/org/dogtagpki/server/rest/AuditService.java
index 7bb048f194a9197ba603af87f0af163d532a8b3c..2d5b371f0f0b52e452263faee6cbc765190b078e 100644
--- a/base/server/cms/src/org/dogtagpki/server/rest/AuditService.java
+++ b/base/server/cms/src/org/dogtagpki/server/rest/AuditService.java
@@ -49,6 +49,7 @@ import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.base.PKIException;
 import com.netscape.certsrv.base.ResourceNotFoundException;
 import com.netscape.certsrv.logging.AuditConfig;
+import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.AuditFile;
 import com.netscape.certsrv.logging.AuditFileCollection;
 import com.netscape.certsrv.logging.AuditResource;
@@ -412,7 +413,7 @@ public class AuditService extends SubsystemService implements AuditResource {
     public void auditTPSConfigSignedAudit(String status, Map<String, String> params) {
 
         String msg = CMS.getLogMessage(
-                "LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT_3",
+                AuditEvent.CONFIG_SIGNED_AUDIT,
                 servletRequest.getUserPrincipal().getName(),
                 status,
                 auditor.getParamString(null, params));
diff --git a/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java b/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java
index 4ee28102afe37899c6a3da7e128c7a28a1241a57..4aa0209afda5e66ada3c9e87dcca31c2f2874bc4 100644
--- a/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java
+++ b/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java
@@ -40,7 +40,7 @@ import com.netscape.certsrv.group.GroupData;
 import com.netscape.certsrv.group.GroupMemberData;
 import com.netscape.certsrv.group.GroupNotFoundException;
 import com.netscape.certsrv.group.GroupResource;
-import com.netscape.certsrv.logging.IAuditor;
+import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
 import com.netscape.certsrv.usrgrp.IGroup;
 import com.netscape.certsrv.usrgrp.IGroupConstants;
@@ -432,6 +432,6 @@ public class GroupService extends SubsystemService implements GroupResource {
     }
 
     public void audit(String type, String id, Map<String, String> params, String status) {
-        audit(IAuditor.LOGGING_SIGNED_AUDIT_CONFIG_ROLE, ScopeDef.SC_GROUPS, type, id, params, status);
+        audit(AuditEvent.CONFIG_ROLE, ScopeDef.SC_GROUPS, type, id, params, status);
     }
 }
diff --git a/base/server/cms/src/org/dogtagpki/server/rest/UserService.java b/base/server/cms/src/org/dogtagpki/server/rest/UserService.java
index eeadba5ae2d4500295e4dfa256b22ebb2c18112c..e10c4f5c1259e30c9e6fd43b4e54d4282b02f4b0 100644
--- a/base/server/cms/src/org/dogtagpki/server/rest/UserService.java
+++ b/base/server/cms/src/org/dogtagpki/server/rest/UserService.java
@@ -52,7 +52,7 @@ import com.netscape.certsrv.common.OpDef;
 import com.netscape.certsrv.common.ScopeDef;
 import com.netscape.certsrv.dbs.certdb.CertId;
 import com.netscape.certsrv.group.GroupMemberData;
-import com.netscape.certsrv.logging.IAuditor;
+import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
 import com.netscape.certsrv.password.IPasswordCheck;
 import com.netscape.certsrv.user.UserCertCollection;
@@ -1227,10 +1227,10 @@ public class UserService extends SubsystemService implements UserResource {
     }
 
     public void auditUser(String type, String id, Map<String, String> params, String status) {
-        audit(IAuditor.LOGGING_SIGNED_AUDIT_CONFIG_ROLE, ScopeDef.SC_USERS, type, id, params, status);
+        audit(AuditEvent.CONFIG_ROLE, ScopeDef.SC_USERS, type, id, params, status);
     }
 
     public void auditUserCert(String type, String id, Map<String, String> params, String status) {
-        audit(IAuditor.LOGGING_SIGNED_AUDIT_CONFIG_ROLE, ScopeDef.SC_USER_CERTS, type, id, params, status);
+        audit(AuditEvent.CONFIG_ROLE, ScopeDef.SC_USER_CERTS, type, id, params, status);
     }
 }
diff --git a/base/server/cmscore/src/com/netscape/cmscore/cert/CertUtils.java b/base/server/cmscore/src/com/netscape/cmscore/cert/CertUtils.java
index 400ad0cdb29f5af277197fcccda8cbe242b322c0..e1c4c760741bc77945e301ec6b4c66d31689dd1d 100644
--- a/base/server/cmscore/src/com/netscape/cmscore/cert/CertUtils.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/cert/CertUtils.java
@@ -41,6 +41,7 @@ import org.mozilla.jss.CryptoManager.CertificateUsage;
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.IConfigStore;
+import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
 import com.netscape.cmsutil.util.Utils;
 
@@ -84,9 +85,6 @@ public class CertUtils {
             "-----END CERTIFICATE REVOCATION LIST-----";
 
     protected static ILogger mSignedAuditLogger = CMS.getSignedAuditLogger();
-    private final static String LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION =
-            "LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION_3";
-
     /**
      * Remove the header and footer in the PKCS10 request.
      */
@@ -911,7 +909,7 @@ public class CertUtils {
             if (subsysType == null) {
                 CMS.debug("CertUtils: verifySystemCerts() invalid cs.type in CS.cfg. System certificates verification not done");
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION,
+                            AuditEvent.CIMC_CERT_VERIFICATION,
                             ILogger.SYSTEM_UID,
                             ILogger.FAILURE,
                             "");
@@ -936,7 +934,7 @@ public class CertUtils {
             verifySystemCertByNickname(nickname, certusage);
 
             auditMessage = CMS.getLogMessage(
-                    LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION,
+                    AuditEvent.CIMC_CERT_VERIFICATION,
                     ILogger.SYSTEM_UID,
                     ILogger.SUCCESS,
                         nickname);
@@ -947,7 +945,7 @@ public class CertUtils {
             CMS.debug("CertUtils: verifySystemCertsByTag() failed: " +
                     e.toString());
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION,
+                        AuditEvent.CIMC_CERT_VERIFICATION,
                         ILogger.SYSTEM_UID,
                         ILogger.FAILURE,
                         "");
@@ -1009,7 +1007,7 @@ public class CertUtils {
             if (subsysType.equals("")) {
                 CMS.debug("CertUtils: verifySystemCerts() cs.type not defined in CS.cfg. System certificates verification not done");
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION,
+                            AuditEvent.CIMC_CERT_VERIFICATION,
                             ILogger.SYSTEM_UID,
                             ILogger.FAILURE,
                             "");
@@ -1022,7 +1020,7 @@ public class CertUtils {
             if (subsysType == null) {
                 CMS.debug("CertUtils: verifySystemCerts() invalid cs.type in CS.cfg. System certificates verification not done");
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION,
+                            AuditEvent.CIMC_CERT_VERIFICATION,
                             ILogger.SYSTEM_UID,
                             ILogger.FAILURE,
                             "");
@@ -1036,7 +1034,7 @@ public class CertUtils {
                 CMS.debug("CertUtils: verifySystemCerts() "
                         + subsysType + ".cert.list not defined in CS.cfg. System certificates verification not done");
                 auditMessage = CMS.getLogMessage(
-                            LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION,
+                            AuditEvent.CIMC_CERT_VERIFICATION,
                             ILogger.SYSTEM_UID,
                             ILogger.FAILURE,
                             "");
@@ -1056,7 +1054,7 @@ public class CertUtils {
         } catch (Exception e) {
             // audit here
             auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION,
+                        AuditEvent.CIMC_CERT_VERIFICATION,
                         ILogger.SYSTEM_UID,
                         ILogger.FAILURE,
                         "");
diff --git a/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
index 4ddb42c67506c727bb52fdc6092a383f87ad22bb..95556b9c636f192485f0bcf5009a53a875839d29 100644
--- a/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
@@ -96,9 +96,6 @@ public class SelfTestSubsystem
     private static final String ELEMENT_DELIMITER = ":";
     private static final String CRITICAL = "critical";
 
-    private static final String LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION =
-            "LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION_2";
-
     /////////////////////
     // default methods //
     /////////////////////
@@ -1809,7 +1806,7 @@ public class SelfTestSubsystem
 
             // store a message in the signed audit log file
             String auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION,
+                        AuditEvent.SELFTESTS_EXECUTION,
                         ILogger.SYSTEM_UID,
                         ILogger.SUCCESS);
 
@@ -1819,7 +1816,7 @@ public class SelfTestSubsystem
 
             // store a message in the signed audit log file
             String auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION,
+                        AuditEvent.SELFTESTS_EXECUTION,
                         ILogger.SYSTEM_UID,
                         ILogger.FAILURE);
 
@@ -1832,7 +1829,7 @@ public class SelfTestSubsystem
 
             // store a message in the signed audit log file
             String auditMessage = CMS.getLogMessage(
-                        LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION,
+                        AuditEvent.SELFTESTS_EXECUTION,
                         ILogger.SYSTEM_UID,
                         ILogger.FAILURE);
 
-- 
2.9.3

