Author: norman Date: Sat Sep 17 13:10:46 2011 New Revision: 1171971 URL: http://svn.apache.org/viewvc?rev=1171971&view=rev Log: Refactor lmtpserver for latest protocols refactoring
Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java?rev=1171971&r1=1171970&r2=1171971&view=diff ============================================================================== --- james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java (original) +++ james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java Sat Sep 17 13:10:46 2011 @@ -18,6 +18,8 @@ ****************************************************************/ package org.apache.james.lmtpserver.netty; +import java.nio.charset.Charset; + import javax.net.ssl.SSLContext; import org.apache.commons.configuration.ConfigurationException; @@ -25,16 +27,18 @@ import org.apache.commons.configuration. import org.apache.james.lmtpserver.CoreCmdHandlerLoader; import org.apache.james.lmtpserver.jmx.JMXHandlersLoader; import org.apache.james.protocols.api.HandlersPackage; +import org.apache.james.protocols.impl.ResponseEncoder; import org.apache.james.protocols.lib.netty.AbstractProtocolAsyncServer; import org.apache.james.protocols.smtp.SMTPConfiguration; -import org.apache.james.protocols.smtp.netty.SMTPResponseEncoder; +import org.apache.james.protocols.smtp.SMTPProtocol; +import org.apache.james.protocols.smtp.SMTPResponse; import org.apache.james.smtpserver.netty.SMTPChannelUpstreamHandler; import org.jboss.netty.channel.ChannelUpstreamHandler; import org.jboss.netty.handler.codec.oneone.OneToOneEncoder; public class LMTPServer extends AbstractProtocolAsyncServer implements LMTPServerMBean { - private final static SMTPResponseEncoder ENCODER = new SMTPResponseEncoder(); + private final static ResponseEncoder ENCODER = new ResponseEncoder(SMTPResponse.class, Charset.forName("US-ASCII")); /** * The maximum message size allowed by this SMTP server. The default value, @@ -195,7 +199,8 @@ public class LMTPServer extends Abstract @Override protected ChannelUpstreamHandler createCoreHandler() { - return new SMTPChannelUpstreamHandler(getProtocolHandlerChain(), lmtpConfig, getLogger()); + SMTPProtocol protocol = new SMTPProtocol(getProtocolHandlerChain(), lmtpConfig); + return new SMTPChannelUpstreamHandler(getProtocolHandlerChain(), protocol.getProtocolSessionFactory(), getLogger()); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org