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 ma...@apache.org on 2017/09/29 07:22:09 UTC

[31/31] james-project git commit: Merge branch 'MAILBOX-307'

Merge branch 'MAILBOX-307'


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a2f22af4
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a2f22af4
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a2f22af4

Branch: refs/heads/master
Commit: a2f22af4c9a53fcc45043c5c84be14a5f21e3497
Parents: 45c3dfb 3f01369
Author: Matthieu Baechler <ma...@apache.org>
Authored: Fri Sep 29 09:21:11 2017 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Fri Sep 29 09:21:11 2017 +0200

----------------------------------------------------------------------
 mailbox/api/pom.xml                             |    4 +
 .../apache/james/mailbox/MailboxManager.java    |   19 +-
 .../james/mailbox/acl/MailboxACLResolver.java   |   11 +-
 .../mailbox/acl/UnionMailboxACLResolver.java    |   94 +-
 .../exception/UnsupportedRightException.java    |    6 +-
 .../apache/james/mailbox/model/MailboxACL.java  |  771 +++++++++---
 .../james/mailbox/model/SimpleMailboxACL.java   | 1129 ------------------
 .../acl/UnionMailboxACLResolverTest.java        |  610 +++++-----
 .../mailbox/model/MailboxACLEntryKeyTest.java   |  157 +++
 .../james/mailbox/model/MailboxACLTest.java     |  227 ++++
 .../james/mailbox/model/Rfc4314RightsTest.java  |  106 +-
 .../model/SimpleMailboxACLEntryKeyTest.java     |  143 ---
 .../mailbox/model/SimpleMailboxACLTest.java     |  214 ----
 .../mailbox/caching/CachingMailboxMapper.java   |    8 +-
 .../cassandra/CassandraMailboxManager.java      |    4 +-
 .../cassandra/mail/CassandraACLMapper.java      |  170 +--
 .../cassandra/mail/CassandraMailboxDAO.java     |   43 +-
 .../cassandra/mail/CassandraMailboxMapper.java  |   56 +-
 .../cassandra/mail/CassandraACLMapperTest.java  |  136 ++-
 .../mail/CassandraMailboxMapperAclTest.java     |   79 ++
 .../mailbox/hbase/HBaseMailboxManager.java      |   18 +-
 .../mailbox/hbase/mail/HBaseMailboxMapper.java  |    7 +-
 .../mailbox/hbase/mail/model/HBaseMailbox.java  |    3 +-
 .../mailbox/jcr/mail/JCRMailboxMapper.java      |    7 +-
 .../mailbox/jcr/mail/model/JCRMailbox.java      |    3 +-
 .../james/mailbox/jpa/JPAMailboxManager.java    |   14 +-
 .../mailbox/jpa/mail/JPAMailboxMapper.java      |    7 +-
 .../mailbox/jpa/mail/model/JPAMailbox.java      |    3 +-
 .../jpa/mail/TransactionalAnnotationMapper.java |   15 +-
 .../jpa/mail/TransactionalMailboxMapper.java    |   21 +-
 .../jpa/mail/TransactionalMessageMapper.java    |   11 +-
 .../LuceneMailboxMessageSearchIndexTest.java    |    3 +-
 .../james/mailbox/maildir/MaildirFolder.java    |   17 +-
 .../maildir/mail/MaildirMailboxMapper.java      |    9 +-
 .../inmemory/mail/InMemoryMailboxMapper.java    |    9 +-
 .../inmemory/mail/InMemoryMapperProvider.java   |    3 +-
 .../mail/MemoryMailboxMapperAclTest.java        |   37 +
 .../mailbox/store/StoreMailboxManager.java      |  133 +--
 .../mailbox/store/StoreMessageManager.java      |    7 +-
 .../mailbox/store/StoreSubscriptionManager.java |   30 +-
 .../store/json/MailboxACLJsonConverter.java     |   64 +
 .../json/SimpleMailboxACLJsonConverter.java     |   67 --
 .../store/json/event/MailboxConverter.java      |    6 +-
 .../james/mailbox/store/mail/MailboxMapper.java |   10 +-
 .../store/mail/model/impl/SimpleMailbox.java    |    4 +-
 .../james/mailbox/store/transaction/Mapper.java |   18 +-
 .../store/TestMailboxSessionMapperFactory.java  |    7 +-
 .../store/json/MailboxACLJsonConverterTest.java |  139 +++
 .../json/SimpleMailboxACLJsonConverterTest.java |  128 --
 .../store/mail/model/ListMailboxAssertTest.java |    2 +-
 .../store/mail/model/MailboxMapperACLTest.java  |  293 +++++
 .../store/mail/model/MapperProvider.java        |    3 +-
 .../mpt/imapmailbox/GrantRightsOnHost.java      |    2 +-
 .../mpt/imapmailbox/suite/ACLCommands.java      |    5 +-
 .../mpt/imapmailbox/suite/ACLIntegration.java   |   68 +-
 .../suite/ACLScriptedTestProtocol.java          |    7 +-
 .../cyrus/host/GrantRightsOnCyrusHost.java      |    5 +-
 .../james/imap/encode/ACLResponseEncoder.java   |    8 +-
 .../imap/encode/ListRightsResponseEncoder.java  |    6 +-
 .../imap/encode/MyRightsResponseEncoder.java    |    4 +-
 .../imap/message/response/ACLResponse.java      |   16 +-
 .../message/response/ListRightsResponse.java    |   10 +-
 .../imap/message/response/MyRightsResponse.java |    8 +-
 .../imap/processor/DeleteACLProcessor.java      |   18 +-
 .../james/imap/processor/GetACLProcessor.java   |    8 +-
 .../james/imap/processor/GetQuotaProcessor.java |    6 +-
 .../imap/processor/GetQuotaRootProcessor.java   |    6 +-
 .../imap/processor/ListRightsProcessor.java     |   17 +-
 .../james/imap/processor/MyRightsProcessor.java |   18 +-
 .../james/imap/processor/SetACLProcessor.java   |   27 +-
 .../imap/processor/DeleteACLProcessorTest.java  |   23 +-
 .../imap/processor/GetACLProcessorTest.java     |   14 +-
 .../imap/processor/GetQuotaProcessorTest.java   |    8 +-
 .../processor/GetQuotaRootProcessorTest.java    |    8 +-
 .../imap/processor/ListRightsProcessorTest.java |   27 +-
 .../imap/processor/SetACLProcessorTest.java     |   31 +-
 .../base/MailboxEventAnalyserTest.java          |   28 +-
 ...ltMailboxesProvisioningFilterThreadTest.java |   17 +-
 78 files changed, 2631 insertions(+), 2849 deletions(-)
----------------------------------------------------------------------



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org