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 ad...@apache.org on 2017/07/06 12:13:21 UTC
[15/15] james-project git commit: Merge remote-tracking branch
'btellier/JAMES-2090'
Merge remote-tracking branch 'btellier/JAMES-2090'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/1dafd884
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/1dafd884
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/1dafd884
Branch: refs/heads/master
Commit: 1dafd8849c45d79f908a63efe8dbb789bf7dfad2
Parents: 1128983 9277d50
Author: Antoine Duprat <ad...@linagora.com>
Authored: Thu Jul 6 14:12:51 2017 +0200
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Thu Jul 6 14:12:51 2017 +0200
----------------------------------------------------------------------
backends-common/cassandra/pom.xml | 46 ++--
.../cassandra/CassandraConfiguration.java | 268 +++++++++++++++++++
.../init/SpringStaticSessionFactory.java | 36 ---
.../cassandra/utils/CassandraUtils.java | 24 +-
.../utils/ZonedDateTimeRepresentation.java | 19 +-
.../cassandra/CassandraConfigurationTest.java | 229 ++++++++++++++++
.../destination/conf/cassandra.properties | 15 +-
.../destination/conf/cassandra.properties | 14 +-
.../CassandraMailboxSessionMapperFactory.java | 28 +-
.../CassandraMailboxPathRegisterMapper.java | 6 +-
.../cassandra/mail/CassandraACLMapper.java | 10 +-
.../mail/CassandraAnnotationMapper.java | 26 +-
.../mail/CassandraDeletedMessageDAO.java | 17 +-
.../cassandra/mail/CassandraMailboxDAO.java | 23 +-
.../cassandra/mail/CassandraMailboxMapper.java | 9 +-
.../cassandra/mail/CassandraMailboxPathDAO.java | 12 +-
.../mail/CassandraMailboxRecentsDAO.java | 12 +-
.../cassandra/mail/CassandraMessageDAO.java | 14 +-
.../cassandra/mail/CassandraMessageIdDAO.java | 12 +-
.../mail/CassandraMessageIdMapper.java | 9 +-
.../mail/CassandraMessageIdToImapUidDAO.java | 12 +-
.../cassandra/mail/CassandraMessageMapper.java | 17 +-
.../cassandra/mail/CassandraModSeqProvider.java | 18 +-
.../cassandra/mail/CassandraUidProvider.java | 18 +-
...essageDeletedDuringFlagsUpdateException.java | 30 ---
.../user/CassandraSubscriptionMapper.java | 8 +-
.../CassandraMailboxManagerProvider.java | 3 +-
.../cassandra/CassandraTestSystemFixture.java | 3 +-
...istributedMailboxDelegatingListenerTest.java | 4 +
...CassandraMailboxPathRegistrerMapperTest.java | 11 +-
.../cassandra/mail/CassandraACLMapperTest.java | 18 +-
.../cassandra/mail/CassandraMailboxDAOTest.java | 3 +-
.../CassandraMailboxManagerAttachmentTest.java | 4 +-
.../CassandraMailboxMapperConcurrencyTest.java | 6 +-
.../mail/CassandraMailboxMapperTest.java | 6 +-
.../cassandra/mail/CassandraMapperProvider.java | 2 +-
.../mail/CassandraModSeqProviderTest.java | 7 +-
.../mail/CassandraUidProviderTest.java | 7 +-
.../user/CassandraSubscriptionMapperTest.java | 3 +-
mpt/app/dependency-reduced-pom.xml | 102 -------
.../cassandra/host/CassandraHostSystem.java | 3 +-
.../cassandra/host/CassandraHostSystem.java | 4 +-
protocols/smtp/dependency-reduced-pom.xml | 143 ----------
.../modules/mailbox/CassandraMailboxModule.java | 4 -
.../mailbox/CassandraSessionConfiguration.java | 4 +-
.../modules/mailbox/CassandraSessionModule.java | 44 ++-
.../mailbox/CassandraSessionModuleTest.java | 65 +++++
.../modules/mailbox/cassandra.properties | 9 +
.../cassandra/CassandraDomainList.java | 93 +++++--
.../CassandraRecipientRewriteTable.java | 105 +++++---
.../cassandra/CassandraUsersRepository.java | 123 ++++++---
.../CassandraUsersRepositoryModule.java | 3 +-
.../cassandra/CassandraDomainListTest.java | 3 +-
.../CassandraRecipientRewriteTableTest.java | 4 +-
.../james/rrt/cassandra/CassandraStepdefs.java | 4 +-
.../cassandra/CassandraUsersRepositoryTest.java | 5 +-
src/site/xdoc/server/config-cassandra.xml | 18 ++
57 files changed, 1154 insertions(+), 591 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/1dafd884/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
----------------------------------------------------------------------
diff --cc mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
index d163233,dda89ec..8eb5136
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
@@@ -37,13 -38,9 +38,12 @@@ import org.apache.james.mailbox.store.m
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CassandraMailboxMapperTest {
+ private static final Logger LOGGER = LoggerFactory.getLogger(CassandraMailboxMapperTest.class);
- public static final int MAX_RETRY = 10;
public static final int UID_VALIDITY = 52;
public static final MailboxPath MAILBOX_PATH = new MailboxPath("#private", "user", "name");
private CassandraCluster cassandra;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org