Author: norman
Date: Tue Sep 27 09:08:11 2011
New Revision: 1176289
URL: http://svn.apache.org/viewvc?rev=1176289&view=rev
Log:
ResponseEncoder will just work with Response interface and US-ASCII charset by
default
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/ResponseEncoder.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java?rev=1176289&r1=1176288&r2=1176289&view=diff
==============================================================================
---
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java
(original)
+++
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java
Tue Sep 27 09:08:11 2011
@@ -32,6 +32,4 @@ public interface Protocol {
boolean isStartTLSSupported();
- Class<? extends Response> getResponseClass();
-
}
Modified:
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java?rev=1176289&r1=1176288&r2=1176289&view=diff
==============================================================================
---
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java
(original)
+++
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java
Tue Sep 27 09:08:11 2011
@@ -63,7 +63,7 @@ public class NettyServer extends Abstrac
super();
this.protocol = protocol;
this.context = context;
- this.responseEncoder = new
ResponseEncoder(protocol.getResponseClass(), Charset.forName("US-ASCII"));
+ this.responseEncoder = new ResponseEncoder();
}
protected ExecutionHandler createExecutionHandler(int size) {
Modified:
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/ResponseEncoder.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/ResponseEncoder.java?rev=1176289&r1=1176288&r2=1176289&view=diff
==============================================================================
---
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/ResponseEncoder.java
(original)
+++
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/ResponseEncoder.java
Tue Sep 27 09:08:11 2011
@@ -44,6 +44,12 @@ public class ResponseEncoder extends One
this.charset = charset;
}
+
+ public ResponseEncoder() {
+ this(Response.class, Charset.forName("US-ASCII"));
+ }
+
+
@Override
protected Object encode(ChannelHandlerContext arg0, Channel arg1, Object
obj) throws Exception {
if (classType.isInstance(obj)) {
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java?rev=1176289&r1=1176288&r2=1176289&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java
Tue Sep 27 09:08:11 2011
@@ -26,7 +26,6 @@ import org.apache.james.protocols.api.Pr
import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
import org.apache.james.protocols.smtp.SMTPConfiguration;
-import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPSessionImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,7 +60,7 @@ public class SMTPProtocol implements Pro
}
public Class<? extends Response> getResponseClass() {
- return SMTPResponse.class;
+ return Response.class;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
