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

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

Browse Source 
78392: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75693: ACE-2149 Remove AVM/WCM - first round, based on the following Sparta commits
         08f1ff556cf3e8eb370e433b69b634026c848af1: SlimRepo: comment-out AVM schema bootstrap and wcm-services-context
            - plus associated bootstrap/startup fallout
            - note: disabling/removing WCM/AVM will be a work-in-progress due to tight code coupling :-(
         cdb78eeae53522cc2d78feb94be49d11648fa582; SlimRepo: comment-out AVM schema bootstrap and wcm-services-context
             - follow-on to fix "regenerate_renditions" fallout error (in Alfresco Explorer web client)
         33337ad4239df91b9a8dc7a00be43e55ffef5bef: SlimRepo: remove WCM/AVM - round 1 (wip)
            - removal of some of the AVM code and tests (including core impl such as AVMServiceImpl, AVMRepository, AVMSyncServiceImpl, underlying DAOs etc)
            - fix Spring config (major impact) and any obvious compile-time fallout
            - ensured repo starts and ran (some of the) repo unit tests
            - also check basic Explorer access
         47e50847bbbbdda5fd64a27c212dfbdd625cbfdb: Jenkins build/test repo - minor: disable/remove repo tests
            - disabled unused tests, removed remaining AVM* tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82537 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 11:57:51 +00:00
parent a78c593e83
commit f01f727e5e
102 changed files with 10194 additions and 36653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/test-java/org/alfresco/repo/node/index/FullIndexRecoveryComponentTest.java
View File

@@ -51,7 +51,6 @@ public class FullIndexRecoveryComponentTest extends TestCase
private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
private FullIndexRecoveryComponent indexRecoverer;
private AVMFullIndexRecoveryComponent avmIndexRecoveryComponent;
private NodeService nodeService;
private NodeRef rootNodeRef;
private TransactionService transactionService;
@@ -63,7 +62,6 @@ public class FullIndexRecoveryComponentTest extends TestCase
{
ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("lucene");
indexRecoverer = (FullIndexRecoveryComponent) luceneSubSystem.getApplicationContext().getBean("search.indexRecoveryComponent");
avmIndexRecoveryComponent = (AVMFullIndexRecoveryComponent) luceneSubSystem.getApplicationContext().getBean("search.avmIndexRecoveryComponent");
nodeService = (NodeService) ctx.getBean("nodeService");
transactionService = (TransactionService) ctx.getBean("transactionComponent");
authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
@@ -151,7 +149,6 @@ public class FullIndexRecoveryComponentTest extends TestCase
public synchronized void testReindexing() throws Exception
{
indexRecoverer.setRecoveryMode(FullIndexRecoveryComponent.RecoveryMode.FULL.name());
avmIndexRecoveryComponent.setRecoveryMode(FullIndexRecoveryComponent.RecoveryMode.FULL.name());
// reindex
Thread reindexThread = new Thread()
{
@@ -160,27 +157,16 @@ public class FullIndexRecoveryComponentTest extends TestCase
indexRecoverer.reindex();
}
};
Thread avmReindexThread = new Thread()
{
public void run()
{
avmIndexRecoveryComponent.reindex();
}
};
//reindexThread.setDaemon(true);
//avmReindexThread.setDaemon(true);
reindexThread.start();
avmReindexThread.start();
// must allow the rebuild to complete or the test after this one will fail to validate their indexes
// - as they now will be deleted.
reindexThread.join();
avmReindexThread.join();
// wait a bit and then terminate
wait(20000);
indexRecoverer.setShutdown(true);
avmIndexRecoveryComponent.setShutdown(true);
wait(20000);
}
}