From db77c511967086f56512881b8c81c49e143b51dd Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Fri, 12 Oct 2012 10:16:01 +0000
Subject: [PATCH] Merged modules/recordsmanagement/BRANCHES/V2.0-BUG-FIX to
 modules/recordsmanagement/BRANCHES/V2.0    42539: RM-506 (RM Console - Audit
 - Some Audit Events are displayed incorrectly.)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.0@42567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../messages/audit-service.properties                       | 4 +++-
 .../audit/RecordsManagementAuditServiceImpl.java            | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

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 6f6d53ded6..da7353c5f0 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
@@ -31,4 +31,6 @@ rm.audit.pdf-record=Set Record As PDF A Record
 rm.audit.photo-record=Set Record As A Digital Photographic Record
 rm.audit.web-record=Set Record As A Web Record
 rm.audit.trail-file-fail=Failed to generate audit trail file.
-rm.audit.audit-report=Audit Report
\ No newline at end of file
+rm.audit.audit-report=Audit Report
+rm.audit.create-disposition-schedule=Create Disposition Schedule
+rm.audit.unfreeze=Unfreeze
\ No newline at end of file
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 70feec88db..ed279bd596 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
@@ -129,6 +129,8 @@ public class RecordsManagementAuditServiceImpl
     private static final String MSG_WEB_RECORD = "rm.audit.web-record";
     private static final String MSG_TRAIL_FILE_FAIL = "rm.audit.trail-file-fail";
     private static final String MSG_AUDIT_REPORT = "rm.audit.audit-report";
+    private static final String MSG_CREATE_DISPOSITION_SCHEDULE = "rm.audit.create-disposition-schedule";
+    private static final String MSG_UNFREEZE = "rm.audit.unfreeze";
     
     /** Logger */
     private static Log logger = LogFactory.getLog(RecordsManagementAuditServiceImpl.class);
@@ -320,6 +322,10 @@ public class RecordsManagementAuditServiceImpl
                     new AuditEvent("applyDigitalPhotographRecord", MSG_PHOTO_RECORD));
         this.auditEvents.put("applyWebRecord", 
                     new AuditEvent("applyWebRecord", MSG_WEB_RECORD));
+        this.auditEvents.put("createDispositionSchedule", 
+                    new AuditEvent("createDispositionSchedule", MSG_CREATE_DISPOSITION_SCHEDULE));
+        this.auditEvents.put("unfreeze", 
+                    new AuditEvent("unfreeze", MSG_UNFREEZE));
     }
     
     @Override