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 4d82b400dcc3ae1aee9a25393216a1c460f966d2 Author: Antoine Duprat <[email protected]> AuthorDate: Mon Mar 4 11:56:13 2019 +0100 JAMES-2671 Share AWS S3 configuration --- .../apache/james/blob}/objectstorage/SpecificAuthConfiguration.java | 2 +- .../apache/james/blob/objectstorage/aws}/AwsS3AuthConfiguration.java | 4 ++-- .../james/blob/objectstorage/aws}/AwsS3AuthConfigurationTest.java | 3 ++- .../james/modules/objectstorage/ObjectStorageBlobConfiguration.java | 1 + .../james/modules/objectstorage/aws/s3/AwsS3ConfigurationReader.java | 1 + .../james/modules/objectstorage/swift/SwiftAuthConfiguration.java | 2 +- .../modules/objectstorage/aws/s3/AwsS3ConfigurationReaderTest.java | 1 + 7 files changed, 9 insertions(+), 5 deletions(-) diff --git a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/SpecificAuthConfiguration.java b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/SpecificAuthConfiguration.java similarity index 94% rename from server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/SpecificAuthConfiguration.java rename to server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/SpecificAuthConfiguration.java index 0049288..c319e73 100644 --- a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/SpecificAuthConfiguration.java +++ b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/SpecificAuthConfiguration.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.james.modules.objectstorage; +package org.apache.james.blob.objectstorage; public interface SpecificAuthConfiguration { diff --git a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3AuthConfiguration.java b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/aws/AwsS3AuthConfiguration.java similarity index 96% rename from server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3AuthConfiguration.java rename to server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/aws/AwsS3AuthConfiguration.java index 2c9ee1c..cbcf4f3 100644 --- a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3AuthConfiguration.java +++ b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/aws/AwsS3AuthConfiguration.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.james.modules.objectstorage.aws.s3; +package org.apache.james.blob.objectstorage.aws; -import org.apache.james.modules.objectstorage.SpecificAuthConfiguration; +import org.apache.james.blob.objectstorage.SpecificAuthConfiguration; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; diff --git a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3AuthConfigurationTest.java b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/aws/AwsS3AuthConfigurationTest.java similarity index 97% rename from server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3AuthConfigurationTest.java rename to server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/aws/AwsS3AuthConfigurationTest.java index 445bcdd..26e2724 100644 --- a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3AuthConfigurationTest.java +++ b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/aws/AwsS3AuthConfigurationTest.java @@ -17,11 +17,12 @@ * under the License. */ -package org.apache.james.modules.objectstorage.aws.s3; +package org.apache.james.blob.objectstorage.aws; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.SoftAssertions.assertSoftly; +import org.apache.james.blob.objectstorage.aws.AwsS3AuthConfiguration; import org.junit.jupiter.api.Test; import nl.jqno.equalsverifier.EqualsVerifier; diff --git a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfiguration.java b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfiguration.java index 03d0b78..06520d8 100644 --- a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfiguration.java +++ b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfiguration.java @@ -27,6 +27,7 @@ import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.james.blob.objectstorage.ContainerName; import org.apache.james.blob.objectstorage.PayloadCodec; +import org.apache.james.blob.objectstorage.SpecificAuthConfiguration; import org.apache.james.modules.objectstorage.aws.s3.AwsS3ConfigurationReader; import org.apache.james.modules.objectstorage.swift.SwiftAuthConfiguration; diff --git a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReader.java b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReader.java index 0c23845..ac65cba 100644 --- a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReader.java +++ b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReader.java @@ -20,6 +20,7 @@ package org.apache.james.modules.objectstorage.aws.s3; import org.apache.commons.configuration.Configuration; +import org.apache.james.blob.objectstorage.aws.AwsS3AuthConfiguration; public class AwsS3ConfigurationReader { diff --git a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftAuthConfiguration.java b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftAuthConfiguration.java index bdda2d6..46773db 100644 --- a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftAuthConfiguration.java +++ b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftAuthConfiguration.java @@ -23,11 +23,11 @@ import java.util.Optional; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; +import org.apache.james.blob.objectstorage.SpecificAuthConfiguration; import org.apache.james.blob.objectstorage.swift.SwiftKeystone2ObjectStorage; import org.apache.james.blob.objectstorage.swift.SwiftKeystone3ObjectStorage; import org.apache.james.blob.objectstorage.swift.SwiftTempAuthObjectStorage; import org.apache.james.modules.objectstorage.ObjectStorageBlobConfiguration; -import org.apache.james.modules.objectstorage.SpecificAuthConfiguration; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; diff --git a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReaderTest.java b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReaderTest.java index 4f59cc3..7cd6042 100644 --- a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReaderTest.java +++ b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReaderTest.java @@ -24,6 +24,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.james.blob.objectstorage.aws.AwsS3AuthConfiguration; import org.junit.jupiter.api.Test; class AwsS3ConfigurationReaderTest { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
