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 ro...@apache.org on 2019/05/13 12:38:16 UTC
[james-project] 07/07: Merge remote-tracking branch
'remk/JAMES-2725-2'
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit db3aad06dc561e8ee5300b32d6b2f2045812e057
Merge: 2a91b93 712f005
Author: Raphael Ouazana <ra...@linagora.com>
AuthorDate: Mon May 13 14:37:15 2019 +0200
Merge remote-tracking branch 'remk/JAMES-2725-2'
.../java/org/apache/james/blob/api/BlobStore.java | 2 +-
.../apache/james/blob/api/MetricableBlobStore.java | 4 +-
.../main/java/org/apache/james/blob/api/Store.java | 28 +---
.../apache/james/blob/api/BlobStoreContract.java | 6 +-
.../james/blob/api/FixedLengthInputStreamTest.java | 63 -------
.../blob/api/MetricableBlobStoreContract.java | 4 +-
.../james/blob/cassandra/CassandraBlobsDAO.java | 2 +-
.../blob/cassandra/CassandraBlobsDAOTest.java | 2 +-
.../apache/james/blob/memory/MemoryBlobStore.java | 2 +-
server/blob/blob-objectstorage/pom.xml | 5 +
.../blob/objectstorage/ObjectStorageBlobsDAO.java | 17 +-
.../ObjectStorageBlobsDAOBuilder.java | 19 ++-
.../james/blob/objectstorage/PutBlobFunction.java | 37 +++++
.../blob/objectstorage/aws/AwsS3ObjectStorage.java | 128 +++++++++++++-
.../objectstorage/ObjectStorageBlobsDAOTest.java | 2 +-
.../aws/AwsS3ObjectStorageBlobsDAOBuilderTest.java | 11 +-
.../apache/james/blob/union/UnionBlobStore.java | 8 +-
.../james/blob/union/UnionBlobStoreTest.java | 14 +-
.../apache/james/blob/mail/MimeMessageStore.java | 6 +-
.../ObjectStorageDependenciesModule.java | 19 ++-
.../james/CassandraRabbitMQJamesServerFixture.java | 43 +++++
.../james/CassandraRabbitMQJamesServerTest.java | 184 ---------------------
.../apache/james/MailsShouldBeWellReceived.java | 66 ++++++++
.../org/apache/james/WithCassandraBlobStore.java | 68 ++++++++
.../apache/james/WithCassandraBlobStoreTest.java | 26 +++
.../apache/james/WithDefaultAwsS3Extension.java | 71 ++++++++
.../org/apache/james/WithDefaultAwsS3Test.java | 41 +++++
.../apache/james/WithDefaultSwiftExtension.java | 71 ++++++++
.../org/apache/james/WithDefaultSwiftTest.java | 41 +++++
.../apache/james/WithEncryptedAwsS3Extension.java | 72 ++++++++
.../org/apache/james/WithEncryptedAwsS3Test.java | 41 +++++
.../apache/james/WithEncryptedSwiftExtension.java | 72 ++++++++
.../org/apache/james/WithEncryptedSwiftTest.java | 42 +++++
.../org/apache/james/JamesServerExtension.java | 5 +
.../james/webadmin/vault/routes/ExportService.java | 2 +-
35 files changed, 913 insertions(+), 311 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org