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

ALF-19782 "4.2 Enterprise can not be started using noindex search subsystem" : fix fallout from public api merge

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54367 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Steven Glover
2013-08-21 15:32:34 +00:00
parent a41cd0200f
commit f1c5dd8372
4 changed files with 1 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
config/alfresco/subsystems/Search/common-opencmis-context.xml
View File

@@ -23,26 +23,6 @@
<value>${solr.query.cmis.queryConsistency}</value> <value>${solr.query.cmis.queryConsistency}</value>
</property> </property>
</bean> </bean>
<bean id="search.cmis.alfresco.switching1.1" class="org.alfresco.repo.search.impl.solr.DbOrIndexSwitchingQueryLanguage" >
<property name="factories">
<list>
<ref bean="search.indexerAndSearcherFactory" />
</list>
</property>
<property name="name">
<value>cmis-alfresco</value>
</property>
<property name="dbQueryLanguage">
<ref bean="search.cmis.alfresco.db1.1" />
</property>
<property name="indexQueryLanguage">
<ref bean="search.cmis.alfresco.index1.1" />
</property>
<property name="queryConsistency">
<value>${solr.query.cmis.queryConsistency}</value>
</property>
</bean>
<bean id="search.cmis.strict.switching" class="org.alfresco.repo.search.impl.solr.DbOrIndexSwitchingQueryLanguage" > <bean id="search.cmis.strict.switching" class="org.alfresco.repo.search.impl.solr.DbOrIndexSwitchingQueryLanguage" >
<property name="factories"> <property name="factories">
@@ -63,26 +43,6 @@
<value>${solr.query.cmis.queryConsistency}</value> <value>${solr.query.cmis.queryConsistency}</value>
</property> </property>
</bean> </bean>
<bean id="search.cmis.strict.switching1.1" class="org.alfresco.repo.search.impl.solr.DbOrIndexSwitchingQueryLanguage" >
<property name="factories">
<list>
<ref bean="search.indexerAndSearcherFactory" />
</list>
</property>
<property name="name">
<value>cmis-strict</value>
</property>
<property name="dbQueryLanguage">
<ref bean="search.cmis.alfresco.db1.1" />
</property>
<property name="indexQueryLanguage">
<ref bean="search.cmis.alfresco.index1.1" />
</property>
<property name="queryConsistency">
<value>${solr.query.cmis.queryConsistency}</value>
</property>
</bean>
<bean id="search.cmis.alfresco.db" class="org.alfresco.repo.search.impl.solr.DbCmisQueryLanguage" > <bean id="search.cmis.alfresco.db" class="org.alfresco.repo.search.impl.solr.DbCmisQueryLanguage" >
<property name="factories"> <property name="factories">
@@ -100,21 +60,4 @@
<ref bean="metdataQueryIndexesCheck" /> <ref bean="metdataQueryIndexesCheck" />
</property> </property>
</bean> </bean>
<bean id="search.cmis.alfresco.db1.1" class="org.alfresco.repo.search.impl.solr.DbCmisQueryLanguage" >
<property name="factories">
<list>
<ref bean="search.indexerAndSearcherFactory" />
</list>
</property>
<property name="queryEngine">
<ref bean="search.dbQueryEngineImpl" />
</property>
<property name="cmisDictionaryService">
<ref bean="OpenCMISDictionaryService1.1" />
</property>
<property name="optionalPatchApplicationCheckBootstrapBean">
<ref bean="metdataQueryIndexesCheck" />
</property>
</bean>
</beans> </beans>

26
config/alfresco/subsystems/Search/lucene/opencmis-context.xml
View File

@@ -30,19 +30,6 @@
</list> </list>
</property> </property>
</bean> </bean>
<bean id="search.lucene.sql.cmis.strict1.1" class="org.alfresco.repo.search.impl.lucene.LuceneOpenCMISStrictSqlQueryLanguage" >
<property name="cmisQueryService">
<ref bean="search.OpenCMISQueryService1.1" />
</property>
<property name="factories">
<list>
<ref bean="search.admLuceneIndexerAndSearcherFactory" />
<ref bean="search.admLuceneUnIndexedIndexerAndSearcherFactory" />
<ref bean="search.avmLuceneIndexerAndSearcherFactory" />
</list>
</property>
</bean>
<bean id="search.cmis.alfresco.index" class="org.alfresco.repo.search.impl.lucene.LuceneOpenCMISAlfrescoSqlQueryLanguage"> <bean id="search.cmis.alfresco.index" class="org.alfresco.repo.search.impl.lucene.LuceneOpenCMISAlfrescoSqlQueryLanguage">
<property name="cmisQueryService"> <property name="cmisQueryService">
@@ -56,19 +43,6 @@
</list> </list>
</property> </property>
</bean> </bean>
<bean id="search.cmis.alfresco.index1.1" class="org.alfresco.repo.search.impl.lucene.LuceneOpenCMISAlfrescoSqlQueryLanguage">
<property name="cmisQueryService">
<ref bean="search.OpenCMISQueryService1.1" />
</property>
<property name="factories">
<list>
<ref bean="search.admLuceneIndexerAndSearcherFactory" />
<ref bean="search.admLuceneUnIndexedIndexerAndSearcherFactory" />
<ref bean="search.avmLuceneIndexerAndSearcherFactory" />
</list>
</property>
</bean>
<bean id="search.adm.luceneQueryEngine" class="org.springframework.aop.framework.ProxyFactoryBean"> <bean id="search.adm.luceneQueryEngine" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces"> <property name="proxyInterfaces">

11
config/alfresco/subsystems/Search/noindex/noindex-search-context.xml
View File

@@ -129,16 +129,5 @@
<value>solr-cmis</value> <value>solr-cmis</value>
</property> </property>
</bean> </bean>
<bean id="search.cmis.alfresco.index1.1" class="org.alfresco.repo.search.impl.solr.NoIndexQueryLanguage" >
<property name="factories">
<list>
<ref bean="search.indexerAndSearcherFactory" />
</list>
</property>
<property name="name">
<value>solr-cmis</value>
</property>
</bean>
</beans> </beans>

16
config/alfresco/subsystems/Search/solr/opencmis-context.xml
View File

@@ -30,7 +30,7 @@
<ref bean="dictionaryService" /> <ref bean="dictionaryService" />
</property> </property>
<property name="solrQueryLanguage"> <property name="solrQueryLanguage">
<ref bean="search.cmis.alfresco.switching1.1" /> <ref bean="search.cmis.alfresco.switching" />
</property> </property>
</bean> </bean>
@@ -47,18 +47,4 @@
<ref bean="search.solrQueryHTTPCLient" /> <ref bean="search.solrQueryHTTPCLient" />
</property> </property>
</bean> </bean>
<bean id="search.cmis.alfresco.index1.1" class="org.alfresco.repo.search.impl.solr.SolrQueryLanguage" >
<property name="factories">
<list>
<ref bean="search.indexerAndSearcherFactory" />
</list>
</property>
<property name="name">
<value>solr-cmis</value>
</property>
<property name="solrQueryHTTPClient">
<ref bean="search.solrQueryHTTPCLient" />
</property>
</bean>
</beans> </beans>