Merge remote-tracking branch 'quynhn/MAILBOX-270'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2e8efa38 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2e8efa38 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2e8efa38 Branch: refs/heads/master Commit: 2e8efa38450d82f63aec1c2d47760191a8f0d925 Parents: aec24c4 5fb155a Author: Antoine Duprat <[email protected]> Authored: Thu Nov 10 08:33:57 2016 +0100 Committer: Antoine Duprat <[email protected]> Committed: Thu Nov 10 08:33:57 2016 +0100 ---------------------------------------------------------------------- .../destination/conf/META-INF/persistence.xml | 1 + .../apache/james/mailbox/MailboxManager.java | 3 +- .../mailbox/exception/AnnotationException.java | 34 +++++++++++ .../james/mailbox/model/MailboxAnnotation.java | 1 - .../james/mailbox/model/MailboxConstants.java | 6 ++ .../james/mailbox/MailboxManagerTest.java | 61 +++++++++++++++++--- .../cassandra/CassandraMailboxManager.java | 8 +++ .../mail/CassandraAnnotationMapper.java | 22 ++++++- .../cassandra/CassandraMailboxManagerTest.java | 13 ++++- .../mailbox/jpa/mail/JPAAnnotationMapper.java | 31 ++++++++-- .../jpa/mail/model/JPAMailboxAnnotation.java | 6 +- .../jpa/mail/TransactionalAnnotationMapper.java | 10 ++++ .../inmemory/InMemoryMailboxManager.java | 6 ++ .../inmemory/mail/InMemoryAnnotationMapper.java | 11 ++++ .../inmemory/InMemoryMailboxManagerTest.java | 6 +- .../mailbox/store/StoreMailboxManager.java | 39 ++++++++++--- .../mailbox/store/mail/AnnotationMapper.java | 14 +++++ .../StoreMailboxManagerAnnotationTest.java | 9 ++- .../store/mail/model/AnnotationMapperTest.java | 27 +++++++++ .../james/mailbox/copier/MailboxCopierTest.java | 5 +- .../imapmailbox/suite/MailboxAnnotation.java | 17 +++++- .../core/src/main/resources/logback.xml | 4 +- .../apache/james/imap/scripts/Annotation.test | 3 +- .../imap/scripts/AnnotationWithBinaryData.test | 34 +++++++++++ .../imap/scripts/AnnotationWithLimitation.test | 45 +++++++++++++++ .../host/ElasticSearchHostSystem.java | 4 +- .../InMemoryEventAsynchronousHostSystem.java | 4 +- .../mpt/imapmailbox/jpa/host/JPAHostSystem.java | 6 +- .../imap/api/display/HumanReadableText.java | 2 + .../imap/processor/SetAnnotationProcessor.java | 4 ++ .../processor/SetAnnotationProcessorTest.java | 16 +++++ .../base/MailboxEventAnalyserTest.java | 1 - .../src/main/resources/META-INF/persistence.xml | 1 + .../apache/james/pop3server/POP3ServerTest.java | 2 +- server/src/site/xdoc/feature-protocols.xml | 14 +++++ 35 files changed, 426 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
