From d8c6cb27355684adde15b4e1376d626898efec0c Mon Sep 17 00:00:00 2001
From: Roy Wetherall <roy.wetherall@alfresco.com>
Date: Thu, 24 May 2012 08:59:33 +0000
Subject: [PATCH] RM-363: alfresco Failed to start modules: A module component
 org_alfresco_module_rm_notificationTemplate Patch failed to execute

 * tempory fix to unblock issue
 * 'proper' fix to come



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.0@36850 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../bootstrap/RMDataDictionaryBootstrap.xml   |  1 +
 .../rm-patch-context.xml                      |  1 +
 .../patch/NotificationTemplatePatch.java      | 31 ++++++++++++++++---
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/RMDataDictionaryBootstrap.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/RMDataDictionaryBootstrap.xml
index 20ffd03264..2b0850d14f 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/RMDataDictionaryBootstrap.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/RMDataDictionaryBootstrap.xml
@@ -164,6 +164,7 @@
 	                      <cm:title>record-superseded-email.ftl</cm:title>
 	                      <cm:name>record-superseded-email.ftl</cm:name>
                           <cm:lastPatchUpdate>org_alfresco_module_rm_notificationTemplatePatch</cm:lastPatchUpdate>
+                          
 	                   </view:properties>
 	               </cm:content>
                </cm:contains>
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-patch-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-patch-context.xml
index faf01ef9d4..8c0dd0e455 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-patch-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-patch-context.xml
@@ -15,6 +15,7 @@
        <property name="notificationHelper" ref="recordsManagementNotificationHelper"/>
        <property name="contentService" ref="ContentService"/>
        <property name="versionService" ref="VersionService"/>
+       <property name="auditService" ref="AuditService"/>
    </bean>
    
    <bean id="org_alfresco_module_rm_RMv2ModelPatch" 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/NotificationTemplatePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/NotificationTemplatePatch.java
index 11c49ea482..e56439965c 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/NotificationTemplatePatch.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/NotificationTemplatePatch.java
@@ -27,6 +27,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.notification.RecordsManagementNotificationHelper;
 import org.alfresco.repo.module.AbstractModuleComponent;
 import org.alfresco.repo.version.VersionModel;
+import org.alfresco.service.cmr.audit.AuditService;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -67,6 +68,9 @@ public class NotificationTemplatePatch extends AbstractModuleComponent
     /** Version service */
     private VersionService versionService;
     
+    /** Audit service */
+    private AuditService auditService;
+    
     /** Bean name */
     private String name;
     
@@ -102,6 +106,14 @@ public class NotificationTemplatePatch extends AbstractModuleComponent
         this.versionService = versionService;
     }
     
+    /**
+     * @param auditService  audit service
+     */
+    public void setAuditService(AuditService auditService)
+    {
+        this.auditService = auditService;
+    }
+    
     /**
      * @see org.alfresco.repo.module.AbstractModuleComponent#setBeanName(java.lang.String)
      */
@@ -146,6 +158,8 @@ public class NotificationTemplatePatch extends AbstractModuleComponent
         }
         else
         {
+            System.out.println(nodeService.getProperty(template, ContentModel.PROP_DESCRIPTION));
+            
             // Check to see if this template has already been updated
             String lastPatchUpdate = (String)nodeService.getProperty(template, PROP_LAST_PATCH_UPDATE);
             if (lastPatchUpdate == null || name.equals(lastPatchUpdate) == false)
@@ -162,7 +176,7 @@ public class NotificationTemplatePatch extends AbstractModuleComponent
                     
                     // Create version (before template is updated)
                     Map<String, Serializable> versionProperties = new HashMap<String, Serializable>(2);
-                    versionProperties.put(Version.PROP_DESCRIPTION, "Initial version");
+                    versionProperties.put(Version.PROP_DESCRIPTION, "Initial version");                    
                     versionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MINOR);
                     versionService.createVersion(template, versionProperties);
                 }               
@@ -171,9 +185,18 @@ public class NotificationTemplatePatch extends AbstractModuleComponent
                 InputStream is = getClass().getClassLoader().getResourceAsStream(templateUpdate);
                 ContentWriter writer = contentService.getWriter(template, ContentModel.PROP_CONTENT, true);
                 writer.putContent(is);
-                
-                // Set the last patch update property
-                nodeService.setProperty(template, PROP_LAST_PATCH_UPDATE, name);                
+                                
+                boolean enabled = auditService.isAuditEnabled();
+                auditService.setAuditEnabled(false);
+                try
+                {
+                    // Set the last patch update property
+                    nodeService.setProperty(template, PROP_LAST_PATCH_UPDATE, name);
+                }
+                finally
+                {
+                    auditService.setAuditEnabled(enabled);
+                }
             }
             else
             {