Author: norman Date: Wed Sep 28 14:07:58 2011 New Revision: 1176888 URL: http://svn.apache.org/viewvc?rev=1176888&view=rev Log: Adjustments for latest protocol changes
Removed: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ProtocolTransport.java Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3StreamResponse.java james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.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=1176888&r1=1176887&r2=1176888&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 Wed Sep 28 14:07:58 2011 @@ -26,18 +26,14 @@ import org.apache.commons.configuration. import org.apache.james.lmtpserver.CoreCmdHandlerLoader; import org.apache.james.lmtpserver.jmx.JMXHandlersLoader; import org.apache.james.protocols.api.handler.HandlersPackage; -import org.apache.james.protocols.impl.ResponseEncoder; import org.apache.james.protocols.lib.netty.AbstractProtocolAsyncServer; import org.apache.james.protocols.lmtp.LMTPConfiguration; import org.apache.james.protocols.lmtp.LMTPProtocol; 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 ResponseEncoder ENCODER = new ResponseEncoder(); - /** * The maximum message size allowed by this SMTP server. The default value, * 0, means no limit. @@ -163,10 +159,6 @@ public class LMTPServer extends Abstract return new SMTPChannelUpstreamHandler(protocol, getLogger()); } - @Override - protected OneToOneEncoder createEncoder() { - return ENCODER; - } @Override protected SSLContext getSSLContext() { Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3StreamResponse.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3StreamResponse.java?rev=1176888&r1=1176887&r2=1176888&view=diff ============================================================================== --- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3StreamResponse.java (original) +++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3StreamResponse.java Wed Sep 28 14:07:58 2011 @@ -19,9 +19,13 @@ package org.apache.james.pop3server; +import java.io.ByteArrayInputStream; import java.io.InputStream; +import java.io.SequenceInputStream; -public class POP3StreamResponse extends POP3Response { +import org.apache.james.protocols.api.StreamResponse; + +public class POP3StreamResponse extends POP3Response implements StreamResponse { private InputStream stream; @@ -31,6 +35,6 @@ public class POP3StreamResponse extends } public InputStream getStream() { - return stream; + return new SequenceInputStream(stream, new ByteArrayInputStream(".\r\n".getBytes())); } } Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java?rev=1176888&r1=1176887&r2=1176888&view=diff ============================================================================== --- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java (original) +++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java Wed Sep 28 14:07:58 2011 @@ -25,21 +25,17 @@ import org.apache.james.pop3server.core. import org.apache.james.pop3server.jmx.JMXHandlersLoader; import org.apache.james.protocols.api.handler.HandlersPackage; import org.apache.james.protocols.impl.BasicChannelUpstreamHandler; -import org.apache.james.protocols.impl.ResponseEncoder; import org.apache.james.protocols.lib.netty.AbstractProtocolAsyncServer; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.channel.ChannelPipelineFactory; import org.jboss.netty.channel.ChannelUpstreamHandler; import org.jboss.netty.channel.group.ChannelGroup; -import org.jboss.netty.handler.codec.oneone.OneToOneEncoder; import org.jboss.netty.handler.stream.ChunkedWriteHandler; /** * NIO POP3 Server which use Netty */ public class POP3Server extends AbstractProtocolAsyncServer implements POP3ServerMBean { - - private final static ResponseEncoder POP3_RESPONSE_ENCODER = new ResponseEncoder(); /** * The configuration data to be passed to the handler */ @@ -85,7 +81,7 @@ public class POP3Server extends Abstract protected void preInit() throws Exception { super.preInit(); POP3Protocol protocol = new POP3Protocol(getProtocolHandlerChain(), theConfigData, getLogger()); - coreHandler = new POP3ChannelUpstreamHandler(protocol, getLogger(), getSSLContext(), getEnabledCipherSuites(), false); + coreHandler = new BasicChannelUpstreamHandler(protocol, getLogger(), getSSLContext(), getEnabledCipherSuites()); } @@ -115,11 +111,6 @@ public class POP3Server extends Abstract return coreHandler; } - @Override - protected OneToOneEncoder createEncoder() { - return POP3_RESPONSE_ENCODER; - } - @Override protected Class<? extends HandlersPackage> getCoreHandlersPackage() { Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java?rev=1176888&r1=1176887&r2=1176888&view=diff ============================================================================== --- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java (original) +++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java Wed Sep 28 14:07:58 2011 @@ -47,7 +47,6 @@ import org.jboss.netty.bootstrap.ServerB import org.jboss.netty.channel.ChannelPipelineFactory; import org.jboss.netty.channel.ChannelUpstreamHandler; import org.jboss.netty.channel.group.ChannelGroup; -import org.jboss.netty.handler.codec.oneone.OneToOneEncoder; import org.jboss.netty.handler.execution.ExecutionHandler; import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor; import org.slf4j.Logger; @@ -569,7 +568,6 @@ public abstract class AbstractConfigurab return executionHandler; } - protected abstract OneToOneEncoder createEncoder(); protected abstract ChannelUpstreamHandler createCoreHandler(); @@ -587,11 +585,6 @@ public abstract class AbstractConfigurab return AbstractConfigurableAsyncServer.this.isSSLSocket(); } - @Override - protected OneToOneEncoder createEncoder() { - return AbstractConfigurableAsyncServer.this.createEncoder(); - - } @Override protected ChannelUpstreamHandler createHandler() { Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java?rev=1176888&r1=1176887&r2=1176888&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java Wed Sep 28 14:07:58 2011 @@ -21,7 +21,6 @@ package org.apache.james.smtpserver; import org.apache.james.protocols.api.ProtocolTransport; import org.apache.james.protocols.smtp.SMTPConfiguration; import org.apache.james.protocols.smtp.SMTPSession; -import org.apache.james.smtpserver.netty.SMTPServer; import org.apache.james.smtpserver.netty.SMTPServer.SMTPHandlerConfigurationDataImpl; import org.slf4j.Logger; Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java?rev=1176888&r1=1176887&r2=1176888&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java Wed Sep 28 14:07:58 2011 @@ -28,7 +28,6 @@ import org.apache.james.dnsservice.libra import org.apache.james.protocols.api.ProtocolSession; import org.apache.james.protocols.api.ProtocolTransport; import org.apache.james.protocols.api.handler.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.SMTPProtocol; @@ -91,8 +90,6 @@ public class SMTPServer extends Abstract private DNSService dns; private String authorizedAddresses; - - private final static ResponseEncoder SMTP_RESPONSE_ENCODER = new ResponseEncoder(); private SMTPChannelUpstreamHandler coreHandler; @@ -382,11 +379,6 @@ public class SMTPServer extends Abstract } @Override - protected OneToOneEncoder createEncoder() { - return SMTP_RESPONSE_ENCODER; - } - - @Override protected Class<? extends HandlersPackage> getCoreHandlersPackage() { return CoreCmdHandlerLoader.class; } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org