Merge remote-tracking branch 'mine/JAMES-2291'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/dec2685f Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/dec2685f Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/dec2685f Branch: refs/heads/master Commit: dec2685fa0c8a21bec2d1f51851c4f98222cf42c Parents: 396d684 eb895a0 Author: Raphael Ouazana <[email protected]> Authored: Thu Jan 25 16:35:00 2018 +0100 Committer: Raphael Ouazana <[email protected]> Committed: Thu Jan 25 16:35:00 2018 +0100 ---------------------------------------------------------------------- .../mailbox/store/StoreMessageManager.java | 2 +- .../store/streaming/BodyOffsetInputStream.java | 159 --------- .../streaming/BodyOffsetInputStreamTest.java | 72 ----- .../org/apache/mailet/PerRecipientHeaders.java | 5 + pom.xml | 5 + .../org/apache/james/blob/api/TestBlobId.java | 65 ++++ .../org/apache/james/server/core/MailImpl.java | 150 +++++++++ server/container/guice/cassandra-guice/pom.xml | 14 + .../apache/james/CassandraJamesServerMain.java | 2 + .../data/CassandraMailRepositoryModule.java | 74 +++++ .../CassandraMailRepositoryIntegrationTest.java | 80 +++++ .../src/test/resources/mailetcontainer.xml | 14 + .../src/test/resources/mailrepositorystore.xml | 5 + .../server/MailStoreRepositoryModule.java | 2 +- .../utils/InMemoryMailRepositoryStore.java | 75 +++-- .../james/utils/MailRepositoryProvider.java | 6 +- .../james/util/CompletableFutureUtil.java | 6 + .../james/util/CompletableFutureUtilTest.java | 19 ++ .../james/util/BodyOffsetInputStream.java | 159 +++++++++ .../james/util/BodyOffsetInputStreamTest.java | 72 +++++ .../mailrepository/MailRepositoryContract.java | 11 + .../mailrepository-cassandra/pom.xml | 117 +++++++ .../cassandra/CassandraMailRepository.java | 222 +++++++++++++ .../CassandraMailRepositoryCountDAO.java | 98 ++++++ .../CassandraMailRepositoryKeysDAO.java | 97 ++++++ .../CassandraMailRepositoryMailDAO.java | 320 +++++++++++++++++++ .../CassandraMailRepositoryModule.java | 94 ++++++ .../cassandra/MailRepositoryTable.java | 51 +++ .../CassandraMailRepositoryCountDAOTest.java | 102 ++++++ .../CassandraMailRepositoryKeysDAOTest.java | 117 +++++++ .../CassandraMailRepositoryMailDAOTest.java | 158 +++++++++ .../cassandra/CassandraMailRepositoryTest.java | 78 +++++ server/pom.xml | 1 + 33 files changed, 2187 insertions(+), 265 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
