Fix for ALF-11001 Index check is not aware of cm:indexControl:isIndexed

- also fixed index checker to respect the current live index subsytem and not the property (which may be over ridden by sub-system configuration)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32062 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2011-11-17 15:29:58 +00:00
parent 1cd461a4cb
commit 7f7224c2f5
4 changed files with 42 additions and 8 deletions

View File

@@ -28,6 +28,7 @@ import java.util.Map;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.management.subsystems.SwitchableApplicationContextFactory;
import org.alfresco.repo.model.Repository;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.ContentReader;
@@ -77,7 +78,7 @@ public class Search extends BaseScopableProcessorExtension
/** Repository helper */
protected Repository repository;
private String searchSubsystem;
private SwitchableApplicationContextFactory searchSubsystem;
/**
* Set the default store reference
@@ -114,7 +115,7 @@ public class Search extends BaseScopableProcessorExtension
this.repository = repository;
}
public void setSearchSubsystem(String searchSubsystem)
public void setSearchSubsystemSwitchableApplicationContextFactory(SwitchableApplicationContextFactory searchSubsystem)
{
this.searchSubsystem = searchSubsystem;
}
@@ -123,7 +124,7 @@ public class Search extends BaseScopableProcessorExtension
public String getSearchSubsystem()
{
return searchSubsystem;
return (searchSubsystem == null) ? "" : searchSubsystem.getCurrentSourceBeanName();
}
/**