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 dcc3db8043cc6a49738d6cb553fcafc2517febc1 Author: Benoit Tellier <[email protected]> AuthorDate: Sat May 22 20:57:26 2021 +0700 JAMES-3589 Allow tailor-made servers to customize their mailet container --- .../src/main/java/org/apache/james/CassandraJamesServerMain.java | 2 ++ .../main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java | 2 ++ .../guice-common/src/main/java/org/apache/james/GuiceJamesServer.java | 4 +--- .../jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java | 4 +++- .../src/main/java/org/apache/james/JPAJamesServerMain.java | 2 ++ .../src/main/java/org/apache/james/MemoryJamesServerMain.java | 2 ++ 6 files changed, 12 insertions(+), 4 deletions(-) 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 5714540..a35f7f1 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 @@ -27,6 +27,7 @@ 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.MailetProcessingModule; import org.apache.james.modules.data.CassandraDLPConfigurationStoreModule; import org.apache.james.modules.data.CassandraDomainListModule; import org.apache.james.modules.data.CassandraJmapModule; @@ -158,6 +159,7 @@ public class CassandraJamesServerMain implements JamesServerMain { new DKIMMailetModule()); protected static Module ALL_BUT_JMX_CASSANDRA_MODULE = Modules.combine( + new MailetProcessingModule(), new CassandraBucketModule(), new CassandraBlobStoreModule(), REQUIRE_TASK_MANAGER_MODULE, 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 f39e2ac..5989f9d 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 @@ -30,6 +30,7 @@ import org.apache.james.modules.CassandraConsistencyTaskSerializationModule; import org.apache.james.modules.DistributedTaskManagerModule; import org.apache.james.modules.DistributedTaskSerializationModule; import org.apache.james.modules.MailboxModule; +import org.apache.james.modules.MailetProcessingModule; import org.apache.james.modules.blobstore.BlobStoreCacheModulesChooser; import org.apache.james.modules.blobstore.BlobStoreConfiguration; import org.apache.james.modules.blobstore.BlobStoreModulesChooser; @@ -155,6 +156,7 @@ public class CassandraRabbitMQJamesServerMain implements JamesServerMain { new SpamAssassinListenerModule()); public static Module REQUIRE_TASK_MANAGER_MODULE = Modules.combine( + new MailetProcessingModule(), CASSANDRA_SERVER_CORE_MODULE, CASSANDRA_MAILBOX_MODULE, PROTOCOLS, diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java index 36ebe4a..0c3c9ac 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java @@ -26,7 +26,6 @@ import javax.annotation.PreDestroy; import org.apache.james.modules.CommonServicesModule; import org.apache.james.modules.IsStartedProbeModule; -import org.apache.james.modules.MailetProcessingModule; import org.apache.james.onami.lifecycle.Stager; import org.apache.james.server.core.configuration.Configuration; import org.apache.james.utils.GuiceProbe; @@ -58,8 +57,7 @@ public class GuiceJamesServer { isStartedProbe, Modules.combine( new IsStartedProbeModule(isStartedProbe), - new CommonServicesModule(configuration), - new MailetProcessingModule())); + new CommonServicesModule(configuration))); } protected GuiceJamesServer(IsStartedProbe isStartedProbe, Module module) { 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 cf06fe8..7b33cb6 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,6 +20,7 @@ package org.apache.james; import org.apache.james.modules.MailboxModule; +import org.apache.james.modules.MailetProcessingModule; import org.apache.james.modules.data.JPADataModule; import org.apache.james.modules.data.SieveJPARepositoryModules; import org.apache.james.modules.mailbox.DefaultEventModule; @@ -94,7 +95,8 @@ public class JPAJamesServerMain implements JamesServerMain { new MemoryDeadLetterModule(), new SpamAssassinListenerModule()); - private static final Module JPA_MODULE_AGGREGATE = Modules.combine(JPA_SERVER_MODULE, PROTOCOLS); + private static final Module JPA_MODULE_AGGREGATE = Modules.combine( + new MailetProcessingModule(), JPA_SERVER_MODULE, PROTOCOLS); public static void main(String[] args) throws Exception { Configuration configuration = Configuration.builder() 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 aba49c8..bc6d1fd 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,6 +19,7 @@ package org.apache.james; +import org.apache.james.modules.MailetProcessingModule; import org.apache.james.modules.data.JPADataModule; import org.apache.james.modules.data.JPAEntityManagerModule; import org.apache.james.modules.protocols.ProtocolHandlerModule; @@ -53,6 +54,7 @@ public class JPAJamesServerMain implements JamesServerMain { new TaskManagerModule()); private static final Module JPA_SERVER_MODULE = Modules.combine( + new MailetProcessingModule(), new JPAEntityManagerModule(), new JPADataModule(), new ActiveMQQueueModule(), 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 33d63c8..0e16d31 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 @@ -26,6 +26,7 @@ import org.apache.james.jwt.JwtConfiguration; import org.apache.james.modules.BlobExportMechanismModule; import org.apache.james.modules.BlobMemoryModule; import org.apache.james.modules.MailboxModule; +import org.apache.james.modules.MailetProcessingModule; import org.apache.james.modules.data.MemoryDataJmapModule; import org.apache.james.modules.data.MemoryDataModule; import org.apache.james.modules.eventstore.MemoryEventStoreModule; @@ -106,6 +107,7 @@ public class MemoryJamesServerMain implements JamesServerMain { new JMAPServerModule()); public static final Module IN_MEMORY_SERVER_MODULE = Modules.combine( + new MailetProcessingModule(), new BlobMemoryModule(), new DeletedMessageVaultModule(), new BlobExportMechanismModule(), --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
