From cef32a5a6a276174ff9a8adad581926f331d42ab Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Thu, 22 May 2014 11:00:47 +0000
Subject: [PATCH] RM-1510 (Audit events are incorrectly displayed)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@71570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../messages/audit-service.properties         | 10 +--
 .../rm-audit-context.xml                      | 62 +++++++++----------
 .../AuditableActionExecuterAbstractBase.java  |  4 +-
 ...yAuditEvent.java => CopyToAuditEvent.java} |  2 +-
 ...eAuditEvent.java => FileToAuditEvent.java} |  8 +--
 ...kAuditEvent.java => LinkToAuditEvent.java} |  4 +-
 ...eAuditEvent.java => MoveToAuditEvent.java} |  8 +--
 7 files changed, 49 insertions(+), 49 deletions(-)
 rename rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/{CopyAuditEvent.java => CopyToAuditEvent.java} (93%)
 rename rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/{FileAuditEvent.java => FileToAuditEvent.java} (92%)
 rename rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/{LinkAuditEvent.java => LinkToAuditEvent.java} (91%)
 rename rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/{MoveAuditEvent.java => MoveToAuditEvent.java} (91%)

diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/audit-service.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/audit-service.properties
index df52099db3..1782d2d875 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/audit-service.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/audit-service.properties
@@ -1,13 +1,13 @@
 rm.audit.updated-metadata=Updated Metadata
 rm.audit.created-object=Created Object
-rm.audit.delte-object=Delete Object
+rm.audit.delete-object=Delete Object
 rm.audit.login-succeeded=Login Succeeded
 rm.audit.login-failed=Login Failed
 rm.audit.create-person=Create Person
-rm.audit.link=Link
-rm.audit.move=Move
-rm.audit.copy=Copy
-rm.audit.file=File
+rm.audit.linkTo=LinkTo
+rm.audit.moveTo=MoveTo
+rm.audit.copyTo=CopyTo
+rm.audit.fileTo=FileTo
 rm.audit.audit-start=Audit Start
 rm.audit.audit-stop=Audit Stop
 rm.audit.audit-clear=Audit Clear
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-audit-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-audit-context.xml
index 2624de2910..32530d7d69 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-audit-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-audit-context.xml
@@ -4,7 +4,7 @@
 <beans>
 
    <!-- audit extractors -->
-   
+
    <bean id="org_alfresco_module_rm_userRolesExtractor" class="org.alfresco.module.org_alfresco_module_rm.audit.extractor.AuthenticatedUserRolesDataExtractor">
       <property name="registry" ref="auditModel.extractorRegistry" />
       <property name="nodeService" ref="nodeService" />
@@ -28,61 +28,61 @@
       <property name="registry" ref="auditModel.extractorRegistry" />
       <property name="nodeService" ref="nodeService" />
    </bean>
-   
+
    <!-- audit events -->
-   
+
    <bean id="audit-event" abstract="true" init-method="init">
       <property name="recordsManagementAuditService" ref="recordsManagementAuditService"/>
-   </bean> 
-   
+   </bean>
+
    <bean id="audit-event.create-object" parent="audit-event" class="org.alfresco.module.org_alfresco_module_rm.audit.event.CreateObjectAuditEvent">
       <property name="name" value="Create RM Object"/>
       <property name="label" value="rm.audit.created-object"/>
    </bean>
-   
+
    <bean id="audit-event.update-object" parent="audit-event" class="org.alfresco.module.org_alfresco_module_rm.audit.event.UpdateObjectAuditEvent">
       <property name="name" value="Update RM Object"/>
       <property name="label" value="rm.audit.updated-metadata"/>
    </bean>
-   
+
    <bean id="audit-event.delete-object" parent="audit-event" class="org.alfresco.module.org_alfresco_module_rm.audit.event.DeleteObjectAuditEvent">
       <property name="name" value="Delete RM Object"/>
-      <property name="label" value="rm.audit.delte-object"/>
+      <property name="label" value="rm.audit.delete-object"/>
    </bean>
-   
+
    <bean id="audit-event.create-person" parent="audit-event" class="org.alfresco.module.org_alfresco_module_rm.audit.event.CreatePersonAuditEvent">
       <property name="name" value="Create Person"/>
       <property name="label" value="rm.audit.create-person"/>
    </bean>
-   
+
    <bean id="audit-event.login-success" parent="audit-event" class="org.alfresco.module.org_alfresco_module_rm.audit.event.AuditEvent">
       <property name="name" value="Login.Success"/>
       <property name="label" value="rm.audit.login-succeeded"/>
    </bean>
-   
+
    <bean id="audit-event.login-fail" parent="audit-event" class="org.alfresco.module.org_alfresco_module_rm.audit.event.AuditEvent">
       <property name="name" value="Login.Failure"/>
       <property name="label" value="rm.audit.login-failed"/>
    </bean>
-   
-   <bean id="audit-event.link" parent="audit-event" class="org.alfresco.module.org_alfresco_module_rm.audit.event.LinkAuditEvent">
-      <property name="name" value="link"/>
-      <property name="label" value="rm.audit.link"/>
-   </bean>
-   
-   <bean id="audit-event.move" parent="audit-event" class="org.alfresco.module.org_alfresco_module_rm.audit.event.MoveAuditEvent">
-      <property name="name" value="move"/>
-      <property name="label" value="rm.audit.move"/>
-   </bean>
-   
-   <bean id="audit-event.copy" parent="audit-event" class="org.alfresco.module.org_alfresco_module_rm.audit.event.CopyAuditEvent">
-      <property name="name" value="copy"/>
-      <property name="label" value="rm.audit.copy"/>
-   </bean>
-   
-   <bean id="audit-event.file" parent="audit-event" class="org.alfresco.module.org_alfresco_module_rm.audit.event.FileAuditEvent">
-      <property name="name" value="file"/>
-      <property name="label" value="rm.audit.file"/>
+
+   <bean id="audit-event.linkTo" parent="audit-event" class="org.alfresco.module.org_alfresco_module_rm.audit.event.LinkToAuditEvent">
+      <property name="name" value="linkTo"/>
+      <property name="label" value="rm.audit.linkTo"/>
    </bean>
 
-</beans>
\ No newline at end of file
+   <bean id="audit-event.moveTo" parent="audit-event" class="org.alfresco.module.org_alfresco_module_rm.audit.event.MoveToAuditEvent">
+      <property name="name" value="moveTo"/>
+      <property name="label" value="rm.audit.moveTo"/>
+   </bean>
+
+   <bean id="audit-event.copyTo" parent="audit-event" class="org.alfresco.module.org_alfresco_module_rm.audit.event.CopyToAuditEvent">
+      <property name="name" value="copyTo"/>
+      <property name="label" value="rm.audit.copyTo"/>
+   </bean>
+
+   <bean id="audit-event.fileTo" parent="audit-event" class="org.alfresco.module.org_alfresco_module_rm.audit.event.FileToAuditEvent">
+      <property name="name" value="fileTo"/>
+      <property name="label" value="rm.audit.fileTo"/>
+   </bean>
+
+</beans>
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 35ae6c2af1..0ecb3f8056 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
@@ -104,9 +104,9 @@ public abstract class AuditableActionExecuterAbstractBase extends ActionExecuter
                 // default to name if no title available
                 title = name;
             }
-            
+
             // register audit event
-            getAuditService().registerAuditEvent(title, name);
+            getAuditService().registerAuditEvent(name, title);
         }
     }
 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CopyAuditEvent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CopyToAuditEvent.java
similarity index 93%
rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CopyAuditEvent.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CopyToAuditEvent.java
index c3cadc56a7..d274b8625c 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CopyAuditEvent.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CopyToAuditEvent.java
@@ -34,7 +34,7 @@ import org.alfresco.service.namespace.QName;
  * @since 2.1
  */
 @BehaviourBean
-public class CopyAuditEvent extends AuditEvent implements OnCopyCompletePolicy
+public class CopyToAuditEvent extends AuditEvent implements OnCopyCompletePolicy
 {
     /**
      * Audit copy of file plan components
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/FileAuditEvent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/FileToAuditEvent.java
similarity index 92%
rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/FileAuditEvent.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/FileToAuditEvent.java
index 48a6f6e262..eb88f599bb 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/FileAuditEvent.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/FileToAuditEvent.java
@@ -30,12 +30,12 @@ import org.alfresco.service.namespace.QName;
 
 /**
  * File audit event.
- * 
+ *
  * @author Roy Wetherall
  * @since 2.1
  */
 @BehaviourBean
-public class FileAuditEvent extends AuditEvent implements OnUpdatePropertiesPolicy
+public class FileToAuditEvent extends AuditEvent implements OnUpdatePropertiesPolicy
 {
     /**
      * @see org.alfresco.repo.node.NodeServicePolicies.OnUpdatePropertiesPolicy#onUpdateProperties(org.alfresco.service.cmr.repository.NodeRef, java.util.Map, java.util.Map)
@@ -45,13 +45,13 @@ public class FileAuditEvent extends AuditEvent implements OnUpdatePropertiesPoli
     (
             kind = BehaviourKind.CLASS,
             type = "rma:record"
-    ) 
+    )
     public void onUpdateProperties(NodeRef nodeRef, Map<QName, Serializable> before, Map<QName, Serializable> after)
     {
         if (before.get(PROP_DATE_FILED) == null && after.get(PROP_DATE_FILED) != null)
         {
             // then we can assume that the record has just been filed
             recordsManagementAuditService.auditEvent(nodeRef, getName());
-        }        
+        }
     }
 }
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/LinkAuditEvent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/LinkToAuditEvent.java
similarity index 91%
rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/LinkAuditEvent.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/LinkToAuditEvent.java
index 3f2fcf00c8..2ce24a712f 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/LinkAuditEvent.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/LinkToAuditEvent.java
@@ -25,13 +25,13 @@ import org.alfresco.repo.policy.annotation.BehaviourKind;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 
 /**
- * Link audit event.
+ * Link to audit event.
  *
  * @author Roy Wetherall
  * @since 2.1
  */
 @BehaviourBean
-public class LinkAuditEvent extends AuditEvent implements OnCreateChildAssociationPolicy
+public class LinkToAuditEvent extends AuditEvent implements OnCreateChildAssociationPolicy
 {
     /**
      * @see org.alfresco.repo.node.NodeServicePolicies.OnCreateChildAssociationPolicy#onCreateChildAssociation(org.alfresco.service.cmr.repository.ChildAssociationRef, boolean)
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/MoveAuditEvent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/MoveToAuditEvent.java
similarity index 91%
rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/MoveAuditEvent.java
rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/MoveToAuditEvent.java
index 6c50dd2812..1e4904c454 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/MoveAuditEvent.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/MoveToAuditEvent.java
@@ -25,13 +25,13 @@ import org.alfresco.repo.policy.annotation.BehaviourKind;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 
 /**
- * Move audit event.
- * 
+ * Move to audit event.
+ *
  * @author Roy Wetherall
  * @since 2.1
  */
 @BehaviourBean
-public class MoveAuditEvent extends AuditEvent implements OnMoveNodePolicy
+public class MoveToAuditEvent extends AuditEvent implements OnMoveNodePolicy
 {
     /**
      * @see org.alfresco.repo.node.NodeServicePolicies.OnMoveNodePolicy#onMoveNode(org.alfresco.service.cmr.repository.ChildAssociationRef, org.alfresco.service.cmr.repository.ChildAssociationRef)
@@ -46,5 +46,5 @@ public class MoveAuditEvent extends AuditEvent implements OnMoveNodePolicy
     {
         recordsManagementAuditService.auditEvent(newChildAssocRef.getChildRef(), getName());
     }
-    
+
 }