audit the delete person event on beforeDeleteNode

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-audit-context.xml

@@ -59,7 +59,7 @@
 
    <bean id="audit-event.delete-person" parent="audit-event"
          class="org.alfresco.module.org_alfresco_module_rm.audit.event.DeletePersonAuditEvent">
-      <property name="nodeService" ref="nodeService" />
+      <!--<property name="nodeService" ref="nodeService" />-->
       <property name="name" value="Delete Person" />
       <property name="label" value="rm.audit.delete-person" />
    </bean>

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

@@ -1494,7 +1494,6 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
         {
             try
             {
-                logger.info("AUDIT ENTRY" + entry.toString());
                 JSONObject json = new JSONObject();
 
                 json.put("timestamp", entry.getTimestampString());
@@ -1515,17 +1514,6 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
                     json.put("nodeName", userName == null ? "": userName);
                     json.put("createPerson", true);
                 }
-                else if(entry.getEvent().equals("Delete Person") && entry.getNodeRef() != null)
-                {
-                    entry.getBeforeProperties().get(ContentModel.PROP_USERNAME);
-                    String userName = null;
-                    if (entry.getBeforeProperties()!= null)
-                    {
-                        userName = (String) entry.getBeforeProperties().get(ContentModel.PROP_USERNAME);;
-                    }
-                    json.put("nodeName", userName == null ? "" : userName);
-                    json.put("deletePerson", true);
-                }
                 else
                 {
                     json.put("nodeName", entry.getNodeName() == null ? "": entry.getNodeName());
@@ -1537,6 +1525,11 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
                     json.put("deleteObject", true);
                 }
 
+                if (entry.getEvent().equals("Delete Person") && entry.getNodeRef() != null)
+                {
+                    json.put("deletePerson", true);
+                }
+
                 json.put("nodeType", entry.getNodeType() == null ? "": entry.getNodeType());
                 json.put("event", entry.getEvent() == null ? "": getAuditEventLabel(entry.getEvent()));
                 json.put("identifier", entry.getIdentifier() == null ? "": entry.getIdentifier());
@@ -1579,7 +1572,6 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
                 }
 
                 json.put("changedValues", changedValues);
-                logger.info("Json valuse " + json.toString());
                 writer.write(json.toString());
             }
             catch (JSONException je)

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/DeletePersonAuditEvent.java

@@ -26,16 +26,11 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.audit.event;
 
-import java.io.Serializable;
-import java.util.Map;
-
 import org.alfresco.repo.node.NodeServicePolicies.BeforeDeleteNodePolicy;
 import org.alfresco.repo.policy.annotation.Behaviour;
 import org.alfresco.repo.policy.annotation.BehaviourBean;
 import org.alfresco.repo.policy.annotation.BehaviourKind;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.namespace.QName;
 
 /**
  * Audits person deletion.
@@ -46,16 +41,14 @@ import org.alfresco.service.namespace.QName;
 @BehaviourBean
 public class DeletePersonAuditEvent extends AuditEvent implements BeforeDeleteNodePolicy
 {
-
+/*
     private NodeService nodeService;
 
-    /**
-     * @param nodeService
-     */
     public void setNodeService(NodeService nodeService)
     {
         this.nodeService = nodeService;
     }
+    */
     /**
      * @see org.alfresco.repo.node.NodeServicePolicies.BeforeDeleteNodePolicy#(org.alfresco.service.cmr.repository.ChildAssociationRef)
      */
@@ -69,8 +62,8 @@ public class DeletePersonAuditEvent extends AuditEvent implements BeforeDeleteNo
     public void beforeDeleteNode(NodeRef nodeRef)
     {
         //audit the property values before the delete event
-        Map<QName, Serializable> before = nodeService.getProperties(nodeRef);
+       // Map<QName, Serializable> before = nodeService.getProperties(nodeRef);
-        recordsManagementAuditService.auditEvent(nodeRef, getName(), before, null, true, false);
+        recordsManagementAuditService.auditEvent(nodeRef, getName(), null, null, true, false);
     }