JAMES-2246 Move memory related meta-modules to MemoryJamesServerMain
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/cc9707f3 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/cc9707f3 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/cc9707f3 Branch: refs/heads/master Commit: cc9707f3ea67320e0a227b03a41ef5dc74452322 Parents: 31f473f Author: benwa <btell...@linagora.com> Authored: Tue Dec 5 14:04:06 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Fri Dec 8 17:33:49 2017 +0700 ---------------------------------------------------------------------- .../org/apache/james/MemoryJamesServerMain.java | 16 +++++++++++++++ .../GatewayRemoteDeliveryIntegrationTest.java | 21 ++------------------ 2 files changed, 18 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/cc9707f3/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java ---------------------------------------------------------------------- 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 d1dcf41..720b762 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 @@ -19,6 +19,7 @@ package org.apache.james; +import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.james.modules.MailboxModule; import org.apache.james.modules.data.MemoryDataJmapModule; import org.apache.james.modules.data.MemoryDataModule; @@ -30,10 +31,12 @@ 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.server.CamelMailetContainerModule; import org.apache.james.modules.server.DataRoutesModules; import org.apache.james.modules.server.JMXServerModule; import org.apache.james.modules.server.MailboxRoutesModule; import org.apache.james.modules.server.MemoryMailQueueModule; +import org.apache.james.modules.server.RawPostDequeueDecoratorModule; import org.apache.james.modules.server.SwaggerRoutesModule; import org.apache.james.modules.server.WebAdminServerModule; @@ -66,6 +69,19 @@ public class MemoryJamesServerMain { new MemoryMailQueueModule(), new MailboxModule()); + public static final Module SMTP_ONLY_MODULE = Modules.combine( + MemoryJamesServerMain.IN_MEMORY_SERVER_MODULE, + new ProtocolHandlerModule(), + new SMTPServerModule(), + new RawPostDequeueDecoratorModule(), + binder -> binder.bind(CamelMailetContainerModule.DefaultProcessorsConfigurationSupplier.class) + .toInstance(DefaultConfigurationBuilder::new)); + + + public static final Module SMTP_AND_IMAP_MODULE = Modules.combine( + SMTP_ONLY_MODULE, + new IMAPServerModule()); + public static final Module IN_MEMORY_SERVER_AGGREGATE_MODULE = Modules.combine( IN_MEMORY_SERVER_MODULE, PROTOCOLS, http://git-wip-us.apache.org/repos/asf/james-project/blob/cc9707f3/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java index 374d7bf..5d7d498 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java @@ -22,14 +22,14 @@ package org.apache.james.mailets; import static com.jayway.restassured.RestAssured.when; import static com.jayway.restassured.config.EncoderConfig.encoderConfig; import static com.jayway.restassured.config.RestAssuredConfig.newConfig; +import static org.apache.james.MemoryJamesServerMain.SMTP_AND_IMAP_MODULE; +import static org.apache.james.MemoryJamesServerMain.SMTP_ONLY_MODULE; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import java.net.InetAddress; import java.util.concurrent.TimeUnit; -import org.apache.commons.configuration.DefaultConfigurationBuilder; -import org.apache.james.MemoryJamesServerMain; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.api.InMemoryDNSService; import org.apache.james.mailbox.model.MailboxConstants; @@ -37,11 +37,6 @@ import org.apache.james.mailets.configuration.CommonProcessors; import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; -import org.apache.james.modules.protocols.IMAPServerModule; -import org.apache.james.modules.protocols.ProtocolHandlerModule; -import org.apache.james.modules.protocols.SMTPServerModule; -import org.apache.james.modules.server.CamelMailetContainerModule; -import org.apache.james.modules.server.RawPostDequeueDecoratorModule; import org.apache.james.probe.DataProbe; import org.apache.james.transport.mailets.LocalDelivery; import org.apache.james.transport.mailets.Null; @@ -66,8 +61,6 @@ import org.junit.rules.TemporaryFolder; import org.testcontainers.containers.wait.HostPortWaitStrategy; import com.google.common.base.Charsets; -import com.google.inject.Module; -import com.google.inject.util.Modules; import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; import com.jayway.awaitility.core.ConditionFactory; @@ -86,16 +79,6 @@ public class GatewayRemoteDeliveryIntegrationTest { private static final String FROM = "from@" + JAMES_APACHE_ORG; private static final String RECIPIENT = "touser@" + JAMES_ANOTHER_DOMAIN; - private static final Module SMTP_ONLY_MODULE = Modules.combine( - MemoryJamesServerMain.IN_MEMORY_SERVER_MODULE, - new ProtocolHandlerModule(), - new SMTPServerModule(), - new RawPostDequeueDecoratorModule(), - binder -> binder.bind(CamelMailetContainerModule.DefaultProcessorsConfigurationSupplier.class) - .toInstance(DefaultConfigurationBuilder::new)); - private static final Module SMTP_AND_IMAP_MODULE = Modules.combine( - SMTP_ONLY_MODULE, - new IMAPServerModule()); @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
