james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r537970 [2/2] - in /james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src: main/java/org/apache/james/experimental/imapserver/message/ main/java/org/apache/james/experimental/imapserver/message/response/ main/java/org/a...
Date Mon, 14 May 2007 20:17:41 GMT
Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/ExamineAndSelectProcessor.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/ExamineAndSelectProcessor.java?view=diff&rev=537970&r1=537969&r2=537970
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/ExamineAndSelectProcessor.java
(original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/ExamineAndSelectProcessor.java
Mon May 14 13:17:38 2007
@@ -26,12 +26,12 @@
 import org.apache.james.experimental.imapserver.ImapSession;
 import org.apache.james.experimental.imapserver.ProtocolException;
 import org.apache.james.experimental.imapserver.commands.ImapCommand;
-import org.apache.james.experimental.imapserver.message.BadResponseMessage;
-import org.apache.james.experimental.imapserver.message.ExamineAndSelectResponseMessage;
 import org.apache.james.experimental.imapserver.message.ImapResponseMessage;
 import org.apache.james.experimental.imapserver.message.request.AbstractImapRequest;
 import org.apache.james.experimental.imapserver.message.request.imap4rev1.ExamineRequest;
 import org.apache.james.experimental.imapserver.message.request.imap4rev1.SelectRequest;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.BadResponse;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.ExamineAndSelectResponse;
 import org.apache.james.experimental.imapserver.processor.AbstractImapRequestProcessor;
 import org.apache.james.experimental.imapserver.store.MailboxException;
 import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -57,7 +57,7 @@
 			{
 				logger.debug("Expected SelectRequest or ExamineRequest, was " + message);
 			}
-			result = new BadResponseMessage("Command unknown by Examine and Select processor.");
+			result = new BadResponse("Command unknown by Examine and Select processor.");
 		}
 		
 		return result;
@@ -90,7 +90,7 @@
             final long uidValidity = mailbox.getUidValidity();
             final MessageResult firstUnseen = mailbox.getFirstUnseen(MessageResult.MSN);
             final int messageCount = mailbox.getMessageCount();
-            result = new ExamineAndSelectResponseMessage(command, permanentFlags, 
+            result = new ExamineAndSelectResponse(command, permanentFlags, 
                     writeable, recentCount, uidValidity, firstUnseen, messageCount,
                     tag);
         } catch (MailboxManagerException e) {

Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/ExpungeProcessor.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/ExpungeProcessor.java?view=diff&rev=537970&r1=537969&r2=537970
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/ExpungeProcessor.java
(original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/ExpungeProcessor.java
Mon May 14 13:17:38 2007
@@ -24,12 +24,12 @@
 import org.apache.james.experimental.imapserver.ImapSession;
 import org.apache.james.experimental.imapserver.ProtocolException;
 import org.apache.james.experimental.imapserver.commands.ImapCommand;
-import org.apache.james.experimental.imapserver.message.BadResponseMessage;
-import org.apache.james.experimental.imapserver.message.CommandCompleteResponseMessage;
-import org.apache.james.experimental.imapserver.message.CommandFailedResponseMessage;
 import org.apache.james.experimental.imapserver.message.ImapResponseMessage;
 import org.apache.james.experimental.imapserver.message.request.AbstractImapRequest;
 import org.apache.james.experimental.imapserver.message.request.imap4rev1.ExpungeRequest;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.BadResponse;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.CommandCompleteResponse;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.CommandFailedResponse;
 import org.apache.james.experimental.imapserver.processor.AbstractImapRequestProcessor;
 import org.apache.james.experimental.imapserver.store.MailboxException;
 import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -51,7 +51,7 @@
 			{
 				logger.debug("Expected ExpungeRequest, was " + message);
 			}
-			result = new BadResponseMessage("Command unknown by Expunge processor.");
+			result = new BadResponse("Command unknown by Expunge processor.");
 		}
 		
 		return result;
@@ -66,11 +66,11 @@
         ImapResponseMessage result;
         ImapMailboxSession mailbox = session.getSelected().getMailbox();
         if (!mailbox.isWriteable()) {
-            result = new CommandFailedResponseMessage(command, "Mailbox selected read only.",
tag );
+            result = new CommandFailedResponse(command, "Mailbox selected read only.", tag
);
         } else {
             try {
                 mailbox.expunge(GeneralMessageSetImpl.all(),MessageResult.NOTHING);
-                result = new CommandCompleteResponseMessage(false, command, tag);
+                result = new CommandCompleteResponse(false, command, tag);
             } catch (MailboxManagerException e) {
                 throw new MailboxException(e);
             }

Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/FetchProcessor.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/FetchProcessor.java?view=diff&rev=537970&r1=537969&r2=537970
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/FetchProcessor.java
(original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/FetchProcessor.java
Mon May 14 13:17:38 2007
@@ -38,14 +38,14 @@
 import org.apache.james.experimental.imapserver.ImapSession;
 import org.apache.james.experimental.imapserver.ProtocolException;
 import org.apache.james.experimental.imapserver.commands.ImapCommand;
-import org.apache.james.experimental.imapserver.message.BadResponseMessage;
 import org.apache.james.experimental.imapserver.message.BodyFetchElement;
 import org.apache.james.experimental.imapserver.message.FetchData;
-import org.apache.james.experimental.imapserver.message.FetchResponseMessage;
 import org.apache.james.experimental.imapserver.message.IdRange;
 import org.apache.james.experimental.imapserver.message.ImapResponseMessage;
 import org.apache.james.experimental.imapserver.message.request.AbstractImapRequest;
 import org.apache.james.experimental.imapserver.message.request.imap4rev1.FetchRequest;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.BadResponse;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.FetchResponse;
 import org.apache.james.experimental.imapserver.processor.AbstractImapRequestProcessor;
 import org.apache.james.experimental.imapserver.store.MailboxException;
 import org.apache.james.experimental.imapserver.store.MessageFlags;
@@ -73,7 +73,7 @@
 			{
 				logger.debug("Expected FetchRequest, was " + message);
 			}
-			result = new BadResponseMessage("Command unknown by Fetch processor.");
+			result = new BadResponse("Command unknown by Fetch processor.");
 		}
 		
 		return result;
@@ -90,8 +90,8 @@
 	private ImapResponseMessage doProcess(final boolean useUids, final IdRange[] idSet, final
FetchData fetch,
 			ImapSession session, String tag, ImapCommand command) throws MailboxException, AuthorizationException,
ProtocolException {
         
-        FetchResponseMessage result = 
-            new FetchResponseMessage(command, useUids, tag);
+        FetchResponse result = 
+            new FetchResponse(command, useUids, tag);
         // TODO only fetch needed results
         int resultToFetch = MessageResult.FLAGS | MessageResult.MIME_MESSAGE
                 | MessageResult.INTERNAL_DATE | MessageResult.MSN

Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/ListProcessor.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/ListProcessor.java?view=diff&rev=537970&r1=537969&r2=537970
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/ListProcessor.java
(original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/ListProcessor.java
Mon May 14 13:17:38 2007
@@ -25,11 +25,11 @@
 import org.apache.james.experimental.imapserver.ImapSession;
 import org.apache.james.experimental.imapserver.ProtocolException;
 import org.apache.james.experimental.imapserver.commands.ImapCommand;
-import org.apache.james.experimental.imapserver.message.BadResponseMessage;
 import org.apache.james.experimental.imapserver.message.ImapResponseMessage;
-import org.apache.james.experimental.imapserver.message.ListResponseMessage;
 import org.apache.james.experimental.imapserver.message.request.AbstractImapRequest;
 import org.apache.james.experimental.imapserver.message.request.imap4rev1.ListRequest;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.BadResponse;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.ListResponse;
 import org.apache.james.experimental.imapserver.processor.AbstractImapRequestProcessor;
 import org.apache.james.experimental.imapserver.store.MailboxException;
 import org.apache.james.mailboxmanager.ListResult;
@@ -50,7 +50,7 @@
 			{
 				logger.debug("Expected ListRequest, was " + message);
 			}
-			result = new BadResponseMessage("Command unknown by List processor.");
+			result = new BadResponse("Command unknown by List processor.");
 		}
 		
 		return result;

Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/LoginProcessor.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/LoginProcessor.java?view=diff&rev=537970&r1=537969&r2=537970
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/LoginProcessor.java
(original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/LoginProcessor.java
Mon May 14 13:17:38 2007
@@ -24,12 +24,12 @@
 import org.apache.james.experimental.imapserver.ImapSession;
 import org.apache.james.experimental.imapserver.ProtocolException;
 import org.apache.james.experimental.imapserver.commands.ImapCommand;
-import org.apache.james.experimental.imapserver.message.BadResponseMessage;
-import org.apache.james.experimental.imapserver.message.CommandCompleteResponseMessage;
-import org.apache.james.experimental.imapserver.message.CommandFailedResponseMessage;
 import org.apache.james.experimental.imapserver.message.ImapResponseMessage;
 import org.apache.james.experimental.imapserver.message.request.AbstractImapRequest;
 import org.apache.james.experimental.imapserver.message.request.imap4rev1.LoginRequest;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.BadResponse;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.CommandCompleteResponse;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.CommandFailedResponse;
 import org.apache.james.experimental.imapserver.processor.AbstractImapRequestProcessor;
 import org.apache.james.experimental.imapserver.store.MailboxException;
 import org.apache.james.services.User;
@@ -48,7 +48,7 @@
 			{
 				logger.debug("Expected LoginRequest, was " + message);
 			}
-			result = new BadResponseMessage("Command unknown by Login processor.");
+			result = new BadResponse("Command unknown by Login processor.");
 		}
 		
 		return result;
@@ -67,10 +67,10 @@
         if ( session.getUsers().test( userid, password ) ) {
             User user = session.getUsers().getUserByName( userid );
             session.setAuthenticated( user );
-            result = CommandCompleteResponseMessage.createWithNoUnsolictedResponses(command,
tag);
+            result = CommandCompleteResponse.createWithNoUnsolictedResponses(command, tag);
         }
         else {
-            result = new CommandFailedResponseMessage( command, "Invalid login/password",
tag );
+            result = new CommandFailedResponse( command, "Invalid login/password", tag );
         }
         return result;
 	}

Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/LogoutProcessor.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/LogoutProcessor.java?view=diff&rev=537970&r1=537969&r2=537970
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/LogoutProcessor.java
(original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/LogoutProcessor.java
Mon May 14 13:17:38 2007
@@ -24,11 +24,11 @@
 import org.apache.james.experimental.imapserver.ImapSession;
 import org.apache.james.experimental.imapserver.ProtocolException;
 import org.apache.james.experimental.imapserver.commands.ImapCommand;
-import org.apache.james.experimental.imapserver.message.BadResponseMessage;
 import org.apache.james.experimental.imapserver.message.ImapResponseMessage;
-import org.apache.james.experimental.imapserver.message.LogoutResponseMessage;
 import org.apache.james.experimental.imapserver.message.request.AbstractImapRequest;
 import org.apache.james.experimental.imapserver.message.request.imap4rev1.LogoutRequest;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.BadResponse;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.LogoutResponse;
 import org.apache.james.experimental.imapserver.processor.AbstractImapRequestProcessor;
 import org.apache.james.experimental.imapserver.store.MailboxException;
 
@@ -46,7 +46,7 @@
 			{
 				logger.debug("Expected LogoutRequest, was " + message);
 			}
-			result = new BadResponseMessage("Command unknown by Logout processor.");
+			result = new BadResponse("Command unknown by Logout processor.");
 		}
 		
 		return result;
@@ -58,7 +58,7 @@
 	}
 	
 	private ImapResponseMessage doProcess(ImapSession session, String tag, ImapCommand command)
throws MailboxException, AuthorizationException, ProtocolException {
-        final LogoutResponseMessage result = new LogoutResponseMessage(command, tag);
+        final LogoutResponse result = new LogoutResponse(command, tag);
         return result;
 	}
 }

Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/LsubProcessor.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/LsubProcessor.java?view=diff&rev=537970&r1=537969&r2=537970
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/LsubProcessor.java
(original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/LsubProcessor.java
Mon May 14 13:17:38 2007
@@ -24,10 +24,10 @@
 import org.apache.james.experimental.imapserver.ImapSession;
 import org.apache.james.experimental.imapserver.ProtocolException;
 import org.apache.james.experimental.imapserver.commands.ImapCommand;
-import org.apache.james.experimental.imapserver.message.BadResponseMessage;
 import org.apache.james.experimental.imapserver.message.ImapResponseMessage;
 import org.apache.james.experimental.imapserver.message.request.AbstractImapRequest;
 import org.apache.james.experimental.imapserver.message.request.imap4rev1.LsubRequest;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.BadResponse;
 import org.apache.james.experimental.imapserver.store.MailboxException;
 import org.apache.james.mailboxmanager.ListResult;
 
@@ -45,7 +45,7 @@
 			{
 				logger.debug("Expected LsubRequest, was " + message);
 			}
-			result = new BadResponseMessage("Command unknown by Lsub processor.");
+			result = new BadResponse("Command unknown by Lsub processor.");
 		}
 		
 		return result;

Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/NoopProcessor.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/NoopProcessor.java?view=diff&rev=537970&r1=537969&r2=537970
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/NoopProcessor.java
(original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/NoopProcessor.java
Mon May 14 13:17:38 2007
@@ -24,11 +24,11 @@
 import org.apache.james.experimental.imapserver.ImapSession;
 import org.apache.james.experimental.imapserver.ProtocolException;
 import org.apache.james.experimental.imapserver.commands.ImapCommand;
-import org.apache.james.experimental.imapserver.message.BadResponseMessage;
-import org.apache.james.experimental.imapserver.message.CommandCompleteResponseMessage;
 import org.apache.james.experimental.imapserver.message.ImapResponseMessage;
 import org.apache.james.experimental.imapserver.message.request.AbstractImapRequest;
 import org.apache.james.experimental.imapserver.message.request.imap4rev1.NoopRequest;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.BadResponse;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.CommandCompleteResponse;
 import org.apache.james.experimental.imapserver.processor.AbstractImapRequestProcessor;
 import org.apache.james.experimental.imapserver.store.MailboxException;
 
@@ -46,7 +46,7 @@
 			{
 				logger.debug("Expected NoopRequest, was " + message);
 			}
-			result = new BadResponseMessage("Command unknown by Noop processor.");
+			result = new BadResponse("Command unknown by Noop processor.");
 		}
 		return result;
 	}
@@ -58,7 +58,7 @@
 	
 	private ImapResponseMessage doProcess(ImapSession session, String tag, ImapCommand command)
throws MailboxException, AuthorizationException, ProtocolException {
         // TODO: untagged responses?
-        final CommandCompleteResponseMessage result = new CommandCompleteResponseMessage(false,
command, tag);
+        final CommandCompleteResponse result = new CommandCompleteResponse(false, command,
tag);
         return result;
 	}
 }

Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/RenameProcessor.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/RenameProcessor.java?view=diff&rev=537970&r1=537969&r2=537970
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/RenameProcessor.java
(original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/RenameProcessor.java
Mon May 14 13:17:38 2007
@@ -24,11 +24,11 @@
 import org.apache.james.experimental.imapserver.ImapSession;
 import org.apache.james.experimental.imapserver.ProtocolException;
 import org.apache.james.experimental.imapserver.commands.ImapCommand;
-import org.apache.james.experimental.imapserver.message.BadResponseMessage;
-import org.apache.james.experimental.imapserver.message.CommandCompleteResponseMessage;
 import org.apache.james.experimental.imapserver.message.ImapResponseMessage;
 import org.apache.james.experimental.imapserver.message.request.AbstractImapRequest;
 import org.apache.james.experimental.imapserver.message.request.imap4rev1.RenameRequest;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.BadResponse;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.CommandCompleteResponse;
 import org.apache.james.experimental.imapserver.processor.AbstractImapRequestProcessor;
 import org.apache.james.experimental.imapserver.store.MailboxException;
 import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -47,7 +47,7 @@
 			{
 				logger.debug("Expected RenameRequest, was " + message);
 			}
-			result = new BadResponseMessage("Command unknown by Rename processor.");
+			result = new BadResponse("Command unknown by Rename processor.");
 		}
 		
 		return result;
@@ -70,6 +70,6 @@
            throw new MailboxException(e);
         }
 
-        return new CommandCompleteResponseMessage(false, command, tag);
+        return new CommandCompleteResponse(false, command, tag);
 	}
 }

Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/SearchProcessor.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/SearchProcessor.java?view=diff&rev=537970&r1=537969&r2=537970
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/SearchProcessor.java
(original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/SearchProcessor.java
Mon May 14 13:17:38 2007
@@ -27,11 +27,11 @@
 import org.apache.james.experimental.imapserver.ImapSession;
 import org.apache.james.experimental.imapserver.ProtocolException;
 import org.apache.james.experimental.imapserver.commands.ImapCommand;
-import org.apache.james.experimental.imapserver.message.BadResponseMessage;
 import org.apache.james.experimental.imapserver.message.ImapResponseMessage;
-import org.apache.james.experimental.imapserver.message.SearchResponseMessage;
 import org.apache.james.experimental.imapserver.message.request.AbstractImapRequest;
 import org.apache.james.experimental.imapserver.message.request.imap4rev1.SearchRequest;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.BadResponse;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.SearchResponse;
 import org.apache.james.experimental.imapserver.processor.AbstractImapRequestProcessor;
 import org.apache.james.experimental.imapserver.store.MailboxException;
 import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -53,7 +53,7 @@
 			{
 				logger.debug("Expected SearchRequest, was " + message);
 			}
-			result = new BadResponseMessage("Command unknown by Search processor.");
+			result = new BadResponse("Command unknown by Search processor.");
 		}
 		
 		return result;
@@ -94,8 +94,8 @@
                 idList.append( messageResults[i].getMsn());
             }
         }
-        final SearchResponseMessage result = 
-            new SearchResponseMessage(command, idList.toString(), 
+        final SearchResponse result = 
+            new SearchResponse(command, idList.toString(), 
                     useUids, tag);
         return result;
 	}

Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/StatusProcessor.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/StatusProcessor.java?view=diff&rev=537970&r1=537969&r2=537970
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/StatusProcessor.java
(original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/StatusProcessor.java
Mon May 14 13:17:38 2007
@@ -25,12 +25,12 @@
 import org.apache.james.experimental.imapserver.ImapSession;
 import org.apache.james.experimental.imapserver.ProtocolException;
 import org.apache.james.experimental.imapserver.commands.ImapCommand;
-import org.apache.james.experimental.imapserver.message.BadResponseMessage;
 import org.apache.james.experimental.imapserver.message.ImapResponseMessage;
 import org.apache.james.experimental.imapserver.message.StatusDataItems;
-import org.apache.james.experimental.imapserver.message.StatusResponseMessage;
 import org.apache.james.experimental.imapserver.message.request.AbstractImapRequest;
 import org.apache.james.experimental.imapserver.message.request.imap4rev1.StatusRequest;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.BadResponse;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.StatusResponse;
 import org.apache.james.experimental.imapserver.processor.AbstractImapRequestProcessor;
 import org.apache.james.experimental.imapserver.store.MailboxException;
 import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -50,7 +50,7 @@
 			{
 				logger.debug("Expected StatusRequest, was " + message);
 			}
-			result = new BadResponseMessage("Command unknown by Status processor.");
+			result = new BadResponse("Command unknown by Status processor.");
 		}
 		
 		return result;
@@ -127,8 +127,8 @@
             buffer.setLength( buffer.length() - 1 );
         }
         buffer.append(')');
-        final StatusResponseMessage result = 
-            new StatusResponseMessage(command, buffer.toString(), tag);
+        final StatusResponse result = 
+            new StatusResponse(command, buffer.toString(), tag);
         return result;
 	}
 }

Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/StoreProcessor.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/StoreProcessor.java?view=diff&rev=537970&r1=537969&r2=537970
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/StoreProcessor.java
(original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/StoreProcessor.java
Mon May 14 13:17:38 2007
@@ -26,13 +26,13 @@
 import org.apache.james.experimental.imapserver.ImapSession;
 import org.apache.james.experimental.imapserver.ProtocolException;
 import org.apache.james.experimental.imapserver.commands.ImapCommand;
-import org.apache.james.experimental.imapserver.message.BadResponseMessage;
 import org.apache.james.experimental.imapserver.message.IdRange;
 import org.apache.james.experimental.imapserver.message.ImapResponseMessage;
 import org.apache.james.experimental.imapserver.message.StoreDirective;
-import org.apache.james.experimental.imapserver.message.StoreResponseMessage;
 import org.apache.james.experimental.imapserver.message.request.AbstractImapRequest;
 import org.apache.james.experimental.imapserver.message.request.imap4rev1.StoreRequest;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.BadResponse;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.StoreResponse;
 import org.apache.james.experimental.imapserver.processor.AbstractImapRequestProcessor;
 import org.apache.james.experimental.imapserver.store.MailboxException;
 import org.apache.james.mailboxmanager.GeneralMessageSet;
@@ -55,7 +55,7 @@
 			{
 				logger.debug("Expected StoreRequest, was " + message);
 			}
-			result = new BadResponseMessage("Command unknown by Store processor.");
+			result = new BadResponse("Command unknown by Store processor.");
 		}
 		
 		return result;
@@ -107,8 +107,8 @@
             throw new MailboxException(e);
         }
         
-        final StoreResponseMessage result = 
-            new StoreResponseMessage(command, useUids, tag);
+        final StoreResponse result = 
+            new StoreResponse(command, useUids, tag);
         return result;
 	}
 }

Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/SubscribeProcessor.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/SubscribeProcessor.java?view=diff&rev=537970&r1=537969&r2=537970
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/SubscribeProcessor.java
(original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/SubscribeProcessor.java
Mon May 14 13:17:38 2007
@@ -24,11 +24,11 @@
 import org.apache.james.experimental.imapserver.ImapSession;
 import org.apache.james.experimental.imapserver.ProtocolException;
 import org.apache.james.experimental.imapserver.commands.ImapCommand;
-import org.apache.james.experimental.imapserver.message.BadResponseMessage;
-import org.apache.james.experimental.imapserver.message.CommandCompleteResponseMessage;
 import org.apache.james.experimental.imapserver.message.ImapResponseMessage;
 import org.apache.james.experimental.imapserver.message.request.AbstractImapRequest;
 import org.apache.james.experimental.imapserver.message.request.imap4rev1.SubscribeRequest;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.BadResponse;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.CommandCompleteResponse;
 import org.apache.james.experimental.imapserver.processor.AbstractImapRequestProcessor;
 import org.apache.james.experimental.imapserver.store.MailboxException;
 import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -47,7 +47,7 @@
 			{
 				logger.debug("Expected SubscribeRequest, was " + message);
 			}
-			result = new BadResponseMessage("Command unknown by Subscribe processor.");
+			result = new BadResponse("Command unknown by Subscribe processor.");
 		}
 		
 		return result;
@@ -67,6 +67,6 @@
         } catch (MailboxManagerException e) {
            throw new MailboxException(e);
         }
-        return new CommandCompleteResponseMessage(false, command, tag);
+        return new CommandCompleteResponse(false, command, tag);
 	}
 }

Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/UnsubscribeProcessor.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/UnsubscribeProcessor.java?view=diff&rev=537970&r1=537969&r2=537970
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/UnsubscribeProcessor.java
(original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/main/java/org/apache/james/experimental/imapserver/processor/imap4rev1/UnsubscribeProcessor.java
Mon May 14 13:17:38 2007
@@ -24,11 +24,11 @@
 import org.apache.james.experimental.imapserver.ImapSession;
 import org.apache.james.experimental.imapserver.ProtocolException;
 import org.apache.james.experimental.imapserver.commands.ImapCommand;
-import org.apache.james.experimental.imapserver.message.BadResponseMessage;
-import org.apache.james.experimental.imapserver.message.CommandCompleteResponseMessage;
 import org.apache.james.experimental.imapserver.message.ImapResponseMessage;
 import org.apache.james.experimental.imapserver.message.request.AbstractImapRequest;
 import org.apache.james.experimental.imapserver.message.request.imap4rev1.UnsubscribeRequest;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.BadResponse;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.CommandCompleteResponse;
 import org.apache.james.experimental.imapserver.processor.AbstractImapRequestProcessor;
 import org.apache.james.experimental.imapserver.store.MailboxException;
 import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -47,7 +47,7 @@
 			{
 				logger.debug("Expected UnsubscribeRequest, was " + message);
 			}
-			result = new BadResponseMessage("Command unknown by Unsubscribe processor.");
+			result = new BadResponse("Command unknown by Unsubscribe processor.");
 		}
 		
 		return result;
@@ -67,6 +67,6 @@
         } catch (MailboxManagerException e) {
             throw new MailboxException(e);
         }
-        return new CommandCompleteResponseMessage(false, command, tag);
+        return new CommandCompleteResponse(false, command, tag);
 	}
 }

Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/test/java/org/apache/james/experimental/imapserver/message/BadResponseMessageTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/test/java/org/apache/james/experimental/imapserver/message/BadResponseMessageTest.java?view=diff&rev=537970&r1=537969&r2=537970
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/test/java/org/apache/james/experimental/imapserver/message/BadResponseMessageTest.java
(original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/test/java/org/apache/james/experimental/imapserver/message/BadResponseMessageTest.java
Mon May 14 13:17:38 2007
@@ -23,8 +23,8 @@
 import org.apache.james.experimental.imapserver.ImapSession;
 import org.apache.james.experimental.imapserver.MockImapResponseWriter;
 import org.apache.james.experimental.imapserver.MockImapSession;
-import org.apache.james.experimental.imapserver.message.BadResponseMessage;
 import org.apache.james.experimental.imapserver.message.ImapResponseMessage;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.BadResponse;
 
 import junit.framework.TestCase;
 
@@ -34,14 +34,14 @@
     
     MockImapResponseWriter writer;
     ImapResponse response;
-    BadResponseMessage message;
+    BadResponse message;
     ImapSession session;
     
     protected void setUp() throws Exception {
         super.setUp();
         writer = new MockImapResponseWriter();
         response = new ImapResponse(writer);
-        message = new BadResponseMessage(MESSAGE);
+        message = new BadResponse(MESSAGE);
         session = new MockImapSession();
     }
 

Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/test/java/org/apache/james/experimental/imapserver/message/CommandFailedResponseMessageTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/test/java/org/apache/james/experimental/imapserver/message/CommandFailedResponseMessageTest.java?view=diff&rev=537970&r1=537969&r2=537970
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/test/java/org/apache/james/experimental/imapserver/message/CommandFailedResponseMessageTest.java
(original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/test/java/org/apache/james/experimental/imapserver/message/CommandFailedResponseMessageTest.java
Mon May 14 13:17:38 2007
@@ -25,7 +25,7 @@
 import org.apache.james.experimental.imapserver.MockImapResponseWriter;
 import org.apache.james.experimental.imapserver.MockImapSession;
 import org.apache.james.experimental.imapserver.commands.MockCommand;
-import org.apache.james.experimental.imapserver.message.CommandFailedResponseMessage;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.CommandFailedResponse;
 
 import junit.framework.TestCase;
 
@@ -53,8 +53,8 @@
     public void testWithResponseCode() throws Exception {
         String code = "A code";
         String message = "A message";
-        CommandFailedResponseMessage responseMessage 
-            = new CommandFailedResponseMessage(command, code, message, TAG);
+        CommandFailedResponse responseMessage 
+            = new CommandFailedResponse(command, code, message, TAG);
         responseMessage.encode(response, session);
         assertEquals(7, writer.operations.size());
         assertEquals(new MockImapResponseWriter.TagOperation(TAG), writer.operations.get(0));
@@ -74,8 +74,8 @@
     
     public void testWithoutResponseCode() throws Exception {
         String message = "A message";
-        CommandFailedResponseMessage responseMessage 
-            = new CommandFailedResponseMessage(command, message, TAG);
+        CommandFailedResponse responseMessage 
+            = new CommandFailedResponse(command, message, TAG);
         responseMessage.encode(response, session);
         assertEquals(6, writer.operations.size());
         assertEquals(new MockImapResponseWriter.TagOperation(TAG), writer.operations.get(0));

Modified: james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/test/java/org/apache/james/experimental/imapserver/message/ErrorResponseMessageTest.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/test/java/org/apache/james/experimental/imapserver/message/ErrorResponseMessageTest.java?view=diff&rev=537970&r1=537969&r2=537970
==============================================================================
--- james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/test/java/org/apache/james/experimental/imapserver/message/ErrorResponseMessageTest.java
(original)
+++ james/server/sandbox/seda-imap-modular/experimental-seda-imap-function/src/test/java/org/apache/james/experimental/imapserver/message/ErrorResponseMessageTest.java
Mon May 14 13:17:38 2007
@@ -22,7 +22,7 @@
 import org.apache.james.experimental.imapserver.ImapConstants;
 import org.apache.james.experimental.imapserver.ImapResponse;
 import org.apache.james.experimental.imapserver.MockImapResponseWriter;
-import org.apache.james.experimental.imapserver.message.ErrorResponseMessage;
+import org.apache.james.experimental.imapserver.message.response.imap4rev1.ErrorResponse;
 
 import junit.framework.TestCase;
 
@@ -31,7 +31,7 @@
     private static final String ERROR = "An error message";
     private static final String TAG = "A Tag";
     
-    ErrorResponseMessage message;
+    ErrorResponse message;
     MockImapResponseWriter writer;
     ImapResponse response;
     
@@ -39,7 +39,7 @@
         super.setUp();
         writer = new MockImapResponseWriter();
         response = new ImapResponse(writer);
-        message = new ErrorResponseMessage(ERROR, TAG);
+        message = new ErrorResponse(ERROR, TAG);
     }
 
     protected void tearDown() throws Exception {



---------------------------------------------------------------------
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