Author: matthieu Date: Tue Nov 3 16:42:48 2015 New Revision: 1712325 URL: http://svn.apache.org/viewvc?rev=1712325&view=rev Log: JAMES-1626 All ProtocolHandler should be lifeCycle aware
If fixes a longstanding error in SMTPServerTest that return code 554 on DNS blacklist test Removed: james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/LifecycleAwareProtocolHandler.java james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/lifecycle/InitializingLifecycleAwareProtocolHandler.java Modified: james/project/trunk/protocols/api/pom.xml james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandler.java james/project/trunk/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java james/project/trunk/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java james/project/trunk/protocols/pom.xml james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java james/project/trunk/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java james/project/trunk/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java james/project/trunk/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/protocols/ProtocolHandlerLoaderBeanFactory.java james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java james/project/trunk/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java james/project/trunk/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java james/project/trunk/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java james/project/trunk/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxUnknownCmdHandler.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java Modified: james/project/trunk/protocols/api/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/api/pom.xml?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/api/pom.xml (original) +++ james/project/trunk/protocols/api/pom.xml Tue Nov 3 16:42:48 2015 @@ -34,8 +34,11 @@ <name>Apache James :: Protocols :: API</name> <dependencies> - - <!-- Logging frameworks - completely optional --> + <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + </dependency> + <!-- Logging frameworks - completely optional --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> Modified: james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java (original) +++ james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java Tue Nov 3 16:42:48 2015 @@ -81,8 +81,8 @@ public abstract class AbstractProtocolHa * @see org.apache.james.protocols.api.handler.ProtocolHandlerChain#destroy() */ public void destroy() { - List<LifecycleAwareProtocolHandler> handlers = getHandlers(LifecycleAwareProtocolHandler.class); - for (LifecycleAwareProtocolHandler handler: handlers) { + List<ProtocolHandler> handlers = getHandlers(ProtocolHandler.class); + for (ProtocolHandler handler: handlers) { handler.destroy(); } } Modified: james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java (original) +++ james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java Tue Nov 3 16:42:48 2015 @@ -29,6 +29,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Locale; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.BaseRequest; import org.apache.james.protocols.api.ProtocolSession; import org.apache.james.protocols.api.Request; @@ -60,7 +62,17 @@ public class CommandDispatcher<Session e public CommandDispatcher() { this(Collections.<String>emptyList()); } - + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * Add it to map (key as command name, value is an array list of CommandHandlers) * Modified: james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java (original) +++ james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java Tue Nov 3 16:42:48 2015 @@ -18,6 +18,8 @@ ****************************************************************/ package org.apache.james.protocols.api.handler; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.logger.Logger; @@ -53,4 +55,13 @@ public class CommandHandlerResultLogger } } + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } } Modified: james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandler.java (original) +++ james/project/trunk/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandler.java Tue Nov 3 16:42:48 2015 @@ -19,6 +19,8 @@ package org.apache.james.protocols.api.handler; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; /** * Just the base interface for all kind of "protocol" handlers. @@ -27,5 +29,18 @@ package org.apache.james.protocols.api.h * */ public interface ProtocolHandler { + + /** + * Init with the given {@link Configuration} + * + * @param config + * @throws ConfigurationException + */ + void init(Configuration config) throws ConfigurationException; + + /** + * Destroy object + */ + void destroy(); } Modified: james/project/trunk/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java (original) +++ james/project/trunk/protocols/imap/src/main/java/org/apache/james/protocols/imap/core/IMAPCommandDispatcher.java Tue Nov 3 16:42:48 2015 @@ -23,6 +23,8 @@ import java.util.Collection; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; @@ -44,7 +46,17 @@ public class IMAPCommandDispatcher exten MultiLineHandler<IMAPSession> handler = new MultiLineHandler<IMAPSession>() { private static final String BYTES_READ = "BYTES_READ"; - + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /* * (non-Javadoc) * @see org.apache.james.protocols.api.handler.MultiLineHandler#isReady(org.apache.james.protocols.api.ProtocolSession, java.nio.ByteBuffer) Modified: james/project/trunk/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java (original) +++ james/project/trunk/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java Tue Nov 3 16:42:48 2015 @@ -27,6 +27,8 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.net.smtp.RelayPath; import org.apache.commons.net.smtp.SMTPClient; import org.apache.commons.net.smtp.SMTPReply; @@ -328,7 +330,16 @@ public abstract class AbstractLMTPServer } return result; } - + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } } private final class TestDeliverHook implements DeliverToRecipientHook { @@ -351,6 +362,16 @@ public abstract class AbstractLMTPServer public List<MailEnvelope> getDelivered() { return delivered; } - }; + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + } } Modified: james/project/trunk/protocols/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/pom.xml?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/pom.xml (original) +++ james/project/trunk/protocols/pom.xml Tue Nov 3 16:42:48 2015 @@ -122,6 +122,21 @@ <version>${commons-codec.version}</version> </dependency> <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + <version>1.9</version> + <exclusions> + <exclusion> + <artifactId>commons-digester</artifactId> + <groupId>commons-digester</groupId> + </exclusion> + <exclusion> + <artifactId>commons-beanutils-core</artifactId> + <groupId>commons-beanutils</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> <version>${commons-lang.version}</version> Modified: james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java (original) +++ james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -28,6 +28,8 @@ import java.util.List; import java.util.Set; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -44,6 +46,16 @@ public class CapaCmdHandler implements C private static final Collection<String> COMMANDS = Collections.unmodifiableCollection(Arrays.asList("CAPA")); private static final Set<String> CAPS = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList("PIPELINING"))); + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * @see * org.apache.james.protocols.api.handler.CommandHandler Modified: james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java (original) +++ james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -24,6 +24,8 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; @@ -41,6 +43,16 @@ public class DeleCmdHandler implements C private static final Response SYNTAX_ERROR = new POP3Response(POP3Response.ERR_RESPONSE, "Usage: DELE [mail number]").immutable(); private static final Response DELETED = new POP3Response(POP3Response.OK_RESPONSE, "Message deleted").immutable(); + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * Handler method called upon receipt of a DELE command. This command * deletes a particular mail message from the mailbox. Modified: james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java (original) +++ james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -25,6 +25,8 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; @@ -37,8 +39,19 @@ import org.apache.james.protocols.pop3.m * Handles LIST command */ public class ListCmdHandler implements CommandHandler<POP3Session> { + private static final Collection<String> COMMANDS = Collections.unmodifiableCollection(Arrays.asList("LIST")); + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * Handler method called upon receipt of a LIST command. Returns the number * of messages in the mailbox and its aggregate size, or optionally, the Modified: james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java (original) +++ james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -23,6 +23,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -33,8 +35,19 @@ import org.apache.james.protocols.pop3.P * Handles NOOP command */ public class NoopCmdHandler implements CommandHandler<POP3Session> { + private static final Collection<String> COMMANDS = Collections.unmodifiableCollection(Arrays.asList("NOOP")); + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * Handler method called upon receipt of a NOOP command. Like all good * NOOPs, does nothing much. Modified: james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java (original) +++ james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -25,6 +25,8 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.ProtocolSession.State; @@ -37,9 +39,11 @@ import org.apache.james.protocols.pop3.m * Handles QUIT command */ public class QuitCmdHandler implements CommandHandler<POP3Session> { + private static final Collection<String> COMMANDS = Collections.unmodifiableCollection(Arrays.asList("QUIT")); private static final Response SIGN_OFF; private static final Response SIGN_OFF_NOT_CLEAN; + static { POP3Response response = new POP3Response(POP3Response.OK_RESPONSE, "Apache James POP3 Server signing off."); response.setEndSession(true); @@ -49,6 +53,17 @@ public class QuitCmdHandler implements C response.setEndSession(true); SIGN_OFF_NOT_CLEAN = response.immutable(); } + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * Handler method called upon receipt of a QUIT command. This method handles * cleanup of the POP3Handler state. Modified: james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java (original) +++ james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -26,6 +26,8 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; @@ -44,6 +46,16 @@ public class RetrCmdHandler implements C private static final Response SYNTAX_ERROR = new POP3Response(POP3Response.ERR_RESPONSE, "Usage: RETR [mail number]").immutable(); private static final Response ERROR_MESSAGE_RETRIEVE = new POP3Response(POP3Response.ERR_RESPONSE, "Error while retrieving message.").immutable(); + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * Handler method called upon receipt of a RETR command. This command * retrieves a particular mail message from the mailbox. Modified: james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java (original) +++ james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -27,6 +27,8 @@ import java.util.Collections; import java.util.List; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.ProtocolSession.State; @@ -41,6 +43,16 @@ import org.apache.james.protocols.pop3.m public class RsetCmdHandler implements CommandHandler<POP3Session> { private static final Collection<String> COMMANDS = Collections.unmodifiableCollection(Arrays.asList("RSET")); + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * Handler method called upon receipt of a RSET command. Calls stat() to * reset the mailbox. Modified: james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java (original) +++ james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -25,6 +25,8 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.ProtocolSession.State; @@ -39,6 +41,16 @@ import org.apache.james.protocols.pop3.m public class StatCmdHandler implements CommandHandler<POP3Session> { private static final Collection<String> COMMANDS = Collections.unmodifiableCollection(Arrays.asList("STAT")); + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * Handler method called upon receipt of a STAT command. Returns the number * of messages in the mailbox and its aggregate size. Modified: james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java (original) +++ james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -25,6 +25,8 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -37,10 +39,22 @@ import org.apache.james.protocols.pop3.P * with the STSL command */ public class StlsCmdHandler implements CommandHandler<POP3Session>, CapaCapability { + private static final Collection<String> COMMANDS = Collections.unmodifiableCollection(Arrays.asList("STLS")); private static final Set<String> CAPS = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList("STLS"))); private static final Response BEGIN_TLS = new POP3StartTlsResponse(POP3Response.OK_RESPONSE, "Begin TLS negotiation").immutable(); + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * @see CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, Request) */ Modified: james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java (original) +++ james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -28,6 +28,8 @@ import java.util.List; import java.util.Set; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.ProtocolSession.State; @@ -43,6 +45,16 @@ public class UidlCmdHandler implements C private static final Collection<String> COMMANDS = Collections.unmodifiableCollection(Arrays.asList("UIDL")); private static final Set<String> CAPS = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList("UIDL"))); + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * Handler method called upon receipt of a UIDL command. Returns a listing * of message ids to the client. Modified: james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java (original) +++ james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -19,6 +19,8 @@ package org.apache.james.protocols.pop3.core; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.UnknownCommandHandler; @@ -36,4 +38,14 @@ public class UnknownCmdHandler extends U public Response onCommand(POP3Session session, Request request) { return POP3Response.ERR; } + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } } Modified: james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java (original) +++ james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -25,6 +25,8 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -39,6 +41,15 @@ public class UserCmdHandler implements C private static final Collection<String> COMMANDS = Collections.unmodifiableCollection(Arrays.asList("USER")); private static final Set<String> CAPS = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList("USER"))); + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } /** * Handler method called upon receipt of a USER command. Reads in the user Modified: james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java (original) +++ james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/WelcomeMessageHandler.java Tue Nov 3 16:42:48 2015 @@ -19,6 +19,8 @@ package org.apache.james.protocols.pop3.core; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.ConnectHandler; @@ -27,6 +29,16 @@ import org.apache.james.protocols.pop3.P public class WelcomeMessageHandler implements ConnectHandler<POP3Session> { + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * @see org.apache.james.protocols.api.handler.ConnectHandler * #onConnect(org.apache.james.pop3server.POP3Session) Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java Tue Nov 3 16:42:48 2015 @@ -18,6 +18,8 @@ ****************************************************************/ package org.apache.james.protocols.smtp.core; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.smtp.MailAddress; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.HookResult; @@ -40,4 +42,13 @@ public class AcceptRecipientIfRelayingIs return HookResult.declined(); } + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } } Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -26,6 +26,8 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; @@ -62,6 +64,16 @@ public class DataCmdHandler implements C } return null; } + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } } public static final class DataLineFilterWrapper implements LineHandler<SMTPSession> { @@ -84,13 +96,32 @@ public class DataCmdHandler implements C Response r = filter.onLine(session, line, next); return r; } - + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } } public final static String MAILENV = "MAILENV"; private LineHandler<SMTPSession> lineHandler; - + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * process DATA command * Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java Tue Nov 3 16:42:48 2015 @@ -27,6 +27,8 @@ import java.nio.ByteBuffer; import java.util.LinkedList; import java.util.List; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.ExtensibleHandler; @@ -55,8 +57,16 @@ public class DataLineMessageHookHandler private List<?> messageHandlers; private List<?> rHooks; - + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } /* * (non-Javadoc) Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -25,6 +25,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -61,4 +63,13 @@ public class ExpnCmdHandler implements C return COMMANDS; } + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } } Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -23,6 +23,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Response; @@ -48,6 +50,17 @@ public class HeloCmdHandler extends Abst DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_ARG) + " Domain address required: " + COMMAND_NAME).immutable(); + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() */ Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -25,6 +25,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -58,4 +60,14 @@ public class HelpCmdHandler implements C public Collection<String> getImplCommands() { return COMMANDS; } + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } } Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -29,6 +29,8 @@ import java.util.Locale; import java.util.Map; import java.util.StringTokenizer; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; @@ -69,6 +71,16 @@ public class MailCmdHandler extends Abst */ private Map<String, MailParametersHook> paramHooks; + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * @see * org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -25,6 +25,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -61,4 +63,13 @@ public class NoopCmdHandler implements C return COMMANDS; } + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } } Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java Tue Nov 3 16:42:48 2015 @@ -18,6 +18,8 @@ ****************************************************************/ package org.apache.james.protocols.smtp.core; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.smtp.MailAddress; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.HookResult; @@ -40,4 +42,13 @@ public class PostmasterAbuseRcptHook imp } } + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } } Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -23,6 +23,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.smtp.SMTPResponse; import org.apache.james.protocols.smtp.SMTPRetCode; @@ -51,7 +53,17 @@ public class QuitCmdHandler extends Abst response.setEndSession(true); SYNTAX_ERROR = response.immutable(); } - + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * Handler method called upon receipt of a QUIT command. This method informs * the client that the connection is closing. Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -26,6 +26,8 @@ import java.util.Collections; import java.util.Locale; import java.util.StringTokenizer; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -50,6 +52,17 @@ public class RcptCmdHandler extends Abst private static final Response SYNTAX_ERROR_ARGS = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_ARGUMENTS, DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_SYNTAX) + " Usage: RCPT TO:<recipient>").immutable(); private static final Response SYNTAX_ERROR_DELIVERY = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_ARGUMENTS, DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_SYNTAX) + " Syntax error in parameters or arguments").immutable(); private static final Response SYNTAX_ERROR_ADDRESS = new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_MAILBOX, DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.ADDRESS_SYNTAX) + " Syntax error in recipient address").immutable(); + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * Handler method called upon receipt of a RCPT command. Reads recipient. * Does some connection validation. Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java Tue Nov 3 16:42:48 2015 @@ -26,6 +26,8 @@ import java.util.Date; import java.util.List; import java.util.Locale; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.smtp.MailAddress; import org.apache.james.protocols.smtp.SMTPSession; @@ -47,6 +49,16 @@ public class ReceivedDataLineFilter exte } }; + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * Return the service type which will be used in the Received headers. * Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -25,6 +25,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -75,5 +77,14 @@ public class RsetCmdHandler implements C public Collection<String> getImplCommands() { return COMMANDS; } - + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } } Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -25,6 +25,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.handler.UnknownCommandHandler; import org.apache.james.protocols.api.Response; @@ -45,6 +47,16 @@ public class UnknownCmdHandler extends A */ private static final Collection<String> COMMANDS = Collections.unmodifiableCollection(Arrays.asList(UnknownCommandHandler.COMMAND_IDENTIFIER)); + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() */ Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -25,6 +25,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -59,4 +61,13 @@ public class VrfyCmdHandler implements C return COMMANDS; } + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } } Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java Tue Nov 3 16:42:48 2015 @@ -20,6 +20,8 @@ package org.apache.james.protocols.smtp.core; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.ConnectHandler; import org.apache.james.protocols.smtp.SMTPResponse; @@ -58,4 +60,14 @@ public class WelcomeMessageHandler imple protected String getServiceType(SMTPSession session) { return SERVICE_TYPE; } + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } } Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -32,6 +32,8 @@ import java.util.Locale; import java.util.StringTokenizer; import org.apache.commons.codec.binary.Base64; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -127,7 +129,17 @@ public class AuthCmdHandler private List<AuthHook> hooks; private List<HookResultHook> rHooks; - + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * handles AUTH command * @@ -164,6 +176,16 @@ public class AuthCmdHandler protected Response onCommand(SMTPSession session, String l) { return doPlainAuthPass(session, l); } + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } }); return AUTH_READY_PLAIN; } else { @@ -177,6 +199,16 @@ public class AuthCmdHandler protected Response onCommand(SMTPSession session, String l) { return doLoginAuthPass(session, l); } + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } }); return AUTH_READY_USERNAME_LOGIN; } else { @@ -296,7 +328,16 @@ public class AuthCmdHandler protected Response onCommand(SMTPSession session, String l) { return doLoginAuthPassCheck(session, user, l); } - + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } }.setUser(user)); return AUTH_READY_PASSWORD_LOGIN; } Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -24,6 +24,8 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.smtp.SMTPResponse; @@ -50,6 +52,16 @@ public class EhloCmdHandler extends Abst private List<EhloExtension> ehloExtensions; + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * Handler method called upon receipt of a EHLO command. Responds with a * greeting and informs the client whether client authentication is Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java Tue Nov 3 16:42:48 2015 @@ -24,6 +24,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.handler.LineHandler; @@ -49,7 +51,15 @@ public class MailSizeEsmtpExtension impl private static final HookResult SYNTAX_ERROR = new HookResult(HookReturnCode.DENY, SMTPRetCode.SYNTAX_ERROR_ARGUMENTS, DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_ARG) + " Syntactically incorrect value for SIZE parameter"); private static final HookResult QUOTA_EXCEEDED = new HookResult(HookReturnCode.DENY, SMTPRetCode.QUOTA_EXCEEDED, DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.SYSTEM_MSG_TOO_BIG) + " Message size exceeds fixed maximum message size"); + @Override + public void init(Configuration config) throws ConfigurationException { + } + + @Override + public void destroy() { + + } /** * @see org.apache.james.protocols.smtp.hook.MailParametersHook#doMailParameter(org.apache.james.protocols.smtp.SMTPSession, java.lang.String, java.lang.String) Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -24,6 +24,8 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.Request; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.CommandHandler; @@ -55,6 +57,16 @@ public class StartTlsCmdHandler implemen return COMMANDS; } + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * Handler method called upon receipt of a STARTTLS command. Resets * message-specific, but not authenticated user, state. Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java Tue Nov 3 16:42:48 2015 @@ -24,6 +24,8 @@ import java.util.Collection; import java.util.Collections; import java.util.StringTokenizer; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.smtp.MailAddress; import org.apache.james.protocols.smtp.SMTPSession; @@ -50,7 +52,17 @@ public class DNSRBLHandler implements Rc public static final String RBL_BLOCKLISTED_MAIL_ATTRIBUTE_NAME = "org.apache.james.smtpserver.rbl.blocklisted"; public static final String RBL_DETAIL_MAIL_ATTRIBUTE_NAME = "org.apache.james.smtpserver.rbl.detail"; - + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * Set the whitelist array * Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java Tue Nov 3 16:42:48 2015 @@ -22,6 +22,8 @@ package org.apache.james.protocols.smtp.core.fastfail; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.smtp.MailAddress; import org.apache.james.protocols.smtp.SMTPRetCode; import org.apache.james.protocols.smtp.SMTPSession; @@ -59,4 +61,14 @@ public class MaxRcptHandler implements R return HookResult.declined(); } } + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } } Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandler.java Tue Nov 3 16:42:48 2015 @@ -20,6 +20,8 @@ package org.apache.james.protocols.smtp.core.fastfail; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.HookResult; @@ -36,8 +38,18 @@ public class MaxUnknownCmdHandler implem public final static int DEFAULT_MAX_UNKOWN = 5; private final static String UNKOWN_COMMAND_COUNT = "UNKNOWN_COMMAND_COUNT"; - private int maxUnknown = DEFAULT_MAX_UNKOWN;; - + private int maxUnknown = DEFAULT_MAX_UNKOWN; + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + public void setMaxUnknownCmdCount(int maxUnknown) { this.maxUnknown = maxUnknown; } Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java Tue Nov 3 16:42:48 2015 @@ -23,6 +23,8 @@ import java.net.InetAddress; import java.net.UnknownHostException; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.smtp.MailAddress; import org.apache.james.protocols.smtp.SMTPRetCode; @@ -41,6 +43,16 @@ public class ResolvableEhloHeloHandler i public final static String BAD_EHLO_HELO = "BAD_EHLO_HELO"; + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * Check if EHLO/HELO is resolvable * Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java Tue Nov 3 16:42:48 2015 @@ -25,6 +25,8 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.smtp.MailAddress; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.HookResult; @@ -42,9 +44,18 @@ public class SpamTrapHandler implements private Collection<String> spamTrapRecips = new ArrayList<String>(); /** Default blocktime 12 hours */ - protected long blockTime = 4320000; - - + protected long blockTime = 4320000; + + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + public void setSpamTrapRecipients(Collection<String> spamTrapRecips) { this.spamTrapRecips = spamTrapRecips; } Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java Tue Nov 3 16:42:48 2015 @@ -24,6 +24,8 @@ package org.apache.james.protocols.smtp. import java.util.Collection; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.smtp.MailAddress; import org.apache.james.protocols.smtp.SMTPRetCode; @@ -39,6 +41,16 @@ import org.apache.james.protocols.smtp.h */ public class SupressDuplicateRcptHandler implements RcptHook { + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) */ Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/HookResultLogger.java Tue Nov 3 16:42:48 2015 @@ -18,6 +18,8 @@ ****************************************************************/ package org.apache.james.protocols.smtp.core.log; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.Hook; import org.apache.james.protocols.smtp.hook.HookResult; @@ -32,6 +34,16 @@ import org.apache.james.protocols.smtp.h */ public class HookResultLogger implements HookResultHook{ + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + public HookResult onHookResult(SMTPSession session, HookResult hResult, long executionTime, Hook hook) { boolean match = false; boolean info = false; Modified: james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java?rev=1712325&r1=1712324&r2=1712325&view=diff ============================================================================== --- james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java (original) +++ james/project/trunk/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java Tue Nov 3 16:42:48 2015 @@ -19,6 +19,8 @@ package org.apache.james.protocols.smtp.hook; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.smtp.MailAddress; import org.apache.james.protocols.smtp.MailEnvelope; import org.apache.james.protocols.smtp.SMTPSession; @@ -32,6 +34,16 @@ import org.apache.james.protocols.smtp.S */ public class SimpleHook implements HeloHook, MailHook, RcptHook, MessageHook { + @Override + public void init(Configuration config) throws ConfigurationException { + + } + + @Override + public void destroy() { + + } + /** * Return {@link HookResult} with {@link HookReturnCode#OK} */ --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org