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 b5277c930f905c866fa607292d67c180a7c4f1a7 Author: Jean Helou <[email protected]> AuthorDate: Thu Nov 12 10:09:37 2020 +0100 JAMES-1902 Extracts in memory mailqueue guice bindings --- server/container/guice/memory-guice/pom.xml | 8 ++-- .../org/apache/james/MemoryJamesServerMain.java | 2 +- server/container/guice/pom.xml | 6 +++ server/container/guice/queue/memory/pom.xml | 50 ++++++++++++++++++++++ .../{ => queue}/memory/MemoryMailQueueModule.java | 2 +- 5 files changed, 62 insertions(+), 6 deletions(-) diff --git a/server/container/guice/memory-guice/pom.xml b/server/container/guice/memory-guice/pom.xml index 53f6cf0..c105297 100644 --- a/server/container/guice/memory-guice/pom.xml +++ b/server/container/guice/memory-guice/pom.xml @@ -186,10 +186,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-queue-memory</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-testing</artifactId> <scope>test</scope> </dependency> @@ -201,6 +197,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>queue-memory-guice</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java index 3fcbe09..152693e 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java @@ -37,6 +37,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.memory.MemoryMailQueueModule; import org.apache.james.modules.server.CamelMailetContainerModule; import org.apache.james.modules.server.DKIMMailetModule; import org.apache.james.modules.server.DLPRoutesModule; @@ -47,7 +48,6 @@ import org.apache.james.modules.server.MailQueueRoutesModule; import org.apache.james.modules.server.MailRepositoriesRoutesModule; import org.apache.james.modules.server.MailboxRoutesModule; import org.apache.james.modules.server.MailboxesExportRoutesModule; -import org.apache.james.modules.server.MemoryMailQueueModule; import org.apache.james.modules.server.NoJwtModule; import org.apache.james.modules.server.RawPostDequeueDecoratorModule; import org.apache.james.modules.server.SieveRoutesModule; diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml index d39672b..6dd2108 100644 --- a/server/container/guice/pom.xml +++ b/server/container/guice/pom.xml @@ -77,6 +77,7 @@ <module>protocols/webadmin-swagger</module> <module>protocols/webadmin-mail-over-web</module> <module>queue/activemq</module> + <module>queue/memory</module> <module>queue/rabbitmq</module> <module>testing</module> <module>sieve-file</module> @@ -256,6 +257,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>queue-memory-guice</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>com.linagora</groupId> <artifactId>logback-elasticsearch-appender</artifactId> <version>1.8.0</version> diff --git a/server/container/guice/queue/memory/pom.xml b/server/container/guice/queue/memory/pom.xml new file mode 100644 index 0000000..0dbeb28 --- /dev/null +++ b/server/container/guice/queue/memory/pom.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.james</groupId> + <artifactId>james-server-guice</artifactId> + <version>3.6.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <artifactId>queue-memory-guice</artifactId> + + <name>Apache James :: Server :: Guice :: Memory</name> + <description>Guice Module for InMemory Mailqueue implementation</description> + + <dependencies> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-queue-memory</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> diff --git a/server/container/guice/queue/memory/src/main/java/org/apache/james/modules/memory/MemoryMailQueueModule.java b/server/container/guice/queue/memory/src/main/java/org/apache/james/modules/queue/memory/MemoryMailQueueModule.java similarity index 98% rename from server/container/guice/queue/memory/src/main/java/org/apache/james/modules/memory/MemoryMailQueueModule.java rename to server/container/guice/queue/memory/src/main/java/org/apache/james/modules/queue/memory/MemoryMailQueueModule.java index 2421318..614968e 100644 --- a/server/container/guice/queue/memory/src/main/java/org/apache/james/modules/memory/MemoryMailQueueModule.java +++ b/server/container/guice/queue/memory/src/main/java/org/apache/james/modules/queue/memory/MemoryMailQueueModule.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.modules.server; +package org.apache.james.modules.queue.memory; import org.apache.james.queue.api.MailQueue; import org.apache.james.queue.api.MailQueueFactory; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
