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 1e1abc6dee4ef9b7e10065eaeb886073ad0082f4 Merge: 82e2bf9 86c0010 Author: Raphael Ouazana <[email protected]> AuthorDate: Thu Jul 18 14:54:51 2019 +0200 Merge remote-tracking branch 'benoit/vault-it' .../CassandraDeletedMessageMetadataVault.java | 3 + .../apache/james/vault/metadata/MetadataDAO.java | 5 +- .../james/vault/metadata/MetadataSerializer.java | 4 +- .../vault/metadata/StorageInformationDAO.java | 5 +- .../james/vault/metadata/UserPerBucketDAO.java | 5 +- .../vault/blob/BlobStoreDeletedMessageVault.java | 3 + .../james/vault/blob/BucketNameGenerator.java | 3 + mailbox/pom.xml | 1 + pom.xml | 11 ++++ .../blob/objectstorage/ObjectStorageBlobsDAO.java | 2 +- .../ObjectStorageBlobConfiguration.java | 5 ++ .../objectstorage/aws/s3/DockerAwsS3TestRule.java | 23 +------- .../objectstorage/swift/DockerSwiftTestRule.java | 23 +------- server/container/guice/cassandra-guice/pom.xml | 4 ++ .../CassandraDeletedMessageVaultModule.java | 64 ++++++++++++++++++++++ .../pom.xml | 5 ++ .../vault/BlobStoreDeletedMessageVaultModule.java | 39 +++++++++++++ .../modules/vault/DeletedMessageVaultModule.java | 16 +----- ...ava => DeletedMessageVaultRetentionModule.java} | 30 +--------- ...estDeleteMessageVaultPreDeletionHookModule.java | 36 ++++++++++++ .../mailbox/MemoryDeletedMessageVaultModule.java | 45 +++++++++++++++ .../cassandra-jmap-integration-testing/pom.xml | 6 ++ .../CassandraDeletedMessageVaultTest.java | 8 +-- ...LinshareBlobExportMechanismIntegrationTest.java | 8 +-- .../integration/DeletedMessagesVaultTest.java | 15 +++-- .../memory-jmap-integration-testing/pom.xml | 6 ++ ...FileMailRepositoryDeletedMessagesVaultTest.java | 8 +-- ...> MemoryBlobStoreDeletedMessagesVaultTest.java} | 49 +++++++++++------ .../memory/MemoryDeletedMessagesVaultTest.java | 12 +--- ...LinshareBlobExportMechanismIntegrationTest.java | 12 +--- .../rabbitmq-jmap-integration-testing/pom.xml | 6 ++ ...RabbitMQBlobStoreDeletedMessagesVaultTest.java} | 38 +++++++++---- .../rabbitmq/RabbitMQDeletedMessagesVaultTest.java | 8 +-- 33 files changed, 337 insertions(+), 171 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
