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 er...@apache.org on 2012/02/12 10:51:21 UTC
svn commit: r1243219 - in /james/protocols/trunk/imap/src:
main/java/org/apache/james/imap/api/process/
main/java/org/apache/james/imap/encode/
main/java/org/apache/james/imap/message/response/
main/java/org/apache/james/imap/processor/ main/java/org/a...
Author: eric
Date: Sun Feb 12 09:51:19 2012
New Revision: 1243219
URL: http://svn.apache.org/viewvc?rev=1243219&view=rev
Log:
Impact imap in protocols with the new structure of mailbox classes (MAILBOX-159)
Modified:
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/process/MailboxTyper.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/process/SelectedMailbox.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/encode/ACLResponseEncoder.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/message/response/ACLResponse.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/CopyProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/FetchGroupImpl.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/PartContentDescriptorImpl.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/HeadersBodyElement.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java
james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java
james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java
james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java
james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java
james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerAdded.java
james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java
james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/process/MailboxTyper.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/process/MailboxTyper.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/process/MailboxTyper.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/process/MailboxTyper.java Sun Feb 12 09:51:19 2012
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.imap.api.process;
-import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.model.MailboxPath;
/**
*
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/process/SelectedMailbox.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/process/SelectedMailbox.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/process/SelectedMailbox.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/api/process/SelectedMailbox.java Sun Feb 12 09:51:19 2012
@@ -23,7 +23,7 @@ import java.util.Collection;
import javax.mail.Flags;
-import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.model.MailboxPath;
/**
* Interface which represent a selected Mailbox during the selected state
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/encode/ACLResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/encode/ACLResponseEncoder.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/encode/ACLResponseEncoder.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/encode/ACLResponseEncoder.java Sun Feb 12 09:51:19 2012
@@ -28,8 +28,8 @@ import org.apache.james.imap.api.ImapMes
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.encode.base.AbstractChainedImapEncoder;
import org.apache.james.imap.message.response.ACLResponse;
-import org.apache.james.mailbox.MailboxACL.MailboxACLEntryKey;
-import org.apache.james.mailbox.MailboxACL.MailboxACLRights;
+import org.apache.james.mailbox.model.MailboxACL.MailboxACLEntryKey;
+import org.apache.james.mailbox.model.MailboxACL.MailboxACLRights;
/**
* ACL Response Encoder.
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/message/response/ACLResponse.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/message/response/ACLResponse.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/message/response/ACLResponse.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/message/response/ACLResponse.java Sun Feb 12 09:51:19 2012
@@ -24,9 +24,9 @@ import java.util.Map.Entry;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.display.CharsetUtil;
import org.apache.james.imap.api.message.response.ImapResponseMessage;
-import org.apache.james.mailbox.MailboxACL;
-import org.apache.james.mailbox.MailboxACL.MailboxACLEntryKey;
-import org.apache.james.mailbox.MailboxACL.MailboxACLRights;
+import org.apache.james.mailbox.model.MailboxACL;
+import org.apache.james.mailbox.model.MailboxACL.MailboxACLEntryKey;
+import org.apache.james.mailbox.model.MailboxACL.MailboxACLRights;
/**
* ACL Response.
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java Sun Feb 12 09:51:19 2012
@@ -25,13 +25,13 @@ import org.apache.james.imap.api.message
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapSession;
-import org.apache.james.mailbox.BadCredentialsException;
-import org.apache.james.mailbox.MailboxConstants;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MailboxExistsException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.BadCredentialsException;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MailboxExistsException;
+import org.apache.james.mailbox.model.MailboxConstants;
+import org.apache.james.mailbox.model.MailboxPath;
public abstract class AbstractAuthProcessor<M extends ImapRequest> extends AbstractMailboxProcessor<M>{
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java Sun Feb 12 09:51:19 2012
@@ -34,8 +34,8 @@ import org.apache.james.imap.api.message
import org.apache.james.imap.api.message.request.ImapRequest;
import org.apache.james.imap.api.message.response.ImapResponseMessage;
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.api.message.response.StatusResponseFactory;
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.api.process.SelectedMailbox;
@@ -47,21 +47,21 @@ import org.apache.james.imap.message.res
import org.apache.james.imap.message.response.VanishedResponse;
import org.apache.james.imap.processor.base.AbstractChainedProcessor;
import org.apache.james.imap.processor.base.FetchGroupImpl;
-import org.apache.james.mailbox.MailboxConstants;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.MessageRangeException;
-import org.apache.james.mailbox.MessageResult;
-import org.apache.james.mailbox.MessageResultIterator;
-import org.apache.james.mailbox.SearchQuery;
import org.apache.james.mailbox.MessageManager.MetaData;
import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup;
-import org.apache.james.mailbox.MessageRange.Type;
-import org.apache.james.mailbox.SearchQuery.NumericRange;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MessageRangeException;
+import org.apache.james.mailbox.model.MailboxConstants;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.MessageRange.Type;
+import org.apache.james.mailbox.model.MessageResult;
+import org.apache.james.mailbox.model.MessageResultIterator;
+import org.apache.james.mailbox.model.SearchQuery;
+import org.apache.james.mailbox.model.SearchQuery.NumericRange;
abstract public class AbstractMailboxProcessor<M extends ImapRequest> extends AbstractChainedProcessor<M> {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java Sun Feb 12 09:51:19 2012
@@ -42,17 +42,17 @@ import org.apache.james.imap.message.req
import org.apache.james.imap.message.response.ExistsResponse;
import org.apache.james.imap.message.response.RecentResponse;
import org.apache.james.imap.processor.base.SelectedMailboxImpl;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxNotFoundException;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageManager.MetaData;
import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.MessageRangeException;
-import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MailboxNotFoundException;
+import org.apache.james.mailbox.exception.MessageRangeException;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.SearchQuery;
abstract class AbstractSelectionProcessor<M extends AbstractMailboxSelectionRequest> extends AbstractMailboxProcessor<M> implements PermitEnableCapabilityProcessor {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java Sun Feb 12 09:51:19 2012
@@ -30,19 +30,19 @@ import org.apache.james.imap.api.ImapSes
import org.apache.james.imap.api.display.HumanReadableText;
import org.apache.james.imap.api.message.IdRange;
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.api.message.response.StatusResponseFactory;
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.api.process.SelectedMailbox;
import org.apache.james.imap.message.request.AppendRequest;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxNotFoundException;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MailboxNotFoundException;
+import org.apache.james.mailbox.model.MailboxPath;
import org.slf4j.Logger;
public class AppendProcessor extends AbstractMailboxProcessor<AppendRequest> {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java Sun Feb 12 09:51:19 2012
@@ -26,12 +26,12 @@ import org.apache.james.imap.api.message
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.message.request.CloseRequest;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.MessageRange;
import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MessageRange;
public class CloseProcessor extends AbstractMailboxProcessor<CloseRequest> {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/CopyProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/CopyProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/CopyProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/CopyProcessor.java Sun Feb 12 09:51:19 2012
@@ -32,14 +32,14 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.api.process.SelectedMailbox;
import org.apache.james.imap.message.request.CopyRequest;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.MessageRangeException;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MessageRangeException;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.MessageRange;
public class CopyProcessor extends AbstractMailboxProcessor<CopyRequest> {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java Sun Feb 12 09:51:19 2012
@@ -26,10 +26,10 @@ import org.apache.james.imap.api.message
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.message.request.CreateRequest;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MailboxExistsException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MailboxExistsException;
+import org.apache.james.mailbox.model.MailboxPath;
public class CreateProcessor extends AbstractMailboxProcessor<CreateRequest> {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java Sun Feb 12 09:51:19 2012
@@ -27,10 +27,10 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.api.process.SelectedMailbox;
import org.apache.james.imap.message.request.DeleteRequest;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxNotFoundException;
-import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MailboxNotFoundException;
+import org.apache.james.mailbox.model.MailboxPath;
public class DeleteProcessor extends AbstractMailboxProcessor<DeleteRequest> {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java Sun Feb 12 09:51:19 2012
@@ -29,20 +29,20 @@ import org.apache.james.imap.api.ImapCon
import org.apache.james.imap.api.ImapSessionUtils;
import org.apache.james.imap.api.display.HumanReadableText;
import org.apache.james.imap.api.message.IdRange;
-import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.api.message.response.StatusResponse.ResponseCode;
+import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.api.process.SelectedMailbox;
import org.apache.james.imap.message.request.ExpungeRequest;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageManager.MetaData;
import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.MessageRangeException;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MessageRangeException;
+import org.apache.james.mailbox.model.MessageRange;
public class ExpungeProcessor extends AbstractMailboxProcessor<ExpungeRequest> implements CapabilityImplementingProcessor {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java Sun Feb 12 09:51:19 2012
@@ -31,15 +31,15 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.message.request.GetACLRequest;
import org.apache.james.imap.message.response.ACLResponse;
-import org.apache.james.mailbox.InsufficientRightsException;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxNotFoundException;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageManager.MetaData;
import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup;
-import org.apache.james.mailbox.SimpleMailboxACL.Rfc4314Rights;
+import org.apache.james.mailbox.exception.InsufficientRightsException;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MailboxNotFoundException;
+import org.apache.james.mailbox.model.SimpleMailboxACL.Rfc4314Rights;
/**
* GETACL Processor.
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java Sun Feb 12 09:51:19 2012
@@ -42,10 +42,10 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.api.process.SelectedMailbox;
import org.apache.james.imap.message.request.IdleRequest;
import org.apache.james.imap.message.response.ContinuationResponse;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxListener;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.MailboxException;
public class IdleProcessor extends AbstractMailboxProcessor<IdleRequest> implements CapabilityImplementingProcessor {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java Sun Feb 12 09:51:19 2012
@@ -31,14 +31,14 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.message.request.LsubRequest;
import org.apache.james.imap.message.response.LSubResponse;
-import org.apache.james.mailbox.MailboxConstants;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxPath;
-import org.apache.james.mailbox.MailboxQuery;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.SubscriptionException;
import org.apache.james.mailbox.SubscriptionManager;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.SubscriptionException;
+import org.apache.james.mailbox.model.MailboxConstants;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.MailboxQuery;
public class LSubProcessor extends AbstractSubscriptionProcessor<LsubRequest> {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java Sun Feb 12 09:51:19 2012
@@ -35,14 +35,14 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.api.process.MailboxTyper;
import org.apache.james.imap.message.request.ListRequest;
import org.apache.james.imap.message.response.ListResponse;
-import org.apache.james.mailbox.MailboxConstants;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxMetaData;
-import org.apache.james.mailbox.MailboxPath;
-import org.apache.james.mailbox.MailboxQuery;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.MailboxMetaData.Children;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxConstants;
+import org.apache.james.mailbox.model.MailboxMetaData;
+import org.apache.james.mailbox.model.MailboxMetaData.Children;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.MailboxQuery;
public class ListProcessor extends AbstractMailboxProcessor<ListRequest> {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java Sun Feb 12 09:51:19 2012
@@ -26,9 +26,9 @@ import org.apache.james.imap.api.message
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.message.request.LogoutRequest;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.MailboxException;
public class LogoutProcessor extends AbstractMailboxProcessor<LogoutRequest> {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java Sun Feb 12 09:51:19 2012
@@ -27,12 +27,12 @@ import org.apache.james.imap.api.message
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.message.request.RenameRequest;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MailboxExistsException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxNotFoundException;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MailboxExistsException;
+import org.apache.james.mailbox.exception.MailboxNotFoundException;
+import org.apache.james.mailbox.model.MailboxPath;
public class RenameProcessor extends AbstractMailboxProcessor<RenameRequest> {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java Sun Feb 12 09:51:19 2012
@@ -49,18 +49,18 @@ import org.apache.james.imap.message.req
import org.apache.james.imap.message.response.ESearchResponse;
import org.apache.james.imap.message.response.SearchResponse;
import org.apache.james.imap.processor.base.FetchGroupImpl;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageManager.MetaData;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.MessageRangeException;
-import org.apache.james.mailbox.MessageResultIterator;
-import org.apache.james.mailbox.SearchQuery;
-import org.apache.james.mailbox.SearchQuery.AddressType;
-import org.apache.james.mailbox.SearchQuery.Criterion;
-import org.apache.james.mailbox.SearchQuery.DateResolution;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MessageRangeException;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.MessageResultIterator;
+import org.apache.james.mailbox.model.SearchQuery;
+import org.apache.james.mailbox.model.SearchQuery.AddressType;
+import org.apache.james.mailbox.model.SearchQuery.Criterion;
+import org.apache.james.mailbox.model.SearchQuery.DateResolution;
public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> implements CapabilityImplementingProcessor {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java Sun Feb 12 09:51:19 2012
@@ -28,11 +28,11 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.message.request.StatusRequest;
import org.apache.james.imap.message.response.MailboxStatusResponse;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxPath;
import org.slf4j.Logger;
public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java Sun Feb 12 09:51:19 2012
@@ -34,25 +34,25 @@ import org.apache.james.imap.api.ImapSes
import org.apache.james.imap.api.display.HumanReadableText;
import org.apache.james.imap.api.message.IdRange;
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.api.message.response.StatusResponseFactory;
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.api.process.SelectedMailbox;
import org.apache.james.imap.message.request.StoreRequest;
import org.apache.james.imap.message.response.FetchResponse;
import org.apache.james.imap.processor.base.FetchGroupImpl;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageManager.MetaData;
import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.MessageRange.Type;
-import org.apache.james.mailbox.MessageRangeException;
-import org.apache.james.mailbox.MessageResult;
-import org.apache.james.mailbox.MessageResultIterator;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MessageRangeException;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.MessageRange.Type;
+import org.apache.james.mailbox.model.MessageResult;
+import org.apache.james.mailbox.model.MessageResultIterator;
public class StoreProcessor extends AbstractMailboxProcessor<StoreRequest> {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java Sun Feb 12 09:51:19 2012
@@ -28,8 +28,8 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.message.request.SubscribeRequest;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.SubscriptionException;
import org.apache.james.mailbox.SubscriptionManager;
+import org.apache.james.mailbox.exception.SubscriptionException;
public class SubscribeProcessor extends AbstractSubscriptionProcessor<SubscribeRequest> {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java Sun Feb 12 09:51:19 2012
@@ -24,9 +24,9 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.message.request.SystemMessage;
import org.apache.james.imap.processor.base.AbstractChainedProcessor;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.MailboxException;
import org.slf4j.Logger;
/**
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java Sun Feb 12 09:51:19 2012
@@ -28,8 +28,8 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.message.request.UnsubscribeRequest;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.SubscriptionException;
import org.apache.james.mailbox.SubscriptionManager;
+import org.apache.james.mailbox.exception.SubscriptionException;
public class UnsubscribeProcessor extends AbstractSubscriptionProcessor<UnsubscribeRequest> {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/FetchGroupImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/FetchGroupImpl.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/FetchGroupImpl.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/FetchGroupImpl.java Sun Feb 12 09:51:19 2012
@@ -23,8 +23,8 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.apache.james.mailbox.MessageResult;
-import org.apache.james.mailbox.MessageResult.MimePath;
+import org.apache.james.mailbox.model.MessageResult;
+import org.apache.james.mailbox.model.MessageResult.MimePath;
/**
* Specifies a fetch group.
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/PartContentDescriptorImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/PartContentDescriptorImpl.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/PartContentDescriptorImpl.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/PartContentDescriptorImpl.java Sun Feb 12 09:51:19 2012
@@ -19,8 +19,8 @@
package org.apache.james.imap.processor.base;
-import org.apache.james.mailbox.MessageResult.MimePath;
-import org.apache.james.mailbox.MessageResult.FetchGroup.PartContentDescriptor;
+import org.apache.james.mailbox.model.MessageResult.FetchGroup.PartContentDescriptor;
+import org.apache.james.mailbox.model.MessageResult.MimePath;
public class PartContentDescriptorImpl implements PartContentDescriptor {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java Sun Feb 12 09:51:19 2012
@@ -35,15 +35,15 @@ import javax.mail.Flags.Flag;
import org.apache.james.imap.api.ImapSessionUtils;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.api.process.SelectedMailbox;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxListener;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.MessageResult;
-import org.apache.james.mailbox.MessageResultIterator;
-import org.apache.james.mailbox.UpdatedFlags;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.MessageResult;
+import org.apache.james.mailbox.model.MessageResultIterator;
+import org.apache.james.mailbox.model.UpdatedFlags;
/**
* Default implementation of {@link SelectedMailbox}
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java Sun Feb 12 09:51:19 2012
@@ -25,10 +25,9 @@ package org.apache.james.imap.processor.
import java.io.IOException;
import java.io.InputStream;
-
import org.apache.james.imap.message.response.FetchResponse.BodyElement;
-import org.apache.james.mailbox.Content;
-import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.Content;
class ContentBodyElement implements BodyElement {
private final String name;
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/EmptyContent.java Sun Feb 12 09:51:19 2012
@@ -22,7 +22,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.james.mailbox.Content;
+import org.apache.james.mailbox.model.Content;
/**
* Just an Empty {@link Content}
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java Sun Feb 12 09:51:19 2012
@@ -22,6 +22,7 @@
*/
package org.apache.james.imap.processor.fetch;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
@@ -29,9 +30,9 @@ import javax.mail.internet.MimeUtility;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.message.response.FetchResponse;
-import org.apache.james.mailbox.Headers;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.Headers;
+import org.apache.james.mailbox.model.MessageResult;
import org.apache.james.mime4j.codec.EncoderUtil;
import org.apache.james.mime4j.dom.address.Address;
import org.apache.james.mime4j.dom.address.AddressList;
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java Sun Feb 12 09:51:19 2012
@@ -39,17 +39,17 @@ import org.apache.james.imap.message.res
import org.apache.james.imap.processor.AbstractMailboxProcessor;
import org.apache.james.imap.processor.EnableProcessor;
import org.apache.james.imap.processor.base.FetchGroupImpl;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.MessageResultIterator;
import org.apache.james.mailbox.MessageManager.MetaData;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.MessageRangeException;
-import org.apache.james.mailbox.MessageResult;
-import org.apache.james.mailbox.MessageResult.FetchGroup;
-import org.apache.james.mailbox.MessageResult.MimePath;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MessageRangeException;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.MessageResult;
+import org.apache.james.mailbox.model.MessageResult.FetchGroup;
+import org.apache.james.mailbox.model.MessageResult.MimePath;
+import org.apache.james.mailbox.model.MessageResultIterator;
public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java Sun Feb 12 09:51:19 2012
@@ -37,13 +37,13 @@ import org.apache.james.imap.api.message
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.api.process.SelectedMailbox;
import org.apache.james.imap.message.response.FetchResponse;
-import org.apache.james.mailbox.Content;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.MessageRangeException;
-import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MessageRangeException;
+import org.apache.james.mailbox.model.Content;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.MessageResult;
public final class FetchResponseBuilder {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java Sun Feb 12 09:51:19 2012
@@ -26,8 +26,8 @@ import java.util.List;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.message.response.FetchResponse.BodyElement;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MessageResult;
/**
* {@link BodyElement} which represent a HEADER element specified by for example (BODY[1.HEADER])
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/HeadersBodyElement.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/HeadersBodyElement.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/HeadersBodyElement.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/HeadersBodyElement.java Sun Feb 12 09:51:19 2012
@@ -21,7 +21,7 @@ package org.apache.james.imap.processor.
import java.io.IOException;
-import org.apache.james.mailbox.Content;
+import org.apache.james.mailbox.model.Content;
public class HeadersBodyElement extends ContentBodyElement{
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java Sun Feb 12 09:51:19 2012
@@ -24,8 +24,10 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MessageResult;
+import javax.mail.MessagingException;
+
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MessageResult;
public class MessageResultUtils {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java Sun Feb 12 09:51:19 2012
@@ -28,8 +28,8 @@ import java.util.List;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.message.response.FetchResponse.BodyElement;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MessageResult;
/**
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java Sun Feb 12 09:51:19 2012
@@ -30,8 +30,8 @@ import java.util.Map;
import org.apache.james.imap.message.response.FetchResponse;
import org.apache.james.imap.message.response.FetchResponse.Envelope;
import org.apache.james.imap.message.response.FetchResponse.Structure;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MimeDescriptor;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MimeDescriptor;
final class MimeDescriptorStructure implements FetchResponse.Structure {
Modified: james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java (original)
+++ james/protocols/trunk/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java Sun Feb 12 09:51:19 2012
@@ -24,7 +24,7 @@ package org.apache.james.imap.processor.
import java.util.Arrays;
-import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.model.MessageResult;
final class MimePathImpl implements MessageResult.MimePath {
private final int[] positions;
Modified: james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java (original)
+++ james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java Sun Feb 12 09:51:19 2012
@@ -30,18 +30,18 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.message.request.GetACLRequest;
import org.apache.james.imap.message.response.ACLResponse;
import org.apache.james.imap.message.response.UnpooledStatusResponseFactory;
-import org.apache.james.mailbox.MailboxACL;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxNotFoundException;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MailboxSession.User;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageManager.MetaData;
import org.apache.james.mailbox.MessageManager.MetaData.FetchGroup;
-import org.apache.james.mailbox.SimpleMailboxACL;
-import org.apache.james.mailbox.SimpleMailboxACL.Rfc4314Rights;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MailboxNotFoundException;
+import org.apache.james.mailbox.model.MailboxACL;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.SimpleMailboxACL;
+import org.apache.james.mailbox.model.SimpleMailboxACL.Rfc4314Rights;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
Modified: james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java (original)
+++ james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java Sun Feb 12 09:51:19 2012
@@ -34,9 +34,9 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.message.request.LsubRequest;
import org.apache.james.imap.message.response.LSubResponse;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxMetaData;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.SubscriptionManager;
+import org.apache.james.mailbox.model.MailboxMetaData;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
Modified: james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java (original)
+++ james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java Sun Feb 12 09:51:19 2012
@@ -25,10 +25,10 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.api.process.MailboxType;
import org.apache.james.imap.message.response.ListResponse;
-import org.apache.james.mailbox.MailboxConstants;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxMetaData;
-import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.model.MailboxConstants;
+import org.apache.james.mailbox.model.MailboxMetaData;
+import org.apache.james.mailbox.model.MailboxPath;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
Modified: james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java (original)
+++ james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java Sun Feb 12 09:51:19 2012
@@ -35,9 +35,9 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.message.request.NamespaceRequest;
import org.apache.james.imap.message.response.NamespaceResponse;
-import org.apache.james.mailbox.MailboxConstants;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.model.MailboxConstants;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
Modified: james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java (original)
+++ james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java Sun Feb 12 09:51:19 2012
@@ -47,13 +47,13 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.message.request.SearchRequest;
import org.apache.james.imap.message.response.SearchResponse;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.SearchQuery;
-import org.apache.james.mailbox.SearchQuery.AddressType;
-import org.apache.james.mailbox.SearchQuery.Criterion;
-import org.apache.james.mailbox.SearchQuery.DateResolution;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.SearchQuery;
+import org.apache.james.mailbox.model.SearchQuery.AddressType;
+import org.apache.james.mailbox.model.SearchQuery.Criterion;
+import org.apache.james.mailbox.model.SearchQuery.DateResolution;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
Modified: james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerAdded.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerAdded.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerAdded.java (original)
+++ james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerAdded.java Sun Feb 12 09:51:19 2012
@@ -25,9 +25,9 @@ import java.util.List;
import javax.mail.Flags;
import org.apache.james.mailbox.MailboxListener;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.MessageMetaData;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.MessageMetaData;
public class FakeMailboxListenerAdded extends MailboxListener.Added {
Modified: james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java (original)
+++ james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java Sun Feb 12 09:51:19 2012
@@ -21,10 +21,10 @@ package org.apache.james.imap.processor.
import java.util.List;
-import org.apache.james.mailbox.MailboxPath;
-import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.UpdatedFlags;
import org.apache.james.mailbox.MailboxListener.FlagsUpdated;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.UpdatedFlags;
public class FakeMailboxListenerFlagsUpdate extends FlagsUpdated {
Modified: james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java (original)
+++ james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java Sun Feb 12 09:51:19 2012
@@ -40,25 +40,25 @@ import org.apache.james.imap.api.ImapSes
import org.apache.james.imap.api.process.ImapLineHandler;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.api.process.SelectedMailbox;
-import org.apache.james.mailbox.BadCredentialsException;
-import org.apache.james.mailbox.Content;
-import org.apache.james.mailbox.Headers;
-import org.apache.james.mailbox.MailboxACL.MailboxACLRight;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxListener;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxMetaData;
-import org.apache.james.mailbox.MailboxPath;
-import org.apache.james.mailbox.MailboxQuery;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.MessageResult;
-import org.apache.james.mailbox.MessageResult.FetchGroup;
-import org.apache.james.mailbox.MessageResultIterator;
-import org.apache.james.mailbox.MimeDescriptor;
-import org.apache.james.mailbox.SearchQuery;
-import org.apache.james.mailbox.UpdatedFlags;
+import org.apache.james.mailbox.exception.BadCredentialsException;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.Content;
+import org.apache.james.mailbox.model.Headers;
+import org.apache.james.mailbox.model.MailboxACL.MailboxACLRight;
+import org.apache.james.mailbox.model.MailboxMetaData;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.MailboxQuery;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.MessageResult;
+import org.apache.james.mailbox.model.MessageResult.FetchGroup;
+import org.apache.james.mailbox.model.MessageResultIterator;
+import org.apache.james.mailbox.model.MimeDescriptor;
+import org.apache.james.mailbox.model.SearchQuery;
+import org.apache.james.mailbox.model.UpdatedFlags;
import org.junit.Test;
import org.slf4j.Logger;
Modified: james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java?rev=1243219&r1=1243218&r2=1243219&view=diff
==============================================================================
--- james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java (original)
+++ james/protocols/trunk/imap/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java Sun Feb 12 09:51:19 2012
@@ -19,15 +19,15 @@
package org.apache.james.imap.processor.fetch;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import org.apache.james.imap.processor.fetch.MessageResultUtils;
-import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.model.MessageResult;
import org.junit.Before;
import org.junit.Test;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org