Author: norman
Date: Tue Sep 27 09:09:33 2011
New Revision: 1176290
URL: http://svn.apache.org/viewvc?rev=1176290&view=rev
Log:
ResponseEncoder will just work with Response interface and US-ASCII charset by
default
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/POP3Protocol.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.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=1176290&r1=1176289&r2=1176290&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
Tue Sep 27 09:09:33 2011
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.lmtpserver.netty;
-import java.nio.charset.Charset;
import javax.net.ssl.SSLContext;
@@ -26,7 +25,6 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.lmtpserver.CoreCmdHandlerLoader;
import org.apache.james.lmtpserver.jmx.JMXHandlersLoader;
-import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.api.handler.HandlersPackage;
import org.apache.james.protocols.impl.ResponseEncoder;
import org.apache.james.protocols.lib.netty.AbstractProtocolAsyncServer;
@@ -38,7 +36,7 @@ import org.jboss.netty.handler.codec.one
public class LMTPServer extends AbstractProtocolAsyncServer implements
LMTPServerMBean {
- private final static ResponseEncoder ENCODER = new
ResponseEncoder(Response.class, Charset.forName("US-ASCII"));
+ private final static ResponseEncoder ENCODER = new ResponseEncoder();
/**
* The maximum message size allowed by this SMTP server. The default value,
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Protocol.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Protocol.java?rev=1176290&r1=1176289&r2=1176290&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Protocol.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Protocol.java
Tue Sep 27 09:09:33 2011
@@ -23,7 +23,6 @@ import org.apache.james.protocols.api.Pr
import org.apache.james.protocols.api.ProtocolSession;
import org.apache.james.protocols.api.ProtocolSessionFactory;
import org.apache.james.protocols.api.ProtocolTransport;
-import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
import org.slf4j.Logger;
@@ -59,9 +58,4 @@ public class POP3Protocol implements Pro
return config.isStartTLSSupported();
}
- @Override
- public Class<? extends Response> getResponseClass() {
- return POP3Response.class;
- }
-
}
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=1176290&r1=1176289&r2=1176290&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
Tue Sep 27 09:09:33 2011
@@ -18,11 +18,9 @@
****************************************************************/
package org.apache.james.pop3server.netty;
-import java.nio.charset.Charset;
import org.apache.james.pop3server.POP3HandlerConfiguration;
import org.apache.james.pop3server.POP3Protocol;
-import org.apache.james.pop3server.POP3Response;
import org.apache.james.pop3server.core.CoreCmdHandlerLoader;
import org.apache.james.pop3server.jmx.JMXHandlersLoader;
import org.apache.james.protocols.api.handler.HandlersPackage;
@@ -41,7 +39,7 @@ import org.jboss.netty.handler.stream.Ch
*/
public class POP3Server extends AbstractProtocolAsyncServer implements
POP3ServerMBean {
- private final static ResponseEncoder POP3_RESPONSE_ENCODER = new
ResponseEncoder(POP3Response.class, Charset.forName("US-ASCII"));
+ private final static ResponseEncoder POP3_RESPONSE_ENCODER = new
ResponseEncoder();
/**
* The configuration data to be passed to the handler
*/
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=1176290&r1=1176289&r2=1176290&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
Tue Sep 27 09:09:33 2011
@@ -95,7 +95,7 @@ public class SMTPServer extends Abstract
private DNSService dns;
private String authorizedAddresses;
- private final static ResponseEncoder SMTP_RESPONSE_ENCODER = new
ResponseEncoder(SMTPResponse.class, Charset.forName("US-ASCII"));
+ private final static ResponseEncoder SMTP_RESPONSE_ENCODER = new
ResponseEncoder();
private SMTPChannelUpstreamHandler coreHandler;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
