From e4b1be9f4346f1cb4f8e076fb4a12ba966829af5 Mon Sep 17 00:00:00 2001
From: Matt Ward <matt.ward@alfresco.com>
Date: Thu, 4 Jul 2013 16:33:18 +0000
Subject: [PATCH] CLOUD-1841: Cloud2 is missing some hazelcast clustering
 pieces

Hazelcast map "webdav-locks" is now present again, the clustered LockStoreFactory bean definition now overrides the non-clustered bean definition, as it should.




git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@52153 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/cache-context.xml  | 6 ++++++
 config/alfresco/webdav-context.xml | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/alfresco/cache-context.xml b/config/alfresco/cache-context.xml
index ca93c2c3c0..dbcbe10726 100644
--- a/config/alfresco/cache-context.xml
+++ b/config/alfresco/cache-context.xml
@@ -6,6 +6,12 @@
    are defined in tx-cache-context.xml
 -->
 <beans>
+   <!--
+    TEMP: This doesn't strictly belong here, but must be loaded before the enterprise/cluster/cluster-context.xml
+    file is imported (so that it overrides this bean correctly.
+    -->
+   <bean id="webdavLockStoreFactory" class="org.alfresco.repo.webdav.SimpleLockStoreFactory"/>
+
    <!-- ===================================== -->
    <!-- Property Values Cache                 -->
    <!-- ===================================== -->
diff --git a/config/alfresco/webdav-context.xml b/config/alfresco/webdav-context.xml
index 3a721d3fac..a418000cc3 100644
--- a/config/alfresco/webdav-context.xml
+++ b/config/alfresco/webdav-context.xml
@@ -24,8 +24,6 @@
         <property name="enabled"><value>${system.webdav.servlet.enabled}</value></property>
         <property name="activitiesEnabled" value="${system.webdav.activities.enabled}"/>
     </bean>
-    
-    <bean id="webdavLockStoreFactory" class="org.alfresco.repo.webdav.SimpleLockStoreFactory"/>
 
     <!-- Configure remote-api source related beans in remote-api-context.xml to ensure no dependency problems -->
 </beans>
\ No newline at end of file