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 2020/04/30 07:28:42 UTC
[james-project] 06/11: Merge branch 'pr-3341'
This is an automated email from the ASF dual-hosted git repository.
matthieu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 8035b7d54520afe1bd5f547e34f51176e3bbc1e1
Merge: 152aa7d ba679b6
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Thu Apr 30 09:26:03 2020 +0200
Merge branch 'pr-3341'
.../org/apache/james/mailbox}/Authenticator.java | 2 +-
.../org/apache/james/mailbox}/Authorizator.java | 2 +-
.../cassandra/CassandraMailboxManagerProvider.java | 4 +-
.../cassandra/CassandraTestSystemFixture.java | 4 +-
.../CassandraMailboxManagerAttachmentTest.java | 4 +-
...asticSearchListeningMessageSearchIndexTest.java | 2 +-
.../mailbox/jpa/JpaMailboxManagerProvider.java | 4 +-
.../maildir/MaildirMailboxManagerProvider.java | 4 +-
.../manager/InMemoryIntegrationResources.java | 4 +-
.../mailbox/spring/AnonymousAuthenticator.java | 62 +++++++++++-----------
.../james/mailbox/spring/NoAuthorizator.java | 62 +++++++++++-----------
.../james/mailbox/store/FakeAuthenticator.java | 1 +
.../james/mailbox/store/FakeAuthorizator.java | 1 +
.../james/mailbox/store/SessionProviderImpl.java | 2 +
mpt/impl/imap-mailbox/core/pom.xml | 5 --
.../apache/james/mpt/host/JamesImapHostSystem.java | 8 +--
server/container/guice/cassandra-guice/pom.xml | 4 ++
.../modules/mailbox/CassandraMailboxModule.java | 8 +--
server/container/guice/jpa-guice/pom.xml | 4 ++
.../james/modules/mailbox/JPAMailboxModule.java | 8 +--
server/container/guice/mailbox/pom.xml | 6 +--
server/container/guice/memory-guice/pom.xml | 4 ++
.../james/modules/mailbox/MemoryMailboxModule.java | 8 +--
server/container/mailbox-adapter/pom.xml | 4 --
.../{store => }/UserRepositoryAuthenticator.java | 4 +-
.../{store => }/UserRepositoryAuthorizator.java | 4 +-
.../UserRepositoryAuthenticatorTest.java | 2 +-
.../UserRepositoryAuthorizatorTest.java | 4 +-
.../apache/james/spring-mailbox-authenticator.xml | 2 +-
.../apache/james/spring-mailbox-authorizator.xml | 2 +-
src/site/xdoc/mailbox/mailbox-spring.xml | 2 +-
31 files changed, 122 insertions(+), 115 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org