mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Fixed merge issue in ContentDiskDriverTest
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@27951 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -115,8 +115,8 @@ public class ContentDiskDriverTest extends TestCase
|
|||||||
applicationContext = ApplicationContextHelper.getApplicationContext();
|
applicationContext = ApplicationContextHelper.getApplicationContext();
|
||||||
repositoryHelper = (Repository)this.applicationContext.getBean("repositoryHelper");
|
repositoryHelper = (Repository)this.applicationContext.getBean("repositoryHelper");
|
||||||
ApplicationContextFactory fileServers = (ApplicationContextFactory) this.applicationContext.getBean("fileServers");
|
ApplicationContextFactory fileServers = (ApplicationContextFactory) this.applicationContext.getBean("fileServers");
|
||||||
cifsHelper = (CifsHelper) this.applicationContext.getBean("cifsHelper");
|
cifsHelper = (CifsHelper) fileServers.getApplicationContext().getBean("cifsHelper");
|
||||||
driver = (ContentDiskDriver)this.applicationContext.getBean("contentDiskDriver");
|
driver = (ContentDiskDriver) fileServers.getApplicationContext().getBean("contentDiskDriver");
|
||||||
mlAwareNodeService = (NodeService) this.applicationContext.getBean("mlAwareNodeService");
|
mlAwareNodeService = (NodeService) this.applicationContext.getBean("mlAwareNodeService");
|
||||||
nodeService = (NodeService)applicationContext.getBean("nodeService");
|
nodeService = (NodeService)applicationContext.getBean("nodeService");
|
||||||
transactionService = (TransactionService)applicationContext.getBean("transactionService");
|
transactionService = (TransactionService)applicationContext.getBean("transactionService");
|
||||||
|
Reference in New Issue
Block a user