james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r760824 - in /james/imap/trunk: api/src/main/java/org/apache/james/imap/api/ decode/src/main/java/org/apache/james/imap/decode/ decode/src/main/java/org/apache/james/imap/decode/base/ decode/src/main/java/org/apache/james/imap/decode/main/ ...
Date Wed, 01 Apr 2009 09:22:01 GMT
Author: rdonkin
Date: Wed Apr  1 09:21:54 2009
New Revision: 760824

URL: http://svn.apache.org/viewvc?rev=760824&view=rev
Log:
Now not only Imap4Rev1. IMAP Namespaces IMAP-76  https://issues.apache.org/jira/browse/IMAP-76

Added:
    james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapMessageFactory.java
      - copied, changed from r760822, james/imap/trunk/api/src/main/java/org/apache/james/imap/api/Imap4Rev1MessageFactory.java
Removed:
    james/imap/trunk/api/src/main/java/org/apache/james/imap/api/Imap4Rev1MessageFactory.java
Modified:
    james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/MessagingImapCommandParser.java
    james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
    james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
    james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java
    james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java
    james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java
    james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java
    james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java
    james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java
    james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java
    james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
    james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java
    james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
    james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java
    james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
    james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
    james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
    james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
    james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
    james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
    james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
    james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
    james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
    james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
    james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/BaseImap4Rev1MessageFactory.java
    james/imap/trunk/seda/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java

Copied: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapMessageFactory.java
(from r760822, james/imap/trunk/api/src/main/java/org/apache/james/imap/api/Imap4Rev1MessageFactory.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapMessageFactory.java?p2=james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapMessageFactory.java&p1=james/imap/trunk/api/src/main/java/org/apache/james/imap/api/Imap4Rev1MessageFactory.java&r1=760822&r2=760824&rev=760824&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/Imap4Rev1MessageFactory.java
(original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapMessageFactory.java Wed
Apr  1 09:21:54 2009
@@ -33,7 +33,7 @@
  * Creates messages. Implementations may support message pooling but this is not
  * required.
  */
-public interface Imap4Rev1MessageFactory {
+public interface ImapMessageFactory {
 
     /**
      * Creates a tagged BAD status response.

Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/MessagingImapCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/MessagingImapCommandParser.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/MessagingImapCommandParser.java
(original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/MessagingImapCommandParser.java
Wed Apr  1 09:21:54 2009
@@ -18,15 +18,15 @@
  ****************************************************************/
 package org.apache.james.imap.decode;
 
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.message.response.StatusResponseFactory;
 
 public interface MessagingImapCommandParser {
 
-    public abstract Imap4Rev1MessageFactory getMessageFactory();
+    public abstract ImapMessageFactory getMessageFactory();
 
     public abstract void setMessageFactory(
-            Imap4Rev1MessageFactory messageFactory);
+            ImapMessageFactory messageFactory);
 
     public abstract StatusResponseFactory getStatusResponseFactory();
 

Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
(original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
Wed Apr  1 09:21:54 2009
@@ -34,7 +34,7 @@
 import javax.mail.Flags;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapMessage;
@@ -62,7 +62,7 @@
 
     private final ImapCommand command;
 
-    private Imap4Rev1MessageFactory messageFactory;
+    private ImapMessageFactory messageFactory;
 
     private StatusResponseFactory statusResponseFactory;
 
@@ -79,14 +79,14 @@
     /**
      * @see org.apache.james.imap.decode.MessagingImapCommandParser#getMessageFactory()
      */
-    public Imap4Rev1MessageFactory getMessageFactory() {
+    public ImapMessageFactory getMessageFactory() {
         return messageFactory;
     }
 
     /**
-     * @see org.apache.james.imap.decode.MessagingImapCommandParser#setMessageFactory(org.apache.james.imap.api.Imap4Rev1MessageFactory)
+     * @see org.apache.james.imap.decode.MessagingImapCommandParser#setMessageFactory(org.apache.james.imap.api.ImapMessageFactory)
      */
-    public void setMessageFactory(Imap4Rev1MessageFactory messageFactory) {
+    public void setMessageFactory(ImapMessageFactory messageFactory) {
         this.messageFactory = messageFactory;
     }
 

Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
(original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
Wed Apr  1 09:21:54 2009
@@ -19,7 +19,7 @@
 package org.apache.james.imap.decode.main;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapMessage;
 import org.apache.james.imap.api.ImapSessionState;
 import org.apache.james.imap.api.display.HumanReadableTextKey;
@@ -33,11 +33,11 @@
 
 public class DefaultImapDecoder implements ImapDecoder {
 
-    private final Imap4Rev1MessageFactory messageFactory;
+    private final ImapMessageFactory messageFactory;
 
     private final ImapCommandParserFactory imapCommands;
 
-    public DefaultImapDecoder(final Imap4Rev1MessageFactory messageFactory,
+    public DefaultImapDecoder(final ImapMessageFactory messageFactory,
             final ImapCommandParserFactory imapCommands) {
         this.messageFactory = messageFactory;
         this.imapCommands = imapCommands;

Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java
(original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AppendCommandParser.java
Wed Apr  1 09:21:54 2009
@@ -23,7 +23,7 @@
 import javax.mail.Flags;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapMessage;
@@ -80,7 +80,7 @@
         request.nextWordChar();
         final byte[] message = consumeLiteral(request);
         endLine(request);
-        final Imap4Rev1MessageFactory factory = getMessageFactory();
+        final ImapMessageFactory factory = getMessageFactory();
         final ImapMessage result = factory.createAppendMessage(command,
                 mailboxName, flags, datetime, message, tag);
         return result;

Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java
(original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/AuthenticateCommandParser.java
Wed Apr  1 09:21:54 2009
@@ -19,7 +19,7 @@
 package org.apache.james.imap.decode.parser;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapMessage;
@@ -37,7 +37,7 @@
             ImapRequestLineReader request, String tag, Log logger) throws ProtocolException
{
         String authType = astring(request);
         endLine(request);
-        final Imap4Rev1MessageFactory factory = getMessageFactory();
+        final ImapMessageFactory factory = getMessageFactory();
         final ImapMessage result = factory.createAuthenticateMessage(command,
                 authType, tag);
         return result;

Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java
(original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CapabilityCommandParser.java
Wed Apr  1 09:21:54 2009
@@ -19,7 +19,7 @@
 package org.apache.james.imap.decode.parser;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapMessage;
@@ -36,7 +36,7 @@
     protected ImapMessage decode(ImapCommand command,
             ImapRequestLineReader request, String tag, Log logger) throws ProtocolException
{
         endLine(request);
-        final Imap4Rev1MessageFactory factory = getMessageFactory();
+        final ImapMessageFactory factory = getMessageFactory();
         final ImapMessage result = factory
                 .createCapabilityMessage(command, tag);
         return result;

Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java
(original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CloseCommandParser.java
Wed Apr  1 09:21:54 2009
@@ -19,7 +19,7 @@
 package org.apache.james.imap.decode.parser;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapMessage;
@@ -36,7 +36,7 @@
     protected ImapMessage decode(ImapCommand command,
             ImapRequestLineReader request, String tag, Log logger) throws ProtocolException
{
         endLine(request);
-        final Imap4Rev1MessageFactory factory = getMessageFactory();
+        final ImapMessageFactory factory = getMessageFactory();
         final ImapMessage result = factory.createCloseMessage(command, tag);
         return result;
     }

Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java
(original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/CreateCommandParser.java
Wed Apr  1 09:21:54 2009
@@ -19,7 +19,7 @@
 package org.apache.james.imap.decode.parser;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapMessage;
@@ -37,7 +37,7 @@
             ImapRequestLineReader request, String tag, Log logger) throws ProtocolException
{
         String mailboxName = mailbox(request);
         endLine(request);
-        final Imap4Rev1MessageFactory factory = getMessageFactory();
+        final ImapMessageFactory factory = getMessageFactory();
         final ImapMessage result = factory.createCreateMessage(command,
                 mailboxName, tag);
         return result;

Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java
(original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/DeleteCommandParser.java
Wed Apr  1 09:21:54 2009
@@ -19,7 +19,7 @@
 package org.apache.james.imap.decode.parser;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapMessage;
@@ -37,7 +37,7 @@
             ImapRequestLineReader request, String tag, Log logger) throws ProtocolException
{
         String mailboxName = mailbox(request);
         endLine(request);
-        final Imap4Rev1MessageFactory factory = getMessageFactory();
+        final ImapMessageFactory factory = getMessageFactory();
         final ImapMessage result = factory.createDeleteMessage(command,
                 mailboxName, tag);
         return result;

Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java
(original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ExpungeCommandParser.java
Wed Apr  1 09:21:54 2009
@@ -19,7 +19,7 @@
 package org.apache.james.imap.decode.parser;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapMessage;
@@ -36,7 +36,7 @@
     protected ImapMessage decode(ImapCommand command,
             ImapRequestLineReader request, String tag, Log logger) throws ProtocolException
{
         endLine(request);
-        final Imap4Rev1MessageFactory factory = getMessageFactory();
+        final ImapMessageFactory factory = getMessageFactory();
         final ImapMessage result = factory.createExpungeMessage(command, tag);
         return result;
     }

Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
(original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
Wed Apr  1 09:21:54 2009
@@ -21,7 +21,7 @@
 import java.util.List;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapMessage;
@@ -222,7 +222,7 @@
         FetchData fetch = fetchRequest(request);
         endLine(request);
 
-        final Imap4Rev1MessageFactory factory = getMessageFactory();
+        final ImapMessageFactory factory = getMessageFactory();
         final ImapMessage result = factory.createFetchMessage(command, useUids,
                 idSet, fetch, tag);
         return result;

Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java
(original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java
Wed Apr  1 09:21:54 2009
@@ -22,7 +22,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.message.response.StatusResponseFactory;
 import org.apache.james.imap.decode.DelegatingImapCommandParser;
@@ -40,13 +40,13 @@
         ImapCommandParserFactory {
     private Map<String, Class> _imapCommands;
 
-    private final Imap4Rev1MessageFactory messageFactory;
+    private final ImapMessageFactory messageFactory;
 
     private final StatusResponseFactory statusResponseFactory;
 
 
     public Imap4Rev1CommandParserFactory(
-            final Imap4Rev1MessageFactory messageFactory,
+            final ImapMessageFactory messageFactory,
             final StatusResponseFactory statusResponseFactory) {
         this.messageFactory = messageFactory;
         this.statusResponseFactory = statusResponseFactory;

Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
(original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ListCommandParser.java
Wed Apr  1 09:21:54 2009
@@ -19,7 +19,7 @@
 package org.apache.james.imap.decode.parser;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapMessage;
@@ -80,7 +80,7 @@
     protected ImapMessage createMessage(ImapCommand command,
             final String referenceName, final String mailboxPattern,
             final String tag) {
-        final Imap4Rev1MessageFactory factory = getMessageFactory();
+        final ImapMessageFactory factory = getMessageFactory();
         final ImapMessage result = factory.createListMessage(command,
                 referenceName, mailboxPattern, tag);
         return result;

Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java
(original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StatusCommandParser.java
Wed Apr  1 09:21:54 2009
@@ -19,7 +19,7 @@
 package org.apache.james.imap.decode.parser;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.api.ImapMessage;
@@ -77,7 +77,7 @@
         final String mailboxName = mailbox(request);
         final StatusDataItems statusDataItems = statusDataItems(request);
         endLine(request);
-        final Imap4Rev1MessageFactory factory = getMessageFactory();
+        final ImapMessageFactory factory = getMessageFactory();
         final ImapMessage result = factory.createStatusMessage(command,
                 mailboxName, statusDataItems, tag);
         return result;

Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
(original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
Wed Apr  1 09:21:54 2009
@@ -22,7 +22,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
 import org.apache.james.imap.api.message.BodyFetchElement;
@@ -38,7 +38,7 @@
 
     FetchCommandParser parser;
 
-    Imap4Rev1MessageFactory mockMessageFactory;
+    ImapMessageFactory mockMessageFactory;
     ImapCommand command;
 
     ImapMessage message;
@@ -46,7 +46,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         parser = new FetchCommandParser();
-        mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
+        mockMessageFactory = mock(ImapMessageFactory.class);
         command = ImapCommand.anyStateCommand("Command");
         message = mock(ImapMessage.class);
         parser.setMessageFactory(mockMessageFactory);

Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
(original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
Wed Apr  1 09:21:54 2009
@@ -25,7 +25,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
 import org.apache.james.imap.api.message.IdRange;
@@ -140,7 +140,7 @@
 
     SearchCommandParser parser;
 
-    Imap4Rev1MessageFactory mockMessageFactory;
+    ImapMessageFactory mockMessageFactory;
 
     ImapCommand command;
 
@@ -149,7 +149,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         parser = new SearchCommandParser();
-        mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
+        mockMessageFactory = mock(ImapMessageFactory.class);
         command = ImapCommand.anyStateCommand("Command");
         message = mock(ImapMessage.class);
         parser.setMessageFactory(mockMessageFactory);

Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
(original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
Wed Apr  1 09:21:54 2009
@@ -27,7 +27,7 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
 import org.apache.james.imap.api.display.HumanReadableTextKey;
@@ -65,7 +65,7 @@
     StatusResponseFactory mockStatusResponseFactory;
 
 
-    Imap4Rev1MessageFactory mockMessageFactory;
+    ImapMessageFactory mockMessageFactory;
     
     ImapCommand command;
 
@@ -74,7 +74,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         parser = new SearchCommandParser();
-        mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
+        mockMessageFactory = mock(ImapMessageFactory.class);
         command = ImapCommand.anyStateCommand("Command");
         message = mock(ImapMessage.class);
         mockStatusResponseFactory = mock(StatusResponseFactory.class);

Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
(original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
Wed Apr  1 09:21:54 2009
@@ -22,7 +22,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
 import org.apache.james.imap.api.message.IdRange;
@@ -35,7 +35,7 @@
 
     SearchCommandParser parser;
 
-    Imap4Rev1MessageFactory mockMessageFactory;
+    ImapMessageFactory mockMessageFactory;
     ImapCommand command;
 
     ImapMessage message;
@@ -43,7 +43,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         parser = new SearchCommandParser();
-        mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
+        mockMessageFactory = mock(ImapMessageFactory.class);
         command = ImapCommand.anyStateCommand("Command");
         message = mock(ImapMessage.class);
         parser.setMessageFactory(mockMessageFactory);

Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
(original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
Wed Apr  1 09:21:54 2009
@@ -22,7 +22,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
 import org.apache.james.imap.api.message.IdRange;
@@ -34,7 +34,7 @@
 public class SearchCommandParserOrTest extends MockObjectTestCase {
     SearchCommandParser parser;
 
-    Imap4Rev1MessageFactory mockMessageFactory;
+    ImapMessageFactory mockMessageFactory;
 
     ImapCommand command;
 
@@ -43,7 +43,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         parser = new SearchCommandParser();
-        mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
+        mockMessageFactory = mock(ImapMessageFactory.class);
         command = ImapCommand.anyStateCommand("Command");
         message = mock(ImapMessage.class);
         parser.setMessageFactory(mockMessageFactory);

Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
(original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
Wed Apr  1 09:21:54 2009
@@ -27,7 +27,7 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
 import org.apache.james.imap.api.display.HumanReadableTextKey;
@@ -128,7 +128,7 @@
 
     StatusResponseFactory mockStatusResponseFactory;
 
-    Imap4Rev1MessageFactory mockMessageFactory;
+    ImapMessageFactory mockMessageFactory;
 
     ImapCommand command;
 
@@ -137,7 +137,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         parser = new SearchCommandParser();
-        mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
+        mockMessageFactory = mock(ImapMessageFactory.class);
         command = ImapCommand.anyStateCommand("Command");
         message = mock(ImapMessage.class);
         mockStatusResponseFactory = mock(StatusResponseFactory.class);

Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
(original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
Wed Apr  1 09:21:54 2009
@@ -22,7 +22,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
 import org.apache.james.imap.api.message.IdRange;
@@ -34,7 +34,7 @@
 
     SearchCommandParser parser;
 
-    Imap4Rev1MessageFactory mockMessageFactory;
+    ImapMessageFactory mockMessageFactory;
 
     ImapCommand command;
 
@@ -43,7 +43,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         parser = new SearchCommandParser();
-        mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
+        mockMessageFactory = mock(ImapMessageFactory.class);
         command = ImapCommand.anyStateCommand("Command");
         message = mock(ImapMessage.class);
         parser.setMessageFactory(mockMessageFactory);

Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
(original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
Wed Apr  1 09:21:54 2009
@@ -22,7 +22,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
 import org.apache.james.imap.api.message.IdRange;
@@ -38,7 +38,7 @@
 
     SearchCommandParser parser;
 
-    Imap4Rev1MessageFactory mockMessageFactory;
+    ImapMessageFactory mockMessageFactory;
     
     ImapCommand command;
 
@@ -47,7 +47,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         parser = new SearchCommandParser();
-        mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
+        mockMessageFactory = mock(ImapMessageFactory.class);
         command = ImapCommand.anyStateCommand("Command");
         message = mock(ImapMessage.class);
         parser.setMessageFactory(mockMessageFactory);

Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
(original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
Wed Apr  1 09:21:54 2009
@@ -25,7 +25,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
 import org.apache.james.imap.api.message.IdRange;
@@ -125,7 +125,7 @@
 
     SearchCommandParser parser;
 
-    Imap4Rev1MessageFactory mockMessageFactory;
+    ImapMessageFactory mockMessageFactory;
 
     ImapCommand command;
 
@@ -134,7 +134,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         parser = new SearchCommandParser();
-        mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
+        mockMessageFactory = mock(ImapMessageFactory.class);
         command = ImapCommand.anyStateCommand("Command");
         message = mock(ImapMessage.class);
         parser.setMessageFactory(mockMessageFactory);

Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
(original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
Wed Apr  1 09:21:54 2009
@@ -24,7 +24,7 @@
 
 import javax.mail.Flags;
 
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
 import org.apache.james.imap.api.message.IdRange;
@@ -37,7 +37,7 @@
     StoreCommandParser parser;
 
 
-    Imap4Rev1MessageFactory mockMessageFactory;
+    ImapMessageFactory mockMessageFactory;
 
     ImapCommand command;
 
@@ -46,7 +46,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         parser = new StoreCommandParser();
-        mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
+        mockMessageFactory = mock(ImapMessageFactory.class);
         command = ImapCommand.anyStateCommand("Command");
         message = mock(ImapMessage.class);
         parser.setMessageFactory(mockMessageFactory);

Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/BaseImap4Rev1MessageFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/BaseImap4Rev1MessageFactory.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/BaseImap4Rev1MessageFactory.java
(original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/BaseImap4Rev1MessageFactory.java
Wed Apr  1 09:21:54 2009
@@ -22,7 +22,7 @@
 
 import javax.mail.Flags;
 
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapMessage;
 import org.apache.james.imap.api.display.HumanReadableTextKey;
@@ -36,7 +36,7 @@
 /**
  * Naive, factory creates unpooled instances.
  */
-public class BaseImap4Rev1MessageFactory implements Imap4Rev1MessageFactory {
+public class BaseImap4Rev1MessageFactory implements ImapMessageFactory {
 
     private StatusResponseFactory statusResponseFactory;
 

Modified: james/imap/trunk/seda/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java?rev=760824&r1=760823&r2=760824&view=diff
==============================================================================
--- james/imap/trunk/seda/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java
(original)
+++ james/imap/trunk/seda/src/main/java/org/apache/james/imap/main/DefaultImapDecoderFactory.java
Wed Apr  1 09:21:54 2009
@@ -19,7 +19,7 @@
 
 package org.apache.james.imap.main;
 
-import org.apache.james.imap.api.Imap4Rev1MessageFactory;
+import org.apache.james.imap.api.ImapMessageFactory;
 import org.apache.james.imap.decode.ImapCommandParserFactory;
 import org.apache.james.imap.decode.ImapDecoder;
 import org.apache.james.imap.decode.ImapDecoderFactory;
@@ -36,7 +36,7 @@
 
     public static final ImapDecoder createDecoder() {
         final UnpooledStatusResponseFactory unpooledStatusResponseFactory = new UnpooledStatusResponseFactory();
-        final Imap4Rev1MessageFactory messageFactory = new BaseImap4Rev1MessageFactory(
+        final ImapMessageFactory messageFactory = new BaseImap4Rev1MessageFactory(
                 unpooledStatusResponseFactory);
         final ImapCommandParserFactory imapCommands = new Imap4Rev1CommandParserFactory(
                 messageFactory, unpooledStatusResponseFactory);



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


Mime
View raw message