This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit d15d695bf40589883ae319147910cb39e6fe0517 Author: Jean Helou <[email protected]> AuthorDate: Mon Nov 16 13:58:42 2020 +0100 JAMES-1902 Moves guice blob bindings to their own directory --- server/container/guice/{blob-api-guice => blob/api}/pom.xml | 12 ++++++------ .../org/apache/james/modules/mailbox/BlobStoreAPIModule.java | 0 .../apache/james/modules/mailbox/ConfigurationComponent.java | 0 .../guice/{blob-export-guice => blob/export}/pom.xml | 12 ++++++------ .../java/org/apache/james/modules/BlobExportImplChoice.java | 0 .../org/apache/james/modules/BlobExportMechanismModule.java | 0 .../james/modules/LinshareBlobExportMechanismModule.java | 0 .../james/modules/LocalFileBlobExportMechanismModule.java | 0 .../org/apache/james/modules/BlobExportImplChoiceTest.java | 0 .../apache/james/modules/BlobExportMechanismModuleTest.java | 0 .../org/apache/james/modules/LinshareGuiceExtension.java | 0 .../guice/{blob-memory-guice => blob/memory}/pom.xml | 12 ++++++------ .../main/java/org/apache/james/modules/BlobMemoryModule.java | 0 server/container/guice/{blob-s3-guice => blob/s3}/pom.xml | 2 +- .../james/modules/objectstorage/DefaultBucketModule.java | 0 .../objectstorage/S3BlobStoreConfigurationReader.java | 0 .../james/modules/objectstorage/S3BlobStoreModule.java | 0 .../objectstorage/aws/s3/AwsS3ConfigurationReader.java | 0 .../objectstorage/aws/s3/AwsS3ConfigurationReaderTest.java | 0 .../modules/objectstorage/aws/s3/DockerAwsS3TestRule.java | 0 server/container/guice/pom.xml | 8 ++++---- 21 files changed, 23 insertions(+), 23 deletions(-) diff --git a/server/container/guice/blob-api-guice/pom.xml b/server/container/guice/blob/api/pom.xml similarity index 96% rename from server/container/guice/blob-api-guice/pom.xml rename to server/container/guice/blob/api/pom.xml index 2d07501..eacf1a4 100644 --- a/server/container/guice/blob-api-guice/pom.xml +++ b/server/container/guice/blob/api/pom.xml @@ -25,7 +25,7 @@ <groupId>org.apache.james</groupId> <artifactId>james-server-guice</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>blob-api-guice</artifactId> @@ -40,13 +40,13 @@ <artifactId>blob-api</artifactId> </dependency> <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - </dependency> - <dependency> <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/server/container/guice/blob-api-guice/src/main/java/org/apache/james/modules/mailbox/BlobStoreAPIModule.java b/server/container/guice/blob/api/src/main/java/org/apache/james/modules/mailbox/BlobStoreAPIModule.java similarity index 100% rename from server/container/guice/blob-api-guice/src/main/java/org/apache/james/modules/mailbox/BlobStoreAPIModule.java rename to server/container/guice/blob/api/src/main/java/org/apache/james/modules/mailbox/BlobStoreAPIModule.java diff --git a/server/container/guice/blob-api-guice/src/main/java/org/apache/james/modules/mailbox/ConfigurationComponent.java b/server/container/guice/blob/api/src/main/java/org/apache/james/modules/mailbox/ConfigurationComponent.java similarity index 100% rename from server/container/guice/blob-api-guice/src/main/java/org/apache/james/modules/mailbox/ConfigurationComponent.java rename to server/container/guice/blob/api/src/main/java/org/apache/james/modules/mailbox/ConfigurationComponent.java diff --git a/server/container/guice/blob-export-guice/pom.xml b/server/container/guice/blob/export/pom.xml similarity index 97% rename from server/container/guice/blob-export-guice/pom.xml rename to server/container/guice/blob/export/pom.xml index 9f4f840..7890354 100644 --- a/server/container/guice/blob-export-guice/pom.xml +++ b/server/container/guice/blob/export/pom.xml @@ -25,7 +25,7 @@ <groupId>org.apache.james</groupId> <artifactId>james-server-guice</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>blob-export-guice</artifactId> @@ -58,16 +58,16 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-configuration</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-common</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-configuration</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> @@ -77,4 +77,4 @@ <scope>test</scope> </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/server/container/guice/blob-export-guice/src/main/java/org/apache/james/modules/BlobExportImplChoice.java b/server/container/guice/blob/export/src/main/java/org/apache/james/modules/BlobExportImplChoice.java similarity index 100% rename from server/container/guice/blob-export-guice/src/main/java/org/apache/james/modules/BlobExportImplChoice.java rename to server/container/guice/blob/export/src/main/java/org/apache/james/modules/BlobExportImplChoice.java diff --git a/server/container/guice/blob-export-guice/src/main/java/org/apache/james/modules/BlobExportMechanismModule.java b/server/container/guice/blob/export/src/main/java/org/apache/james/modules/BlobExportMechanismModule.java similarity index 100% rename from server/container/guice/blob-export-guice/src/main/java/org/apache/james/modules/BlobExportMechanismModule.java rename to server/container/guice/blob/export/src/main/java/org/apache/james/modules/BlobExportMechanismModule.java diff --git a/server/container/guice/blob-export-guice/src/main/java/org/apache/james/modules/LinshareBlobExportMechanismModule.java b/server/container/guice/blob/export/src/main/java/org/apache/james/modules/LinshareBlobExportMechanismModule.java similarity index 100% rename from server/container/guice/blob-export-guice/src/main/java/org/apache/james/modules/LinshareBlobExportMechanismModule.java rename to server/container/guice/blob/export/src/main/java/org/apache/james/modules/LinshareBlobExportMechanismModule.java diff --git a/server/container/guice/blob-export-guice/src/main/java/org/apache/james/modules/LocalFileBlobExportMechanismModule.java b/server/container/guice/blob/export/src/main/java/org/apache/james/modules/LocalFileBlobExportMechanismModule.java similarity index 100% rename from server/container/guice/blob-export-guice/src/main/java/org/apache/james/modules/LocalFileBlobExportMechanismModule.java rename to server/container/guice/blob/export/src/main/java/org/apache/james/modules/LocalFileBlobExportMechanismModule.java diff --git a/server/container/guice/blob-export-guice/src/test/java/org/apache/james/modules/BlobExportImplChoiceTest.java b/server/container/guice/blob/export/src/test/java/org/apache/james/modules/BlobExportImplChoiceTest.java similarity index 100% rename from server/container/guice/blob-export-guice/src/test/java/org/apache/james/modules/BlobExportImplChoiceTest.java rename to server/container/guice/blob/export/src/test/java/org/apache/james/modules/BlobExportImplChoiceTest.java diff --git a/server/container/guice/blob-export-guice/src/test/java/org/apache/james/modules/BlobExportMechanismModuleTest.java b/server/container/guice/blob/export/src/test/java/org/apache/james/modules/BlobExportMechanismModuleTest.java similarity index 100% rename from server/container/guice/blob-export-guice/src/test/java/org/apache/james/modules/BlobExportMechanismModuleTest.java rename to server/container/guice/blob/export/src/test/java/org/apache/james/modules/BlobExportMechanismModuleTest.java diff --git a/server/container/guice/blob-export-guice/src/test/java/org/apache/james/modules/LinshareGuiceExtension.java b/server/container/guice/blob/export/src/test/java/org/apache/james/modules/LinshareGuiceExtension.java similarity index 100% rename from server/container/guice/blob-export-guice/src/test/java/org/apache/james/modules/LinshareGuiceExtension.java rename to server/container/guice/blob/export/src/test/java/org/apache/james/modules/LinshareGuiceExtension.java diff --git a/server/container/guice/blob-memory-guice/pom.xml b/server/container/guice/blob/memory/pom.xml similarity index 97% rename from server/container/guice/blob-memory-guice/pom.xml rename to server/container/guice/blob/memory/pom.xml index e06bbc7..3c1f6d9 100644 --- a/server/container/guice/blob-memory-guice/pom.xml +++ b/server/container/guice/blob/memory/pom.xml @@ -25,7 +25,7 @@ <groupId>org.apache.james</groupId> <artifactId>james-server-guice</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>blob-memory-guice</artifactId> @@ -44,13 +44,13 @@ <artifactId>blob-memory</artifactId> </dependency> <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - </dependency> - <dependency> <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/server/container/guice/blob-memory-guice/src/main/java/org/apache/james/modules/BlobMemoryModule.java b/server/container/guice/blob/memory/src/main/java/org/apache/james/modules/BlobMemoryModule.java similarity index 100% rename from server/container/guice/blob-memory-guice/src/main/java/org/apache/james/modules/BlobMemoryModule.java rename to server/container/guice/blob/memory/src/main/java/org/apache/james/modules/BlobMemoryModule.java diff --git a/server/container/guice/blob-s3-guice/pom.xml b/server/container/guice/blob/s3/pom.xml similarity index 97% rename from server/container/guice/blob-s3-guice/pom.xml rename to server/container/guice/blob/s3/pom.xml index 7d064f4..0c2c853 100644 --- a/server/container/guice/blob-s3-guice/pom.xml +++ b/server/container/guice/blob/s3/pom.xml @@ -25,7 +25,7 @@ <groupId>org.apache.james</groupId> <artifactId>james-server-guice</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>blob-s3-guice</artifactId> diff --git a/server/container/guice/blob-s3-guice/src/main/java/org/apache/james/modules/objectstorage/DefaultBucketModule.java b/server/container/guice/blob/s3/src/main/java/org/apache/james/modules/objectstorage/DefaultBucketModule.java similarity index 100% rename from server/container/guice/blob-s3-guice/src/main/java/org/apache/james/modules/objectstorage/DefaultBucketModule.java rename to server/container/guice/blob/s3/src/main/java/org/apache/james/modules/objectstorage/DefaultBucketModule.java diff --git a/server/container/guice/blob-s3-guice/src/main/java/org/apache/james/modules/objectstorage/S3BlobStoreConfigurationReader.java b/server/container/guice/blob/s3/src/main/java/org/apache/james/modules/objectstorage/S3BlobStoreConfigurationReader.java similarity index 100% rename from server/container/guice/blob-s3-guice/src/main/java/org/apache/james/modules/objectstorage/S3BlobStoreConfigurationReader.java rename to server/container/guice/blob/s3/src/main/java/org/apache/james/modules/objectstorage/S3BlobStoreConfigurationReader.java diff --git a/server/container/guice/blob-s3-guice/src/main/java/org/apache/james/modules/objectstorage/S3BlobStoreModule.java b/server/container/guice/blob/s3/src/main/java/org/apache/james/modules/objectstorage/S3BlobStoreModule.java similarity index 100% rename from server/container/guice/blob-s3-guice/src/main/java/org/apache/james/modules/objectstorage/S3BlobStoreModule.java rename to server/container/guice/blob/s3/src/main/java/org/apache/james/modules/objectstorage/S3BlobStoreModule.java diff --git a/server/container/guice/blob-s3-guice/src/main/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReader.java b/server/container/guice/blob/s3/src/main/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReader.java similarity index 100% rename from server/container/guice/blob-s3-guice/src/main/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReader.java rename to server/container/guice/blob/s3/src/main/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReader.java diff --git a/server/container/guice/blob-s3-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReaderTest.java b/server/container/guice/blob/s3/src/test/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReaderTest.java similarity index 100% rename from server/container/guice/blob-s3-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReaderTest.java rename to server/container/guice/blob/s3/src/test/java/org/apache/james/modules/objectstorage/aws/s3/AwsS3ConfigurationReaderTest.java diff --git a/server/container/guice/blob-s3-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/DockerAwsS3TestRule.java b/server/container/guice/blob/s3/src/test/java/org/apache/james/modules/objectstorage/aws/s3/DockerAwsS3TestRule.java similarity index 100% rename from server/container/guice/blob-s3-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/DockerAwsS3TestRule.java rename to server/container/guice/blob/s3/src/test/java/org/apache/james/modules/objectstorage/aws/s3/DockerAwsS3TestRule.java diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml index 7f29105..31e2a18 100644 --- a/server/container/guice/pom.xml +++ b/server/container/guice/pom.xml @@ -34,10 +34,10 @@ <modules> - <module>blob-api-guice</module> - <module>blob-export-guice</module> - <module>blob-memory-guice</module> - <module>blob-s3-guice</module> + <module>blob/api</module> + <module>blob/export</module> + <module>blob/memory</module> + <module>blob/s3</module> <module>cassandra-guice</module> <module>cassandra-ldap-guice</module> <module>cassandra-rabbitmq-guice</module> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
