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 e32571a9822661af9614bd4b1e03cac44c9f4a78 Author: Jean Helou <[email protected]> AuthorDate: Thu Nov 12 12:38:13 2020 +0100 JAMES-1902 Renames activemq mailqueue guice bindings module --- pom.xml | 10 +++++----- server/container/guice/cassandra-guice/pom.xml | 8 ++++---- .../main/java/org/apache/james/CassandraJamesServerMain.java | 2 +- server/container/guice/jpa-guice/pom.xml | 8 ++++---- .../src/main/java/org/apache/james/JPAJamesServerMain.java | 2 +- server/container/guice/jpa-smtp-common/pom.xml | 8 ++++---- .../src/main/java/org/apache/james/JPAJamesServerMain.java | 2 +- server/container/guice/jpa-smtp/pom.xml | 8 ++++---- server/container/guice/pom.xml | 10 +++++----- server/container/guice/queue/activemq/pom.xml | 2 +- .../modules/{ => queue}/activemq/ActiveMQQueueModule.java | 2 +- server/mailet/integration-testing/pom.xml | 10 +++++----- .../java/org/apache/james/transport/mailets/AddFooterTest.java | 2 +- 13 files changed, 37 insertions(+), 37 deletions(-) diff --git a/pom.xml b/pom.xml index 73f03cb..a054465 100644 --- a/pom.xml +++ b/pom.xml @@ -1450,11 +1450,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-activemq</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-common</artifactId> <version>${project.version}</version> </dependency> @@ -1939,6 +1934,11 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>queue-activemq-guice</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>quota-mailing-cassandra</artifactId> <version>${project.version}</version> </dependency> diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml index 97b1455..c3199e8 100644 --- a/server/container/guice/cassandra-guice/pom.xml +++ b/server/container/guice/cassandra-guice/pom.xml @@ -150,10 +150,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-activemq</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-common</artifactId> </dependency> <dependency> @@ -300,6 +296,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>queue-activemq-guice</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>quota-mailing-cassandra</artifactId> </dependency> <dependency> diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java index 412c209..40bfa50 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java @@ -26,7 +26,6 @@ import org.apache.james.json.DTOModule; import org.apache.james.modules.BlobExportMechanismModule; import org.apache.james.modules.CassandraConsistencyTaskSerializationModule; import org.apache.james.modules.MailboxModule; -import org.apache.james.modules.activemq.ActiveMQQueueModule; import org.apache.james.modules.data.CassandraDLPConfigurationStoreModule; import org.apache.james.modules.data.CassandraDomainListModule; import org.apache.james.modules.data.CassandraJmapModule; @@ -52,6 +51,7 @@ import org.apache.james.modules.protocols.ManageSieveServerModule; import org.apache.james.modules.protocols.POP3ServerModule; import org.apache.james.modules.protocols.ProtocolHandlerModule; import org.apache.james.modules.protocols.SMTPServerModule; +import org.apache.james.modules.queue.activemq.ActiveMQQueueModule; import org.apache.james.modules.server.DKIMMailetModule; import org.apache.james.modules.server.DLPRoutesModule; import org.apache.james.modules.server.DataRoutesModules; diff --git a/server/container/guice/jpa-guice/pom.xml b/server/container/guice/jpa-guice/pom.xml index 31e1304..81a1f92 100644 --- a/server/container/guice/jpa-guice/pom.xml +++ b/server/container/guice/jpa-guice/pom.xml @@ -63,10 +63,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-activemq</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-common</artifactId> </dependency> <dependency> @@ -164,6 +160,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>queue-activemq-guice</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java b/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java index 210ee2f..cf06fe8 100644 --- a/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java +++ b/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java @@ -20,7 +20,6 @@ package org.apache.james; import org.apache.james.modules.MailboxModule; -import org.apache.james.modules.activemq.ActiveMQQueueModule; import org.apache.james.modules.data.JPADataModule; import org.apache.james.modules.data.SieveJPARepositoryModules; import org.apache.james.modules.mailbox.DefaultEventModule; @@ -33,6 +32,7 @@ import org.apache.james.modules.protocols.ManageSieveServerModule; import org.apache.james.modules.protocols.POP3ServerModule; import org.apache.james.modules.protocols.ProtocolHandlerModule; import org.apache.james.modules.protocols.SMTPServerModule; +import org.apache.james.modules.queue.activemq.ActiveMQQueueModule; import org.apache.james.modules.server.DataRoutesModules; import org.apache.james.modules.server.DefaultProcessorsConfigurationProviderModule; import org.apache.james.modules.server.ElasticSearchMetricReporterModule; diff --git a/server/container/guice/jpa-smtp-common/pom.xml b/server/container/guice/jpa-smtp-common/pom.xml index db42d5f..0e60340 100644 --- a/server/container/guice/jpa-smtp-common/pom.xml +++ b/server/container/guice/jpa-smtp-common/pom.xml @@ -39,10 +39,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-activemq</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-common</artifactId> </dependency> <dependency> @@ -74,6 +70,10 @@ <artifactId>james-server-jpa-common-guice</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>queue-activemq-guice</artifactId> + </dependency> + <dependency> <groupId>com.linagora</groupId> <artifactId>logback-elasticsearch-appender</artifactId> </dependency> diff --git a/server/container/guice/jpa-smtp-common/src/main/java/org/apache/james/JPAJamesServerMain.java b/server/container/guice/jpa-smtp-common/src/main/java/org/apache/james/JPAJamesServerMain.java index c65f618..aba49c8 100644 --- a/server/container/guice/jpa-smtp-common/src/main/java/org/apache/james/JPAJamesServerMain.java +++ b/server/container/guice/jpa-smtp-common/src/main/java/org/apache/james/JPAJamesServerMain.java @@ -19,11 +19,11 @@ package org.apache.james; -import org.apache.james.modules.activemq.ActiveMQQueueModule; import org.apache.james.modules.data.JPADataModule; import org.apache.james.modules.data.JPAEntityManagerModule; import org.apache.james.modules.protocols.ProtocolHandlerModule; import org.apache.james.modules.protocols.SMTPServerModule; +import org.apache.james.modules.queue.activemq.ActiveMQQueueModule; import org.apache.james.modules.server.DKIMMailetModule; import org.apache.james.modules.server.DataRoutesModules; import org.apache.james.modules.server.DefaultProcessorsConfigurationProviderModule; diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/container/guice/jpa-smtp/pom.xml index 6e6a124..fcc1c92 100644 --- a/server/container/guice/jpa-smtp/pom.xml +++ b/server/container/guice/jpa-smtp/pom.xml @@ -58,10 +58,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-activemq</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-common</artifactId> <type>test-jar</type> <scope>test</scope> @@ -76,6 +72,10 @@ <artifactId>james-server-mailets</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>queue-activemq-guice</artifactId> + </dependency> + <dependency> <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml index 6dd2108..a8230da 100644 --- a/server/container/guice/pom.xml +++ b/server/container/guice/pom.xml @@ -100,11 +100,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-activemq</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-configuration</artifactId> <version>${project.version}</version> </dependency> @@ -258,6 +253,11 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>queue-activemq-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/activemq/pom.xml b/server/container/guice/queue/activemq/pom.xml index 2268141..60fe58d 100644 --- a/server/container/guice/queue/activemq/pom.xml +++ b/server/container/guice/queue/activemq/pom.xml @@ -26,7 +26,7 @@ <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>james-server-guice-activemq</artifactId> + <artifactId>queue-activemq-guice</artifactId> <name>Apache James :: Server :: Guice :: ActiveMQ</name> <description>Guice Module for ActiveMQ</description> diff --git a/server/container/guice/queue/activemq/src/main/java/org/apache/james/modules/activemq/ActiveMQQueueModule.java b/server/container/guice/queue/activemq/src/main/java/org/apache/james/modules/queue/activemq/ActiveMQQueueModule.java similarity index 98% rename from server/container/guice/queue/activemq/src/main/java/org/apache/james/modules/activemq/ActiveMQQueueModule.java rename to server/container/guice/queue/activemq/src/main/java/org/apache/james/modules/queue/activemq/ActiveMQQueueModule.java index f6af3e0..58e02d8 100644 --- a/server/container/guice/queue/activemq/src/main/java/org/apache/james/modules/activemq/ActiveMQQueueModule.java +++ b/server/container/guice/queue/activemq/src/main/java/org/apache/james/modules/queue/activemq/ActiveMQQueueModule.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.modules.activemq; +package org.apache.james.modules.queue.activemq; import javax.jms.ConnectionFactory; diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml index 723e887..da1cfb0 100644 --- a/server/mailet/integration-testing/pom.xml +++ b/server/mailet/integration-testing/pom.xml @@ -55,11 +55,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-activemq</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-common</artifactId> <type>test-jar</type> <scope>test</scope> @@ -100,6 +95,11 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>queue-activemq-guice</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java index d70c86a..30bd565 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java @@ -32,7 +32,7 @@ import org.apache.james.mailets.TemporaryJamesServer; import org.apache.james.mailets.configuration.CommonProcessors; import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.ProcessorConfiguration; -import org.apache.james.modules.activemq.ActiveMQQueueModule; +import org.apache.james.modules.queue.activemq.ActiveMQQueueModule; import org.apache.james.modules.protocols.ImapGuiceProbe; import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
