Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions

View File

@@ -40,8 +40,6 @@ public class IndexConfigurationCheckerBootstrapBean extends AbstractLifecycleBea
private IndexConfigurationChecker indexConfigurationChecker;
private RepositoryState repositoryState;
private TransactionService transactionService;
private boolean strict;
@@ -55,12 +53,11 @@ public class IndexConfigurationCheckerBootstrapBean extends AbstractLifecycleBea
{
public Object execute() throws Exception
{
// reindex
if((repositoryState == null) || (false == repositoryState.isBootstrapping()))
{
log.info("Checking/Recovering indexes ...");
check();
}
// reindex
log.info("Checking/Recovering indexes ...");
check();
return null;
}
};
@@ -130,16 +127,6 @@ public class IndexConfigurationCheckerBootstrapBean extends AbstractLifecycleBea
this.indexConfigurationChecker = indexConfigurationChecker;
}
public RepositoryState getRepositoryState()
{
return repositoryState;
}
public void setRepositoryState(RepositoryState repositoryState)
{
this.repositoryState = repositoryState;
}
public void setStrict(boolean strict)
{
this.strict = strict;