Author: norman
Date: Thu Apr 7 12:16:13 2011
New Revision: 1089849
URL: http://svn.apache.org/viewvc?rev=1089849&view=rev
Log:
Move high-level operations from ImapResponseWriter to ImapResponseComposer and
make it easy to chain operations. See IMAP-279
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java?rev=1089849&r1=1089848&r2=1089849&view=diff
==============================================================================
---
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
(original)
+++
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
Thu Apr 7 12:16:13 2011
@@ -22,17 +22,17 @@ package org.apache.james.imapserver.nett
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.apache.james.imap.main.AbstractImapResponseWriter;
+import org.apache.james.imap.encode.ImapResponseWriter;
import org.apache.james.imap.message.response.Literal;
import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.handler.stream.ChunkedStream;
/**
- * {@link AbstractImapResponseWriter} implementation which writes the data to a
+ * {@link ImapResponseWriter} implementation which writes the data to a
* {@link Channel}
*/
-public class ChannelImapResponseWriter extends AbstractImapResponseWriter {
+public class ChannelImapResponseWriter implements ImapResponseWriter {
private Channel channel;
@@ -40,25 +40,20 @@ public class ChannelImapResponseWriter e
this.channel = channel;
}
+
/*
* (non-Javadoc)
- *
- * @see
- * org.apache.james.imap.main.AbstractImapResponseWriter#write(java.nio.
- * ByteBuffer)
+ * @see
org.apache.james.imap.encode.ImapResponseWriter#write(java.nio.ByteBuffer)
*/
- protected void write(ByteBuffer buffer) throws IOException {
+ public void write(ByteBuffer buffer) throws IOException {
channel.write(ChannelBuffers.wrappedBuffer(buffer));
}
/*
* (non-Javadoc)
- *
- * @see
- * org.apache.james.imap.main.AbstractImapResponseWriter#write(org.apache
- * .james.imap.message.response.Literal)
+ * @see
org.apache.james.imap.encode.ImapResponseWriter#write(org.apache.james.imap.message.response.Literal)
*/
- protected void write(Literal literal) throws IOException {
+ public void write(Literal literal) throws IOException {
channel.write(new ChunkedStream(literal.getInputStream()));
}
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java?rev=1089849&r1=1089848&r2=1089849&view=diff
==============================================================================
---
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
(original)
+++
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
Thu Apr 7 12:16:13 2011
@@ -112,10 +112,6 @@ public class ImapChannelUpstreamHandler
// write hello to client
response.hello(hello);
- //
ctx.getChannel().write(ChannelBuffers.copiedBuffer((ImapConstants.UNTAGGED
- // + " OK " + hello +" " + new
- // String(ImapConstants.BYTES_LINE_END)).getBytes()));
-
super.channelConnected(ctx, e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
