Make sure archivalID is passed through archival

There was some confusion in the previous commit for archival
logging.  The archivalID is the id provided by the CA for the archival
and is its requestID.  This allows the cert request operation
to be tracked through the archival.

Made sure therefore, that we have two fields - one for the archivalID
and one for the requestId (which is the KRA archival request ID)

In addition, some of the archival events occur in the CA component
just before the request id sent to the KRA.  These events will not
be displayed unless the audit event is added to the CA CS.cfg.

Change-Id: I3904d42ae677d5916385e0120f0e25311b4d9d08

2 files changed, 4 insertions, 14 deletions

diff --git a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataArchivalEvent.java b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataArchivalEvent.java
index 43f752507..adc8d5bd8 100644
--- a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataArchivalEvent.java
+++ b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataArchivalEvent.java
@@ -30,6 +30,7 @@ public class SecurityDataArchivalEvent extends AuditEvent {
     public SecurityDataArchivalEvent(
             String subjectID,
             String outcome,
+            String archivalID,
             RequestId requestID,
             String clientKeyID) {
 
@@ -38,22 +39,9 @@ public class SecurityDataArchivalEvent extends AuditEvent {
         setParameters(new Object[] {
                 subjectID,
                 outcome,
+                archivalID,
                 requestID,
                 clientKeyID
         });
     }
-
-    public SecurityDataArchivalEvent(
-            String subjectID,
-            String outcome,
-            String requestID) {
-        super(LOGGING_PROPERTY);
-
-        setParameters(new Object[] {
-                subjectID,
-                outcome,
-                requestID,
-                null
-        });
-    }
 }
\ No newline at end of file
diff --git a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataArchivalProcessedEvent.java b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataArchivalProcessedEvent.java
index eb4f6b302..0ec21ae7f 100644
--- a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataArchivalProcessedEvent.java
+++ b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataArchivalProcessedEvent.java
@@ -30,6 +30,7 @@ public class SecurityDataArchivalProcessedEvent extends AuditEvent {
     public SecurityDataArchivalProcessedEvent(
             String subjectID,
             String outcome,
+            String archivalRequestId,
             RequestId requestID,
             String clientKeyID,
             KeyId keyID,
@@ -41,6 +42,7 @@ public class SecurityDataArchivalProcessedEvent extends AuditEvent {
         setParameters(new Object[] {
                 subjectID,
                 outcome,
+                archivalRequestId,
                 requestID,
                 clientKeyID,
                 keyID,