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 8ebf5df272c8e123686ce21b3f4d04a797222f0b Author: Jean Helou <[email protected]> AuthorDate: Thu Nov 12 12:43:58 2020 +0100 JAMES-1902 renames rabbitmq mailqueue guice bindings module --- .../mpt/smtp/CassandraRabbitMQAwsS3SmtpTestRuleFactory.java | 2 +- server/container/guice/cassandra-guice/pom.xml | 8 ++++---- .../org/apache/james/CassandraRabbitMQJamesServerMain.java | 2 +- server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml | 6 +++--- server/container/guice/pom.xml | 11 +++++------ server/container/guice/queue/rabbitmq/pom.xml | 2 +- .../james/modules/{ => queue}/rabbitmq/RabbitMQModule.java | 2 +- 7 files changed, 16 insertions(+), 17 deletions(-) diff --git a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/CassandraRabbitMQAwsS3SmtpTestRuleFactory.java b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/CassandraRabbitMQAwsS3SmtpTestRuleFactory.java index ae2271e..bb0bf7c 100644 --- a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/CassandraRabbitMQAwsS3SmtpTestRuleFactory.java +++ b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/CassandraRabbitMQAwsS3SmtpTestRuleFactory.java @@ -35,7 +35,7 @@ import org.apache.james.modules.mailbox.KeyspacesConfiguration; import org.apache.james.modules.objectstorage.DefaultBucketModule; import org.apache.james.modules.objectstorage.aws.s3.DockerAwsS3TestRule; import org.apache.james.modules.protocols.SmtpGuiceProbe.SmtpServerConnectedType; -import org.apache.james.modules.rabbitmq.RabbitMQModule; +import org.apache.james.modules.queue.rabbitmq.RabbitMQModule; import org.apache.james.modules.server.CamelMailetContainerModule; import org.apache.james.queue.api.MailQueueItemDecoratorFactory; import org.apache.james.queue.api.RawMailQueueItemDecoratorFactory; diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml index c3199e8..b358fd6 100644 --- a/server/container/guice/cassandra-guice/pom.xml +++ b/server/container/guice/cassandra-guice/pom.xml @@ -206,10 +206,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-rabbitmq</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-smtp</artifactId> </dependency> <dependency> @@ -300,6 +296,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>queue-rabbitmq-guice</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>quota-mailing-cassandra</artifactId> </dependency> <dependency> diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java b/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java index 2e1dde8..c0c23d9 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java +++ b/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java @@ -27,7 +27,7 @@ import org.apache.james.modules.blobstore.BlobStoreCacheModulesChooser; import org.apache.james.modules.blobstore.BlobStoreConfiguration; import org.apache.james.modules.blobstore.BlobStoreModulesChooser; import org.apache.james.modules.event.RabbitMQEventBusModule; -import org.apache.james.modules.rabbitmq.RabbitMQModule; +import org.apache.james.modules.queue.rabbitmq.RabbitMQModule; import org.apache.james.modules.server.JMXServerModule; import org.apache.james.modules.server.RabbitMailQueueRoutesModule; diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml index 588ae50..579bc8b 100644 --- a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml +++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml @@ -108,12 +108,12 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-rabbitmq</artifactId> + <artifactId>james-server-testing</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-testing</artifactId> - <scope>test</scope> + <artifactId>queue-rabbitmq-guice</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml index a8230da..dc34571 100644 --- a/server/container/guice/pom.xml +++ b/server/container/guice/pom.xml @@ -159,12 +159,6 @@ <artifactId>james-server-guice-pop</artifactId> <version>${project.version}</version> </dependency> - - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-rabbitmq</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-sieve-file</artifactId> @@ -258,6 +252,11 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>queue-rabbitmq-guice</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>queue-memory-guice</artifactId> <version>${project.version}</version> </dependency> diff --git a/server/container/guice/queue/rabbitmq/pom.xml b/server/container/guice/queue/rabbitmq/pom.xml index 6f3747d..2981294 100644 --- a/server/container/guice/queue/rabbitmq/pom.xml +++ b/server/container/guice/queue/rabbitmq/pom.xml @@ -26,7 +26,7 @@ <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>james-server-guice-rabbitmq</artifactId> + <artifactId>queue-rabbitmq-guice</artifactId> <name>Apache James :: Server :: Guice :: RabbitMQ</name> <description>Guice Module for RabbitMQ</description> diff --git a/server/container/guice/queue/rabbitmq/src/main/java/org/apache/james/modules/rabbitmq/RabbitMQModule.java b/server/container/guice/queue/rabbitmq/src/main/java/org/apache/james/modules/queue/rabbitmq/RabbitMQModule.java similarity index 99% rename from server/container/guice/queue/rabbitmq/src/main/java/org/apache/james/modules/rabbitmq/RabbitMQModule.java rename to server/container/guice/queue/rabbitmq/src/main/java/org/apache/james/modules/queue/rabbitmq/RabbitMQModule.java index 36cfa20..8f42fb6 100644 --- a/server/container/guice/queue/rabbitmq/src/main/java/org/apache/james/modules/rabbitmq/RabbitMQModule.java +++ b/server/container/guice/queue/rabbitmq/src/main/java/org/apache/james/modules/queue/rabbitmq/RabbitMQModule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.modules.rabbitmq; +package org.apache.james.modules.queue.rabbitmq; import java.io.FileNotFoundException; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
