Author: btellier
Date: Sat Nov 28 17:09:31 2015
New Revision: 1717001
URL: http://svn.apache.org/viewvc?rev=1717001&view=rev
Log:
MAILBOX-257 Add Spring configuration for re indexer
Added:
james/project/trunk/mailbox/tool/src/main/resources/
james/project/trunk/mailbox/tool/src/main/resources/META-INF/
james/project/trunk/mailbox/tool/src/main/resources/META-INF/spring/
james/project/trunk/mailbox/tool/src/main/resources/META-INF/spring/mailbox-tools.xml
Modified:
james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java
james/project/trunk/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
Added:
james/project/trunk/mailbox/tool/src/main/resources/META-INF/spring/mailbox-tools.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/tool/src/main/resources/META-INF/spring/mailbox-tools.xml?rev=1717001&view=auto
==============================================================================
---
james/project/trunk/mailbox/tool/src/main/resources/META-INF/spring/mailbox-tools.xml
(added)
+++
james/project/trunk/mailbox/tool/src/main/resources/META-INF/spring/mailbox-tools.xml
Sat Nov 28 17:09:31 2015
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
+
+ <bean id ="reindexer-impl"
class="org.apache.james.mailbox.indexer.ReIndexerImpl" lazy-init="true">
+ <constructor-arg index="0" ref="mailboxmanager"/>
+ <constructor-arg index="1" ref="indexer"/>
+ <constructor-arg index="2" ref="messageMapperFactory"/>
+ </bean>
+
+ <bean id ="fake-reindexer"
class="org.apache.james.mailbox.indexer.ThrowsReIndexer" lazy-init="true"/>
+
+</beans>
Modified:
james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java?rev=1717001&r1=1717000&r2=1717001&view=diff
==============================================================================
---
james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java
(original)
+++
james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java
Sat Nov 28 17:09:31 2015
@@ -49,15 +49,19 @@ public class IndexerConfigurationBeanFac
BeanDefinitionRegistry registry = (BeanDefinitionRegistry)
beanFactory;
String indexer = null;
+ String reIndexer = null;
if (provider.equalsIgnoreCase("lazyIndex")) {
indexer = "lazyIndex";
+ reIndexer = "fake-reindexer";
} else if (provider.equalsIgnoreCase("elasticsearch")) {
indexer = "elasticsearch-listener";
+ reIndexer = "reindexer-impl";
}
if (indexer == null)
throw new ConfigurationException("Indexer provider " +
provider + " not supported!");
registry.registerAlias(indexer, "indexer");
+ registry.registerAlias(reIndexer, "reindexer");
} catch (ConfigurationException e) {
throw new FatalBeanException("Unable to config the indexer", e);
Modified:
james/project/trunk/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml?rev=1717001&r1=1717000&r2=1717001&view=diff
==============================================================================
---
james/project/trunk/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
(original)
+++
james/project/trunk/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
Sat Nov 28 17:09:31 2015
@@ -258,6 +258,8 @@
</property>
</bean>
+ <import resource="classpath:META-INF/spring/mailbox-tools.xml"/>
+
<bean id="usersrepositorymanagement"
class="org.apache.james.user.lib.UsersRepositoryManagement"/>
<bean id="recipientrewritetablemanagement"
class="org.apache.james.rrt.lib.RecipientRewriteTableManagement"/>
<bean id="domainlistmanagement"
class="org.apache.james.domainlist.lib.DomainListManagement"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
