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 5ce80350bbb13399938a112ddb94db29635febeb Author: Benoit Tellier <[email protected]> AuthorDate: Mon Sep 23 11:26:09 2019 +0700 JAMES-1881 SPF should not log as ManageSieveMailet... --- .../org/apache/james/transport/mailets/BayesianAnalysisFeeder.java | 3 +-- .../src/main/java/org/apache/james/transport/mailets/DSNBounce.java | 3 +-- .../main/java/org/apache/james/transport/mailets/FromRepository.java | 3 +-- .../src/main/java/org/apache/james/transport/mailets/Redirect.java | 3 +-- .../mailets/src/main/java/org/apache/james/transport/mailets/SPF.java | 3 +-- .../main/java/org/apache/james/transport/mailets/WhiteListManager.java | 3 +-- .../java/org/apache/james/samples/mailets/InstrumentationMailet.java | 3 +-- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java index 2769732..38d8717 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java @@ -32,7 +32,6 @@ import javax.mail.internet.MimeMessage; import javax.sql.DataSource; import org.apache.james.filesystem.api.FileSystem; -import org.apache.james.transport.mailets.managesieve.ManageSieveMailet; import org.apache.james.util.bayesian.JDBCBayesianAnalyzer; import org.apache.james.util.sql.JDBCUtil; import org.apache.mailet.Experimental; @@ -132,7 +131,7 @@ import org.slf4j.LoggerFactory; */ @Experimental public class BayesianAnalysisFeeder extends GenericMailet { - private static final Logger LOGGER = LoggerFactory.getLogger(ManageSieveMailet.class); + private static final Logger LOGGER = LoggerFactory.getLogger(BayesianAnalysisFeeder.class); /** * The JDBCUtil helper class diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java index f9b42f5..8901085 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java @@ -39,7 +39,6 @@ import org.apache.james.core.MaybeSender; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.javax.MimeMultipartReport; import org.apache.james.server.core.MailImpl; -import org.apache.james.transport.mailets.managesieve.ManageSieveMailet; import org.apache.james.transport.mailets.redirect.InitParameters; import org.apache.james.transport.mailets.redirect.MailModifier; import org.apache.james.transport.mailets.redirect.NotifyMailetInitParameters; @@ -107,7 +106,7 @@ import com.google.common.collect.ImmutableList; */ public class DSNBounce extends GenericMailet implements RedirectNotify { - private static final Logger LOGGER = LoggerFactory.getLogger(ManageSieveMailet.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DSNBounce.class); private static final String[] CONFIGURABLE_PARAMETERS = new String[]{ "debug", "passThrough", "messageString", "attachment", "sender", "prefix" }; private static final List<MailAddress> RECIPIENT_MAIL_ADDRESSES = ImmutableList.of(SpecialAddress.REVERSE_PATH); diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java index bb2c91b..ecb3abc 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java @@ -31,7 +31,6 @@ import org.apache.james.mailrepository.api.MailKey; import org.apache.james.mailrepository.api.MailRepository; import org.apache.james.mailrepository.api.MailRepositoryStore; import org.apache.james.mailrepository.api.MailRepositoryUrl; -import org.apache.james.transport.mailets.managesieve.ManageSieveMailet; import org.apache.mailet.Attribute; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; @@ -52,7 +51,7 @@ import org.slf4j.LoggerFactory; */ @Experimental public class FromRepository extends GenericMailet { - private static final Logger LOGGER = LoggerFactory.getLogger(ManageSieveMailet.class); + private static final Logger LOGGER = LoggerFactory.getLogger(FromRepository.class); /** The repository from where this mailet spools mail. */ private MailRepository repository; diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java index bd787d9..3e7fd72 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java @@ -28,7 +28,6 @@ import javax.mail.internet.InternetAddress; import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; -import org.apache.james.transport.mailets.managesieve.ManageSieveMailet; import org.apache.james.transport.mailets.redirect.AddressExtractor; import org.apache.james.transport.mailets.redirect.InitParameters; import org.apache.james.transport.mailets.redirect.ProcessRedirectNotify; @@ -302,7 +301,7 @@ import com.google.common.collect.ImmutableList; */ public class Redirect extends GenericMailet implements RedirectNotify { - private static final Logger LOGGER = LoggerFactory.getLogger(ManageSieveMailet.class); + private static final Logger LOGGER = LoggerFactory.getLogger(Redirect.class); private static final String[] CONFIGURABLE_PARAMETERS = new String[] { "static", "debug", "passThrough", "fakeDomainCheck", "inline", "attachment", "message", "recipients", "to", "replyTo", "replyto", "reversePath", "sender", "subject", "prefix", "attachError", "isReply" }; diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java index a4f20d5..2974067 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java @@ -25,7 +25,6 @@ import javax.mail.internet.MimeMessage; import org.apache.james.jspf.core.Logger; import org.apache.james.jspf.executor.SPFResult; import org.apache.james.jspf.impl.DefaultSPF; -import org.apache.james.transport.mailets.managesieve.ManageSieveMailet; import org.apache.mailet.Attribute; import org.apache.mailet.AttributeName; import org.apache.mailet.AttributeValue; @@ -56,7 +55,7 @@ import org.slf4j.LoggerFactory; */ @Experimental public class SPF extends GenericMailet { - private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(ManageSieveMailet.class); + private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(SPF.class); private boolean addHeader = false; private org.apache.james.jspf.impl.SPF spf; diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java index d2fa34f..572bec1 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java @@ -48,7 +48,6 @@ import javax.sql.DataSource; import org.apache.james.core.Domain; import org.apache.james.core.MailAddress; -import org.apache.james.transport.mailets.managesieve.ManageSieveMailet; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.model.JamesUser; import org.apache.james.util.sql.JDBCUtil; @@ -127,7 +126,7 @@ import org.slf4j.LoggerFactory; @Experimental @SuppressWarnings("deprecation") public class WhiteListManager extends GenericMailet { - private static final Logger LOGGER = LoggerFactory.getLogger(ManageSieveMailet.class); + private static final Logger LOGGER = LoggerFactory.getLogger(WhiteListManager.class); private boolean automaticInsert; private String displayFlag; diff --git a/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java b/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java index ea26413..347e79f 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java @@ -33,7 +33,6 @@ import javax.mail.internet.MimeMessage.RecipientType; import javax.mail.internet.NewsAddress; import org.apache.james.core.MailAddress; -import org.apache.james.transport.mailets.managesieve.ManageSieveMailet; import org.apache.mailet.Mail; import org.apache.mailet.Mailet; import org.apache.mailet.MailetConfig; @@ -45,7 +44,7 @@ import org.slf4j.LoggerFactory; * debugging. */ public class InstrumentationMailet implements Mailet { - private static final Logger LOGGER = LoggerFactory.getLogger(ManageSieveMailet.class); + private static final Logger LOGGER = LoggerFactory.getLogger(InstrumentationMailet.class); private MailetConfig config; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
