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

ACE-2092: EOL Lucene

Browse Source 
- Renamed lucene to buildonly in tests
   - TODO:
   - Add to ERROR message about upgrading to Solr

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86431 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ahmed Owian
2014-10-03 16:32:35 +00:00
parent 0254c08db9
commit b6cf2c6513
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,7 @@ public class FullIndexRecoveryComponentTest extends TestCase
public void setUp() throws Exception public void setUp() throws Exception
{ {
ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("lucene"); ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("buildonly");
indexRecoverer = (FullIndexRecoveryComponent) luceneSubSystem.getApplicationContext().getBean("search.indexRecoveryComponent"); indexRecoverer = (FullIndexRecoveryComponent) luceneSubSystem.getApplicationContext().getBean("search.indexRecoveryComponent");
nodeService = (NodeService) ctx.getBean("nodeService"); nodeService = (NodeService) ctx.getBean("nodeService");
transactionService = (TransactionService) ctx.getBean("transactionComponent"); transactionService = (TransactionService) ctx.getBean("transactionComponent");

2
source/test-java/org/alfresco/repo/node/index/IndexTransactionTrackerTest.java
View File

@@ -75,7 +75,7 @@ public class IndexTransactionTrackerTest extends TestCase
ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY); ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY);
searchService = (SearchService) ctx.getBean("searchService"); searchService = (SearchService) ctx.getBean("searchService");
nodeService = (NodeService) ctx.getBean("nodeService"); nodeService = (NodeService) ctx.getBean("nodeService");
ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("lucene"); ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("buildonly");
threadPoolExecutor = (ThreadPoolExecutor) luceneSubSystem.getApplicationContext().getBean("search.indexTrackerThreadPoolExecutor"); threadPoolExecutor = (ThreadPoolExecutor) luceneSubSystem.getApplicationContext().getBean("search.indexTrackerThreadPoolExecutor");
fileFolderService = serviceRegistry.getFileFolderService(); fileFolderService = serviceRegistry.getFileFolderService();
authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent"); authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");

2
source/test-java/org/alfresco/repo/node/index/MissingContentReindexComponentTest.java
View File

@@ -78,7 +78,7 @@ public class MissingContentReindexComponentTest extends TestCase
searchService = serviceRegistry.getSearchService(); searchService = serviceRegistry.getSearchService();
nodeService = serviceRegistry.getNodeService(); nodeService = serviceRegistry.getNodeService();
ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("lucene"); ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("buildonly");
threadPoolExecutor = (ThreadPoolExecutor) luceneSubSystem.getApplicationContext().getBean("search.indexTrackerThreadPoolExecutor"); threadPoolExecutor = (ThreadPoolExecutor) luceneSubSystem.getApplicationContext().getBean("search.indexTrackerThreadPoolExecutor");
fileFolderService = serviceRegistry.getFileFolderService(); fileFolderService = serviceRegistry.getFileFolderService();
authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent"); authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");

2
source/test-java/org/alfresco/repo/search/impl/lucene/ALF947Test.java
View File

@@ -57,7 +57,7 @@ public class ALF947Test extends TestCase
public void setUp() throws Exception public void setUp() throws Exception
{ {
this.nodeService = (NodeService) ctx.getBean("dbNodeService"); this.nodeService = (NodeService) ctx.getBean("dbNodeService");
ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("lucene"); ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("buildonly");
this.indexerAndSearcher = (LuceneIndexerAndSearcher) luceneSubSystem.getApplicationContext().getBean("search.admLuceneIndexerAndSearcherFactory"); this.indexerAndSearcher = (LuceneIndexerAndSearcher) luceneSubSystem.getApplicationContext().getBean("search.admLuceneIndexerAndSearcherFactory");
this.authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent"); this.authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
this.transactionService = (TransactionService) ctx.getBean("transactionComponent"); this.transactionService = (TransactionService) ctx.getBean("transactionComponent");

2
source/test-java/org/alfresco/repo/search/impl/lucene/LuceneIndexBackupComponentTest.java
View File

@@ -54,7 +54,7 @@ public class LuceneIndexBackupComponentTest extends TestCase
TransactionService transactionService = (TransactionService) ctx.getBean("transactionComponent"); TransactionService transactionService = (TransactionService) ctx.getBean("transactionComponent");
NodeService nodeService = (NodeService) ctx.getBean("NodeService"); NodeService nodeService = (NodeService) ctx.getBean("NodeService");
ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("lucene"); ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("buildonly");
LuceneIndexerAndSearcher factory = (LuceneIndexerAndSearcher) luceneSubSystem.getApplicationContext().getBean("search.admLuceneIndexerAndSearcherFactory"); LuceneIndexerAndSearcher factory = (LuceneIndexerAndSearcher) luceneSubSystem.getApplicationContext().getBean("search.admLuceneIndexerAndSearcherFactory");
this.authenticationComponent = (AuthenticationComponent)ctx.getBean("authenticationComponent"); this.authenticationComponent = (AuthenticationComponent)ctx.getBean("authenticationComponent");

5
source/test-java/org/alfresco/repo/tenant/MultiTDemoTest.java
View File

@@ -201,7 +201,7 @@ public class MultiTDemoTest extends TestCase
repositoryHelper = (Repository) ctx.getBean("repositoryHelper"); repositoryHelper = (Repository) ctx.getBean("repositoryHelper");
siteService = (SiteService) ctx.getBean("SiteService"); siteService = (SiteService) ctx.getBean("SiteService");
ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("lucene"); ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("buildonly");
indexRecoverer = (FullIndexRecoveryComponent) luceneSubSystem.getApplicationContext().getBean("search.indexRecoveryComponent"); indexRecoverer = (FullIndexRecoveryComponent) luceneSubSystem.getApplicationContext().getBean("search.indexRecoveryComponent");
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // authenticate as super-admin AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // authenticate as super-admin
@@ -320,6 +320,7 @@ public class MultiTDemoTest extends TestCase
// reindex // reindex
Thread reindexThread = new Thread() Thread reindexThread = new Thread()
{ {
@Override
public void run() public void run()
{ {
indexRecoverer.reindex(); indexRecoverer.reindex();
@@ -1458,7 +1459,7 @@ public class MultiTDemoTest extends TestCase
NodeRef homeFolderNodeRef = (NodeRef)nodeService.getProperty(personNodeRef, ContentModel.PROP_HOMEFOLDER); NodeRef homeFolderNodeRef = (NodeRef)nodeService.getProperty(personNodeRef, ContentModel.PROP_HOMEFOLDER);
assertFalse(homeFolderNodeRef.toString().contains(tenantDomain)); assertFalse(homeFolderNodeRef.toString().contains(tenantDomain));
Map<QName, Serializable> props = (Map<QName, Serializable>)nodeService.getProperties(personNodeRef); Map<QName, Serializable> props = nodeService.getProperties(personNodeRef);
assertFalse(props.get(ContentModel.PROP_HOMEFOLDER).toString().contains(tenantDomain)); assertFalse(props.get(ContentModel.PROP_HOMEFOLDER).toString().contains(tenantDomain));
// Test "store-identifier" property // Test "store-identifier" property