http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java index def9542..6cfd351 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java @@ -21,10 +21,8 @@ package org.apache.james.transport.mailets; import static io.restassured.RestAssured.with; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; -import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import org.apache.james.mailets.TemporaryJamesServer; @@ -33,6 +31,8 @@ import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; import org.apache.james.mailrepository.api.MailKey; import org.apache.james.mailrepository.api.MailRepositoryUrl; +import org.apache.james.modules.protocols.ImapGuiceProbe; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.transport.matchers.All; import org.apache.james.utils.DataProbeImpl; @@ -97,7 +97,7 @@ public class ToRepositoryTest { @Test public void incomingShouldBeStoredInProcessorByDefault() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(RECIPIENT, RECIPIENT) .sendMessage(RECIPIENT, RECIPIENT); @@ -106,7 +106,7 @@ public class ToRepositoryTest { @Test public void userShouldBeAbleToAccessReprocessedMails() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(RECIPIENT, RECIPIENT) .sendMessage(RECIPIENT, RECIPIENT); @@ -127,7 +127,7 @@ public class ToRepositoryTest { .basePath(TasksRoutes.BASE) .get(taskId + "/await"); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessageCount(awaitAtMostOneMinute, 2); @@ -136,7 +136,7 @@ public class ToRepositoryTest { @Test public void userShouldBeAbleToAccessReprocessedMail() throws Exception { - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(RECIPIENT, RECIPIENT) .sendMessage(RECIPIENT, RECIPIENT); @@ -153,7 +153,7 @@ public class ToRepositoryTest { .jsonPath() .get("taskId"); - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(RECIPIENT, PASSWORD) .select(IMAPMessageReader.INBOX) .awaitMessageCount(awaitAtMostOneMinute, 1);
http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java index 79ff8bc..aacc8b0 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java @@ -22,7 +22,6 @@ package org.apache.james.transport.mailets; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; import static org.apache.james.mailets.configuration.Constants.PASSWORD; -import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; @@ -31,6 +30,7 @@ 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.mailrepository.api.MailRepositoryUrl; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.transport.matchers.All; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.IMAPMessageReader; @@ -74,7 +74,7 @@ public class ToSenderDomainRepositoryTest { .addProperty("urlPrefix", CUSTOM_REPOSITORY_PREFIX)))); MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(RECIPIENT, RECIPIENT); awaitAtMostOneMinute.until( @@ -95,7 +95,7 @@ public class ToSenderDomainRepositoryTest { .addProperty("allowRepositoryCreation", "true")))); MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(RECIPIENT, RECIPIENT); awaitAtMostOneMinute.until( @@ -118,7 +118,7 @@ public class ToSenderDomainRepositoryTest { probe.createRepository(DOMAIN_URL); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(RECIPIENT, RECIPIENT); awaitAtMostOneMinute.until( @@ -144,7 +144,7 @@ public class ToSenderDomainRepositoryTest { .addProperty("repositoryPath", AWAIT_REPOSITORY_PATH.asString())))); MailRepositoryProbeImpl mailRepositoryProbe = jamesServer.getProbe(MailRepositoryProbeImpl.class); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(RECIPIENT, RECIPIENT); awaitAtMostOneMinute.until( @@ -167,7 +167,7 @@ public class ToSenderDomainRepositoryTest { probe.createRepository(DOMAIN_URL); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(RECIPIENT, RECIPIENT); awaitAtMostOneMinute.until( @@ -187,7 +187,7 @@ public class ToSenderDomainRepositoryTest { .addProperty("urlPrefix", CUSTOM_REPOSITORY_PREFIX)))); MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class); - messageSender.connect(LOCALHOST_IP, SMTP_PORT) + messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()) .sendMessage(RECIPIENT, RECIPIENT) .sendMessage(RECIPIENT, RECIPIENT); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/mailet/integration-testing/src/test/resources/imapserver.xml ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/resources/imapserver.xml b/server/mailet/integration-testing/src/test/resources/imapserver.xml index 5db05e9..aa7c2fb 100644 --- a/server/mailet/integration-testing/src/test/resources/imapserver.xml +++ b/server/mailet/integration-testing/src/test/resources/imapserver.xml @@ -23,7 +23,7 @@ under the License. <imapservers> <imapserver enabled="true"> <jmxName>imapserver</jmxName> - <bind>0.0.0.0:1143</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> <tls socketTLS="false" startTLS="false"> <!-- To create a new keystore execute: http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/mailet/integration-testing/src/test/resources/smtpserver.xml ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/resources/smtpserver.xml b/server/mailet/integration-testing/src/test/resources/smtpserver.xml index b0e2764..3466c9c 100644 --- a/server/mailet/integration-testing/src/test/resources/smtpserver.xml +++ b/server/mailet/integration-testing/src/test/resources/smtpserver.xml @@ -22,7 +22,7 @@ <smtpservers> <smtpserver enabled="true"> <jmxName>smtpserver-global</jmxName> - <bind>0.0.0.0:1025</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> <tls socketTLS="false" startTLS="false"> <keystore>file://conf/keystore</keystore> @@ -48,7 +48,7 @@ </smtpserver> <smtpserver enabled="true"> <jmxName>smtpserver-TLS</jmxName> - <bind>0.0.0.0:10465</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> <tls socketTLS="false" startTLS="false"> <keystore>file://conf/keystore</keystore> http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/imapserver.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/imapserver.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/imapserver.xml index 28ce44c..e997022 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/imapserver.xml +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/imapserver.xml @@ -23,7 +23,7 @@ under the License. <imapservers> <imapserver enabled="true"> <jmxName>imapserver</jmxName> - <bind>0.0.0.0:1143</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> <tls socketTLS="false" startTLS="false"> <!-- To create a new keystore execute: @@ -38,7 +38,7 @@ under the License. </imapserver> <imapserver enabled="true"> <jmxName>imapserver-ssl</jmxName> - <bind>0.0.0.0:1993</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> <tls socketTLS="false" startTLS="false"> <!-- To create a new keystore execute: http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/lmtpserver.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/lmtpserver.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/lmtpserver.xml index 5c4a9c7..ffa6eae 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/lmtpserver.xml +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/lmtpserver.xml @@ -23,7 +23,7 @@ <lmtpserver enabled="true"> <jmxName>lmtpserver</jmxName> <!-- LMTP should not be reachable from outside your network so bind it to loopback--> - <bind>127.0.0.1:1024</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> <connectiontimeout>1200</connectiontimeout> <!-- Set the maximum simultaneous incoming connections for this service --> http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/pop3server.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/pop3server.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/pop3server.xml index e4187da..595c313 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/pop3server.xml +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/pop3server.xml @@ -22,7 +22,7 @@ <pop3servers> <pop3server enabled="true"> <jmxName>pop3server</jmxName> - <bind>0.0.0.0:1110</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> <tls socketTLS="false" startTLS="false"> <!-- To create a new keystore execute: http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/smtpserver.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/smtpserver.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/smtpserver.xml index 2f83c8e..c348f04 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/smtpserver.xml +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/smtpserver.xml @@ -22,7 +22,7 @@ <smtpservers> <smtpserver enabled="true"> <jmxName>smtpserver-global</jmxName> - <bind>0.0.0.0:1025</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> <tls socketTLS="false" startTLS="false"> <keystore>file://conf/keystore</keystore> @@ -45,7 +45,7 @@ </smtpserver> <smtpserver enabled="true"> <jmxName>smtpserver-TLS</jmxName> - <bind>0.0.0.0:10465</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> <tls socketTLS="false" startTLS="false"> <keystore>file://conf/keystore</keystore> @@ -72,7 +72,7 @@ </smtpserver> <smtpserver enabled="true"> <jmxName>smtpserver-authenticated</jmxName> - <bind>0.0.0.0:1587</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> <tls socketTLS="false" startTLS="false"> <keystore>file://conf/keystore</keystore> http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml index 26c1261..02a8f5d 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml @@ -72,11 +72,21 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-imap</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-mailbox</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-smtp</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-webadmin</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java index 54f10b3..0fa17dc 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java @@ -64,8 +64,4 @@ public interface TestingConstants { String LOCALHOST_IP = "127.0.0.1"; - int SMTP_PORT = 1025; - int IMAP_PORT = 1143; - - } http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java index 0a40262..c9e6b04 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java @@ -21,7 +21,6 @@ package org.apache.james.jmap; import static org.apache.james.jmap.TestingConstants.DOMAIN; import static org.apache.james.jmap.TestingConstants.LOCALHOST_IP; -import static org.apache.james.jmap.TestingConstants.SMTP_PORT; import static org.apache.james.jmap.TestingConstants.calmlyAwait; import static org.awaitility.Duration.ONE_MINUTE; import static org.hamcrest.Matchers.equalTo; @@ -38,6 +37,7 @@ import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.store.probe.MailboxProbe; import org.apache.james.modules.MailboxProbeImpl; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.FakeSmtp; @@ -108,7 +108,7 @@ public abstract class VacationRelayIntegrationTest { String externalMail = "r...@yopmail.com"; SMTPClient smtpClient = new SMTPClient(); - smtpClient.connect(LOCALHOST_IP, SMTP_PORT); + smtpClient.connect(LOCALHOST_IP, guiceJamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()); smtpClient.helo(DOMAIN); smtpClient.setSender(externalMail); smtpClient.rcpt("<" + USER_WITH_DOMAIN + ">"); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java index af15f8b..f49a9b4 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java @@ -35,12 +35,10 @@ import static org.apache.james.jmap.TestingConstants.ARGUMENTS; import static org.apache.james.jmap.TestingConstants.BOB; import static org.apache.james.jmap.TestingConstants.BOB_PASSWORD; import static org.apache.james.jmap.TestingConstants.DOMAIN; -import static org.apache.james.jmap.TestingConstants.IMAP_PORT; import static org.apache.james.jmap.TestingConstants.LOCALHOST_IP; import static org.apache.james.jmap.TestingConstants.NAME; import static org.apache.james.jmap.TestingConstants.SECOND_ARGUMENTS; import static org.apache.james.jmap.TestingConstants.SECOND_NAME; -import static org.apache.james.jmap.TestingConstants.SMTP_PORT; import static org.apache.james.jmap.TestingConstants.calmlyAwait; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.contains; @@ -101,6 +99,8 @@ import org.apache.james.mailbox.store.probe.QuotaProbe; import org.apache.james.modules.ACLProbeImpl; import org.apache.james.modules.MailboxProbeImpl; import org.apache.james.modules.QuotaProbesImpl; +import org.apache.james.modules.protocols.ImapGuiceProbe; +import org.apache.james.modules.protocols.SmtpGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.util.ClassLoaderUtils; import org.apache.james.util.MimeMessageUtil; @@ -5010,7 +5010,7 @@ public abstract class SetMessagesMethodTest { calmlyAwait.atMost(30, TimeUnit.SECONDS).until(() -> isAnyMessageFoundInInbox(accessToken)); try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) { - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, jmapServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(USERNAME, PASSWORD) .select(MailboxConstants.INBOX); assertThat(imapMessageReader.readFirstMessage()) @@ -5403,7 +5403,7 @@ public abstract class SetMessagesMethodTest { .sender(fromAddress) .recipient(fromAddress) .build(); - try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, SMTP_PORT, DOMAIN)) { + try (SMTPMessageSender messageSender = SMTPMessageSender.noAuthentication(LOCALHOST_IP, jmapServer.getProbe(SmtpGuiceProbe.class).getSmtpPort(), DOMAIN)) { messageSender.sendMessage(mail); } http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java index dfcbdda..b28044d 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java @@ -26,7 +26,6 @@ import static io.restassured.config.RestAssuredConfig.newConfig; import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser; import static org.apache.james.jmap.JmapURIBuilder.baseUri; import static org.apache.james.jmap.TestingConstants.ARGUMENTS; -import static org.apache.james.jmap.TestingConstants.IMAP_PORT; import static org.apache.james.jmap.TestingConstants.LOCALHOST_IP; import static org.apache.james.jmap.TestingConstants.NAME; import static org.apache.james.jmap.TestingConstants.calmlyAwait; @@ -40,6 +39,7 @@ import java.util.Map; import org.apache.james.GuiceJamesServer; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.mailbox.Role; +import org.apache.james.modules.protocols.ImapGuiceProbe; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.IMAPMessageReader; import org.apache.james.utils.JmapGuiceProbe; @@ -164,7 +164,7 @@ public interface SpamAssassinContract { .path(ARGUMENTS + ".messageIds"); try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) { - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, james.getJmapServer().getProbe(ImapGuiceProbe.class).getImapPort()) .login(ALICE, ALICE_PASSWORD) .select(IMAPMessageReader.INBOX); @@ -211,7 +211,7 @@ public interface SpamAssassinContract { .path(ARGUMENTS + ".messageIds"); try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) { - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, james.getJmapServer().getProbe(ImapGuiceProbe.class).getImapPort()) .login(ALICE, ALICE_PASSWORD) .select(IMAPMessageReader.INBOX); @@ -397,7 +397,7 @@ public interface SpamAssassinContract { // Alice is moving this message out of Spam -> forgetting in SpamAssassin try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) { - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, james.getJmapServer().getProbe(ImapGuiceProbe.class).getImapPort()) .login(ALICE, ALICE_PASSWORD) .select("Spam"); @@ -457,7 +457,7 @@ public interface SpamAssassinContract { // Alice is deleting this message try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) { - imapMessageReader.connect(LOCALHOST_IP, IMAP_PORT) + imapMessageReader.connect(LOCALHOST_IP, james.getJmapServer().getProbe(ImapGuiceProbe.class).getImapPort()) .login(ALICE, ALICE_PASSWORD) .select("Spam"); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java index 15ac827..b09b4d8 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/ImapStepdefs.java @@ -19,7 +19,6 @@ package org.apache.james.jmap.methods.integration.cucumber; -import static org.apache.james.jmap.TestingConstants.IMAP_PORT; import static org.apache.james.transport.mailets.remote.delivery.HeloNameProvider.LOCALHOST; import static org.assertj.core.api.Assertions.assertThat; @@ -27,6 +26,7 @@ import java.util.Map; import javax.inject.Inject; +import org.apache.james.modules.protocols.ImapGuiceProbe; import org.apache.james.utils.IMAPMessageReader; import com.github.fge.lambdas.Throwing; @@ -58,7 +58,7 @@ public class ImapStepdefs { @Then("^the user has a IMAP message in mailbox \"([^\"]*)\"$") public void hasMessageInMailbox(String mailbox) throws Throwable { try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) { - imapMessageReader.connect(LOCALHOST, IMAP_PORT) + imapMessageReader.connect(LOCALHOST, mainStepdefs.jmapServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(userStepdefs.getConnectedUser(), userStepdefs.getUserPassword(userStepdefs.getConnectedUser())) .select(mailbox); @@ -69,7 +69,7 @@ public class ImapStepdefs { @Then("^the message has IMAP flag \"([^\"]*)\" in mailbox \"([^\"]*)\" for \"([^\"]*)\"$") public void hasMessageWithFlagInMailbox(String flags, String mailbox, String username) throws Throwable { try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) { - imapMessageReader.connect(LOCALHOST, IMAP_PORT) + imapMessageReader.connect(LOCALHOST, mainStepdefs.jmapServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(userStepdefs.getConnectedUser(), userStepdefs.getUserPassword(username)) .select(mailbox); @@ -81,7 +81,7 @@ public class ImapStepdefs { @Then("^the user has a IMAP notification about (\\d+) new message when selecting mailbox \"([^\"]*)\"$") public void hasANotificationAboutNewMessagesInMailbox(int numOfNewMessage, String mailbox) throws Throwable { try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) { - imapMessageReader.connect(LOCALHOST, IMAP_PORT) + imapMessageReader.connect(LOCALHOST, mainStepdefs.jmapServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(userStepdefs.getConnectedUser(), userStepdefs.getUserPassword(userStepdefs.getConnectedUser())) .select(mailbox); @@ -94,7 +94,7 @@ public class ImapStepdefs { @Then("^the user does not have a IMAP message in mailbox \"([^\"]*)\"$") public void hasNoMessageInMailbox(String mailbox) throws Throwable { try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) { - imapMessageReader.connect(LOCALHOST, IMAP_PORT) + imapMessageReader.connect(LOCALHOST, mainStepdefs.jmapServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(userStepdefs.getConnectedUser(), userStepdefs.getUserPassword(userStepdefs.getConnectedUser())) .select(mailbox); @@ -110,7 +110,7 @@ public class ImapStepdefs { String password = userStepdefs.getUserPassword(login); imapConnections.put(mailbox, new IMAPMessageReader() - .connect(LOCALHOST, IMAP_PORT) + .connect(LOCALHOST, mainStepdefs.jmapServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(login, password) .select(mailbox)); } @@ -135,7 +135,7 @@ public class ImapStepdefs { String password = userStepdefs.getUserPassword(login); try (IMAPMessageReader imapMessageReader = new IMAPMessageReader()) { - imapMessageReader.connect(LOCALHOST, IMAP_PORT) + imapMessageReader.connect(LOCALHOST, mainStepdefs.jmapServer.getProbe(ImapGuiceProbe.class).getImapPort()) .login(login, password) .select(srcMailbox); assertThat(imapMessageReader).isNotNull(); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/imapserver.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/imapserver.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/imapserver.xml index 5db05e9..aa7c2fb 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/imapserver.xml +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/imapserver.xml @@ -23,7 +23,7 @@ under the License. <imapservers> <imapserver enabled="true"> <jmxName>imapserver</jmxName> - <bind>0.0.0.0:1143</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> <tls socketTLS="false" startTLS="false"> <!-- To create a new keystore execute: http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/smtpserver.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/smtpserver.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/smtpserver.xml index eb84850..0211d77 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/smtpserver.xml +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/smtpserver.xml @@ -22,7 +22,7 @@ <smtpservers> <smtpserver enabled="true"> <jmxName>smtpserver-global</jmxName> - <bind>0.0.0.0:1025</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> <tls socketTLS="false" startTLS="false"> <keystore>file://conf/keystore</keystore> http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java index a6fe7a2..b5edfb2 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java @@ -119,6 +119,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe private MBeanServer mbeanServer; + private int port; @Inject public final void setFileSystem(FileSystem filesystem) { @@ -264,6 +265,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe executionHandler = createExecutionHander(); frameHandlerFactory = createFrameHandlerFactory(); bind(); + port = retrieveFirstBindedPort(); mbeanServer = ManagementFactory.getPlatformMBeanServer(); registerMBean(); @@ -274,6 +276,20 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe } + private int retrieveFirstBindedPort() { + List<InetSocketAddress> listenAddresses = getListenAddresses(); + InetSocketAddress inetSocketAddress = listenAddresses.get(0); + return inetSocketAddress.getPort(); + } + + public int getPort() { + return port; + } + + public boolean useSSL() { + return useSSL; + } + @PreDestroy public final void destroy() { http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/OioLMTPServerFactory.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/OioLMTPServerFactory.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/OioLMTPServerFactory.java index 7775024..dd466a0 100644 --- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/OioLMTPServerFactory.java +++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/OioLMTPServerFactory.java @@ -18,6 +18,8 @@ ****************************************************************/ package org.apache.james.lmtpserver.netty; +import javax.inject.Inject; + import org.apache.james.filesystem.api.FileSystem; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.protocols.lib.handler.ProtocolHandlerLoader; @@ -25,6 +27,7 @@ import org.jboss.netty.util.HashedWheelTimer; public class OioLMTPServerFactory extends LMTPServerFactory { + @Inject public OioLMTPServerFactory(ProtocolHandlerLoader loader, FileSystem fileSystem, MetricFactory metricFactory, HashedWheelTimer hashedWheelTimer) { super(loader, fileSystem, metricFactory, hashedWheelTimer); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/OioSMTPServerFactory.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/OioSMTPServerFactory.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/OioSMTPServerFactory.java index 44d8b80..d95d24a 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/OioSMTPServerFactory.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/OioSMTPServerFactory.java @@ -19,6 +19,8 @@ package org.apache.james.smtpserver.netty; +import javax.inject.Inject; + import org.apache.james.dnsservice.api.DNSService; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.metrics.api.MetricFactory; @@ -27,6 +29,7 @@ import org.jboss.netty.util.HashedWheelTimer; public class OioSMTPServerFactory extends SMTPServerFactory { + @Inject public OioSMTPServerFactory(DNSService dns, ProtocolHandlerLoader loader, FileSystem fileSystem, MetricFactory metricFactory, HashedWheelTimer hashedWheelTimer) { super(dns, loader, fileSystem, metricFactory, hashedWheelTimer); http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java index 632f574..304dd07 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java @@ -51,9 +51,9 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe /** * Whether authentication is required to use this SMTP server. */ - private static final int AUTH_DISABLED = 0; - private static final int AUTH_REQUIRED = 1; - private static final int AUTH_ANNOUNCE = 2; + public static final int AUTH_DISABLED = 0; + public static final int AUTH_REQUIRED = 1; + public static final int AUTH_ANNOUNCE = 2; private int authRequired = AUTH_DISABLED; /** @@ -339,4 +339,7 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe return new AllButStartTlsLineChannelHandlerFactory(AbstractChannelPipelineFactory.MAX_LINE_LENGTH); } + public int getAuthRequired() { + return authRequired; + } } http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/webadmin-integration-test/src/test/resources/imapserver.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/src/test/resources/imapserver.xml b/server/protocols/webadmin-integration-test/src/test/resources/imapserver.xml index 28ce44c..e997022 100644 --- a/server/protocols/webadmin-integration-test/src/test/resources/imapserver.xml +++ b/server/protocols/webadmin-integration-test/src/test/resources/imapserver.xml @@ -23,7 +23,7 @@ under the License. <imapservers> <imapserver enabled="true"> <jmxName>imapserver</jmxName> - <bind>0.0.0.0:1143</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> <tls socketTLS="false" startTLS="false"> <!-- To create a new keystore execute: @@ -38,7 +38,7 @@ under the License. </imapserver> <imapserver enabled="true"> <jmxName>imapserver-ssl</jmxName> - <bind>0.0.0.0:1993</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> <tls socketTLS="false" startTLS="false"> <!-- To create a new keystore execute: http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/webadmin-integration-test/src/test/resources/lmtpserver.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/src/test/resources/lmtpserver.xml b/server/protocols/webadmin-integration-test/src/test/resources/lmtpserver.xml index 5c4a9c7..7739071 100644 --- a/server/protocols/webadmin-integration-test/src/test/resources/lmtpserver.xml +++ b/server/protocols/webadmin-integration-test/src/test/resources/lmtpserver.xml @@ -23,7 +23,7 @@ <lmtpserver enabled="true"> <jmxName>lmtpserver</jmxName> <!-- LMTP should not be reachable from outside your network so bind it to loopback--> - <bind>127.0.0.1:1024</bind> + <bind>127.0.0.1:0</bind> <connectionBacklog>200</connectionBacklog> <connectiontimeout>1200</connectiontimeout> <!-- Set the maximum simultaneous incoming connections for this service --> http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/webadmin-integration-test/src/test/resources/managesieveserver.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/src/test/resources/managesieveserver.xml b/server/protocols/webadmin-integration-test/src/test/resources/managesieveserver.xml index ec57e09..eee4052 100644 --- a/server/protocols/webadmin-integration-test/src/test/resources/managesieveserver.xml +++ b/server/protocols/webadmin-integration-test/src/test/resources/managesieveserver.xml @@ -31,7 +31,7 @@ <jmxName>managesieveserver</jmxName> - <bind>0.0.0.0:4190</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/webadmin-integration-test/src/test/resources/pop3server.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/src/test/resources/pop3server.xml b/server/protocols/webadmin-integration-test/src/test/resources/pop3server.xml index e4187da..595c313 100644 --- a/server/protocols/webadmin-integration-test/src/test/resources/pop3server.xml +++ b/server/protocols/webadmin-integration-test/src/test/resources/pop3server.xml @@ -22,7 +22,7 @@ <pop3servers> <pop3server enabled="true"> <jmxName>pop3server</jmxName> - <bind>0.0.0.0:1110</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> <tls socketTLS="false" startTLS="false"> <!-- To create a new keystore execute: http://git-wip-us.apache.org/repos/asf/james-project/blob/60b1d219/server/protocols/webadmin-integration-test/src/test/resources/smtpserver.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/src/test/resources/smtpserver.xml b/server/protocols/webadmin-integration-test/src/test/resources/smtpserver.xml index a3d4b8f..c932ff1 100644 --- a/server/protocols/webadmin-integration-test/src/test/resources/smtpserver.xml +++ b/server/protocols/webadmin-integration-test/src/test/resources/smtpserver.xml @@ -22,7 +22,7 @@ <smtpservers> <smtpserver enabled="true"> <jmxName>smtpserver-global</jmxName> - <bind>0.0.0.0:1025</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> <tls socketTLS="false" startTLS="false"> <keystore>file://conf/keystore</keystore> @@ -46,7 +46,7 @@ </smtpserver> <smtpserver enabled="true"> <jmxName>smtpserver-TLS</jmxName> - <bind>0.0.0.0:10465</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> <tls socketTLS="false" startTLS="false"> <keystore>file://conf/keystore</keystore> @@ -74,7 +74,7 @@ </smtpserver> <smtpserver enabled="true"> <jmxName>smtpserver-authenticated</jmxName> - <bind>0.0.0.0:1587</bind> + <bind>0.0.0.0:0</bind> <connectionBacklog>200</connectionBacklog> <tls socketTLS="false" startTLS="false"> <keystore>file://conf/keystore</keystore> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
