From 5923f7c593f97ee284e8f434b692df596dc3a09a Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Thu, 12 Sep 2013 06:39:52 +0000 Subject: [PATCH] RM: tweak Audit Service API git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@55260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../AuditableActionExecuterAbstractBase.java | 2 +- .../audit/RecordsManagementAuditService.java | 17 ++++++++++++++++- .../RecordsManagementAuditServiceImpl.java | 19 ++++++++++++++----- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/AuditableActionExecuterAbstractBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/AuditableActionExecuterAbstractBase.java index fe63055b3b..8dd8c19404 100755 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/AuditableActionExecuterAbstractBase.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/AuditableActionExecuterAbstractBase.java @@ -112,7 +112,7 @@ public abstract class AuditableActionExecuterAbstractBase extends ActionExecuter if (auditedImmediately == true) { // To be audited immediately before the action is executed, eg. to audit before actionedUponNodeRef gets deleted during the execution. - getAuditService().auditEvent(actionedUponNodeRef, this.getActionDefinition().getName(), null, null); + getAuditService().auditEvent(actionedUponNodeRef, this.getActionDefinition().getName(), null, null, true); } else { 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 9013e91b35..d1738e6064 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 be audited immediately and not be removed if no property is changed. + * Audits an event, assumes that the event should not be audited immediately and not be removed if no property is changed. * * @param nodeRef node reference * @param eventName event name @@ -87,6 +87,21 @@ public interface RecordsManagementAuditService extends RecordsManagementAuditSer Map before, Map after); + /** + * Audit event, assumes not to be removed if no property is changed. + * + * @param nodeRef node reference + * @param eventName event name + * @param before property values before event + * @param after property values after event + * @param immediate true if event is to be audited immediately, false otherwise + */ + void auditEvent(NodeRef nodeRef, + String eventName, + Map before, + Map after, + boolean immediate); + /** * Audit event. * 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 ad8ce084c9..41719f7aaa 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); + auditEvent(filePlan, AUDIT_EVENT_START, null, null, true); } /** @@ -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); + auditEvent(filePlan, AUDIT_EVENT_STOP, null, null, true); 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); + auditEvent(filePlan, AUDIT_EVENT_CLEAR, null, null, true); } /** @@ -440,7 +440,16 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean @Override public void auditEvent(NodeRef nodeRef, String eventName, Map before, Map after) { - auditEvent(nodeRef, eventName, before, after, true, false); + auditEvent(nodeRef, eventName, before, after, false, false); + } + + /** + * @see org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService#auditEvent(org.alfresco.service.cmr.repository.NodeRef, java.lang.String, java.util.Map, java.util.Map, boolean) + */ + @Override + public void auditEvent(NodeRef nodeRef, String eventName, Map before, Map after, boolean immediate) + { + auditEvent(nodeRef, eventName, before, after, immediate, false); } /** @@ -984,7 +993,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); + auditEvent(nodeRef, AUDIT_EVENT_VIEW, null, null, true); } /**