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

MNT-17512 Minor fixes after review.

Browse Source 
Add new service method to security bean. Add early exit from audit event
finding loop. Tidy javadoc and remove some blank lines.
This commit is contained in:
Tom Page
2017-02-24 08:05:11 +00:00
parent 7dab46ad40
commit ac65ee7758
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
View File

@@ -970,6 +970,7 @@
<![CDATA[ <![CDATA[
org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.registerAuditEvent=RM_ALLOW org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.registerAuditEvent=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.auditEvent=RM_ALLOW org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.auditEvent=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.auditOrUpdateEvent=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.clearAuditLog=RM_CAP.0.rma:filePlanComponent.DeleteAudit org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.clearAuditLog=RM_CAP.0.rma:filePlanComponent.DeleteAudit
org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.getAuditTrail=RM_ALLOW org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.getAuditTrail=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.getAuditTrailFile=RM_ALLOW org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService.getAuditTrailFile=RM_ALLOW

3
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditService.java
View File

@@ -46,8 +46,6 @@ public interface RecordsManagementAuditService extends RecordsManagementAuditSer
{ {
public enum ReportFormat { HTML, JSON } public enum ReportFormat { HTML, JSON }
/** /**
* Retrieves a list of audit events. * Retrieves a list of audit events.
* *
@@ -165,7 +163,6 @@ public interface RecordsManagementAuditService extends RecordsManagementAuditSer
*/ */
void stopAuditLog(NodeRef filePlan); void stopAuditLog(NodeRef filePlan);
/** /**
* Clears the RM audit. * Clears the RM audit.
* *

6
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
View File

@@ -577,22 +577,20 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
* *
* @param nodeRef The node the event is against. * @param nodeRef The node the event is against.
* @param eventName The name of the event. * @param eventName The name of the event.
* @param auditDetails The complete set of events for the transaction.
* @return The pre-existing event node, or null if none exists. * @return The pre-existing event node, or null if none exists.
*/ */
private RMAuditNode findExistingEventNode(NodeRef nodeRef, String eventName) private RMAuditNode findExistingEventNode(NodeRef nodeRef, String eventName)
{ {
AlfrescoTransactionSupport.bindListener(txnListener); AlfrescoTransactionSupport.bindListener(txnListener);
Set<RMAuditNode> auditDetails = TransactionalResourceHelper.getSet(KEY_RM_AUDIT_NODE_RECORDS); Set<RMAuditNode> auditDetails = TransactionalResourceHelper.getSet(KEY_RM_AUDIT_NODE_RECORDS);
RMAuditNode existingEventNode = null;
for (RMAuditNode existingRMAuditNode : auditDetails) for (RMAuditNode existingRMAuditNode : auditDetails)
{ {
if (existingRMAuditNode.getNodeRef().equals(nodeRef) && existingRMAuditNode.getEventName().equals(eventName)) if (existingRMAuditNode.getNodeRef().equals(nodeRef) && existingRMAuditNode.getEventName().equals(eventName))
{ {
existingEventNode = existingRMAuditNode; return existingRMAuditNode;
} }
} }
return existingEventNode; return null;
} }
/** /**

2
rm-community/rm-community-repo/source/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImpl.java
View File

@@ -209,7 +209,7 @@ public class ExtendedPermissionServiceImpl extends PermissionServiceImpl
{ {
// post process permission // post process permission
result = postProcessor.process(result, nodeRef, perm); result = postProcessor.process(result, nodeRef, perm);
} }
return result; return result;
} }