You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2018/07/25 02:59:02 UTC

[21/29] james-project git commit: JAMES-2469 Simplify configuration in mailet integration tests

JAMES-2469 Simplify configuration in mailet integration tests


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/48030071
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/48030071
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/48030071

Branch: refs/heads/master
Commit: 4803007171a783d8c777161208ae2b98115e24dc
Parents: fe846d5
Author: benwa <bt...@linagora.com>
Authored: Sat Jul 14 11:29:27 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:37 2018 +0700

----------------------------------------------------------------------
 .../james/mailets/TemporaryJamesServer.java     |  12 +-
 .../mailets/configuration/CommonProcessors.java | 130 +------------------
 .../configuration/MailetConfiguration.java      |   2 +-
 .../mailets/configuration/MailetContainer.java  |   2 +-
 .../configuration/ProcessorConfiguration.java   |   4 -
 .../crypto/SMIMESignIntegrationTest.java        |   5 -
 .../src/test/resources/imapserver.xml           |  15 ---
 .../src/test/resources/lmtpserver.xml           |  18 ---
 .../src/test/resources/managesieveserver.xml    |  33 -----
 .../src/test/resources/pop3server.xml           |  19 ---
 .../src/test/resources/smtpserver.xml           |  30 -----
 11 files changed, 9 insertions(+), 261 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
index e9d2f94..3337ef8 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
@@ -54,20 +54,12 @@ public class TemporaryJamesServer {
     public static final MailetContainer.Builder DEFAULT_MAILET_CONTAINER_CONFIGURATION = MailetContainer.builder()
         .putProcessor(CommonProcessors.root())
         .putProcessor(CommonProcessors.error())
-        .putProcessor(CommonProcessors.transport())
-        .putProcessor(CommonProcessors.spam())
-        .putProcessor(CommonProcessors.localAddressError())
-        .putProcessor(CommonProcessors.relayDenied())
-        .putProcessor(CommonProcessors.bounces())
-        .putProcessor(CommonProcessors.sieveManagerCheck());
+        .putProcessor(CommonProcessors.transport());
 
     public static final MailetContainer.Builder SIMPLE_MAILET_CONTAINER_CONFIGURATION = MailetContainer.builder()
         .putProcessor(CommonProcessors.simpleRoot())
         .putProcessor(CommonProcessors.error())
-        .putProcessor(CommonProcessors.transport())
-        .putProcessor(CommonProcessors.localAddressError())
-        .putProcessor(CommonProcessors.relayDenied())
-        .putProcessor(CommonProcessors.bounces());
+        .putProcessor(CommonProcessors.transport());
 
     public static class Builder {
         private ImmutableList.Builder<Module> overrideModules;

http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
index d465620..936124f 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
@@ -30,20 +30,15 @@ import org.apache.james.transport.mailets.Null;
 import org.apache.james.transport.mailets.PostmasterAlias;
 import org.apache.james.transport.mailets.RecipientRewriteTable;
 import org.apache.james.transport.mailets.RemoteDelivery;
-import org.apache.james.transport.mailets.SetMailAttribute;
 import org.apache.james.transport.mailets.SetMimeHeader;
 import org.apache.james.transport.mailets.Sieve;
 import org.apache.james.transport.mailets.ToProcessor;
 import org.apache.james.transport.mailets.ToRepository;
-import org.apache.james.transport.mailets.managesieve.ManageSieveMailet;
 import org.apache.james.transport.matchers.All;
 import org.apache.james.transport.matchers.HasMailAttribute;
-import org.apache.james.transport.matchers.InSpammerBlacklist;
-import org.apache.james.transport.matchers.RecipientIs;
 import org.apache.james.transport.matchers.RecipientIsLocal;
 import org.apache.james.transport.matchers.RelayLimit;
 import org.apache.james.transport.matchers.SMTPAuthSuccessful;
-import org.apache.mailet.Mail;
 
 public class CommonProcessors {
 
@@ -51,7 +46,7 @@ public class CommonProcessors {
 
     public static ProcessorConfiguration root() {
         return ProcessorConfiguration.root()
-                .enableJmx(true)
+                .enableJmx(false)
                 .addMailet(MailetConfiguration.builder()
                         .matcher(All.class)
                         .mailet(PostmasterAlias.class))
@@ -59,35 +54,6 @@ public class CommonProcessors {
                         .matcher(RelayLimit.class)
                         .matcherCondition("30")
                         .mailet(Null.class))
-                .addMailet(MailetConfiguration.builder()
-                        .matcher(RecipientIs.class)
-                        .matcherCondition("sievemanager@james.linagora.com")
-                        .mailet(ToProcessor.class)
-                        .addProperty("processor", "sieve-manager-check"))
-                .addMailet(MailetConfiguration.builder()
-                        .matcher(HasMailAttribute.class)
-                        .matcherCondition("spamChecked")
-                        .mailet(ToProcessor.class)
-                        .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
-                .addMailet(MailetConfiguration.builder()
-                        .matcher(All.class)
-                        .mailet(SetMailAttribute.class)
-                        .addProperty("spamChecked", "true"))
-                .addMailet(MailetConfiguration.builder()
-                        .matcher(SMTPAuthSuccessful.class)
-                        .mailet(ToProcessor.class)
-                        .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
-                .addMailet(MailetConfiguration.builder()
-                        .matcher(InSpammerBlacklist.class)
-                        .matcherCondition("query.bondedsender.org.")
-                        .mailet(ToProcessor.class)
-                        .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
-                .addMailet(MailetConfiguration.builder()
-                        .matcher(InSpammerBlacklist.class)
-                        .matcherCondition("dnsbl.njabl.org.")
-                        .mailet(ToProcessor.class)
-                        .addProperty("processor", ProcessorConfiguration.STATE_SPAM)
-                        .addProperty("notice", "550 Requested action not taken: rejected - see http://njabl.org/"))
                 .addMailet(MailetConfiguration.TO_TRANSPORT)
                 .build();
     }
@@ -100,7 +66,7 @@ public class CommonProcessors {
 
     public static ProcessorConfiguration error() {
         return ProcessorConfiguration.error()
-                .enableJmx(true)
+                .enableJmx(false)
                 .addMailet(MailetConfiguration.builder()
                         .matcher(All.class)
                         .mailet(Bounce.class))
@@ -113,12 +79,7 @@ public class CommonProcessors {
 
     public static ProcessorConfiguration transport() {
         return ProcessorConfiguration.transport()
-                .enableJmx(true)
-                .addMailet(MailetConfiguration.builder()
-                        .matcher(SMTPAuthSuccessful.class)
-                        .mailet(SetMimeHeader.class)
-                        .addProperty("name", "X-UserIsAuth")
-                        .addProperty("value", "true"))
+                .enableJmx(false)
                 .addMailet(MailetConfiguration.builder()
                         .matcher(HasMailAttribute.class)
                         .matcherCondition("org.apache.james.SMIMECheckSignature")
@@ -154,7 +115,7 @@ public class CommonProcessors {
                 .addMailet(MailetConfiguration.builder()
                         .matcher(All.class)
                         .mailet(ToProcessor.class)
-                        .addProperty("processor", "relay-denied"))
+                        .addProperty("processor", "error"))
                 .build();
     }
 
@@ -165,94 +126,13 @@ public class CommonProcessors {
             .build();
     }
 
-    public static ProcessorConfiguration spam() {
-        return ProcessorConfiguration.spam()
-                .enableJmx(true)
-                .addMailet(MailetConfiguration.builder()
-                        .matcher(All.class)
-                        .mailet(ToRepository.class)
-                        .addProperty("repositoryPath", "file://var/mail/spam/"))
-                .build();
-    }
-
-    public static ProcessorConfiguration localAddressError() {
-        return ProcessorConfiguration.builder()
-                .state("local-address-error")
-                .enableJmx(true)
-                .addMailet(MailetConfiguration.builder()
-                        .matcher(All.class)
-                        .mailet(Bounce.class)
-                        .addProperty("attachment", "none"))
-                .addMailet(MailetConfiguration.builder()
-                        .matcher(All.class)
-                        .mailet(ToRepository.class)
-                        .addProperty("repositoryPath", "file://var/mail/address-error/"))
-                .build();
-    }
-
-    public static ProcessorConfiguration relayDenied() {
-        return ProcessorConfiguration.builder()
-                .state("replay-denied")
-                .enableJmx(true)
-                .addMailet(MailetConfiguration.builder()
-                        .matcher(All.class)
-                        .mailet(Bounce.class)
-                        .addProperty("attachment", "none"))
-                .addMailet(MailetConfiguration.builder()
-                        .matcher(All.class)
-                        .mailet(ToRepository.class)
-                        .addProperty("repositoryPath", "file://var/mail/relay-denied/")
-                        .addProperty("notice", "Warning: You are sending an e-mail to a remote server. You must be authentified to perform such an operation"))
-                .build();
-    }
-
     public static ProcessorConfiguration bounces() {
         return ProcessorConfiguration.bounces()
-                .enableJmx(true)
+                .enableJmx(false)
                 .addMailet(MailetConfiguration.builder()
                         .matcher(All.class)
                         .mailet(DSNBounce.class)
                         .addProperty("passThrough", "false"))
                 .build();
     }
-
-    public static ProcessorConfiguration sieveManagerCheck() {
-        return ProcessorConfiguration.builder()
-                .state("sieve-manager-check")
-                .enableJmx(true)
-                .addMailet(MailetConfiguration.builder()
-                        .matcher(RecipientIsLocal.class)
-                        .mailet(ToProcessor.class)
-                        .addProperty("processor", "sieve-manager"))
-                .addMailet(MailetConfiguration.builder()
-                        .matcher(All.class)
-                        .mailet(Bounce.class)
-                        .addProperty("inline", "heads")
-                        .addProperty("attachment", "none")
-                        .addProperty("passThrough", "false")
-                        .addProperty("prefix", "[REJECTED]")
-                        .addProperty("notice", "You can't send messages to configure SIEVE on this serveur unless you are the official SIEVE manager."))
-                .addMailet(MailetConfiguration.builder()
-                        .matcher(All.class)
-                        .mailet(Null.class))
-                .build();
-    }
-
-    public static ProcessorConfiguration sieveManager() {
-        return ProcessorConfiguration.builder()
-                .state("sieve-manager")
-                .enableJmx(true)
-                .addMailet(MailetConfiguration.builder()
-                        .matcher(All.class)
-                        .mailet(SetMailAttribute.class)
-                        .addProperty(Mail.SMTP_AUTH_USER_ATTRIBUTE_NAME, "true"))
-                .addMailet(MailetConfiguration.builder()
-                        .matcher(All.class)
-                        .mailet(ManageSieveMailet.class)
-                        .addProperty("helpURL", "file:/root/james-server-app-3.0.0-beta5-SNAPSHOT/conf/managesieve.help.txt"))
-                .addMailet(MailetConfiguration.builder()
-                        .matcher(All.class)
-                        .mailet(Null.class))
-                .build();
-    }
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
index b7619c3..cdba77d 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
@@ -106,7 +106,7 @@ public class MailetConfiguration implements SerializableAsXml {
 
     public static MailetConfiguration.Builder remoteDeliveryBuilder() {
         return remoteDeliveryBuilderNoBounces()
-            .addProperty("bounceProcessor", ProcessorConfiguration.STATE_BOUNCES);
+            .addProperty("bounceProcessor", ProcessorConfiguration.STATE_ERROR);
     }
 
     public static MailetConfiguration.Builder remoteDeliveryBuilderNoBounces() {

http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
index 0e2c3db..ebe29e6 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
@@ -104,7 +104,7 @@ public class MailetContainer implements SerializableAsXml {
     public String serializeAsXml() {
         StringBuilder builder = new StringBuilder();
         builder.append("<?xml version=\"1.0\"?>\n")
-            .append("<mailetcontainer enableJmx=\"true\">\n")
+            .append("<mailetcontainer enableJmx=\"false\">\n")
             .append("<context><postmaster>").append(getPostmaster()).append("</postmaster>").append("</context>\n")
             .append("<spooler><threads>").append(getThreads()).append("</threads>").append("</spooler>\n")
             .append("<processors>\n");

http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
index d214f66..08a0a17 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
@@ -54,10 +54,6 @@ public class ProcessorConfiguration implements SerializableAsXml {
         return builder().state(STATE_ERROR);
     }
 
-    public static Builder spam() {
-        return builder().state(STATE_SPAM);
-    }
-
     public static class Builder {
 
         private String state;

http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
index 669248f..03f9506 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
@@ -86,11 +86,6 @@ public class SMIMESignIntegrationTest {
                     .addProperty("keyStoreType", "PKCS12")
                     .addProperty("debug", "true"))
                 .addMailet(MailetConfiguration.LOCAL_DELIVERY))
-            .putProcessor(CommonProcessors.spam())
-            .putProcessor(CommonProcessors.localAddressError())
-            .putProcessor(CommonProcessors.relayDenied())
-            .putProcessor(CommonProcessors.bounces())
-            .putProcessor(CommonProcessors.sieveManagerCheck())
             .build();
 
         jamesServer = TemporaryJamesServer.builder()

http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/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 28ce44c..5db05e9 100644
--- a/server/mailet/integration-testing/src/test/resources/imapserver.xml
+++ b/server/mailet/integration-testing/src/test/resources/imapserver.xml
@@ -36,19 +36,4 @@ under the License.
         <connectionLimit>0</connectionLimit>
         <connectionLimitPerIP>0</connectionLimitPerIP>
     </imapserver>
-    <imapserver enabled="true">
-        <jmxName>imapserver-ssl</jmxName>
-        <bind>0.0.0.0:1993</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="false">
-            <!-- To create a new keystore execute:
-              keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-             -->
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-        </tls>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-    </imapserver>
 </imapservers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/resources/lmtpserver.xml
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/resources/lmtpserver.xml b/server/mailet/integration-testing/src/test/resources/lmtpserver.xml
index 5c4a9c7..f838adb 100644
--- a/server/mailet/integration-testing/src/test/resources/lmtpserver.xml
+++ b/server/mailet/integration-testing/src/test/resources/lmtpserver.xml
@@ -20,22 +20,4 @@
 
 <lmtpservers>
 
-    <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>
-        <connectionBacklog>200</connectionBacklog>
-        <connectiontimeout>1200</connectiontimeout>
-        <!-- Set the maximum simultaneous incoming connections for this service -->
-        <connectionLimit>0</connectionLimit>
-        <!-- Set the maximum simultaneous incoming connections per IP for this service -->
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <!--  This sets the maximum allowed message size (in kilobytes) for this -->
-        <!--  LMTP service. If unspecified, the value defaults to 0, which means no limit. -->
-        <maxmessagesize>0</maxmessagesize>
-        <handlerchain>
-            <handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </lmtpserver>
-
 </lmtpservers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/resources/managesieveserver.xml
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/resources/managesieveserver.xml b/server/mailet/integration-testing/src/test/resources/managesieveserver.xml
index ec57e09..f136a43 100644
--- a/server/mailet/integration-testing/src/test/resources/managesieveserver.xml
+++ b/server/mailet/integration-testing/src/test/resources/managesieveserver.xml
@@ -27,39 +27,6 @@
 
 <managesieveservers>
 
-   <managesieveserver enabled="true">
-
-     <jmxName>managesieveserver</jmxName>
-
-     <bind>0.0.0.0:4190</bind>
-
-     <connectionBacklog>200</connectionBacklog>
-
-     <tls socketTLS="false" startTLS="false">
-       <!-- To create a new keystore execute:
-        keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-         -->
-       <keystore>file://conf/keystore</keystore>
-       <secret>james72laBalle</secret>
-       <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-       <!-- The algorithm is optional and only needs to be specified when using something other
-        than the Sun JCE provider - You could use IbmX509 with IBM Java runtime. -->
-       <algorithm>SunX509</algorithm>
-     </tls>
-         
-        <!-- connection timeout in secconds -->
-        <connectiontimeout>360</connectiontimeout>
-
-        <!-- Set the maximum simultaneous incoming connections for this service -->
-        <connectionLimit>0</connectionLimit>
-         
-        <!-- Set the maximum simultaneous incoming connections per IP for this service -->
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <maxmessagesize>0</maxmessagesize>
-        <addressBracketsEnforcement>true</addressBracketsEnforcement>
-  
-   </managesieveserver>
-
 </managesieveservers>
 
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/resources/pop3server.xml
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/resources/pop3server.xml b/server/mailet/integration-testing/src/test/resources/pop3server.xml
index e4187da..bec385a 100644
--- a/server/mailet/integration-testing/src/test/resources/pop3server.xml
+++ b/server/mailet/integration-testing/src/test/resources/pop3server.xml
@@ -20,23 +20,4 @@
 
 
 <pop3servers>
-    <pop3server enabled="true">
-        <jmxName>pop3server</jmxName>
-        <bind>0.0.0.0:1110</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="false">
-            <!-- To create a new keystore execute:
-                  keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
-             -->
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-        </tls>
-        <connectiontimeout>1200</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <handlerchain>
-            <handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </pop3server>
 </pop3servers>

http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/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 30c56f8..b0e2764 100644
--- a/server/mailet/integration-testing/src/test/resources/smtpserver.xml
+++ b/server/mailet/integration-testing/src/test/resources/smtpserver.xml
@@ -76,36 +76,6 @@
             <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
         </handlerchain>
     </smtpserver>
-    <smtpserver enabled="true">
-        <jmxName>smtpserver-authenticated</jmxName>
-        <bind>0.0.0.0:1587</bind>
-        <connectionBacklog>200</connectionBacklog>
-        <tls socketTLS="false" startTLS="false">
-            <keystore>file://conf/keystore</keystore>
-            <secret>james72laBalle</secret>
-            <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
-            <algorithm>SunX509</algorithm>
-        </tls>
-        <connectiontimeout>360</connectiontimeout>
-        <connectionLimit>0</connectionLimit>
-        <connectionLimitPerIP>0</connectionLimitPerIP>
-        <!--
-           Authorize only local users
-        -->
-        <authRequired>true</authRequired>
-        {{#hasAuthorizedAddresses}}
-        <authorizedAddresses>{{authorizedAddresses}}</authorizedAddresses>
-        {{/hasAuthorizedAddresses}}
-        <!-- Trust authenticated users -->
-        <verifyIdentity>false</verifyIdentity>
-        <maxmessagesize>{{maxmessagesize}}</maxmessagesize>
-        <addressBracketsEnforcement>{{bracketEnforcement}}</addressBracketsEnforcement>
-        <smtpGreeting>JAMES Linagora's SMTP awesome Server</smtpGreeting>
-        <handlerchain>
-            <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
-            <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
-        </handlerchain>
-    </smtpserver>
 </smtpservers>
 
 


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org