inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/DEV/mward/cifs_hazelcast_conf to HEAD:

Browse Source 
36500: ALF-13821: CIFS and WebDAV should use same Hazelcast configuration mechanism
   36507: ALF-13821: CIFS and WebDAV should use same Hazelcast configuration mechanism
   36511: ALF-13821: CIFS and WebDAV should use same Hazelcast configuration mechanism
   36519: ALF-13821: Extract hazelcastConfig, hazelcastInstanceFactory bean definitions from webdav-context.xml to cluster-context.xml
   36553: ALF-13821: CIFS and WebDAV should use same Hazelcast configuration mechanism

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@36581 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2012-05-18 18:10:02 +00:00
parent d369fffbc0
commit 9c8545f6b4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/webdav/WebDAVLockServiceImplTest.java
View File

@@ -53,7 +53,7 @@ public class WebDAVLockServiceImplTest
{
davLockService = new WebDAVLockServiceImpl();
LockStoreFactory lockStoreFactory = Mockito.mock(LockStoreFactory.class);
Mockito.when(lockStoreFactory.getLockStore()).thenReturn(lockStore);
Mockito.when(lockStoreFactory.createLockStore()).thenReturn(lockStore);
davLockService.setLockStoreFactory(lockStoreFactory);
davLockService.setNodeService(nodeService);
davLockService.setCheckOutCheckInService(cociService);