You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rd...@apache.org on 2007/11/25 13:23:08 UTC

svn commit: r597975 - in /james/server/trunk: experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/encode/writer/ imap-api/src/mai...

Author: rdonkin
Date: Sun Nov 25 04:23:06 2007
New Revision: 597975

URL: http://svn.apache.org/viewvc?rev=597975&view=rev
Log:
Revise encoder stack. IOExceptions now raised and thrown. Switched to channel-based low level IO. Retain output stream for now.

Added:
    james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/encode/writer/ChannelImapResponseWriter.java
Modified:
    james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapHandler.java
    james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapRequestHandler.java
    james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/encode/writer/OutputStreamImapResponseWriter.java
    james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/ImapConstants.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapResponseComposer.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapResponseWriter.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/base/AbstractChainedImapEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/base/EndImapEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/base/ImapResponseComposerImpl.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/ExistsResponseEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/ExpungeResponseEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/FetchResponseEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/RecentResponseEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/StatusResponseEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/BadResponseEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/CapabilityResponseEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/CommandCompleteResponseEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/CommandFailedResponseEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/ErrorResponseEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/ExamineAndSelectResponseEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/LogoutResponseEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/StatusCommandResponseEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/LSubResponseEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/ListResponseEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/ListingEncodingUtils.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/SearchResponseEncoder.java
    james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/status/UntaggedNoResponseEncoder.java
    james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/ImapResponseCommandTest.java
    james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/ImapResponseTest.java
    james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/base/ByteImapResponseWriter.java
    james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/ErrorResponseMessageTest.java

Modified: james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapHandler.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapHandler.java (original)
+++ james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapHandler.java Sun Nov 25 04:23:06 2007
@@ -86,7 +86,12 @@
         getLogger().debug("forceConnectionClose: "+message);
         final OutputStreamImapResponseWriter writer = new OutputStreamImapResponseWriter(outs);
         ImapResponseComposer response = new ImapResponseComposerImpl(writer);
-        response.byeResponse(message);
+        try {
+            response.byeResponse(message);
+        } catch (IOException e) {
+            getLogger().info("Write BYE failed");
+            getLogger().debug("Cannot write BYE on connection close", e);
+        }
         endSession();
     }
 

Modified: james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapRequestHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapRequestHandler.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapRequestHandler.java (original)
+++ james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/ImapRequestHandler.java Sun Nov 25 04:23:06 2007
@@ -19,6 +19,7 @@
 
 package org.apache.james.experimental.imapserver;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
@@ -91,26 +92,48 @@
         ImapResponseComposerImpl response = new ImapResponseComposerImpl( new OutputStreamImapResponseWriter( output ));
         response.enableLogging(getLogger()); 
 
-        doProcessRequest( request, response, session );
-
-        // Consume the rest of the line, throwing away any extras. This allows us
-        // to clean up after a protocol error.
-        request.consumeLine();
-
-        return !(ImapSessionState.LOGOUT == session.getState());
+        final boolean result;
+        if (doProcessRequest( request, response, session )) {
+    
+            // Consume the rest of the line, throwing away any extras. This allows us
+            // to clean up after a protocol error.
+            request.consumeLine();
+    
+            result = !(ImapSessionState.LOGOUT == session.getState());
+        } else {
+            result = false;
+        }
+        return result;
     }
 
-    private void doProcessRequest( ImapRequestLineReader request,
+    private boolean doProcessRequest( ImapRequestLineReader request,
                                    ImapResponseComposer response,
                                    ImapSession session)
     {
         ImapMessage message = decoder.decode(request);
-        processor.process(message, new ResponseEncoder(encoder, response), session);
+        final ResponseEncoder responseEncoder = new ResponseEncoder(encoder, response);
+        processor.process(message, responseEncoder, session);
+        final boolean result;
+        final IOException failure = responseEncoder.getFailure();
+        if (failure == null) {
+            result = true;
+        } else {
+            result = false;
+            final Logger logger = getLogger();
+            logger.info(failure.getMessage());
+            if (logger.isDebugEnabled()) {
+                logger.debug("Failed to write " + message, failure);
+            }
+        }
+        return result;
     }
 
     private static final class ResponseEncoder implements Responder {
         private final ImapEncoder encoder;
         private final ImapResponseComposer composer;
+
+        private IOException failure;
+        
         
         public ResponseEncoder(final ImapEncoder encoder, final ImapResponseComposer composer) {
             super();
@@ -119,7 +142,22 @@
         }
         
         public void respond(final ImapResponseMessage message) {
+            try {
             encoder.encode(message, composer);
+            } catch (IOException failure) {
+                this.failure = failure;
+            }
+        }
+
+        /**
+         * Gets the recorded failure.
+         * @return the failure, 
+         * or null when no failure has occured
+         */
+        public final IOException getFailure() {
+            return failure;
         }
+        
+        
     }
 }

Added: james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/encode/writer/ChannelImapResponseWriter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/encode/writer/ChannelImapResponseWriter.java?rev=597975&view=auto
==============================================================================
--- james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/encode/writer/ChannelImapResponseWriter.java (added)
+++ james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/encode/writer/ChannelImapResponseWriter.java Sun Nov 25 04:23:06 2007
@@ -0,0 +1,195 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ ****************************************************************/
+
+package org.apache.james.experimental.imapserver.encode.writer;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.WritableByteChannel;
+import java.nio.charset.Charset;
+
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.james.api.imap.ImapConstants;
+import org.apache.james.imapserver.codec.encode.ImapResponseWriter;
+
+/**
+ * Class providing methods to send response messages from the server
+ * to the client.
+ */
+public class ChannelImapResponseWriter extends AbstractLogEnabled implements ImapConstants, ImapResponseWriter {
+    
+    private static final int DEFAULT_BUFFER_SIZE = 128;
+    
+    private final Charset usAscii;
+    private final WritableByteChannel out;
+    private final ByteBuffer buffer;
+    private boolean skipNextSpace;
+
+    public ChannelImapResponseWriter( final WritableByteChannel out) {
+        this(out, DEFAULT_BUFFER_SIZE);
+    }
+    
+    public ChannelImapResponseWriter( final WritableByteChannel out, final int bufferSize  )
+    {
+        this.out = out;
+        skipNextSpace = false;
+        buffer = ByteBuffer.allocate(bufferSize);
+        usAscii = Charset.forName("US-ASCII");
+    }
+
+    /**
+     * Writes the message provided to the client, prepended with the
+     * untagged marker "*".
+     *
+     * @param message The message to write to the client.
+     * @throws IOException 
+     */
+    public void untaggedResponse( String message ) throws IOException
+    {
+        untagged();
+        message( message );
+        end();
+    }
+    
+    public void byeResponse( String message ) throws IOException {
+        untaggedResponse(BYE + SP + message);
+    }
+
+    private void write(final ByteBuffer buffer) throws IOException {
+        while(out.write(buffer)>0) {
+            // Write all
+        }
+    }
+    
+    private void writeASCII(final String string) throws IOException {
+        final ByteBuffer buffer = usAscii.encode(string);
+        write( buffer );
+    }
+    
+    private void write(byte[] bytes) throws IOException {
+        final ByteBuffer wrap = ByteBuffer.wrap(bytes);
+        write(wrap);
+    }
+    
+    public void untagged() throws IOException {
+        writeASCII( UNTAGGED );
+    }
+
+    public void tag(String tag) throws IOException {
+        writeASCII( tag );
+    }
+
+    public void message( String message ) throws IOException
+    {
+        if ( message != null ) {
+            space();
+            writeASCII( message );
+        }
+    }
+
+    public void message( long number ) throws IOException
+    {
+        space();
+        writeASCII( Long.toString(number) );
+    }
+
+    public void responseCode( String responseCode ) throws IOException
+    {
+        if ( responseCode != null ) {
+            writeASCII( " [" );
+            writeASCII( responseCode );
+            write( BYTES_CLOSE_SQUARE_BRACKET );
+        }
+    }
+
+    public void end() throws IOException
+    {
+        write(BYTES_LINE_END);
+        flush();
+    }
+
+    public void commandName(String commandName) throws IOException {
+        space();
+        writeASCII( commandName );
+    }
+
+    public void quote(String message) throws IOException {
+        space();
+        final int length = message.length();
+        buffer.clear();
+        buffer.put(BYTE_DQUOTE);
+        for (int i=0;i<length;i++) {
+            writeIfFull();
+            char character = message.charAt(i);
+            if (character == ImapConstants.BACK_SLASH 
+                    || character == DQUOTE) {
+                buffer.put(BYTE_BACK_SLASH);
+            }
+            writeIfFull();
+            // 7-bit ASCII only
+            if (character > 128) {
+                buffer.put(BYTE_QUESTION);
+            } else {
+                buffer.put((byte) character);
+            }
+        }
+        writeIfFull();
+        buffer.put(BYTE_DQUOTE);
+        buffer.flip();
+        write(buffer);
+    }
+
+    private void writeIfFull() throws IOException {
+        if (!buffer.hasRemaining()) {
+            buffer.flip();
+            write(buffer);
+            buffer.clear();
+        }
+    }
+    
+    public void flush() throws IOException {
+    }
+
+    public void closeParen() throws IOException {
+        write(BYTES_CLOSING_PARENTHESIS);
+        clearSkipNextSpace();
+    }
+
+    public void openParen() throws IOException {
+        space();
+        write(BYTES_OPENING_PARENTHESIS);
+        skipNextSpace();
+    }
+    
+    private void clearSkipNextSpace() {
+        skipNextSpace = false;
+    }
+    
+    private void skipNextSpace() {
+        skipNextSpace = true;
+    }
+    
+    private void space() throws IOException {
+        if (skipNextSpace) {
+            skipNextSpace = false;
+        } else {
+            write(BYTES_SPACE);
+        }
+    }
+}

Modified: james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/encode/writer/OutputStreamImapResponseWriter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/encode/writer/OutputStreamImapResponseWriter.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/encode/writer/OutputStreamImapResponseWriter.java (original)
+++ james/server/trunk/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/encode/writer/OutputStreamImapResponseWriter.java Sun Nov 25 04:23:06 2007
@@ -19,132 +19,28 @@
 
 package org.apache.james.experimental.imapserver.encode.writer;
 
+import java.io.IOException;
 import java.io.OutputStream;
-import java.io.PrintWriter;
-
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.james.api.imap.ImapConstants;
-import org.apache.james.imapserver.codec.encode.ImapResponseWriter;
-import org.apache.james.util.InternetPrintWriter;
+import java.nio.channels.Channels;
 
 /**
  * Class providing methods to send response messages from the server
  * to the client.
  */
-public class OutputStreamImapResponseWriter extends AbstractLogEnabled implements ImapConstants, ImapResponseWriter {
+public class OutputStreamImapResponseWriter extends ChannelImapResponseWriter {
     
-    private PrintWriter writer;
-    private boolean skipNextSpace;
+    private final OutputStream output;
 
     public OutputStreamImapResponseWriter( OutputStream output )
     {
-        this.writer = new InternetPrintWriter( output, true );
-        skipNextSpace = false;
-    }
-
-    /**
-     * Writes the message provided to the client, prepended with the
-     * untagged marker "*".
-     *
-     * @param message The message to write to the client.
-     */
-    public void untaggedResponse( String message )
-    {
-        untagged();
-        message( message );
-        end();
-    }
-    
-    public void byeResponse( String message ) {
-        untaggedResponse(BYE + SP + message);
-    }
-
-    public void untagged()
-    {
-        writer.print( UNTAGGED );
-    }
-
-    public void tag(String tag)
-    {
-        writer.print( tag );
-    }
-
-    public void message( String message )
-    {
-        if ( message != null ) {
-            space();
-            writer.print( message );
-        }
-    }
-
-    public void message( long number )
-    {
-        space();
-        writer.print( number );
+        super(Channels.newChannel(output));
+        this.output = output;
     }
 
-    public void responseCode( String responseCode )
-    {
-        if ( responseCode != null ) {
-            writer.print( " [" );
-            writer.print( responseCode );
-            writer.print( ']' );
-        }
-    }
-
-    public void end()
-    {
-        writer.println();
-        writer.flush();
-    }
-
-    public void commandName(String commandName) {
-        space();
-        writer.print( commandName );
-    }
-
-    public void quote(String message) {
-        space();
-        writer.print( DQUOTE );
-        final int length = message.length();
-        for (int i=0;i<length;i++) {
-            char character = message.charAt(i);
-            if (character == ImapConstants.FORWARD_SLASH || character == DQUOTE) {
-                writer.print(ImapConstants.FORWARD_SLASH);
-            }
-            writer.print(character);
-        }
-        writer.print(DQUOTE);
-    }
-    
-    public void flush() {
-        writer.flush();
-    }
-
-    public void closeParen() {
-        writer.print(CLOSING_PARENTHESIS);
-        clearSkipNextSpace();
-    }
-
-    public void openParen() {
-        space();
-        writer.print(OPENING_PARENTHESIS);
-        skipNextSpace();
+    public void flush() throws IOException {
+        super.flush();
+        output.flush();
     }
     
-    private void clearSkipNextSpace() {
-        skipNextSpace = false;
-    }
-    
-    private void skipNextSpace() {
-        skipNextSpace = true;
-    }
     
-    private void space() {
-        if (skipNextSpace) {
-            skipNextSpace = false;
-        } else {
-            writer.print(SP_CHAR);
-        }
-    }
 }

Modified: james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/ImapConstants.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/ImapConstants.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/ImapConstants.java (original)
+++ james/server/trunk/imap-api/src/main/java/org/apache/james/api/imap/ImapConstants.java Sun Nov 25 04:23:06 2007
@@ -27,11 +27,27 @@
     String BAD = "BAD";
     String BYE = "BYE";
     String UNTAGGED = "*";
+    
 
     String SP = " ";
     
     public static final String NIL = "NIL";
     public static final String UID = "UID";
+    
+    public static final byte BYTE_OPENING_PARENTHESIS = 0x28;
+    public static final byte[] BYTES_OPENING_PARENTHESIS = {BYTE_OPENING_PARENTHESIS};
+    public static final byte BYTE_CLOSING_PARENTHESIS = 0x29;
+    public static final byte[] BYTES_CLOSING_PARENTHESIS = {BYTE_CLOSING_PARENTHESIS};
+    public static final byte BYTE_SP = 0x20;
+    public static final byte[] BYTES_SPACE = {BYTE_SP};
+    public static final byte BYTE_DQUOTE = 0x22;
+    public static final byte BYTE_BACK_SLASH = 0x5C;
+    public static final byte BYTE_QUESTION = 0x3F;
+    public static final byte[] BYTES_DQUOTE = {BYTE_DQUOTE};
+    public static final byte BYTE_CLOSE_SQUARE_BRACKET = 0x5D;
+    public static final byte[] BYTES_CLOSE_SQUARE_BRACKET = {BYTE_CLOSE_SQUARE_BRACKET};
+    public static final byte[] BYTES_LINE_END = {0x0D, 0x0A};
+    
     public static final char OPENING_PARENTHESIS = '(';
     public static final char CLOSING_PARENTHESIS = ')';
     public static final char SP_CHAR = ' ';
@@ -48,7 +64,7 @@
     final String NAMESPACE_PREFIX = String.valueOf( NAMESPACE_PREFIX_CHAR );
 
     String INBOX_NAME = "INBOX";
-    public static final char FORWARD_SLASH = '\\';
+    public static final char BACK_SLASH = '\\';
     public static final String STATUS_UNSEEN = "UNSEEN";
     public static final String STATUS_UIDVALIDITY = "UIDVALIDITY";
     public static final String STATUS_UIDNEXT = "UIDNEXT";

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapEncoder.java Sun Nov 25 04:23:06 2007
@@ -19,6 +19,8 @@
 
 package org.apache.james.imapserver.codec.encode;
 
+import java.io.IOException;
+
 import org.apache.james.api.imap.ImapMessage;
 
 /**
@@ -32,6 +34,7 @@
      * TODO: pass in writer rather than composer
      * @param message <code>ImapMessage</code>, not null
      * @param composer <code>ImapResponseComposer</code>, not null
+     * @throws IOException TODO
      */
-    void encode( ImapMessage message, ImapResponseComposer composer );
+    void encode( ImapMessage message, ImapResponseComposer composer ) throws IOException;
 }

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapResponseComposer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapResponseComposer.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapResponseComposer.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapResponseComposer.java Sun Nov 25 04:23:06 2007
@@ -19,6 +19,7 @@
 
 package org.apache.james.imapserver.codec.encode;
 
+import java.io.IOException;
 import java.util.List;
 
 import javax.mail.Flags;
@@ -39,7 +40,7 @@
      *                The ImapCommand which was completed.
      */
     public abstract void commandComplete(final ImapCommand command,
-            final String tag);
+            final String tag) throws IOException;
 
     /**
      * Writes a standard tagged OK response on completion of a command, with a
@@ -55,7 +56,7 @@
      *                A string response code to send to the client.
      */
     public abstract void commandComplete(final ImapCommand command,
-            final String responseCode, final String tag);
+            final String responseCode, final String tag) throws IOException;
 
     /**
      * Writes a standard NO response on command failure, together with a
@@ -71,7 +72,7 @@
      *                A message describing why the command failed.
      */
     public abstract void commandFailed(final ImapCommand command,
-            final String reason, final String tag);
+            final String reason, final String tag) throws IOException;
 
     /**
      * Writes a standard NO response on command failure, together with a
@@ -89,7 +90,7 @@
      *                A message describing why the command failed.
      */
     public abstract void commandFailed(ImapCommand command,
-            String responseCode, String reason, final String tag);
+            String responseCode, String reason, final String tag) throws IOException;
 
     /**
      * Writes a standard BAD response on command error, together with a
@@ -102,19 +103,19 @@
      * @param message
      *                The descriptive error message.
      */
-    public abstract void commandError(final String message, final String tag);
+    public abstract void commandError(final String message, final String tag) throws IOException;
 
     /**
      * Writes a standard untagged BAD response, together with a descriptive
      * message.
      */
-    public abstract void badResponse(String message);
+    public abstract void badResponse(String message) throws IOException;
 
     /**
      * Writes a standard untagged BAD response, together with a descriptive
      * message.
      */
-    public abstract void badResponse(String message, String tag);
+    public abstract void badResponse(String message, String tag) throws IOException;
 
     /**
      * Writes an untagged OK response, with the supplied response code, and an
@@ -125,7 +126,7 @@
      * @param message
      *                The message to follow the []
      */
-    public abstract void okResponse(String responseCode, String message);
+    public abstract void okResponse(String responseCode, String message) throws IOException;
 
     /**
      * Writes an untagged NO response. Indicates that a warning. The command may
@@ -137,27 +138,27 @@
      *                response code or null when there is no response code
      */
     public abstract void untaggedNoResponse(String displayMessage,
-            String responseCode);
+            String responseCode) throws IOException;
 
     /**
      * Writes flags to output using standard format.
      * @param flags <code>Flags</code>, not null
      */
-    public abstract void flags(Flags flags);
+    public abstract void flags(Flags flags) throws IOException;
     
     /**
      * Writes a complete FLAGS response.
      * @param flags <code>Flags</code>, not null
      */
-    public abstract void flagsResponse(Flags flags);
+    public abstract void flagsResponse(Flags flags) throws IOException;
     
-    public abstract void existsResponse(int count);
+    public abstract void existsResponse(int count) throws IOException;
 
-    public abstract void recentResponse(int count);
+    public abstract void recentResponse(int count) throws IOException;
 
-    public abstract void expungeResponse(int msn);
+    public abstract void expungeResponse(int msn) throws IOException;
     
-    public abstract void searchResponse(long[] ids);
+    public abstract void searchResponse(long[] ids) throws IOException;
 
     /**
      * Starts a FETCH response by writing the opening
@@ -165,21 +166,21 @@
      * @param msn message number
      * @see #closeFetchResponse()
      */
-    public abstract void openFetchResponse(long msn);
+    public abstract void openFetchResponse(long msn) throws IOException;
     
     /**
      * Ends a FETCH response by writing the closing
      * paren-crlf sequence.
      */
-    public abstract void closeFetchResponse();
+    public abstract void closeFetchResponse() throws IOException;
     
     /**
      * @deprecated
      * @see #openFetchResponse(long)
      */
-    public abstract void legacyFetchResponse(int msn, String msgData);
+    public abstract void legacyFetchResponse(int msn, String msgData) throws IOException;
 
-    public abstract void commandResponse(ImapCommand command, String message);
+    public abstract void commandResponse(ImapCommand command, String message) throws IOException;
 
     /**
      * Writes a list response
@@ -190,7 +191,7 @@
      * or null if delimiter is <code>NIL</code>
      * @param name mailbox name
      */
-    public abstract void listResponse(String typeName, List attributes, String hierarchyDelimiter, String name);
+    public abstract void listResponse(String typeName, List attributes, String hierarchyDelimiter, String name) throws IOException;
     
     /**
      * Writes the message provided to the client, prepended with the request
@@ -199,7 +200,7 @@
      * @param message
      *                The message to write to the client.
      */
-    public abstract void taggedResponse(String message, String tag);
+    public abstract void taggedResponse(String message, String tag) throws IOException;
 
     /**
      * Writes the message provided to the client, prepended with the untagged
@@ -208,27 +209,27 @@
      * @param message
      *                The message to write to the client.
      */
-    public abstract void untaggedResponse(String message);
+    public abstract void untaggedResponse(String message) throws IOException;
 
-    public abstract void byeResponse(String message);
+    public abstract void byeResponse(String message) throws IOException;
 
-    public abstract void untagged();
+    public abstract void untagged() throws IOException;
 
-    public abstract void commandName(final String name);
+    public abstract void commandName(final String name) throws IOException;
 
-    public abstract void message(final String message);
+    public abstract void message(final String message) throws IOException;
 
-    public abstract void message(final long number);
+    public abstract void message(final long number) throws IOException;
 
-    public abstract void responseCode(final String responseCode);
+    public abstract void responseCode(final String responseCode) throws IOException;
 
-    public abstract void end();
+    public abstract void end() throws IOException;
 
-    public abstract void permanentFlagsResponse(Flags flags);
+    public abstract void permanentFlagsResponse(Flags flags) throws IOException;
 
-    public abstract void tag(String tag);
+    public abstract void tag(String tag) throws IOException;
 
     public abstract void statusResponse(String tag, ImapCommand command,
-            String type, String responseCode, String text);
+            String type, String responseCode, String text) throws IOException;
 
 }

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapResponseWriter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapResponseWriter.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapResponseWriter.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/ImapResponseWriter.java Sun Nov 25 04:23:06 2007
@@ -19,6 +19,8 @@
 
 package org.apache.james.imapserver.codec.encode;
 
+import java.io.IOException;
+
 /**
  * <p>Writes IMAP response.</p>
  * <p>Factors out basic IMAP reponse writing operations 
@@ -28,55 +30,54 @@
 
     /**
      * Starts an untagged response.
-     *
      */
-    void untagged();
+    void untagged() throws IOException;
 
     /**
      * Starts a tagged response.
      * @param tag the tag, not null
      */
-    void tag(String tag);
+    void tag(String tag) throws IOException;
 
     /**
      * Writes a command name.
      * @param commandName the command name, not null
      */
-    void commandName( String commandName );
+    void commandName( String commandName ) throws IOException;
 
     /**
      * Writes a message.
      * @param message the message, not null
      */
-    void message( String message );
+    void message( String message ) throws IOException;
 
-    void message( long number );
+    void message( long number ) throws IOException;
  
     /**
      * Writes a response code.
      * @param responseCode the response code, not null
      */
-    void responseCode( String responseCode );
+    void responseCode( String responseCode ) throws IOException;
 
     /**
      * Writes a quoted message.
      * @param message message, not null
      */
-    void quote(String message);
+    void quote(String message) throws IOException;
     
     /**
      * Opens a parenthesis - writes a <code>(</code>.
      */
-    void openParen();
+    void openParen() throws IOException;
     
     /**
      * Closes a parenthesis - writes a <code>)</code>.
      */
-    void closeParen();
+    void closeParen() throws IOException;
 
     /**
      * Ends a response.
      *
      */
-    void end();
+    void end() throws IOException;
 }

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/base/AbstractChainedImapEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/base/AbstractChainedImapEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/base/AbstractChainedImapEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/base/AbstractChainedImapEncoder.java Sun Nov 25 04:23:06 2007
@@ -19,6 +19,7 @@
 
 package org.apache.james.imapserver.codec.encode.base;
 
+import java.io.IOException;
 import java.util.Collection;
 import java.util.Iterator;
 
@@ -42,7 +43,7 @@
         setupLogger(next);
     }
     
-    public void encode(ImapMessage message, ImapResponseComposer composer) {
+    public void encode(ImapMessage message, ImapResponseComposer composer) throws IOException {
         final boolean isAcceptable = isAcceptable(message);
         if (isAcceptable) {
             doEncode(message, composer);
@@ -51,14 +52,14 @@
         }
     }
 
-    protected void chainEncodeAll(final Collection messages, final ImapResponseComposer composer) {
+    protected void chainEncodeAll(final Collection messages, final ImapResponseComposer composer) throws IOException {
         for (Iterator iter = messages.iterator(); iter.hasNext();) {
             ImapMessage message = (ImapMessage) iter.next();
             chainEncode(message, composer);
         }
     }
     
-    protected void chainEncode(ImapMessage message, ImapResponseComposer composer) {
+    protected void chainEncode(ImapMessage message, ImapResponseComposer composer) throws IOException {
         next.encode(message, composer);
     }
 
@@ -79,5 +80,5 @@
      *            <code>ImapMessage</code>, not null
      * @param composer <code>ImapResponseComposer</code>, not null
      */
-    abstract protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer);
+    abstract protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) throws IOException;
 }

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/base/EndImapEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/base/EndImapEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/base/EndImapEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/base/EndImapEncoder.java Sun Nov 25 04:23:06 2007
@@ -19,6 +19,8 @@
 
 package org.apache.james.imapserver.codec.encode.base;
 
+import java.io.IOException;
+
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.james.api.imap.ImapMessage;
@@ -27,7 +29,7 @@
 
 public class EndImapEncoder extends AbstractLogEnabled implements ImapEncoder {
 
-    public void encode(ImapMessage message, ImapResponseComposer composer) {
+    public void encode(ImapMessage message, ImapResponseComposer composer) throws IOException {
         final Logger logger = getLogger();
         logger.warn("Unknown message");
         if (logger.isDebugEnabled()) {

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/base/ImapResponseComposerImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/base/ImapResponseComposerImpl.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/base/ImapResponseComposerImpl.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/base/ImapResponseComposerImpl.java Sun Nov 25 04:23:06 2007
@@ -19,6 +19,7 @@
 
 package org.apache.james.imapserver.codec.encode.base;
 
+import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 
@@ -58,17 +59,19 @@
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#commandComplete(org.apache.james.api.imap.ImapCommand, java.lang.String)
      */
-    public void commandComplete(final ImapCommand command, final String tag) {
+    public void commandComplete(final ImapCommand command, final String tag) throws IOException {
         commandComplete(command, null, tag);
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#commandComplete(org.apache.james.api.imap.ImapCommand, java.lang.String, java.lang.String)
      */
     public void commandComplete(final ImapCommand command,
-            final String responseCode, final String tag) {
+            final String responseCode, final String tag) throws IOException {
         tag(tag);
         message(OK);
         responseCode(responseCode);
@@ -78,18 +81,20 @@
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#commandFailed(org.apache.james.api.imap.ImapCommand, java.lang.String, java.lang.String)
      */
     public void commandFailed(final ImapCommand command, final String reason,
-            final String tag) {
+            final String tag) throws IOException {
         commandFailed(command, null, reason, tag);
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#commandFailed(org.apache.james.api.imap.ImapCommand, java.lang.String, java.lang.String, java.lang.String)
      */
     public void commandFailed(ImapCommand command, String responseCode,
-            String reason, final String tag) {
+            String reason, final String tag) throws IOException {
         tag(tag);
         message(NO);
         responseCode(responseCode);
@@ -104,9 +109,10 @@
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#commandError(java.lang.String, java.lang.String)
      */
-    public void commandError(final String message, final String tag) {
+    public void commandError(final String message, final String tag) throws IOException {
         tag(tag);
         message(BAD);
         message(message);
@@ -118,9 +124,10 @@
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#badResponse(java.lang.String)
      */
-    public void badResponse(String message) {
+    public void badResponse(String message) throws IOException {
         untagged();
         message(BAD);
         message(message);
@@ -132,9 +139,10 @@
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#badResponse(java.lang.String, java.lang.String)
      */
-    public void badResponse(String message, String tag) {
+    public void badResponse(String message, String tag) throws IOException {
         tag(tag);
         message(BAD);
         message(message);
@@ -146,9 +154,10 @@
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#okResponse(java.lang.String, java.lang.String)
      */
-    public void okResponse(String responseCode, String message) {
+    public void okResponse(String responseCode, String message) throws IOException {
         untagged();
         message(OK);
         responseCode(responseCode);
@@ -157,9 +166,10 @@
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#untaggedNoResponse(java.lang.String, java.lang.String)
      */
-    public void untaggedNoResponse(String displayMessage, String responseCode) {
+    public void untaggedNoResponse(String displayMessage, String responseCode) throws IOException {
         untagged();
         message(NO);
         responseCode(responseCode);
@@ -168,18 +178,20 @@
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#flagsResponse(javax.mail.Flags)
      */
-    public void flagsResponse(Flags flags) {
+    public void flagsResponse(Flags flags) throws IOException {
         untagged();
         flags(flags);
         end();
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#existsResponse(int)
      */
-    public void existsResponse(int count) {
+    public void existsResponse(int count) throws IOException {
         untagged();
         message(count);
         message(EXISTS);
@@ -187,9 +199,10 @@
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#recentResponse(int)
      */
-    public void recentResponse(int count) {
+    public void recentResponse(int count) throws IOException {
         untagged();
         message(count);
         message(RECENT);
@@ -197,9 +210,10 @@
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#expungeResponse(int)
      */
-    public void expungeResponse(int msn) {
+    public void expungeResponse(int msn) throws IOException {
         untagged();
         message(msn);
         message(EXPUNGE);
@@ -207,9 +221,10 @@
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#legacyFetchResponse(int, java.lang.String)
      */
-    public void legacyFetchResponse(int msn, String msgData) {
+    public void legacyFetchResponse(int msn, String msgData) throws IOException {
         untagged();
         message(msn);
         message(FETCH);
@@ -218,9 +233,10 @@
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#commandResponse(org.apache.james.api.imap.ImapCommand, java.lang.String)
      */
-    public void commandResponse(ImapCommand command, String message) {
+    public void commandResponse(ImapCommand command, String message) throws IOException {
         untagged();
         commandName(command);
         message(message);
@@ -228,53 +244,59 @@
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#taggedResponse(java.lang.String, java.lang.String)
      */
-    public void taggedResponse(String message, String tag) {
+    public void taggedResponse(String message, String tag) throws IOException {
         tag(tag);
         message(message);
         end();
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#untaggedResponse(java.lang.String)
      */
-    public void untaggedResponse(String message) {
+    public void untaggedResponse(String message) throws IOException {
         untagged();
         message(message);
         end();
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#byeResponse(java.lang.String)
      */
-    public void byeResponse(String message) {
+    public void byeResponse(String message) throws IOException {
         untaggedResponse(BYE + SP + message);
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#untagged()
      */
-    public void untagged() {
+    public void untagged() throws IOException {
         writer.untagged();
     }
 
-    private void commandName(final ImapCommand command) {
+    private void commandName(final ImapCommand command) throws IOException {
         final String name = command.getName();
         commandName(name);
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#commandName(java.lang.String)
      */
-    public void commandName(final String name) {
+    public void commandName(final String name) throws IOException {
         writer.commandName(name);
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#message(java.lang.String)
      */
-    public void message(final String message) {
+    public void message(final String message) throws IOException {
         if (message != null) {
             // TODO: consider message normalisation
             // TODO: CR/NFs in message must be replaced
@@ -284,32 +306,36 @@
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#message(long)
      */
-    public void message(final long number) {
+    public void message(final long number) throws IOException {
         writer.message(number);
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#responseCode(java.lang.String)
      */
-    public void responseCode(final String responseCode) {
+    public void responseCode(final String responseCode) throws IOException {
         if (responseCode != null) {
             writer.responseCode(responseCode);
         }
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#end()
      */
-    public void end() {
+    public void end() throws IOException {
         writer.end();
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#permanentFlagsResponse(javax.mail.Flags)
      */
-    public void permanentFlagsResponse(Flags flags) {
+    public void permanentFlagsResponse(Flags flags) throws IOException {
         untagged();
         message(OK);
         responseCode("PERMANENTFLAGS " + MessageFlags.format(flags));
@@ -317,16 +343,18 @@
     }
 
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#tag(java.lang.String)
      */
-    public void tag(String tag) {
+    public void tag(String tag) throws IOException {
         writer.tag(tag);
     }
     
     /**
+     * @throws IOException 
      * @see org.apache.james.imapserver.codec.encode.ImapResponseComposer#statusResponse(java.lang.String, org.apache.james.api.imap.ImapCommand, java.lang.String, java.lang.String, java.lang.String)
      */
-    public void statusResponse(String tag, ImapCommand command, String type, String responseCode, String text) {
+    public void statusResponse(String tag, ImapCommand command, String type, String responseCode, String text) throws IOException {
         if (tag == null) {
             untagged();
         } else {
@@ -345,7 +373,7 @@
         end();
     }
 
-    public void listResponse(String typeName, List attributes, String hierarchyDelimiter, String name) {
+    public void listResponse(String typeName, List attributes, String hierarchyDelimiter, String name) throws IOException {
         untagged();
         message(typeName);
         openParen();
@@ -368,27 +396,27 @@
         end();
     }
 
-    public void quote(String message) {
+    public void quote(String message) throws IOException {
         writer.quote(message);
     }
 
-    public void closeParen() {
+    public void closeParen() throws IOException {
         writer.closeParen();
         
     }
 
-    public void openParen() {
+    public void openParen() throws IOException {
         writer.openParen();
     }
 
-    public void searchResponse(long[] ids) {
+    public void searchResponse(long[] ids) throws IOException {
         untagged();
         message(ImapConstants.SEARCH_RESPONSE_NAME);
         message(ids);
         end();
     }
 
-    private void message(long[] ids) {
+    private void message(long[] ids) throws IOException {
         if (ids != null) {
             final int length = ids.length;
             for (int i=0;i<length; i++) {
@@ -398,7 +426,7 @@
         }
     }
 
-    public void flags(Flags flags) {
+    public void flags(Flags flags) throws IOException {
         message(FLAGS);
         openParen();
         if ( flags.contains(Flags.Flag.ANSWERED) ) {
@@ -422,12 +450,12 @@
         closeParen();
     }
 
-    public void closeFetchResponse() {
+    public void closeFetchResponse() throws IOException {
         closeParen();
         end();
     }
 
-    public void openFetchResponse(long msn) {
+    public void openFetchResponse(long msn) throws IOException {
         untagged();
         message(msn);
         message(FETCH);

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/ExistsResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/ExistsResponseEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/ExistsResponseEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/ExistsResponseEncoder.java Sun Nov 25 04:23:06 2007
@@ -19,6 +19,8 @@
 
 package org.apache.james.imapserver.codec.encode.imap4rev1;
 
+import java.io.IOException;
+
 import org.apache.james.api.imap.ImapMessage;
 import org.apache.james.imap.message.response.imap4rev1.ExistsResponse;
 import org.apache.james.imapserver.codec.encode.ImapEncoder;
@@ -35,7 +37,7 @@
         return message instanceof ExistsResponse;
     }
 
-    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) {
+    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) throws IOException {
         final ExistsResponse existsResponse = (ExistsResponse) acceptableMessage;
         final int numberOfMessages = existsResponse.getNumberOfMessages();
         composer.existsResponse(numberOfMessages);

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/ExpungeResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/ExpungeResponseEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/ExpungeResponseEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/ExpungeResponseEncoder.java Sun Nov 25 04:23:06 2007
@@ -19,6 +19,8 @@
 
 package org.apache.james.imapserver.codec.encode.imap4rev1;
 
+import java.io.IOException;
+
 import org.apache.james.api.imap.ImapMessage;
 import org.apache.james.imap.message.response.imap4rev1.ExpungeResponse;
 import org.apache.james.imapserver.codec.encode.ImapEncoder;
@@ -35,7 +37,7 @@
         return (message instanceof ExpungeResponse);
     }
 
-    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) {
+    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) throws IOException {
         final ExpungeResponse expungeResponse = (ExpungeResponse) acceptableMessage;
         final int messageSequenceNumber = expungeResponse.getMessageSequenceNumber();
         composer.expungeResponse(messageSequenceNumber);

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/FetchResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/FetchResponseEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/FetchResponseEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/FetchResponseEncoder.java Sun Nov 25 04:23:06 2007
@@ -19,6 +19,8 @@
 
 package org.apache.james.imapserver.codec.encode.imap4rev1;
 
+import java.io.IOException;
+
 import javax.mail.Flags;
 
 import org.apache.james.api.imap.ImapConstants;
@@ -40,7 +42,7 @@
             || (message instanceof FetchResponse);
     }
 
-    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) {
+    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) throws IOException {
         if (acceptableMessage instanceof FetchResponse) {
             final FetchResponse fetchResponse = (FetchResponse) acceptableMessage;
             final long messageNumber = fetchResponse.getMessageNumber();
@@ -61,7 +63,7 @@
         }
     }
 
-    private void encodeLegacy(ImapResponseComposer composer, final LegacyFetchResponse fetchResponse) {
+    private void encodeLegacy(ImapResponseComposer composer, final LegacyFetchResponse fetchResponse) throws IOException {
         // TODO: this is inefficient
         final String data = fetchResponse.getData();
         final int number = fetchResponse.getNumber();

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/RecentResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/RecentResponseEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/RecentResponseEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/RecentResponseEncoder.java Sun Nov 25 04:23:06 2007
@@ -19,6 +19,8 @@
 
 package org.apache.james.imapserver.codec.encode.imap4rev1;
 
+import java.io.IOException;
+
 import org.apache.james.api.imap.ImapMessage;
 import org.apache.james.imap.message.response.imap4rev1.RecentResponse;
 import org.apache.james.imapserver.codec.encode.ImapEncoder;
@@ -35,7 +37,7 @@
         return (message instanceof RecentResponse);
     }
 
-    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) {        // TODO Auto-generated method stub
+    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) throws IOException {        // TODO Auto-generated method stub
         final RecentResponse recentResponse = (RecentResponse) acceptableMessage;
         final int numberFlaggedRecent = recentResponse.getNumberFlaggedRecent();
         composer.recentResponse(numberFlaggedRecent);

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/StatusResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/StatusResponseEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/StatusResponseEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/StatusResponseEncoder.java Sun Nov 25 04:23:06 2007
@@ -19,6 +19,8 @@
 
 package org.apache.james.imapserver.codec.encode.imap4rev1;
 
+import java.io.IOException;
+
 import org.apache.james.api.imap.ImapMessage;
 import org.apache.james.api.imap.display.HumanReadableTextKey;
 import org.apache.james.api.imap.message.response.imap4rev1.StatusResponse;
@@ -33,7 +35,7 @@
     }
 
     protected void doEncode(ImapMessage acceptableMessage,
-            ImapResponseComposer composer) {
+            ImapResponseComposer composer) throws IOException {
         StatusResponse response = (StatusResponse) acceptableMessage;
         composer.statusResponse(response.getTag(), response.getCommand(), 
                 asString(response.getServerResponseType()), asString(response.getResponseCode()),

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/BadResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/BadResponseEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/BadResponseEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/BadResponseEncoder.java Sun Nov 25 04:23:06 2007
@@ -19,6 +19,8 @@
 
 package org.apache.james.imapserver.codec.encode.imap4rev1.legacy;
 
+import java.io.IOException;
+
 import org.apache.james.api.imap.ImapMessage;
 import org.apache.james.imap.message.response.imap4rev1.legacy.BadResponse;
 import org.apache.james.imapserver.codec.encode.ImapEncoder;
@@ -35,7 +37,7 @@
         super(next);
     }
 
-    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) {
+    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) throws IOException {
         BadResponse response = (BadResponse) acceptableMessage;
         String tag = response.getTag();
         String message = response.getMessage();

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/CapabilityResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/CapabilityResponseEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/CapabilityResponseEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/CapabilityResponseEncoder.java Sun Nov 25 04:23:06 2007
@@ -18,6 +18,7 @@
  ****************************************************************/
 package org.apache.james.imapserver.codec.encode.imap4rev1.legacy;
 
+import java.io.IOException;
 import java.util.List;
 
 import org.apache.james.api.imap.ImapCommand;
@@ -37,7 +38,7 @@
         super(next);
     }
 
-    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) {
+    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) throws IOException {
         CapabilityResponse response = (CapabilityResponse) acceptableMessage;
         // TODO: inject capability text
         composer.untaggedResponse( ImapConstants.CAPABILITY_RESPONSE );

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/CommandCompleteResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/CommandCompleteResponseEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/CommandCompleteResponseEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/CommandCompleteResponseEncoder.java Sun Nov 25 04:23:06 2007
@@ -19,6 +19,7 @@
 
 package org.apache.james.imapserver.codec.encode.imap4rev1.legacy;
 
+import java.io.IOException;
 import java.util.List;
 
 import org.apache.james.api.imap.ImapCommand;
@@ -37,7 +38,7 @@
         super(next);
     }
 
-    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) {
+    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) throws IOException {
         CommandCompleteResponse response = (CommandCompleteResponse) acceptableMessage;
         
         List unsolicitedResponses = response.getUnsolicatedResponses();

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/CommandFailedResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/CommandFailedResponseEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/CommandFailedResponseEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/CommandFailedResponseEncoder.java Sun Nov 25 04:23:06 2007
@@ -19,6 +19,8 @@
 
 package org.apache.james.imapserver.codec.encode.imap4rev1.legacy;
 
+import java.io.IOException;
+
 import org.apache.james.api.imap.ImapCommand;
 import org.apache.james.api.imap.ImapMessage;
 import org.apache.james.imap.message.response.imap4rev1.legacy.CommandFailedResponse;
@@ -36,7 +38,7 @@
     }
 
 
-    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) {
+    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) throws IOException {
         CommandFailedResponse response = (CommandFailedResponse) acceptableMessage;
         final String responseCode = response.getResponseCode();
         final ImapCommand command = response.getCommand();

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/ErrorResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/ErrorResponseEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/ErrorResponseEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/ErrorResponseEncoder.java Sun Nov 25 04:23:06 2007
@@ -19,6 +19,8 @@
 
 package org.apache.james.imapserver.codec.encode.imap4rev1.legacy;
 
+import java.io.IOException;
+
 import org.apache.james.api.imap.ImapMessage;
 import org.apache.james.imap.message.response.imap4rev1.legacy.ErrorResponse;
 import org.apache.james.imapserver.codec.encode.ImapEncoder;
@@ -37,7 +39,7 @@
         super(next);
     }
     
-    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) {
+    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) throws IOException {
         ErrorResponse response = (ErrorResponse) acceptableMessage;
         final String message = response.getMessage();
         final String tag = response.getTag();

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/ExamineAndSelectResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/ExamineAndSelectResponseEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/ExamineAndSelectResponseEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/ExamineAndSelectResponseEncoder.java Sun Nov 25 04:23:06 2007
@@ -18,6 +18,8 @@
  ****************************************************************/
 package org.apache.james.imapserver.codec.encode.imap4rev1.legacy;
 
+import java.io.IOException;
+
 import javax.mail.Flags;
 
 import org.apache.james.api.imap.ImapCommand;
@@ -37,7 +39,7 @@
         super(next);
     }
 
-    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) {
+    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) throws IOException {
         ExamineAndSelectResponse response = (ExamineAndSelectResponse) acceptableMessage;
         final Flags permanentFlags = response.getPermanentFlags();
         composer.flagsResponse(permanentFlags);

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/LogoutResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/LogoutResponseEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/LogoutResponseEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/LogoutResponseEncoder.java Sun Nov 25 04:23:06 2007
@@ -18,6 +18,8 @@
  ****************************************************************/
 package org.apache.james.imapserver.codec.encode.imap4rev1.legacy;
 
+import java.io.IOException;
+
 import org.apache.james.api.imap.ImapCommand;
 import org.apache.james.api.imap.ImapMessage;
 import org.apache.james.imap.message.response.imap4rev1.legacy.LogoutResponse;
@@ -34,7 +36,7 @@
         super(next);
     }
     
-    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) {
+    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) throws IOException {
         LogoutResponse response = (LogoutResponse) acceptableMessage;
         
         final String message = response.getMessage();

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/StatusCommandResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/StatusCommandResponseEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/StatusCommandResponseEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/StatusCommandResponseEncoder.java Sun Nov 25 04:23:06 2007
@@ -18,6 +18,7 @@
  ****************************************************************/
 package org.apache.james.imapserver.codec.encode.imap4rev1.legacy;
 
+import java.io.IOException;
 import java.util.List;
 
 import org.apache.james.api.imap.ImapCommand;
@@ -36,7 +37,7 @@
         super(next);
     }
 
-    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) {
+    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) throws IOException {
         StatusResponse response = (StatusResponse) acceptableMessage;
         final ImapCommand command = response.getCommand();
         final String message = response.getMessage();

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/LSubResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/LSubResponseEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/LSubResponseEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/LSubResponseEncoder.java Sun Nov 25 04:23:06 2007
@@ -18,6 +18,8 @@
  ****************************************************************/
 package org.apache.james.imapserver.codec.encode.imap4rev1.server;
 
+import java.io.IOException;
+
 import org.apache.james.api.imap.ImapConstants;
 import org.apache.james.api.imap.ImapMessage;
 import org.apache.james.imap.message.response.imap4rev1.server.AbstractListingResponse;
@@ -36,7 +38,7 @@
         super(next);
     }
     protected void doEncode(final ImapMessage acceptableMessage, 
-                                final ImapResponseComposer composer) {
+                                final ImapResponseComposer composer) throws IOException {
         final AbstractListingResponse response = (AbstractListingResponse) acceptableMessage;
         ListingEncodingUtils.encodeListingResponse(ImapConstants.LSUB_RESPONSE_NAME
                 ,composer, response);

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/ListResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/ListResponseEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/ListResponseEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/ListResponseEncoder.java Sun Nov 25 04:23:06 2007
@@ -18,6 +18,8 @@
  ****************************************************************/
 package org.apache.james.imapserver.codec.encode.imap4rev1.server;
 
+import java.io.IOException;
+
 import org.apache.james.api.imap.ImapConstants;
 import org.apache.james.api.imap.ImapMessage;
 import org.apache.james.imap.message.response.imap4rev1.server.AbstractListingResponse;
@@ -36,7 +38,7 @@
         super(next);
     }
     protected void doEncode(final ImapMessage acceptableMessage, 
-                                final ImapResponseComposer composer) {
+                                final ImapResponseComposer composer) throws IOException {
         final AbstractListingResponse response = (AbstractListingResponse) acceptableMessage;
         ListingEncodingUtils.encodeListingResponse(ImapConstants.LIST_RESPONSE_NAME, 
                 composer, response);

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/ListingEncodingUtils.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/ListingEncodingUtils.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/ListingEncodingUtils.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/ListingEncodingUtils.java Sun Nov 25 04:23:06 2007
@@ -19,6 +19,7 @@
 
 package org.apache.james.imapserver.codec.encode.imap4rev1.server;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -28,7 +29,7 @@
 
 public class ListingEncodingUtils {
     
-    public static void encodeListingResponse(final String responseTypeName, final ImapResponseComposer composer, final AbstractListingResponse response) {
+    public static void encodeListingResponse(final String responseTypeName, final ImapResponseComposer composer, final AbstractListingResponse response) throws IOException {
         final List attributes = getNameAttributes(response);
         
         final String name = response.getName();

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/SearchResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/SearchResponseEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/SearchResponseEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/server/SearchResponseEncoder.java Sun Nov 25 04:23:06 2007
@@ -18,6 +18,7 @@
  ****************************************************************/
 package org.apache.james.imapserver.codec.encode.imap4rev1.server;
 
+import java.io.IOException;
 import java.util.List;
 
 import org.apache.james.api.imap.ImapCommand;
@@ -36,7 +37,7 @@
         super(next);
     }
 
-    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) {
+    protected void doEncode(ImapMessage acceptableMessage, ImapResponseComposer composer) throws IOException {
         SearchResponse response = (SearchResponse) acceptableMessage;
         final long[] ids = response.getIds();
         composer.searchResponse(ids);

Modified: james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/status/UntaggedNoResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/status/UntaggedNoResponseEncoder.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/status/UntaggedNoResponseEncoder.java (original)
+++ james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/status/UntaggedNoResponseEncoder.java Sun Nov 25 04:23:06 2007
@@ -19,6 +19,8 @@
 
 package org.apache.james.imapserver.codec.encode.imap4rev1.status;
 
+import java.io.IOException;
+
 import org.apache.james.api.imap.ImapMessage;
 import org.apache.james.imap.message.response.imap4rev1.status.UntaggedNoResponse;
 import org.apache.james.imapserver.codec.encode.ImapEncoder;
@@ -32,7 +34,7 @@
     }
 
     protected void doEncode(ImapMessage acceptableMessage,
-            ImapResponseComposer composer) {
+            ImapResponseComposer composer) throws IOException {
         UntaggedNoResponse response = (UntaggedNoResponse) acceptableMessage;
         final String displayText = response.getDisplayText();
         final String responseCode = response.getResponseCode();

Modified: james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/ImapResponseCommandTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/ImapResponseCommandTest.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/ImapResponseCommandTest.java (original)
+++ james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/ImapResponseCommandTest.java Sun Nov 25 04:23:06 2007
@@ -49,7 +49,7 @@
         super.tearDown();
     }
 
-    public void testCommandCompleteImapCommand() {
+    public void testCommandCompleteImapCommand() throws Exception {
         response.commandComplete(command, TAG);
         assertEquals(5, writer.operations.size());
         assertEquals(new MockImapResponseWriter.TagOperation(TAG), writer.operations.get(0));
@@ -63,7 +63,7 @@
                 writer.operations.get(4));
     }
 
-    public void testCommandCompleteImapCommandString() {
+    public void testCommandCompleteImapCommandString() throws Exception  {
         final String code = "responseCode";
         response.commandComplete(command, code, TAG);
         assertEquals(6, writer.operations.size());
@@ -80,7 +80,7 @@
                 writer.operations.get(5));
     }
 
-    public void testCommandFailedImapCommandString() {
+    public void testCommandFailedImapCommandString() throws Exception {
         final String reason = "A reason";
         response.commandFailed(command, reason, TAG);
         assertEquals(6, writer.operations.size());
@@ -97,7 +97,7 @@
                 writer.operations.get(5));
     }
 
-    public void testCommandFailedImapCommandStringString() {
+    public void testCommandFailedImapCommandStringString() throws Exception {
         final String reason = "A reason";
         final String code = "A code";
         response.commandFailed(command, code, reason, TAG);
@@ -117,7 +117,7 @@
                 writer.operations.get(6));
     }
 
-    public void testCommandResponse() {
+    public void testCommandResponse() throws Exception {
         String message = "A message";
         response.commandResponse(command, message);
         assertEquals(4, writer.operations.size());

Modified: james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/ImapResponseTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/ImapResponseTest.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/ImapResponseTest.java (original)
+++ james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/ImapResponseTest.java Sun Nov 25 04:23:06 2007
@@ -45,7 +45,7 @@
     }
 
 
-    public void testCommandError() {
+    public void testCommandError() throws Exception {
         String message = "A message";
         response.commandError(message, TAG);
         assertEquals(4, writer.operations.size());
@@ -58,7 +58,7 @@
                 writer.operations.get(3));
     }
 
-    public void testBadResponse() {
+    public void testBadResponse() throws Exception {
         String message = "A message";
         response.badResponse(message);
         assertEquals(4, writer.operations.size());
@@ -71,7 +71,7 @@
                 writer.operations.get(3));
     }
 
-    public void testOkResponse() {
+    public void testOkResponse() throws Exception {
         String message = "A message";
         String code = "A code";
         response.okResponse(code, message);
@@ -87,7 +87,7 @@
                 writer.operations.get(4));
     }
 
-    public void testFlagsResponse() {
+    public void testFlagsResponse() throws Exception {
         Flags flags = new Flags();
         response.flagsResponse(flags);
         assertEquals(5, writer.operations.size());
@@ -102,7 +102,7 @@
                 writer.operations.get(4));
     }
 
-    public void testExistsResponse() {
+    public void testExistsResponse() throws Exception {
         int count = 5;
         response.existsResponse(count);
         assertEquals(4, writer.operations.size());
@@ -115,7 +115,7 @@
                 writer.operations.get(3));
     }
 
-    public void testRecentResponse() {
+    public void testRecentResponse() throws Exception {
         int count = 5;
         response.recentResponse(count);
         assertEquals(4, writer.operations.size());
@@ -128,7 +128,7 @@
                 writer.operations.get(3));
     }
 
-    public void testExpungeResponse() {
+    public void testExpungeResponse() throws Exception {
         int count = 5;
         response.expungeResponse(count);
         assertEquals(4, writer.operations.size());
@@ -141,7 +141,7 @@
                 writer.operations.get(3));
     }
 
-    public void testFetchResponse() {
+    public void testFetchResponse() throws Exception {
         int count = 7;
         String data = "Some data";
         response.legacyFetchResponse(count, data);
@@ -158,7 +158,7 @@
     }
 
 
-    public void testTaggedResponse() {
+    public void testTaggedResponse() throws Exception {
         String message = "A message";
         response.taggedResponse(message, TAG);
         assertEquals(3, writer.operations.size());
@@ -169,7 +169,7 @@
                 writer.operations.get(2));
     }
 
-    public void testUntaggedResponse() {
+    public void testUntaggedResponse() throws Exception {
         String message = "A message";
         response.untaggedResponse(message);
         assertEquals(3, writer.operations.size());
@@ -180,7 +180,7 @@
                 writer.operations.get(2));
     }
 
-    public void testByeResponse() {
+    public void testByeResponse() throws Exception {
         String message = "A message";
         response.byeResponse(message);
         assertEquals(3, writer.operations.size());
@@ -191,7 +191,7 @@
                 writer.operations.get(2));
     }
 
-    public void testPermanentFlagsResponse() {
+    public void testPermanentFlagsResponse() throws Exception {
         Flags flags = new Flags();
         response.permanentFlagsResponse(flags);
         assertEquals(4, writer.operations.size());

Modified: james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/base/ByteImapResponseWriter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/base/ByteImapResponseWriter.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/base/ByteImapResponseWriter.java (original)
+++ james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/base/ByteImapResponseWriter.java Sun Nov 25 04:23:06 2007
@@ -114,8 +114,8 @@
         final int length = message.length();
         for (int i=0;i<length;i++) {
             char character = message.charAt(i);
-            if (character == ImapConstants.FORWARD_SLASH || character == DQUOTE) {
-                writer.print(ImapConstants.FORWARD_SLASH);
+            if (character == ImapConstants.BACK_SLASH || character == DQUOTE) {
+                writer.print(ImapConstants.BACK_SLASH);
             }
             writer.print(character);
         }

Modified: james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/ErrorResponseMessageTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/ErrorResponseMessageTest.java?rev=597975&r1=597974&r2=597975&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/ErrorResponseMessageTest.java (original)
+++ james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/ErrorResponseMessageTest.java Sun Nov 25 04:23:06 2007
@@ -52,7 +52,7 @@
         super.tearDown();
     }
 
-    public void testWrite() {
+    public void testWrite() throws Exception  {
         encoder.encode(message, response);
         assertEquals(4, writer.operations.size());
         assertEquals(new MockImapResponseWriter.TagOperation(TAG), writer.operations.get(0));



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org