From af972bfae0af95d065b87eca72191f2f5b8e4ba1 Mon Sep 17 00:00:00 2001 From: Craig Tan Date: Thu, 12 Sep 2013 02:42:14 +0000 Subject: [PATCH] RM-947 Remove unwanted properties from being audited for the 'Updated Metadata' event in RM - Just tidied things up a little. Added the following override so that by default it is audited immediately and the audit entry isn't removed. This means a lot of the calling clients don't need to understand or define the last two properties. @Override public void auditEvent(NodeRef nodeRef, String eventName, Map before, Map after) { auditEvent(nodeRef, eventName, before, after, true, false); } git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@55256 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../audit/RecordsManagementAuditService.java | 2 +- .../audit/RecordsManagementAuditServiceImpl.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditService.java index 2619299e26..9013e91b35 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditService.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditService.java @@ -75,7 +75,7 @@ public interface RecordsManagementAuditService extends RecordsManagementAuditSer String eventName); /** - * Audits an event, assumes that the event should not be audited immediately and not be removed if no property is changed. + * Audits an event, assumes that the event should be audited immediately and not be removed if no property is changed. * * @param nodeRef node reference * @param eventName event name diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java index 0f80f5c1ab..ad8ce084c9 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java @@ -359,7 +359,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean logger.info("Started Records Management auditing"); } - auditEvent(filePlan, AUDIT_EVENT_START, null, null, true, false); + auditEvent(filePlan, AUDIT_EVENT_START, null, null); } /** @@ -370,7 +370,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean ParameterCheck.mandatory("filePlan", filePlan); // TODO use file plan to scope audit log - auditEvent(filePlan, AUDIT_EVENT_STOP, null, null, true, false); + auditEvent(filePlan, AUDIT_EVENT_STOP, null, null); auditService.disableAudit( RM_AUDIT_APPLICATION_NAME, @@ -397,7 +397,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean logger.debug("Records Management audit log has been cleared"); } - auditEvent(filePlan, AUDIT_EVENT_CLEAR, null, null, true, false); + auditEvent(filePlan, AUDIT_EVENT_CLEAR, null, null); } /** @@ -440,7 +440,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean @Override public void auditEvent(NodeRef nodeRef, String eventName, Map before, Map after) { - auditEvent(nodeRef, eventName, before, after, false, false); + auditEvent(nodeRef, eventName, before, after, true, false); } /** @@ -984,7 +984,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean // grab the default file plan, but don't fail if it can't be found! nodeRef = filePlanService.getFilePlanBySiteId(FilePlanService.DEFAULT_RM_SITE_ID); } - auditEvent(nodeRef, AUDIT_EVENT_VIEW, null, null, true, false); + auditEvent(nodeRef, AUDIT_EVENT_VIEW, null, null); } /**