You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2017/01/11 16:45:49 UTC
[22/22] james-project git commit: Merge remote-tracking branch
'benoit/JAMES-1894'
Merge remote-tracking branch 'benoit/JAMES-1894'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a82724a4
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a82724a4
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a82724a4
Branch: refs/heads/master
Commit: a82724a4509b7b1ff6a45f7e5753c0860191eb42
Parents: ed02e92 941a703
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Wed Jan 11 17:44:45 2017 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Wed Jan 11 17:44:45 2017 +0100
----------------------------------------------------------------------
.../apache/james/mailbox/MailboxManager.java | 7 +-
.../apache/james/mailbox/model/SearchQuery.java | 958 ++++++-------------
mailbox/elasticsearch/pom.xml | 4 +-
.../mailbox/elasticsearch/IndexAttachments.java | 3 +-
.../elasticsearch/NodeMappingFactory.java | 6 +-
...lasticSearchListeningMessageSearchIndex.java | 23 +-
.../elasticsearch/json/IndexableMessage.java | 53 +-
.../json/IndexableMessageWithMessageId.java | 72 ++
.../json/JsonMessageConstants.java | 3 +-
.../json/MessageToElasticSearchJson.java | 27 +-
.../elasticsearch/query/CriterionConverter.java | 2 +-
.../elasticsearch/query/SortConverter.java | 6 +-
.../search/ElasticSearchSearcher.java | 63 +-
.../ElasticSearchIntegrationTest.java | 8 +-
...hListeningMailboxMessageSearchIndexTest.java | 40 +-
.../json/IndexableMessageTest.java | 23 +
.../MailboxMessageToElasticSearchJsonTest.java | 49 +-
.../src/test/resources/logback-test.xml | 25 +
.../lucene/search/LuceneMessageSearchIndex.java | 96 +-
.../META-INF/spring/mailbox-index-lucene.xml | 2 +
.../LuceneMailboxMessageSearchIndexTest.java | 69 +-
.../search/LuceneMessageSearchIndexTest.java | 6 +-
.../META-INF/spring/mailbox-index-lucene.xml | 3 +
.../mailbox/store/StoreMailboxManager.java | 9 +-
.../store/search/LazyMessageSearchIndex.java | 5 +-
.../store/search/MessageSearchIndex.java | 36 +-
.../mailbox/store/search/MessageSearches.java | 43 +-
.../store/search/SimpleMessageSearchIndex.java | 77 +-
.../comparator/BaseSubjectComparator.java | 17 +-
.../search/comparator/CombinedComparator.java | 118 ++-
.../comparator/HeaderDisplayComparator.java | 31 +-
.../comparator/HeaderMailboxComparator.java | 45 +-
.../comparator/InternalDateComparator.java | 14 +-
.../search/comparator/MessageIdComparator.java | 35 +
.../search/comparator/ReverseComparator.java | 18 +-
.../search/comparator/SentDateComparator.java | 23 +-
.../store/search/comparator/SizeComparator.java | 15 +-
.../store/search/comparator/UidComparator.java | 14 +-
.../james/mailbox/store/MessageBuilder.java | 7 +-
.../search/AbstractMessageSearchIndexTest.java | 268 +++---
.../store/search/CombinedComparatorTest.java | 132 +++
.../store/src/test/resources/eml/htmlMail.json | 3 +-
mailbox/store/src/test/resources/eml/mail.json | 3 +-
.../src/test/resources/eml/nonTextual.json | 3 +-
.../src/test/resources/eml/pgpSignedMail.json | 3 +-
.../src/test/resources/eml/recursiveMail.json | 3 +-
.../eml/recursiveMailWithoutAttachments.json | 3 +-
.../store/src/test/resources/eml/spamMail.json | 3 +-
.../host/ElasticSearchHostSystem.java | 11 +-
.../host/LuceneSearchHostSystem.java | 7 +-
.../base/MailboxEventAnalyserTest.java | 2 +-
.../integration/GetMessageListMethodTest.java | 95 +-
.../jmap/methods/GetMessageListMethod.java | 86 +-
.../apache/james/jmap/utils/SortConverter.java | 83 ++
.../jmap/utils/SortToComparatorConvertor.java | 85 --
.../FirstUserConnectionFilterThreadTest.java | 6 +-
.../james/jmap/utils/SortConverterTest.java | 114 +++
.../utils/SortToComparatorConvertorTest.java | 146 ---
58 files changed, 1562 insertions(+), 1549 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org