inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM: tweak Audit Service API

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@55260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2013-09-12 06:39:52 +00:00
parent 19a4f06591
commit 5923f7c593
3 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/AuditableActionExecuterAbstractBase.java
View File

@@ -112,7 +112,7 @@ public abstract class AuditableActionExecuterAbstractBase extends ActionExecuter
if (auditedImmediately == true) if (auditedImmediately == true)
{ {
// To be audited immediately before the action is executed, eg. to audit before actionedUponNodeRef gets deleted during the execution. // 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 else
{ {

17
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditService.java
View File

@@ -75,7 +75,7 @@ public interface RecordsManagementAuditService extends RecordsManagementAuditSer
String eventName); 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 nodeRef node reference
* @param eventName event name * @param eventName event name
@@ -87,6 +87,21 @@ public interface RecordsManagementAuditService extends RecordsManagementAuditSer
Map<QName, Serializable> before, Map<QName, Serializable> before,
Map<QName, Serializable> after); Map<QName, Serializable> 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<QName, Serializable> before,
Map<QName, Serializable> after,
boolean immediate);
/** /**
* Audit event. * Audit event.
* *

19
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
View File

@@ -359,7 +359,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
logger.info("Started Records Management auditing"); 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); ParameterCheck.mandatory("filePlan", filePlan);
// TODO use file plan to scope audit log // 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( auditService.disableAudit(
RM_AUDIT_APPLICATION_NAME, RM_AUDIT_APPLICATION_NAME,
@@ -397,7 +397,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
logger.debug("Records Management audit log has been cleared"); 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 @Override
public void auditEvent(NodeRef nodeRef, String eventName, Map<QName, Serializable> before, Map<QName, Serializable> after) public void auditEvent(NodeRef nodeRef, String eventName, Map<QName, Serializable> before, Map<QName, Serializable> 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<QName, Serializable> before, Map<QName, Serializable> 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! // grab the default file plan, but don't fail if it can't be found!
nodeRef = filePlanService.getFilePlanBySiteId(FilePlanService.DEFAULT_RM_SITE_ID); nodeRef = filePlanService.getFilePlanBySiteId(FilePlanService.DEFAULT_RM_SITE_ID);
} }
auditEvent(nodeRef, AUDIT_EVENT_VIEW, null, null); auditEvent(nodeRef, AUDIT_EVENT_VIEW, null, null, true);
} }
/** /**