JAMES-1842: JPA and Lucene, delete spring-mailbox-lucene.xml because it's no longer in use
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6b1d5430 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6b1d5430 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6b1d5430 Branch: refs/heads/master Commit: 6b1d54304f484541dc327998ac412ab6124ff0e1 Parents: 33e39c7 Author: Quynh Nguyen <[email protected]> Authored: Wed Oct 19 10:31:33 2016 +0700 Committer: Benoit Tellier <[email protected]> Committed: Wed Nov 9 16:10:06 2016 +0700 ---------------------------------------------------------------------- .../META-INF/spring/spring-mailbox.xml | 4 +- .../org/apache/james/spring-mailbox-lucene.xml | 44 -------------------- 2 files changed, 3 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/6b1d5430/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml ---------------------------------------------------------------------- diff --git a/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml b/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml index 33e557c..182d1c1 100644 --- a/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml +++ b/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml @@ -28,9 +28,11 @@ <import resource="classpath:META-INF/spring/mailbox-locker.xml"/> <!-- TODO: fix dependency issues with lucene and JCR and re-enable --> - <!--<import resource="classpath:META-INF/spring/mailbox-index-lucene.xml" />--> <import resource="classpath:META-INF/spring/mailbox-jpa.xml"/> + <import resource="classpath:META-INF/spring/mailbox-index-lucene.xml" /> +<!-- <import resource="classpath:META-INF/spring/mailbox-elasticsearch.xml"/> --> + <!-- TODO: update spring context creation to match new Jackrabbit version --> <!--<import resource="classpath:META-INF/spring/mailbox-jcr.xml" />--> http://git-wip-us.apache.org/repos/asf/james-project/blob/6b1d5430/mailbox/spring/src/test/resources/META-INF/org/apache/james/spring-mailbox-lucene.xml ---------------------------------------------------------------------- diff --git a/mailbox/spring/src/test/resources/META-INF/org/apache/james/spring-mailbox-lucene.xml b/mailbox/spring/src/test/resources/META-INF/org/apache/james/spring-mailbox-lucene.xml deleted file mode 100644 index 506b68f..0000000 --- a/mailbox/spring/src/test/resources/META-INF/org/apache/james/spring-mailbox-lucene.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?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";> - - <!-- - Mailbox Lucene - --> - - <bean id="lazyIndex" class="org.apache.james.mailbox.store.search.LazyMessageSearchIndex"> - <constructor-arg index="0" ref="luceneIndex"/> - </bean> - <bean id="luceneIndex" class="org.apache.james.mailbox.lucene.search.LuceneMessageSearchIndex"> - <constructor-arg index="0" ref="maildir-sessionMapperFactory"/> - <constructor-arg index="1" ref="ramDirectory"/> - <constructor-arg index="2" value="false"/> - <constructor-arg index="3" value="true"/> - <property name="enableSuffixMatch" value="true"/> - </bean> - <bean id="ramDirectory" class="org.apache.lucene.store.FSDirectory" factory-method="open"> - <constructor-arg index="0" value="target/var/store/lucene"/> - </bean> - -</beans> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
