Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

59120: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59105: Fix broken tests in LockableAspectInterceptorTest.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62100 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 01:03:54 +00:00
parent 4d8e6900a7
commit 68bfd2b72e

View File

@@ -62,7 +62,7 @@ public class LockableAspectInterceptorTest
userName = AuthenticationUtil.getAdminUserName(); userName = AuthenticationUtil.getAdminUserName();
AuthenticationUtil.setFullyAuthenticatedUser(userName); AuthenticationUtil.setFullyAuthenticatedUser(userName);
nodeService = (NodeService) appCtx.getBean("NodeService"); nodeService = (NodeService) appCtx.getBean("NodeService");
rawNodeService = (NodeService) appCtx.getBean("mlAwareNodeService"); rawNodeService = (NodeService) appCtx.getBean("dbNodeService");
lockStore = (LockStore) appCtx.getBean("lockStore"); lockStore = (LockStore) appCtx.getBean("lockStore");
rootNode = nodeService.getRootNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE); rootNode = nodeService.getRootNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
interceptor = (LockableAspectInterceptor) appCtx.getBean("lockableAspectInterceptor"); interceptor = (LockableAspectInterceptor) appCtx.getBean("lockableAspectInterceptor");