From 0fee373f87e231073ebf35876ee5c678422fb1c4 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Thu, 3 Nov 2011 16:32:33 +0000
Subject: [PATCH] ALF-8906 - IMAP : can login but not browse directories -
 Zimbra Desktop

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/bootstrap/imapSpacesLocales.acp  | Bin 8605 -> 0 bytes
 .../messages/patch-service.properties         |   2 ++
 .../messages/patch-service_de.properties      |   1 +
 .../messages/patch-service_es.properties      |   1 +
 .../messages/patch-service_fr.properties      |   1 +
 .../messages/patch-service_it.properties      |   1 +
 .../messages/patch-service_ja.properties      |   1 +
 .../messages/patch-service_nl.properties      |   1 +
 .../alfresco/patch/patch-services-context.xml |  23 ++++++------------
 9 files changed, 15 insertions(+), 16 deletions(-)
 delete mode 100644 config/alfresco/bootstrap/imapSpacesLocales.acp

diff --git a/config/alfresco/bootstrap/imapSpacesLocales.acp b/config/alfresco/bootstrap/imapSpacesLocales.acp
deleted file mode 100644
index f73532a2a03fdbe37c1390454fbe0bf83d5cac82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8605
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
Y_l@T^>W}>i>-yP^f`rsY_2bk30RJ4CJ^%m!

diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index fa2d4d9ccf..54dc3db59c 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -408,6 +408,8 @@ patch.htmlNotificationMailTemplates.description=Adds HTML email templates for no
 
 patch.imapSpacesLocaleTemplates.description=Adds content templates for IMAP clients (Non-default locales only)
 
+patch.imapSpacesLocaleTemplates2.description=Replaces content templates for IMAP clients
+
 patch.exampleJavaScript.description=Loads sample Javascript file into datadictionary scripts folder
 
 patch.fixAclInheritance.description=Fixes any ACL inheritance issues.
diff --git a/config/alfresco/messages/patch-service_de.properties b/config/alfresco/messages/patch-service_de.properties
index d1ffef4b9b..89a7b8f6fb 100755
--- a/config/alfresco/messages/patch-service_de.properties
+++ b/config/alfresco/messages/patch-service_de.properties
@@ -407,6 +407,7 @@ patch.inviteEmailTemplates.created=Email templates added: {0}
 patch.htmlNotificationMailTemplates.description=Adds HTML email templates for notifying users of new content
 
 patch.imapSpacesLocaleTemplates.description=Adds content templates for IMAP clients (Non-default locales only)
+patch.imapSpacesLocaleTemplates2.description=Replaces content templates for IMAP clients
 
 patch.exampleJavaScript.description=Loads sample Javascript file into datadictionary scripts folder
 
diff --git a/config/alfresco/messages/patch-service_es.properties b/config/alfresco/messages/patch-service_es.properties
index d1ffef4b9b..89a7b8f6fb 100755
--- a/config/alfresco/messages/patch-service_es.properties
+++ b/config/alfresco/messages/patch-service_es.properties
@@ -407,6 +407,7 @@ patch.inviteEmailTemplates.created=Email templates added: {0}
 patch.htmlNotificationMailTemplates.description=Adds HTML email templates for notifying users of new content
 
 patch.imapSpacesLocaleTemplates.description=Adds content templates for IMAP clients (Non-default locales only)
+patch.imapSpacesLocaleTemplates2.description=Replaces content templates for IMAP clients
 
 patch.exampleJavaScript.description=Loads sample Javascript file into datadictionary scripts folder
 
diff --git a/config/alfresco/messages/patch-service_fr.properties b/config/alfresco/messages/patch-service_fr.properties
index d1ffef4b9b..89a7b8f6fb 100755
--- a/config/alfresco/messages/patch-service_fr.properties
+++ b/config/alfresco/messages/patch-service_fr.properties
@@ -407,6 +407,7 @@ patch.inviteEmailTemplates.created=Email templates added: {0}
 patch.htmlNotificationMailTemplates.description=Adds HTML email templates for notifying users of new content
 
 patch.imapSpacesLocaleTemplates.description=Adds content templates for IMAP clients (Non-default locales only)
+patch.imapSpacesLocaleTemplates2.description=Replaces content templates for IMAP clients
 
 patch.exampleJavaScript.description=Loads sample Javascript file into datadictionary scripts folder
 
diff --git a/config/alfresco/messages/patch-service_it.properties b/config/alfresco/messages/patch-service_it.properties
index d1ffef4b9b..89a7b8f6fb 100755
--- a/config/alfresco/messages/patch-service_it.properties
+++ b/config/alfresco/messages/patch-service_it.properties
@@ -407,6 +407,7 @@ patch.inviteEmailTemplates.created=Email templates added: {0}
 patch.htmlNotificationMailTemplates.description=Adds HTML email templates for notifying users of new content
 
 patch.imapSpacesLocaleTemplates.description=Adds content templates for IMAP clients (Non-default locales only)
+patch.imapSpacesLocaleTemplates2.description=Replaces content templates for IMAP clients
 
 patch.exampleJavaScript.description=Loads sample Javascript file into datadictionary scripts folder
 
diff --git a/config/alfresco/messages/patch-service_ja.properties b/config/alfresco/messages/patch-service_ja.properties
index d1ffef4b9b..89a7b8f6fb 100755
--- a/config/alfresco/messages/patch-service_ja.properties
+++ b/config/alfresco/messages/patch-service_ja.properties
@@ -407,6 +407,7 @@ patch.inviteEmailTemplates.created=Email templates added: {0}
 patch.htmlNotificationMailTemplates.description=Adds HTML email templates for notifying users of new content
 
 patch.imapSpacesLocaleTemplates.description=Adds content templates for IMAP clients (Non-default locales only)
+patch.imapSpacesLocaleTemplates2.description=Replaces content templates for IMAP clients
 
 patch.exampleJavaScript.description=Loads sample Javascript file into datadictionary scripts folder
 
diff --git a/config/alfresco/messages/patch-service_nl.properties b/config/alfresco/messages/patch-service_nl.properties
index d1ffef4b9b..89a7b8f6fb 100755
--- a/config/alfresco/messages/patch-service_nl.properties
+++ b/config/alfresco/messages/patch-service_nl.properties
@@ -407,6 +407,7 @@ patch.inviteEmailTemplates.created=Email templates added: {0}
 patch.htmlNotificationMailTemplates.description=Adds HTML email templates for notifying users of new content
 
 patch.imapSpacesLocaleTemplates.description=Adds content templates for IMAP clients (Non-default locales only)
+patch.imapSpacesLocaleTemplates2.description=Replaces content templates for IMAP clients
 
 patch.exampleJavaScript.description=Loads sample Javascript file into datadictionary scripts folder
 
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 1dfb452453..8ac210cbb7 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -2717,22 +2717,13 @@
         </property>
     </bean>
     
-    <bean id="patch.imapSpacesLocaleTemplates" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
+    <!-- Used to bootstrap imapSpacesLocales Prior to share/alfresco split of 3.5  -->
+    <bean id="patch.imapSpacesLocaleTemplates" class="org.alfresco.repo.admin.patch.impl.NoOpPatch" parent="basePatch">
         <property name="id"><value>patch.imapSpacesLocaleTemplates</value></property>
-        <property name="description"><value>patch.imapSpacesLocaleTemplates.description</value></property>
+        <property name="description"><value>patch.noOpPatch.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
-        <property name="fixesToSchema"><value>5005</value></property>
-        <property name="targetSchema"><value>5006</value></property>
-        <property name="importerBootstrap">
-            <ref bean="spacesBootstrap" />
-        </property>
-        <property name="bootstrapView">
-            <props>
-                <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.imapConfig.childname}/${spaces.imap_templates.childname}</prop>
-                <prop key="location">alfresco/bootstrap/imapSpacesLocales.acp</prop>
-                <prop key="messages">alfresco/messages/bootstrap-spaces</prop>
-            </props>
-        </property>
+        <property name="fixesToSchema"><value>4302</value></property>
+        <property name="targetSchema"><value>4305</value></property>
     </bean>
     
     <!-- For importing whole sites -->
@@ -2859,8 +2850,8 @@
     </bean> 
     
     <bean id="patch.imapSpacesTemplates2" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
-        <property name="id"><value>patch.imapSpacesLocaleTemplates</value></property>
-        <property name="description"><value>patch.imapSpacesLocaleTemplates.description</value></property>
+        <property name="id"><value>patch.imapSpacesTemplates2</value></property>
+        <property name="description"><value>patch.imapSpacesLocaleTemplates2.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
         <property name="fixesToSchema"><value>5005</value></property>
         <property name="targetSchema"><value>5006</value></property>