Merge remote-tracking branch 'quynhn/JPA_Lucene'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a0050bd1 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a0050bd1 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a0050bd1 Branch: refs/heads/master Commit: a0050bd113294820fbe337a23c774bed8d345e4b Parents: e37e92f 2d55c4c Author: Antoine Duprat <[email protected]> Authored: Mon Nov 14 11:53:06 2016 +0100 Committer: Antoine Duprat <[email protected]> Committed: Mon Nov 14 11:53:06 2016 +0100 ---------------------------------------------------------------------- dockerfiles/compilation/java-6/compile.sh | 4 +- .../run/spring/destination/conf/indexer.xml | 2 +- .../META-INF/spring/mailbox-cassandra.xml | 1 + .../org/apache/james/mailbox/jpa/JPAId.java | 7 + .../resources/META-INF/spring/mailbox-jpa.xml | 2 + mailbox/lucene/pom.xml | 16 -- .../META-INF/spring/mailbox-index-lucene.xml | 9 +- .../META-INF/spring/mailbox-memory.xml | 2 + .../META-INF/spring/spring-mailbox.xml | 4 +- .../org/apache/james/spring-mailbox-lucene.xml | 44 ----- .../META-INF/spring/mailbox-index-lucene.xml | 43 ++++ mailbox/src/site/xdoc/mailbox-spring.xml | 1 - .../imap/scripts/UidSearchAtomsIndexer.test | 16 +- mpt/impl/imap-mailbox/lucenesearch/pom.xml | 70 +++++++ .../lucenesearch/LuceneSearchMailboxTest.java | 74 +++++++ .../LuceneSearchMailboxTestModule.java | 42 ++++ .../host/LuceneSearchHostSystem.java | 197 +++++++++++++++++++ mpt/impl/imap-mailbox/pom.xml | 17 +- mpt/pom.xml | 11 ++ .../app/src/main/resources/indexer-template.xml | 4 +- .../app/spring/JamesAppSpringMainTest.java | 7 +- server/app/src/test/resources/events.xml | 90 +++++++++ server/app/src/test/resources/indexer.xml | 33 ++++ .../src/test/resources/managesieveserver.xml | 63 ++++++ server/app/src/test/resources/quota.xml | 53 +++++ ...erConfigurationBeanFactoryPostProcessor.java | 3 + ...oxConfigurationBeanFactoryPostProcessor.java | 5 + 27 files changed, 736 insertions(+), 84 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
