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 ma...@apache.org on 2015/11/03 17:42:49 UTC
svn commit: r1712325 [2/2] - in /james/project/trunk: protocols/
protocols/api/
protocols/api/src/main/java/org/apache/james/protocols/api/handler/
protocols/imap/src/main/java/org/apache/james/protocols/imap/core/
protocols/lmtp/src/test/java/org/apac...
Modified: james/project/trunk/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java (original)
+++ james/project/trunk/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java Tue Nov 3 16:42:48 2015
@@ -27,6 +27,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.net.smtp.SMTPClient;
import org.apache.commons.net.smtp.SMTPReply;
import org.apache.james.protocols.api.Protocol;
@@ -442,6 +444,16 @@ public abstract class AbstractSMTPServer
public void testHeloHookPermanentError() throws Exception {
HeloHook hook = new HeloHook() {
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
+
public HookResult doHelo(SMTPSession session, String helo) {
return new HookResult(HookReturnCode.DENY);
}
@@ -481,6 +493,16 @@ public abstract class AbstractSMTPServer
public void testHeloHookTempraryError() throws Exception {
HeloHook hook = new HeloHook() {
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
+
public HookResult doHelo(SMTPSession session, String helo) {
return new HookResult(HookReturnCode.DENYSOFT);
}
@@ -519,6 +541,16 @@ public abstract class AbstractSMTPServer
public void testMailHookPermanentError() throws Exception {
MailHook hook = new MailHook() {
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
+
public HookResult doMail(SMTPSession session, MailAddress sender) {
return new HookResult(HookReturnCode.DENY);
}
@@ -560,6 +592,16 @@ public abstract class AbstractSMTPServer
public void testMailHookTemporaryError() throws Exception {
MailHook hook = new MailHook() {
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
+
public HookResult doMail(SMTPSession session, MailAddress sender) {
return new HookResult(HookReturnCode.DENYSOFT);
}
@@ -602,6 +644,16 @@ public abstract class AbstractSMTPServer
public void testRcptHookPermanentError() throws Exception {
RcptHook hook = new RcptHook() {
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
+
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
if (RCPT1.equals(rcpt.toString())) {
return new HookResult(HookReturnCode.DENY);
@@ -657,6 +709,16 @@ public abstract class AbstractSMTPServer
public void testRcptHookTemporaryError() throws Exception {
RcptHook hook = new RcptHook() {
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
+
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
if (RCPT1.equals(rcpt.toString())) {
return new HookResult(HookReturnCode.DENYSOFT);
@@ -749,6 +811,16 @@ public abstract class AbstractSMTPServer
MessageHook hook = new MessageHook() {
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
+
public HookResult onMessage(SMTPSession session, MailEnvelope mail) {
return new HookResult(HookReturnCode.DENY);
}
@@ -803,7 +875,16 @@ public abstract class AbstractSMTPServer
MessageHook hook = new MessageHook() {
-
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
+
public HookResult onMessage(SMTPSession session, MailEnvelope mail) {
return new HookResult(HookReturnCode.DENYSOFT);
}
@@ -857,7 +938,16 @@ public abstract class AbstractSMTPServer
public void testConnectHandlerPermananet() throws Exception {
ConnectHandler<SMTPSession> connectHandler = new ConnectHandler<SMTPSession>() {
-
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
+
public Response onConnect(SMTPSession session) {
return new SMTPResponse("554", "Bye Bye");
}
@@ -892,7 +982,16 @@ public abstract class AbstractSMTPServer
public void testConnectHandlerTemporary() throws Exception {
ConnectHandler<SMTPSession> connectHandler = new ConnectHandler<SMTPSession>() {
-
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
+
public Response onConnect(SMTPSession session) {
return new SMTPResponse("451", "Bye Bye");
}
@@ -927,8 +1026,17 @@ public abstract class AbstractSMTPServer
final AtomicBoolean called = new AtomicBoolean(false);
DisconnectHandler<SMTPSession> handler = new DisconnectHandler<SMTPSession>() {
-
- public void onDisconnect(SMTPSession session) {
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
+
+ public void onDisconnect(SMTPSession session) {
called.set(true);
}
};
Modified: james/project/trunk/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java (original)
+++ james/project/trunk/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java Tue Nov 3 16:42:48 2015
@@ -24,6 +24,8 @@ import static junit.framework.Assert.ass
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.api.ProtocolSession.State;
import org.apache.james.protocols.smtp.MailAddress;
import org.apache.james.protocols.smtp.MailAddressException;
@@ -36,7 +38,17 @@ public class ValidSenderDomainHandlerTes
private ValidSenderDomainHandler createHandler() {
return new ValidSenderDomainHandler() {
-
+
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
+
@Override
protected boolean hasMXRecord(SMTPSession session, String domain) {
if (domain.equals("test.james.apache.org")) {
Modified: james/project/trunk/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java
URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java (original)
+++ james/project/trunk/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java Tue Nov 3 16:42:48 2015
@@ -21,6 +21,8 @@ package org.apache.james.protocols.smtp.
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.protocols.smtp.MailEnvelope;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookResult;
@@ -40,4 +42,13 @@ public class TestMessageHook implements
return queued;
}
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
}
Modified: james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/protocols/ProtocolHandlerLoaderBeanFactory.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/protocols/ProtocolHandlerLoaderBeanFactory.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/protocols/ProtocolHandlerLoaderBeanFactory.java (original)
+++ james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/protocols/ProtocolHandlerLoaderBeanFactory.java Tue Nov 3 16:42:48 2015
@@ -21,10 +21,8 @@ package org.apache.james.container.sprin
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.container.spring.bean.factory.AbstractBeanFactory;
-import org.apache.james.protocols.api.handler.LifecycleAwareProtocolHandler;
import org.apache.james.protocols.api.handler.ProtocolHandler;
import org.apache.james.protocols.lib.handler.ProtocolHandlerLoader;
-import org.apache.james.protocols.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
@@ -38,9 +36,7 @@ public class ProtocolHandlerLoaderBeanFa
// Use the classloader which is used for bean instance stuff
Class<ProtocolHandler> c = (Class<ProtocolHandler>) getBeanFactory().getBeanClassLoader().loadClass(name);
ProtocolHandler handler = (ProtocolHandler) getBeanFactory().createBean(c, AutowireCapableBeanFactory.AUTOWIRE_AUTODETECT, true);
- if (handler instanceof LifecycleAwareProtocolHandler) {
- ((InitializingLifecycleAwareProtocolHandler) handler).init(config);
- }
+ handler.init(config);
return handler;
} catch (ClassNotFoundException e) {
throw new LoadingException("Unable to load handler", e);
Modified: james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java (original)
+++ james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java Tue Nov 3 16:42:48 2015
@@ -24,11 +24,11 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.protocols.api.handler.ExtensibleHandler;
+import org.apache.james.protocols.api.handler.ProtocolHandler;
import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
import org.apache.james.protocols.api.handler.WiringException;
import org.apache.james.protocols.lib.handler.HandlersPackage;
import org.apache.james.protocols.lib.handler.ProtocolHandlerLoader;
-import org.apache.james.protocols.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
import java.util.LinkedList;
import java.util.List;
@@ -150,12 +150,12 @@ public class ProtocolHandlerChainImpl im
}
/**
- * Destroy all loaded {@link InitializingLifecycleAwareProtocolHandler}
+ * Destroy all loaded {@link ProtocolHandler}
*/
@Override
public void destroy() {
- LinkedList<InitializingLifecycleAwareProtocolHandler> lHandlers = getHandlers(InitializingLifecycleAwareProtocolHandler.class);
- for (InitializingLifecycleAwareProtocolHandler handler : lHandlers) {
+ LinkedList<ProtocolHandler> lHandlers = getHandlers(ProtocolHandler.class);
+ for (ProtocolHandler handler : lHandlers) {
handler.destroy();
}
}
Modified: james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java (original)
+++ james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java Tue Nov 3 16:42:48 2015
@@ -20,7 +20,6 @@ package org.apache.james.protocols.lib.j
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -28,17 +27,12 @@ import org.apache.commons.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.CommandHandler;
-import org.apache.james.protocols.api.handler.ExtensibleHandler;
-import org.apache.james.protocols.api.handler.ProtocolHandler;
-import org.apache.james.protocols.api.handler.ProtocolHandlerResultHandler;
-import org.apache.james.protocols.api.handler.WiringException;
-import org.apache.james.protocols.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
+import org.apache.james.protocols.api.handler.*;
/**
* Expose JMX statistics for {@link CommandHandler}
*/
-public abstract class AbstractCommandHandlerResultJMXMonitor<S extends ProtocolSession> implements ProtocolHandlerResultHandler<Response, S>, ExtensibleHandler, InitializingLifecycleAwareProtocolHandler {
+public abstract class AbstractCommandHandlerResultJMXMonitor<S extends ProtocolSession> implements ProtocolHandlerResultHandler<Response, S>, ExtensibleHandler, ProtocolHandler {
private final Map<String, AbstractCommandHandlerStats> cStats = new HashMap<String, AbstractCommandHandlerStats>();
private String jmxName;
Modified: james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java (original)
+++ james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java Tue Nov 3 16:42:48 2015
@@ -20,7 +20,6 @@ package org.apache.james.protocols.lib.j
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -28,19 +27,14 @@ import org.apache.commons.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.ConnectHandler;
-import org.apache.james.protocols.api.handler.ExtensibleHandler;
-import org.apache.james.protocols.api.handler.ProtocolHandler;
-import org.apache.james.protocols.api.handler.ProtocolHandlerResultHandler;
-import org.apache.james.protocols.api.handler.WiringException;
-import org.apache.james.protocols.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
+import org.apache.james.protocols.api.handler.*;
/**
* Handler which will gather statistics for {@link ConnectHandler}'s
*
* @param <S>
*/
-public abstract class AbstractConnectHandlerResultJMXMonitor<R extends Response, S extends ProtocolSession> implements ProtocolHandlerResultHandler<R,S>, ExtensibleHandler, InitializingLifecycleAwareProtocolHandler {
+public abstract class AbstractConnectHandlerResultJMXMonitor<R extends Response, S extends ProtocolSession> implements ProtocolHandlerResultHandler<R,S>, ExtensibleHandler, ProtocolHandler {
private final Map<String, ConnectHandlerStats> cStats = new HashMap<String, ConnectHandlerStats>();
private String jmxName;
Modified: james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java (original)
+++ james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java Tue Nov 3 16:42:48 2015
@@ -20,7 +20,6 @@ package org.apache.james.protocols.lib.j
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -28,19 +27,14 @@ import org.apache.commons.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;
-import org.apache.james.protocols.api.handler.LineHandler;
-import org.apache.james.protocols.api.handler.ProtocolHandler;
-import org.apache.james.protocols.api.handler.ProtocolHandlerResultHandler;
-import org.apache.james.protocols.api.handler.WiringException;
-import org.apache.james.protocols.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
+import org.apache.james.protocols.api.handler.*;
/**
* Handler which will gather statistics for {@link LineHandler}'s
*
* @param <S>
*/
-public abstract class AbstractLineHandlerResultJMXMonitor<R extends Response, S extends ProtocolSession> implements ProtocolHandlerResultHandler<R, S>, ExtensibleHandler, InitializingLifecycleAwareProtocolHandler {
+public abstract class AbstractLineHandlerResultJMXMonitor<R extends Response, S extends ProtocolSession> implements ProtocolHandlerResultHandler<R, S>, ExtensibleHandler, ProtocolHandler {
private final Map<String, LineHandlerStats> lStats = new HashMap<String, LineHandlerStats>();
private String jmxName;
Modified: james/project/trunk/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java (original)
+++ james/project/trunk/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java Tue Nov 3 16:42:48 2015
@@ -25,6 +25,7 @@ public class MockProtocolHandlerLoader i
ProtocolHandler obj = create(name);
injectResources(obj);
postConstruct(obj);
+ init(obj, config);
synchronized (this) {
loaderRegistry.add(obj);
}
@@ -129,6 +130,21 @@ public class MockProtocolHandlerLoader i
}
}
+ private void init(Object resource, Configuration config) throws IllegalAccessException, InvocationTargetException {
+ Method[] methods = resource.getClass().getMethods();
+ for (Method method : methods) {
+ if (isInit(method)) {
+ Object[] args = { config };
+ method.invoke(resource, args);
+ }
+ }
+ }
+ private boolean isInit(Method method) {
+ return method.getName().equals("init")
+ && method.getParameterTypes().length == 1
+ && method.getParameterTypes()[0].equals(Configuration.class);
+ }
+
public Object getObjectForName(String name) {
return get(name);
}
Modified: james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java (original)
+++ james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java Tue Nov 3 16:42:48 2015
@@ -22,6 +22,8 @@ package org.apache.james.lmtpserver;
import java.util.LinkedList;
import java.util.List;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.lmtpserver.hook.MailboxDeliverToRecipientHandler;
import org.apache.james.protocols.api.handler.CommandDispatcher;
import org.apache.james.protocols.api.handler.CommandHandlerResultLogger;
@@ -101,4 +103,14 @@ public class CoreCmdHandlerLoader implem
public List<String> getHandlers() {
return commands;
}
+
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
}
Modified: james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java (original)
+++ james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java Tue Nov 3 16:42:48 2015
@@ -24,6 +24,8 @@ import java.util.Date;
import javax.inject.Inject;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.exception.MailboxException;
@@ -99,4 +101,13 @@ public class MailboxDeliverToRecipientHa
return result;
}
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
}
Modified: james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java (original)
+++ james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java Tue Nov 3 16:42:48 2015
@@ -21,6 +21,8 @@ package org.apache.james.lmtpserver.jmx;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.protocols.lib.handler.HandlersPackage;
public class JMXHandlersLoader implements HandlersPackage {
@@ -40,4 +42,13 @@ public class JMXHandlersLoader implement
return handlers;
}
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
}
Modified: james/project/trunk/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java (original)
+++ james/project/trunk/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java Tue Nov 3 16:42:48 2015
@@ -22,6 +22,8 @@ package org.apache.james.pop3server.core
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.handler.CommandDispatcher;
import org.apache.james.protocols.api.handler.CommandHandlerResultLogger;
import org.apache.james.protocols.lib.handler.HandlersPackage;
@@ -96,4 +98,13 @@ public class CoreCmdHandlerLoader implem
return commands;
}
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
}
Modified: james/project/trunk/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java (original)
+++ james/project/trunk/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java Tue Nov 3 16:42:48 2015
@@ -22,7 +22,7 @@ import java.util.Collection;
import org.apache.james.protocols.api.handler.CommandHandler;
-import org.apache.james.protocols.api.handler.LifecycleAwareProtocolHandler;
+import org.apache.james.protocols.api.handler.ProtocolHandler;
import org.apache.james.protocols.lib.jmx.AbstractCommandHandlerResultJMXMonitor;
import org.apache.james.protocols.lib.jmx.AbstractCommandHandlerStats;
import org.apache.james.protocols.pop3.POP3Session;
@@ -30,7 +30,7 @@ import org.apache.james.protocols.pop3.P
/**
* Gather JMX stats for {@link CommandHandler}
*/
-public class CommandHandlerResultJMXMonitor extends AbstractCommandHandlerResultJMXMonitor<POP3Session> implements LifecycleAwareProtocolHandler {
+public class CommandHandlerResultJMXMonitor extends AbstractCommandHandlerResultJMXMonitor<POP3Session> implements ProtocolHandler {
/**
* @see org.apache.james.protocols.lib.jmx.AbstractCommandHandlerResultJMXMonitor
Modified: james/project/trunk/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java (original)
+++ james/project/trunk/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java Tue Nov 3 16:42:48 2015
@@ -21,6 +21,8 @@ package org.apache.james.pop3server.jmx;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.protocols.lib.handler.HandlersPackage;
public class JMXHandlersLoader implements HandlersPackage {
@@ -39,4 +41,13 @@ public class JMXHandlersLoader implement
return handlers;
}
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
}
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java Tue Nov 3 16:42:48 2015
@@ -18,6 +18,8 @@
****************************************************************/
package org.apache.james.smtpserver;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.core.MailImpl;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookResult;
@@ -39,6 +41,16 @@ public class AddDefaultAttributesMessage
*/
private final static String SMTP_AUTH_NETWORK_NAME = "org.apache.james.SMTPIsAuthNetwork";
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
+
public HookResult onMessage(SMTPSession session, Mail mail) {
if (mail instanceof MailImpl) {
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java Tue Nov 3 16:42:48 2015
@@ -21,6 +21,8 @@ package org.apache.james.smtpserver;
import javax.inject.Inject;
import javax.inject.Named;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.api.DomainListException;
import org.apache.james.protocols.smtp.core.AbstractAuthRequiredToRelayRcptHook;
@@ -34,6 +36,16 @@ public class AuthRequiredToRelayRcptHook
this.domains = domains;
}
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
+
/**
* @see org.apache.james.protocols.smtp.core.AbstractAuthRequiredToRelayRcptHook#isLocalDomain(java.lang.String)
*/
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java Tue Nov 3 16:42:48 2015
@@ -22,6 +22,8 @@ package org.apache.james.smtpserver;
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.handler.CommandDispatcher;
import org.apache.james.protocols.api.handler.CommandHandlerResultLogger;
import org.apache.james.protocols.lib.handler.HandlersPackage;
@@ -114,4 +116,14 @@ public class CoreCmdHandlerLoader implem
public List<String> getHandlers() {
return commands;
}
+
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
}
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java Tue Nov 3 16:42:48 2015
@@ -19,6 +19,8 @@
package org.apache.james.smtpserver;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.core.MailImpl;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageInputStream;
@@ -66,6 +68,16 @@ public class DataLineJamesMessageHookHan
private List<MessageHook> mHandlers;
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
+
public Response onLine(SMTPSession session, ByteBuffer lineByteBuffer, LineHandler<SMTPSession> next) {
byte[] line = new byte[lineByteBuffer.remaining()];
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java Tue Nov 3 16:42:48 2015
@@ -27,7 +27,7 @@ import java.util.Map;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.protocols.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
+import org.apache.james.protocols.api.handler.ProtocolHandler;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
@@ -41,7 +41,7 @@ import org.apache.mailet.MailAddress;
* if the {@link Mail} has more then one recipient, then the highest priority
* (which was found) is set
*/
-public class MailPriorityHandler implements JamesMessageHook, InitializingLifecycleAwareProtocolHandler {
+public class MailPriorityHandler implements JamesMessageHook, ProtocolHandler {
private final Map<String, Integer> prioMap = new HashMap<String, Integer>();
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java Tue Nov 3 16:42:48 2015
@@ -19,6 +19,7 @@
package org.apache.james.smtpserver;
+import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.lifecycle.api.Configurable;
@@ -76,4 +77,13 @@ public class POP3BeforeSMTPHandler imple
return null;
}
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
}
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java Tue Nov 3 16:42:48 2015
@@ -21,11 +21,12 @@ package org.apache.james.smtpserver;
import java.util.Collection;
-import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.inject.Named;
import javax.mail.MessagingException;
+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.dsn.DSNStatus;
import org.apache.james.protocols.smtp.hook.HookResult;
@@ -48,11 +49,20 @@ public class SendMailHandler implements
this.queueFactory = queueFactory;
}
- @PostConstruct
public void init() {
+
+ }
+
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
queue = queueFactory.getQueue(MailQueueFactory.SPOOL);
}
+ @Override
+ public void destroy() {
+
+ }
+
/**
* Adds header to the message
*
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java Tue Nov 3 16:42:48 2015
@@ -21,6 +21,8 @@ package org.apache.james.smtpserver;
import javax.inject.Inject;
import javax.inject.Named;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.api.DomainListException;
import org.apache.james.protocols.smtp.MailAddress;
@@ -50,6 +52,16 @@ public class SenderAuthIdentifyVerificat
}
@Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
+
+ @Override
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
ExtendedSMTPSession nSession = (ExtendedSMTPSession) session;
if (nSession.verifyIdentity()) {
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java Tue Nov 3 16:42:48 2015
@@ -23,7 +23,7 @@ import javax.mail.internet.MimeMessage;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.james.protocols.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
+import org.apache.james.protocols.api.handler.ProtocolHandler;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
@@ -32,7 +32,7 @@ import org.apache.mailet.Mail;
/**
* Adds the header to the message
*/
-public class SetMimeHeaderHandler implements JamesMessageHook, InitializingLifecycleAwareProtocolHandler {
+public class SetMimeHeaderHandler implements JamesMessageHook, ProtocolHandler {
/**
* The header name and value that needs to be added
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java Tue Nov 3 16:42:48 2015
@@ -21,6 +21,8 @@ package org.apache.james.smtpserver;
import javax.inject.Inject;
import javax.inject.Named;
+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.AuthHook;
import org.apache.james.protocols.smtp.hook.HookResult;
@@ -71,5 +73,14 @@ public class UsersRepositoryAuthHook imp
}
return new HookResult(HookReturnCode.DECLINED);
}
-
+
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
}
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java Tue Nov 3 16:42:48 2015
@@ -30,9 +30,9 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.protocols.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
+import org.apache.james.protocols.api.handler.ProtocolHandler;
-public class DNSRBLHandler extends org.apache.james.protocols.smtp.core.fastfail.DNSRBLHandler implements InitializingLifecycleAwareProtocolHandler {
+public class DNSRBLHandler extends org.apache.james.protocols.smtp.core.fastfail.DNSRBLHandler implements ProtocolHandler {
private DNSService dns;
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java Tue Nov 3 16:42:48 2015
@@ -41,7 +41,7 @@ import org.apache.commons.configuration.
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.library.netmatcher.NetMatcher;
import org.apache.james.filesystem.api.FileSystem;
-import org.apache.james.protocols.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
+import org.apache.james.protocols.api.handler.ProtocolHandler;
import org.apache.james.protocols.smtp.MailAddress;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.core.fastfail.AbstractGreylistHandler;
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
/**
* GreylistHandler which can be used to activate Greylisting
*/
-public class JDBCGreylistHandler extends AbstractGreylistHandler implements InitializingLifecycleAwareProtocolHandler {
+public class JDBCGreylistHandler extends AbstractGreylistHandler implements ProtocolHandler {
/** This log is the fall back shared by all instances */
private static final Logger FALLBACK_LOG = LoggerFactory.getLogger(JDBCGreylistHandler.class);
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java Tue Nov 3 16:42:48 2015
@@ -21,9 +21,9 @@ package org.apache.james.smtpserver.fast
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.james.protocols.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
+import org.apache.james.protocols.api.handler.ProtocolHandler;
-public class MaxRcptHandler extends org.apache.james.protocols.smtp.core.fastfail.MaxRcptHandler implements InitializingLifecycleAwareProtocolHandler {
+public class MaxRcptHandler extends org.apache.james.protocols.smtp.core.fastfail.MaxRcptHandler implements ProtocolHandler {
@Override
public void init(Configuration config) throws ConfigurationException {
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxUnknownCmdHandler.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxUnknownCmdHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxUnknownCmdHandler.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxUnknownCmdHandler.java Tue Nov 3 16:42:48 2015
@@ -21,9 +21,9 @@ package org.apache.james.smtpserver.fast
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.james.protocols.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
+import org.apache.james.protocols.api.handler.ProtocolHandler;
-public class MaxUnknownCmdHandler extends org.apache.james.protocols.smtp.core.fastfail.MaxUnknownCmdHandler implements InitializingLifecycleAwareProtocolHandler {
+public class MaxUnknownCmdHandler extends org.apache.james.protocols.smtp.core.fastfail.MaxUnknownCmdHandler implements ProtocolHandler {
@Override
public void init(Configuration config) throws ConfigurationException {
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java Tue Nov 3 16:42:48 2015
@@ -29,7 +29,7 @@ import org.apache.james.jspf.executor.SP
import org.apache.james.jspf.impl.DefaultSPF;
import org.apache.james.jspf.impl.SPF;
import org.apache.james.protocols.api.ProtocolSession.State;
-import org.apache.james.protocols.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
+import org.apache.james.protocols.api.handler.ProtocolHandler;
import org.apache.james.protocols.smtp.MailAddress;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
@@ -43,7 +43,7 @@ import org.apache.mailet.Mail;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, InitializingLifecycleAwareProtocolHandler {
+public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, ProtocolHandler {
/** This log is the fall back shared by all instances */
private static final Logger FALLBACK_LOG = LoggerFactory.getLogger(SPFHandler.class);
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java Tue Nov 3 16:42:48 2015
@@ -25,7 +25,7 @@ import javax.mail.internet.MimeMessage;
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.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
+import org.apache.james.protocols.api.handler.ProtocolHandler;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.dsn.DSNStatus;
import org.apache.james.protocols.smtp.hook.HookResult;
@@ -63,7 +63,7 @@ import org.apache.mailet.Mail;
*
* </p>
*/
-public class SpamAssassinHandler implements JamesMessageHook, InitializingLifecycleAwareProtocolHandler {
+public class SpamAssassinHandler implements JamesMessageHook, ProtocolHandler {
/** The port spamd is listen on */
private int spamdPort = 783;
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java Tue Nov 3 16:42:48 2015
@@ -21,11 +21,11 @@ package org.apache.james.smtpserver.fast
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.james.protocols.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
+import org.apache.james.protocols.api.handler.ProtocolHandler;
import java.util.Arrays;
-public class SpamTrapHandler extends org.apache.james.protocols.smtp.core.fastfail.SpamTrapHandler implements InitializingLifecycleAwareProtocolHandler {
+public class SpamTrapHandler extends org.apache.james.protocols.smtp.core.fastfail.SpamTrapHandler implements ProtocolHandler {
@Override
public void init(Configuration config) throws ConfigurationException {
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java Tue Nov 3 16:42:48 2015
@@ -37,7 +37,7 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.protocols.api.ProtocolSession.State;
-import org.apache.james.protocols.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
+import org.apache.james.protocols.api.handler.ProtocolHandler;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.dsn.DSNStatus;
import org.apache.james.protocols.smtp.hook.HookResult;
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
* Extract domains from message and check against URIRBLServer. For more
* informations see <a href="http://www.surbl.org">www.surbl.org</a>
*/
-public class URIRBLHandler implements JamesMessageHook, InitializingLifecycleAwareProtocolHandler {
+public class URIRBLHandler implements JamesMessageHook, ProtocolHandler {
/** This log is the fall back shared by all instances */
private static final Logger FALLBACK_LOG = LoggerFactory.getLogger(URIRBLHandler.class);
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java Tue Nov 3 16:42:48 2015
@@ -25,7 +25,7 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.api.DomainListException;
-import org.apache.james.protocols.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
+import org.apache.james.protocols.api.handler.ProtocolHandler;
import org.apache.james.protocols.smtp.MailAddress;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.core.fastfail.AbstractValidRcptHandler;
@@ -39,7 +39,7 @@ import org.apache.james.user.api.UsersRe
/**
* Handler which reject invalid recipients
*/
-public class ValidRcptHandler extends AbstractValidRcptHandler implements InitializingLifecycleAwareProtocolHandler {
+public class ValidRcptHandler extends AbstractValidRcptHandler implements ProtocolHandler {
private UsersRepository users;
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java Tue Nov 3 16:42:48 2015
@@ -31,7 +31,7 @@ import org.apache.commons.configuration.
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.TemporaryResolutionException;
import org.apache.james.dnsservice.library.netmatcher.NetMatcher;
-import org.apache.james.protocols.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
+import org.apache.james.protocols.api.handler.ProtocolHandler;
import org.apache.james.protocols.smtp.MailAddress;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
* This class can be used to reject email with bogus MX which is send from a
* authorized user or an authorized network.
*/
-public class ValidRcptMX implements InitializingLifecycleAwareProtocolHandler, RcptHook {
+public class ValidRcptMX implements RcptHook, ProtocolHandler {
/**
* This log is the fall back shared by all instances
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java Tue Nov 3 16:42:48 2015
@@ -23,6 +23,8 @@ import java.util.Collection;
import javax.inject.Inject;
import javax.inject.Named;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.protocols.smtp.SMTPSession;
@@ -53,4 +55,13 @@ public class ValidSenderDomainHandler ex
}
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
}
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java Tue Nov 3 16:42:48 2015
@@ -20,15 +20,14 @@ package org.apache.james.smtpserver.jmx;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.protocols.api.handler.ExtensibleHandler;
+import org.apache.james.protocols.api.handler.ProtocolHandler;
import org.apache.james.protocols.api.handler.WiringException;
-import org.apache.james.protocols.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.Hook;
import org.apache.james.protocols.smtp.hook.HookResult;
@@ -38,7 +37,7 @@ import org.apache.james.protocols.smtp.h
* {@link HookResultHook} implementation which will register a
* {@link HookStatsMBean} under JMX for every Hook it processed
*/
-public class HookResultJMXMonitor implements HookResultHook, ExtensibleHandler, InitializingLifecycleAwareProtocolHandler {
+public class HookResultJMXMonitor implements HookResultHook, ExtensibleHandler, ProtocolHandler {
private final Map<String, HookStats> hookStats = new HashMap<String, HookStats>();
private String jmxPath;
Modified: james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java Tue Nov 3 16:42:48 2015
@@ -21,6 +21,8 @@ package org.apache.james.smtpserver.jmx;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.protocols.lib.handler.HandlersPackage;
public class JMXHandlersLoader implements HandlersPackage {
@@ -40,4 +42,13 @@ public class JMXHandlersLoader implement
return handlers;
}
+ @Override
+ public void init(Configuration config) throws ConfigurationException {
+
+ }
+
+ @Override
+ public void destroy() {
+
+ }
}
Modified: james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java?rev=1712325&r1=1712324&r2=1712325&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java (original)
+++ james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java Tue Nov 3 16:42:48 2015
@@ -1337,7 +1337,7 @@ public class SMTPServerTest {
smtpProtocol.setSender(sender);
smtpProtocol.addRecipient("mail@sample.com");
- assertEquals("reject", 550, smtpProtocol.getReplyCode());
+ assertEquals("reject", 554, smtpProtocol.getReplyCode());
smtpProtocol.sendShortMessageData("Subject: test\r\n\r\nTest body testDNSRBLRejectWorks\r\n");
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org