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 2009/03/18 14:20:21 UTC

svn commit: r755590 [2/5] - in /james/protocols/imap/trunk: api/src/main/java/org/apache/james/imap/api/ api/src/main/java/org/apache/james/imap/api/imap4rev1/ api/src/main/java/org/apache/james/imap/api/message/response/ api/src/main/java/org/apache/j...

Copied: james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java (from r755562, james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/ExpungeCommandParser.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java?p2=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java&p1=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/ExpungeCommandParser.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/ExpungeCommandParser.java (original)
+++ james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java Wed Mar 18 13:20:15 2009
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
+import org.apache.james.imap.api.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1MessageFactory;
 import org.apache.james.imap.decode.ImapRequestLineReader;
 import org.apache.james.imap.decode.InitialisableCommandFactory;
 import org.apache.james.imap.decode.ProtocolException;
@@ -34,7 +34,7 @@
     }
 
     /**
-     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory)
+     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
      */
     public void init(Imap4Rev1CommandFactory factory) {
         final ImapCommand command = factory.getExpunge();

Copied: james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java (from r755562, james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/FetchCommandParser.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java?p2=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java&p1=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/FetchCommandParser.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/FetchCommandParser.java (original)
+++ james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java Wed Mar 18 13:20:15 2009
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
 import java.util.List;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
+import org.apache.james.imap.api.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.message.BodyFetchElement;
 import org.apache.james.imap.api.message.FetchData;
 import org.apache.james.imap.api.message.IdRange;
@@ -38,7 +38,7 @@
     }
 
     /**
-     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory)
+     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
      */
     public void init(Imap4Rev1CommandFactory factory) {
         final ImapCommand command = factory.getFetch();

Copied: james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java (from r755562, james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/Imap4Rev1CommandParserFactory.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java?p2=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java&p1=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/Imap4Rev1CommandParserFactory.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/Imap4Rev1CommandParserFactory.java (original)
+++ james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java Wed Mar 18 13:20:15 2009
@@ -17,17 +17,17 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.james.imap.api.AbstractLogEnabled;
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
+import org.apache.james.imap.api.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.ImapConstants;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1MessageFactory;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponseFactory;
+import org.apache.james.imap.api.message.response.StatusResponseFactory;
 import org.apache.james.imap.decode.DelegatingImapCommandParser;
 import org.apache.james.imap.decode.ImapCommandParser;
 import org.apache.james.imap.decode.ImapCommandParserFactory;
@@ -132,7 +132,7 @@
     }
 
     /**
-     * @see org.apache.james.imap.decode.imap4rev1.ImapCommandParserFactory#getParser(java.lang.String)
+     * @see org.apache.james.imap.decode.parser.ImapCommandParserFactory#getParser(java.lang.String)
      */
     public ImapCommandParser getParser(String commandName) {
         Class cmdClass = (Class) _imapCommands.get(commandName.toUpperCase());

Copied: james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java (from r755562, james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/ListCommandParser.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java?p2=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java&p1=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/ListCommandParser.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/ListCommandParser.java (original)
+++ james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java Wed Mar 18 13:20:15 2009
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
+import org.apache.james.imap.api.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1MessageFactory;
 import org.apache.james.imap.decode.ImapRequestLineReader;
 import org.apache.james.imap.decode.InitialisableCommandFactory;
 import org.apache.james.imap.decode.ProtocolException;
@@ -32,7 +32,7 @@
     }
 
     /**
-     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory)
+     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
      */
     public void init(Imap4Rev1CommandFactory factory) {
         final ImapCommand command = factory.getList();

Copied: james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java (from r755562, james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/LoginCommandParser.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java?p2=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java&p1=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/LoginCommandParser.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/LoginCommandParser.java (original)
+++ james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java Wed Mar 18 13:20:15 2009
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
 import org.apache.james.imap.decode.ImapRequestLineReader;
 import org.apache.james.imap.decode.InitialisableCommandFactory;
 import org.apache.james.imap.decode.ProtocolException;
@@ -33,7 +33,7 @@
     }
 
     /**
-     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory)
+     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
      */
     public void init(Imap4Rev1CommandFactory factory) {
         final ImapCommand command = factory.getLogin();

Copied: james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java (from r755562, james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/LogoutCommandParser.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java?p2=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java&p1=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/LogoutCommandParser.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/LogoutCommandParser.java (original)
+++ james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LogoutCommandParser.java Wed Mar 18 13:20:15 2009
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
 import org.apache.james.imap.decode.ImapRequestLineReader;
 import org.apache.james.imap.decode.InitialisableCommandFactory;
 import org.apache.james.imap.decode.ProtocolException;
@@ -33,7 +33,7 @@
     }
 
     /**
-     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory)
+     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
      */
     public void init(Imap4Rev1CommandFactory factory) {
         final ImapCommand command = factory.getLogout();

Copied: james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java (from r755562, james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/LsubCommandParser.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java?p2=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java&p1=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/LsubCommandParser.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/LsubCommandParser.java (original)
+++ james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/LsubCommandParser.java Wed Mar 18 13:20:15 2009
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
 import org.apache.james.imap.decode.InitialisableCommandFactory;
 
 class LsubCommandParser extends ListCommandParser implements
@@ -30,7 +30,7 @@
     }
 
     /**
-     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory)
+     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
      */
     public void init(Imap4Rev1CommandFactory factory) {
         final ImapCommand command = factory.getLsub();

Copied: james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java (from r755562, james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/NoopCommandParser.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java?p2=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java&p1=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/NoopCommandParser.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/NoopCommandParser.java (original)
+++ james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/NoopCommandParser.java Wed Mar 18 13:20:15 2009
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
 import org.apache.james.imap.decode.ImapRequestLineReader;
 import org.apache.james.imap.decode.InitialisableCommandFactory;
 import org.apache.james.imap.decode.ProtocolException;
@@ -33,7 +33,7 @@
     }
 
     /**
-     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory)
+     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
      */
     public void init(Imap4Rev1CommandFactory factory) {
         final ImapCommand command = factory.getNoop();

Copied: james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java (from r755562, james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/RenameCommandParser.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java?p2=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java&p1=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/RenameCommandParser.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/RenameCommandParser.java (original)
+++ james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/RenameCommandParser.java Wed Mar 18 13:20:15 2009
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
 import org.apache.james.imap.decode.ImapRequestLineReader;
 import org.apache.james.imap.decode.InitialisableCommandFactory;
 import org.apache.james.imap.decode.ProtocolException;
@@ -33,7 +33,7 @@
     }
 
     /**
-     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory)
+     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
      */
     public void init(Imap4Rev1CommandFactory factory) {
         final ImapCommand command = factory.getRename();

Copied: james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java (from r755562, james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParser.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java?p2=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java&p1=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParser.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParser.java (original)
+++ james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java Wed Mar 18 13:20:15 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
 import java.nio.charset.Charset;
 import java.nio.charset.IllegalCharsetNameException;
@@ -28,16 +28,16 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
 import org.apache.james.imap.api.display.HumanReadableTextKey;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
 import org.apache.james.imap.api.message.IdRange;
 import org.apache.james.imap.api.message.request.DayMonthYear;
 import org.apache.james.imap.api.message.request.SearchKey;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponse;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponseFactory;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponse.ResponseCode;
+import org.apache.james.imap.api.message.response.StatusResponse;
+import org.apache.james.imap.api.message.response.StatusResponseFactory;
+import org.apache.james.imap.api.message.response.StatusResponse.ResponseCode;
 import org.apache.james.imap.decode.ImapRequestLineReader;
 import org.apache.james.imap.decode.InitialisableCommandFactory;
 import org.apache.james.imap.decode.ProtocolException;
@@ -51,7 +51,7 @@
     }
 
     /**
-     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory)
+     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
      */
     public void init(Imap4Rev1CommandFactory factory) {
         final ImapCommand command = factory.getSearch();

Copied: james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java (from r755562, james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/SelectCommandParser.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java?p2=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java&p1=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/SelectCommandParser.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/SelectCommandParser.java (original)
+++ james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SelectCommandParser.java Wed Mar 18 13:20:15 2009
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
 import org.apache.james.imap.decode.ImapRequestLineReader;
 import org.apache.james.imap.decode.InitialisableCommandFactory;
 import org.apache.james.imap.decode.ProtocolException;
@@ -33,7 +33,7 @@
     }
 
     /**
-     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory)
+     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
      */
     public void init(Imap4Rev1CommandFactory factory) {
         final ImapCommand command = factory.getSelect();

Copied: james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java (from r755562, james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/StatusCommandParser.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java?p2=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java&p1=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/StatusCommandParser.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/StatusCommandParser.java (original)
+++ james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java Wed Mar 18 13:20:15 2009
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
+import org.apache.james.imap.api.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.message.StatusDataItems;
 import org.apache.james.imap.decode.ImapRequestLineReader;
 import org.apache.james.imap.decode.InitialisableCommandFactory;
@@ -35,7 +35,7 @@
     }
 
     /**
-     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory)
+     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
      */
     public void init(Imap4Rev1CommandFactory factory) {
         final ImapCommand command = factory.getStatus();

Copied: james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java (from r755562, james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/StoreCommandParser.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java?p2=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java&p1=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/StoreCommandParser.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/StoreCommandParser.java (original)
+++ james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StoreCommandParser.java Wed Mar 18 13:20:15 2009
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
 import javax.mail.Flags;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
 import org.apache.james.imap.api.message.IdRange;
 import org.apache.james.imap.decode.ImapRequestLineReader;
 import org.apache.james.imap.decode.InitialisableCommandFactory;
@@ -34,7 +34,7 @@
     }
 
     /**
-     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory)
+     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
      */
     public void init(Imap4Rev1CommandFactory factory) {
         final ImapCommand command = factory.getStore();

Copied: james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java (from r755562, james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/SubscribeCommandParser.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java?p2=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java&p1=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/SubscribeCommandParser.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/SubscribeCommandParser.java (original)
+++ james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SubscribeCommandParser.java Wed Mar 18 13:20:15 2009
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
 import org.apache.james.imap.decode.ImapRequestLineReader;
 import org.apache.james.imap.decode.InitialisableCommandFactory;
 import org.apache.james.imap.decode.ProtocolException;
@@ -33,7 +33,7 @@
     }
 
     /**
-     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory)
+     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
      */
     public void init(Imap4Rev1CommandFactory factory) {
         final ImapCommand command = factory.getSubscribe();

Copied: james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java (from r755562, james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/UidCommandParser.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java?p2=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java&p1=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/UidCommandParser.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/UidCommandParser.java (original)
+++ james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java Wed Mar 18 13:20:15 2009
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
 import org.apache.james.imap.decode.DelegatingImapCommandParser;
 import org.apache.james.imap.decode.ImapCommandParser;
 import org.apache.james.imap.decode.ImapCommandParserFactory;
@@ -37,7 +37,7 @@
     }
 
     /**
-     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory)
+     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
      */
     public void init(Imap4Rev1CommandFactory factory) {
         final ImapCommand command = factory.getUid();

Copied: james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java (from r755562, james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/UnsubscribeCommandParser.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java?p2=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java&p1=james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/UnsubscribeCommandParser.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/imap4rev1/UnsubscribeCommandParser.java (original)
+++ james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/UnsubscribeCommandParser.java Wed Mar 18 13:20:15 2009
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
 import org.apache.james.imap.decode.ImapRequestLineReader;
 import org.apache.james.imap.decode.InitialisableCommandFactory;
 import org.apache.james.imap.decode.ProtocolException;
@@ -33,7 +33,7 @@
     }
 
     /**
-     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory)
+     * @see org.apache.james.imap.decode.InitialisableCommandFactory#init(org.apache.james.imap.api.Imap4Rev1CommandFactory)
      */
     public void init(Imap4Rev1CommandFactory factory) {
         final ImapCommand command = factory.getUnsubscribe();

Propchange: james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java (from r755562, james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/FetchCommandParserPartialFetchTest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java?p2=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java&p1=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/FetchCommandParserPartialFetchTest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/FetchCommandParserPartialFetchTest.java (original)
+++ james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java Wed Mar 18 13:20:15 2009
@@ -17,20 +17,21 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
+import org.apache.james.imap.api.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.message.BodyFetchElement;
 import org.apache.james.imap.api.message.FetchData;
 import org.apache.james.imap.api.message.IdRange;
 import org.apache.james.imap.decode.ImapRequestLineReader;
 import org.apache.james.imap.decode.ProtocolException;
+import org.apache.james.imap.decode.parser.FetchCommandParser;
 import org.jmock.Expectations;
 import org.jmock.integration.junit3.MockObjectTestCase;
 

Modified: james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/MockLogger.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/MockLogger.java?rev=755590&r1=755561&r2=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/MockLogger.java (original)
+++ james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/MockLogger.java Wed Mar 18 13:20:15 2009
@@ -20,7 +20,7 @@
 /**
  * 
  */
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
 import org.apache.commons.logging.Log;
 

Modified: james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/NioUtils.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/NioUtils.java?rev=755590&r1=755561&r2=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/NioUtils.java (original)
+++ james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/NioUtils.java Wed Mar 18 13:20:15 2009
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;

Copied: james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java (from r755562, james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserAndParenthesesTest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java?p2=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java&p1=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserAndParenthesesTest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserAndParenthesesTest.java (original)
+++ james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java Wed Mar 18 13:20:15 2009
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -25,15 +25,16 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
+import org.apache.james.imap.api.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.message.IdRange;
 import org.apache.james.imap.api.message.request.DayMonthYear;
 import org.apache.james.imap.api.message.request.SearchKey;
 import org.apache.james.imap.decode.ImapRequestLineReader;
 import org.apache.james.imap.decode.ProtocolException;
+import org.apache.james.imap.decode.parser.SearchCommandParser;
 import org.jmock.Expectations;
 import org.jmock.integration.junit3.MockObjectTestCase;
 

Copied: james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java (from r755562, james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserCharsetTest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java?p2=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java&p1=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserCharsetTest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserCharsetTest.java (original)
+++ james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java Wed Mar 18 13:20:15 2009
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -27,15 +27,16 @@
 import java.util.Iterator;
 import java.util.Set;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
+import org.apache.james.imap.api.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
 import org.apache.james.imap.api.display.HumanReadableTextKey;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.message.request.SearchKey;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponse;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponseFactory;
+import org.apache.james.imap.api.message.response.StatusResponse;
+import org.apache.james.imap.api.message.response.StatusResponseFactory;
 import org.apache.james.imap.decode.ImapRequestLineReader;
+import org.apache.james.imap.decode.parser.SearchCommandParser;
 import org.jmock.Expectations;
 import org.jmock.integration.junit3.MockObjectTestCase;
 

Copied: james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java (from r755562, james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserNotTest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java?p2=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java&p1=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserNotTest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserNotTest.java (original)
+++ james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java Wed Mar 18 13:20:15 2009
@@ -17,19 +17,20 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
+import org.apache.james.imap.api.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.message.IdRange;
 import org.apache.james.imap.api.message.request.DayMonthYear;
 import org.apache.james.imap.api.message.request.SearchKey;
 import org.apache.james.imap.decode.ImapRequestLineReader;
+import org.apache.james.imap.decode.parser.SearchCommandParser;
 import org.jmock.Expectations;
 import org.jmock.integration.junit3.MockObjectTestCase;
 

Copied: james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java (from r755562, james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserOrTest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java?p2=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java&p1=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserOrTest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserOrTest.java (original)
+++ james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java Wed Mar 18 13:20:15 2009
@@ -17,19 +17,20 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
+import org.apache.james.imap.api.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.message.IdRange;
 import org.apache.james.imap.api.message.request.DayMonthYear;
 import org.apache.james.imap.api.message.request.SearchKey;
 import org.apache.james.imap.decode.ImapRequestLineReader;
+import org.apache.james.imap.decode.parser.SearchCommandParser;
 import org.jmock.Expectations;
 import org.jmock.integration.junit3.MockObjectTestCase;
 

Copied: james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java (from r755562, james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserQuotedCharsetTest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java?p2=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java&p1=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserQuotedCharsetTest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserQuotedCharsetTest.java (original)
+++ james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java Wed Mar 18 13:20:15 2009
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -27,16 +27,17 @@
 import java.util.Iterator;
 import java.util.Set;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
+import org.apache.james.imap.api.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
 import org.apache.james.imap.api.display.HumanReadableTextKey;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.message.request.SearchKey;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponse;
-import org.apache.james.imap.api.message.response.imap4rev1.StatusResponseFactory;
+import org.apache.james.imap.api.message.response.StatusResponse;
+import org.apache.james.imap.api.message.response.StatusResponseFactory;
 import org.apache.james.imap.decode.ImapRequestLineReader;
 import org.apache.james.imap.decode.ProtocolException;
+import org.apache.james.imap.decode.parser.SearchCommandParser;
 import org.jmock.Expectations;
 import org.jmock.integration.junit3.MockObjectTestCase;
 

Copied: james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java (from r755562, james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserSearchKeySequenceSetTest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java?p2=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java&p1=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserSearchKeySequenceSetTest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserSearchKeySequenceSetTest.java (original)
+++ james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java Wed Mar 18 13:20:15 2009
@@ -17,18 +17,19 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
+import org.apache.james.imap.api.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.message.IdRange;
 import org.apache.james.imap.api.message.request.SearchKey;
 import org.apache.james.imap.decode.ImapRequestLineReader;
+import org.apache.james.imap.decode.parser.SearchCommandParser;
 import org.jmock.Expectations;
 import org.jmock.integration.junit3.MockObjectTestCase;
 

Copied: james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java (from r755562, james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserSearchKeyTest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java?p2=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java&p1=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserSearchKeyTest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserSearchKeyTest.java (original)
+++ james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java Wed Mar 18 13:20:15 2009
@@ -17,20 +17,21 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
+import org.apache.james.imap.api.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.message.IdRange;
 import org.apache.james.imap.api.message.request.DayMonthYear;
 import org.apache.james.imap.api.message.request.SearchKey;
 import org.apache.james.imap.decode.ImapRequestLineReader;
 import org.apache.james.imap.decode.ProtocolException;
+import org.apache.james.imap.decode.parser.SearchCommandParser;
 import org.jmock.Expectations;
 import org.jmock.integration.junit3.MockObjectTestCase;
 

Copied: james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java (from r755562, james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserTopLevelAndTest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java?p2=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java&p1=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserTopLevelAndTest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserTopLevelAndTest.java (original)
+++ james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java Wed Mar 18 13:20:15 2009
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -25,15 +25,16 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
+import org.apache.james.imap.api.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.message.IdRange;
 import org.apache.james.imap.api.message.request.DayMonthYear;
 import org.apache.james.imap.api.message.request.SearchKey;
 import org.apache.james.imap.decode.ImapRequestLineReader;
 import org.apache.james.imap.decode.ProtocolException;
+import org.apache.james.imap.decode.parser.SearchCommandParser;
 import org.jmock.Expectations;
 import org.jmock.integration.junit3.MockObjectTestCase;
 

Copied: james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java (from r755562, james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/StoreCommandParserTest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java?p2=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java&p1=james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/StoreCommandParserTest.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/StoreCommandParserTest.java (original)
+++ james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java Wed Mar 18 13:20:15 2009
@@ -17,19 +17,20 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.decode.imap4rev1;
+package org.apache.james.imap.decode.parser;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
 import javax.mail.Flags;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
+import org.apache.james.imap.api.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.message.IdRange;
 import org.apache.james.imap.decode.ImapRequestLineReader;
+import org.apache.james.imap.decode.parser.StoreCommandParser;
 import org.jmock.Expectations;
 import org.jmock.integration.junit3.MockObjectTestCase;
 

Modified: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/StandardImap4Rev1CommandFactory.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/StandardImap4Rev1CommandFactory.java?rev=755590&r1=755589&r2=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/StandardImap4Rev1CommandFactory.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/StandardImap4Rev1CommandFactory.java Wed Mar 18 13:20:15 2009
@@ -18,9 +18,9 @@
  ****************************************************************/
 package org.apache.james.imap.command.imap4rev1;
 
+import org.apache.james.imap.api.Imap4Rev1CommandFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
-import org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory;
 
 public class StandardImap4Rev1CommandFactory implements Imap4Rev1CommandFactory {
 
@@ -97,168 +97,168 @@
             .authenticatedStateCommand(ImapConstants.UNSUBSCRIBE_COMMAND_NAME);
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getAppend()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getAppend()
      */
     public ImapCommand getAppend() {
         return append;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getAuthenticate()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getAuthenticate()
      */
     public ImapCommand getAuthenticate() {
         return authenticate;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getCapability()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getCapability()
      */
     public ImapCommand getCapability() {
         return capability;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getCheck()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getCheck()
      */
     public ImapCommand getCheck() {
         return check;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getClose()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getClose()
      */
     public ImapCommand getClose() {
         return close;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getCopy()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getCopy()
      */
     public ImapCommand getCopy() {
         return copy;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getCreate()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getCreate()
      */
     public ImapCommand getCreate() {
         return create;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getDelete()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getDelete()
      */
     public ImapCommand getDelete() {
         return delete;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getExamine()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getExamine()
      */
     public ImapCommand getExamine() {
         return examine;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getExpunge()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getExpunge()
      */
     public ImapCommand getExpunge() {
         return expunge;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getFetch()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getFetch()
      */
     public ImapCommand getFetch() {
         return fetch;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getList()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getList()
      */
     public ImapCommand getList() {
         return list;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getLogin()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getLogin()
      */
     public ImapCommand getLogin() {
         return login;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getLogout()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getLogout()
      */
     public ImapCommand getLogout() {
         return logout;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getLsub()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getLsub()
      */
     public ImapCommand getLsub() {
         return lsub;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getNoop()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getNoop()
      */
     public ImapCommand getNoop() {
         return noop;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getRename()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getRename()
      */
     public ImapCommand getRename() {
         return rename;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getSearch()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getSearch()
      */
     public ImapCommand getSearch() {
         return search;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getSelect()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getSelect()
      */
     public ImapCommand getSelect() {
         return select;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getStatus()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getStatus()
      */
     public ImapCommand getStatus() {
         return status;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getStore()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getStore()
      */
     public ImapCommand getStore() {
         return store;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getSubscribe()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getSubscribe()
      */
     public ImapCommand getSubscribe() {
         return subscribe;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getUid()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getUid()
      */
     public ImapCommand getUid() {
         return uid;
     }
 
     /**
-     * @see org.apache.james.imap.api.imap4rev1.Imap4Rev1CommandFactory#getUnsubscribe()
+     * @see org.apache.james.imap.api.Imap4Rev1CommandFactory#getUnsubscribe()
      */
     public ImapCommand getUnsubscribe() {
         return unsubscribe;

Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/CapabilityResponseEncoder.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/server/CapabilityResponseEncoder.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/CapabilityResponseEncoder.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/CapabilityResponseEncoder.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/server/CapabilityResponseEncoder.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/server/CapabilityResponseEncoder.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/CapabilityResponseEncoder.java Wed Mar 18 13:20:15 2009
@@ -16,15 +16,13 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.encode.imap4rev1.server;
+package org.apache.james.imap.encode;
 
 import java.io.IOException;
 
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.encode.ImapResponseComposer;
 import org.apache.james.imap.encode.base.AbstractChainedImapEncoder;
-import org.apache.james.imap.message.response.imap4rev1.server.CapabilityResponse;
+import org.apache.james.imap.message.response.CapabilityResponse;
 
 /**
  * Encodes <code>CAPABILITY</code> response.

Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ExistsResponseEncoder.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/ExistsResponseEncoder.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ExistsResponseEncoder.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ExistsResponseEncoder.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/ExistsResponseEncoder.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/ExistsResponseEncoder.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ExistsResponseEncoder.java Wed Mar 18 13:20:15 2009
@@ -17,15 +17,13 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.encode.imap4rev1;
+package org.apache.james.imap.encode;
 
 import java.io.IOException;
 
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.encode.ImapResponseComposer;
 import org.apache.james.imap.encode.base.AbstractChainedImapEncoder;
-import org.apache.james.imap.message.response.imap4rev1.ExistsResponse;
+import org.apache.james.imap.message.response.ExistsResponse;
 
 public class ExistsResponseEncoder extends AbstractChainedImapEncoder {
 

Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ExistsResponseEncoder.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ExpungeResponseEncoder.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/ExpungeResponseEncoder.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ExpungeResponseEncoder.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ExpungeResponseEncoder.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/ExpungeResponseEncoder.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/ExpungeResponseEncoder.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ExpungeResponseEncoder.java Wed Mar 18 13:20:15 2009
@@ -17,15 +17,13 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.encode.imap4rev1;
+package org.apache.james.imap.encode;
 
 import java.io.IOException;
 
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.encode.ImapResponseComposer;
 import org.apache.james.imap.encode.base.AbstractChainedImapEncoder;
-import org.apache.james.imap.message.response.imap4rev1.ExpungeResponse;
+import org.apache.james.imap.message.response.ExpungeResponse;
 
 public class ExpungeResponseEncoder extends AbstractChainedImapEncoder {
 

Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ExpungeResponseEncoder.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/FetchResponseEncoder.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/FetchResponseEncoder.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/FetchResponseEncoder.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java Wed Mar 18 13:20:15 2009
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.encode.imap4rev1;
+package org.apache.james.imap.encode;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -33,12 +33,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.encode.EncoderUtils;
-import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.encode.ImapResponseComposer;
 import org.apache.james.imap.encode.base.AbstractChainedImapEncoder;
-import org.apache.james.imap.message.response.imap4rev1.FetchResponse;
-import org.apache.james.imap.message.response.imap4rev1.FetchResponse.Structure;
+import org.apache.james.imap.message.response.FetchResponse;
+import org.apache.james.imap.message.response.FetchResponse.Structure;
 
 public class FetchResponseEncoder extends AbstractChainedImapEncoder {
 

Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FlagsResponseEncoder.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/FlagsResponseEncoder.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FlagsResponseEncoder.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FlagsResponseEncoder.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/FlagsResponseEncoder.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/FlagsResponseEncoder.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FlagsResponseEncoder.java Wed Mar 18 13:20:15 2009
@@ -17,17 +17,15 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.encode.imap4rev1;
+package org.apache.james.imap.encode;
 
 import java.io.IOException;
 
 import javax.mail.Flags;
 
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.encode.ImapResponseComposer;
 import org.apache.james.imap.encode.base.AbstractChainedImapEncoder;
-import org.apache.james.imap.message.response.imap4rev1.FlagsResponse;
+import org.apache.james.imap.message.response.FlagsResponse;
 
 public class FlagsResponseEncoder extends AbstractChainedImapEncoder {
 

Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/FlagsResponseEncoder.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java?rev=755590&r1=755589&r2=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java Wed Mar 18 13:20:15 2009
@@ -26,7 +26,7 @@
 import javax.mail.Flags;
 
 import org.apache.james.imap.api.ImapCommand;
-import org.apache.james.imap.message.response.imap4rev1.Literal;
+import org.apache.james.imap.message.response.Literal;
 
 public interface ImapResponseComposer {
 

Modified: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseWriter.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseWriter.java?rev=755590&r1=755589&r2=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseWriter.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseWriter.java Wed Mar 18 13:20:15 2009
@@ -21,7 +21,7 @@
 
 import java.io.IOException;
 
-import org.apache.james.imap.message.response.imap4rev1.Literal;
+import org.apache.james.imap.message.response.Literal;
 
 /**
  * <p>

Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/server/LSubResponseEncoder.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/server/LSubResponseEncoder.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/server/LSubResponseEncoder.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java Wed Mar 18 13:20:15 2009
@@ -16,17 +16,15 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.encode.imap4rev1.server;
+package org.apache.james.imap.encode;
 
 import java.io.IOException;
 
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.encode.ImapResponseComposer;
 import org.apache.james.imap.encode.base.AbstractChainedImapEncoder;
-import org.apache.james.imap.message.response.imap4rev1.server.AbstractListingResponse;
-import org.apache.james.imap.message.response.imap4rev1.server.LSubResponse;
+import org.apache.james.imap.message.response.AbstractListingResponse;
+import org.apache.james.imap.message.response.LSubResponse;
 
 /**
  * Encoders IMAP4rev1 <code>List</code> responses.

Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/LSubResponseEncoder.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/server/ListResponseEncoder.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/server/ListResponseEncoder.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/server/ListResponseEncoder.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java Wed Mar 18 13:20:15 2009
@@ -16,17 +16,15 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.encode.imap4rev1.server;
+package org.apache.james.imap.encode;
 
 import java.io.IOException;
 
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.encode.ImapResponseComposer;
 import org.apache.james.imap.encode.base.AbstractChainedImapEncoder;
-import org.apache.james.imap.message.response.imap4rev1.server.AbstractListingResponse;
-import org.apache.james.imap.message.response.imap4rev1.server.ListResponse;
+import org.apache.james.imap.message.response.AbstractListingResponse;
+import org.apache.james.imap.message.response.ListResponse;
 
 /**
  * Encoders IMAP4rev1 <code>List</code> responses.

Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListResponseEncoder.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/server/ListingEncodingUtils.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/server/ListingEncodingUtils.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/server/ListingEncodingUtils.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java Wed Mar 18 13:20:15 2009
@@ -17,15 +17,14 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.encode.imap4rev1.server;
+package org.apache.james.imap.encode;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.james.imap.api.ImapConstants;
-import org.apache.james.imap.encode.ImapResponseComposer;
-import org.apache.james.imap.message.response.imap4rev1.server.AbstractListingResponse;
+import org.apache.james.imap.message.response.AbstractListingResponse;
 
 public class ListingEncodingUtils {
 

Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/RecentResponseEncoder.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/RecentResponseEncoder.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/RecentResponseEncoder.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/RecentResponseEncoder.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/RecentResponseEncoder.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/RecentResponseEncoder.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/RecentResponseEncoder.java Wed Mar 18 13:20:15 2009
@@ -17,15 +17,13 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.encode.imap4rev1;
+package org.apache.james.imap.encode;
 
 import java.io.IOException;
 
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.encode.ImapResponseComposer;
 import org.apache.james.imap.encode.base.AbstractChainedImapEncoder;
-import org.apache.james.imap.message.response.imap4rev1.RecentResponse;
+import org.apache.james.imap.message.response.RecentResponse;
 
 public class RecentResponseEncoder extends AbstractChainedImapEncoder {
 

Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/RecentResponseEncoder.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/STATUSResponseEncoder.java (from r755562, james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/server/STATUSResponseEncoder.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/STATUSResponseEncoder.java?p2=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/STATUSResponseEncoder.java&p1=james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/server/STATUSResponseEncoder.java&r1=755562&r2=755590&rev=755590&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/server/STATUSResponseEncoder.java (original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/STATUSResponseEncoder.java Wed Mar 18 13:20:15 2009
@@ -17,15 +17,13 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.encode.imap4rev1.server;
+package org.apache.james.imap.encode;
 
 import java.io.IOException;
 
 import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.encode.ImapResponseComposer;
 import org.apache.james.imap.encode.base.AbstractChainedImapEncoder;
-import org.apache.james.imap.message.response.imap4rev1.server.STATUSResponse;
+import org.apache.james.imap.message.response.STATUSResponse;
 
 /**
  * Encodes <code>STATUS</code> responses.

Propchange: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/STATUSResponseEncoder.java
------------------------------------------------------------------------------
    svn:mergeinfo = 



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