You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rd...@apache.org on 2008/12/31 14:42:27 UTC
svn commit: r730395 [2/4] - in /james/protocols/imap/trunk:
deployment/src/test/java/org/apache/james/imap/functional/
deployment/src/test/java/org/apache/james/imap/functional/jpa/
deployment/src/test/java/org/apache/james/mailboxmanager/torque/ jpa/s...
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Mailbox.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/mailbox/Mailbox.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Mailbox.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Mailbox.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/mailbox/Mailbox.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/mailbox/Mailbox.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Mailbox.java Wed Dec 31 05:42:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.mailbox;
+package org.apache.james.imap.mailbox;
import java.util.Date;
import java.util.Iterator;
@@ -25,14 +25,8 @@
import javax.mail.Flags;
import javax.mail.internet.MimeMessage;
-import org.apache.james.mailboxmanager.MessageRange;
-import org.apache.james.mailboxmanager.MailboxListener;
-import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.mailboxmanager.MailboxSession;
-import org.apache.james.mailboxmanager.MessageResult;
-import org.apache.james.mailboxmanager.SearchQuery;
-import org.apache.james.mailboxmanager.UnsupportedCriteriaException;
-import org.apache.james.mailboxmanager.MessageResult.FetchGroup;
+import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
+
public interface Mailbox {
@@ -42,12 +36,12 @@
* Example #mail.paul.lists.apache.james-dev (3rd level folder of user paul)
*
* @return Full folder name with namespace
- * @throws MailboxManagerException
+ * @throws MailboxException
*/
- String getName() throws MailboxManagerException;
+ String getName() throws MailboxException;
int getMessageCount(MailboxSession mailboxSession)
- throws MailboxManagerException;
+ throws MailboxException;
boolean isWriteable();
@@ -61,28 +55,28 @@
* <li> IMAP: msn or (msn and uid)</li>
* <li> Javamail Folder: Message[]</li>
* </ul>
- * @throws MailboxManagerException
+ * @throws MailboxException
* if anything went wrong
* @throws UnsupportedCriteriaException
* when any of the search parameters are not supported by this
* mailbox
*/
Iterator search(SearchQuery searchQuery, FetchGroup fetchGroup,
- MailboxSession mailboxSession) throws MailboxManagerException;
+ MailboxSession mailboxSession) throws MailboxException;
long getUidValidity(MailboxSession mailboxSession)
- throws MailboxManagerException;
+ throws MailboxException;
/**
*
* @param mailboxSession
* TODO
* @return the uid that will be assigned to the next appended message
- * @throws MailboxManagerException
+ * @throws MailboxException
*/
long getUidNext(MailboxSession mailboxSession)
- throws MailboxManagerException;
+ throws MailboxException;
/**
* @return Flags that can be stored
@@ -90,13 +84,13 @@
Flags getPermanentFlags();
long[] recent(boolean reset, MailboxSession mailboxSession)
- throws MailboxManagerException;
+ throws MailboxException;
int getUnseenCount(MailboxSession mailboxSession)
- throws MailboxManagerException;
+ throws MailboxException;
MessageResult getFirstUnseen(FetchGroup fetchGroup,
- MailboxSession mailboxSession) throws MailboxManagerException;
+ MailboxSession mailboxSession) throws MailboxException;
/**
*
@@ -116,11 +110,11 @@
* <li> IMAP, UIDPLUS: nothing required </li>
* <li> Javamail Folder: requires the expunged Message[]</li>
* </ul>
- * @throws MailboxManagerException
+ * @throws MailboxException
* if anything went wrong
*/
Iterator expunge(MessageRange set, FetchGroup fetchGroup,
- MailboxSession mailboxSession) throws MailboxManagerException;
+ MailboxSession mailboxSession) throws MailboxException;
/**
* this is much more straight forward for IMAP instead of setting Flags of
@@ -141,11 +135,11 @@
* TODO
* @return {@link MessageResult} <code>Iterator</code> containing messages
* whose flags have been updated, not null
- * @throws MailboxManagerException
+ * @throws MailboxException
*/
Iterator setFlags(Flags flags, boolean value, boolean replace,
MessageRange set, FetchGroup fetchGroup,
- MailboxSession mailboxSession) throws MailboxManagerException;
+ MailboxSession mailboxSession) throws MailboxException;
/**
* @param internalDate
@@ -168,12 +162,12 @@
* <li> UIDPlusFolder: requires to return appended Message or uid</li>
* <li> UIDPLUS: requires to return appended uid</li>
* </ul>
- * @throws MailboxManagerException
+ * @throws MailboxException
* if anything went wrong
*/
MessageResult appendMessage(MimeMessage message, Date internalDate,
FetchGroup fetchGroup, MailboxSession mailboxSession)
- throws MailboxManagerException;
+ throws MailboxException;
/**
* TODO: consolidate search and getMessages into a single method
@@ -187,11 +181,11 @@
* parts...</li>
* <li> Javamail Folder: Message[]</li>
* </ul>
- * @throws MailboxManagerException
+ * @throws MailboxException
*/
Iterator getMessages(MessageRange set, FetchGroup fetchGroup,
- MailboxSession mailboxSession) throws MailboxManagerException;
+ MailboxSession mailboxSession) throws MailboxException;
/**
* Implementations of Mailbox may interpret the fact that someone is
@@ -199,9 +193,9 @@
* everyone has removed itself.
*
* @param listener
- * @throws MailboxManagerException
+ * @throws MailboxException
*/
- void addListener(MailboxListener listener) throws MailboxManagerException;
+ void addListener(MailboxListener listener) throws MailboxException;
void removeListener(MailboxListener listener);
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Mailbox.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Mailbox.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxException.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxManagerException.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxException.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxException.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxManagerException.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxManagerException.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxException.java Wed Dec 31 05:42:24 2008
@@ -17,11 +17,11 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager;
+package org.apache.james.imap.mailbox;
import javax.mail.MessagingException;
-public class MailboxManagerException extends MessagingException {
+public class MailboxException extends MessagingException {
private static final long serialVersionUID = -7034955921835169361L;
@@ -29,12 +29,12 @@
private String message;
- public MailboxManagerException(Exception e) {
+ public MailboxException(Exception e) {
cause = e;
message = "MailboxException caused by " + cause;
}
- public MailboxManagerException(String string) {
+ public MailboxException(String string) {
message = string;
}
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExistsException.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxExistsException.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExistsException.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExistsException.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxExistsException.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxExistsException.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExistsException.java Wed Dec 31 05:42:24 2008
@@ -17,12 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager;
+package org.apache.james.imap.mailbox;
/**
* Indicates that the operation failed since the mailbox already exists.
*/
-public class MailboxExistsException extends MailboxManagerException {
+public class MailboxExistsException extends MailboxException {
private static final long serialVersionUID = -486951759505030166L;
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExistsException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExpression.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/manager/MailboxExpression.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExpression.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExpression.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/manager/MailboxExpression.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/manager/MailboxExpression.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExpression.java Wed Dec 31 05:42:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.manager;
+package org.apache.james.imap.mailbox;
/**
* Expresses select criteria for mailboxes.
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExpression.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxListener.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxListener.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxListener.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxListener.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxListener.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxListener.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxListener.java Wed Dec 31 05:42:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager;
+package org.apache.james.imap.mailbox;
import java.util.Iterator;
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxListener.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManager.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManager.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManager.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java Wed Dec 31 05:42:24 2008
@@ -17,17 +17,10 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.manager;
+package org.apache.james.imap.mailbox;
import java.util.Collection;
-import org.apache.james.mailboxmanager.MessageRange;
-import org.apache.james.mailboxmanager.ListResult;
-import org.apache.james.mailboxmanager.MailboxExistsException;
-import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.mailboxmanager.MailboxNotFoundException;
-import org.apache.james.mailboxmanager.MailboxSession;
-import org.apache.james.mailboxmanager.mailbox.Mailbox;
/**
* <p>
@@ -87,13 +80,13 @@
* @param autocreate
* create this mailbox if it doesn't exist
* @return <code>ImapMailboxSession</code>, not null
- * @throws MailboxManagerException
+ * @throws MailboxException
* when the mailbox cannot be opened
* @throws MailboxNotFoundException
* when the given mailbox does not exist
*/
Mailbox getMailbox(String mailboxName, boolean autocreate)
- throws MailboxManagerException;
+ throws MailboxException;
/**
* Creates a new mailbox. Any intermediary mailboxes missing from the
@@ -101,12 +94,12 @@
*
* @param mailboxName
* name, not null
- * @throws MailboxManagerException
+ * @throws MailboxException
*/
- void createMailbox(String mailboxName) throws MailboxManagerException;
+ void createMailbox(String mailboxName) throws MailboxException;
void deleteMailbox(String mailboxName, MailboxSession session)
- throws MailboxManagerException;
+ throws MailboxException;
/**
* Renames a mailbox.
@@ -115,13 +108,13 @@
* original name for the mailbox
* @param to
* new name for the mailbox
- * @throws MailboxManagerException
+ * @throws MailboxException
* @throws MailboxExistsException
* when the <code>to</code> mailbox exists
* @throws MailboxNotFound
* when the <code>from</code> mailbox does not exist
*/
- void renameMailbox(String from, String to) throws MailboxManagerException;
+ void renameMailbox(String from, String to) throws MailboxException;
/**
* this is done by the MailboxRepository because maybe this operation could
@@ -137,7 +130,7 @@
* <code>MailboxSession</code>, not null
*/
void copyMessages(MessageRange set, String from, String to,
- MailboxSession session) throws MailboxManagerException;
+ MailboxSession session) throws MailboxException;
/**
* TODO: Expression requires parsing. Probably easier for the caller to
@@ -146,12 +139,12 @@
* @param expression
* <code>MailboxExpression</code> used to select mailboxes to
* be returned
- * @throws MailboxManagerException
+ * @throws MailboxException
*/
ListResult[] list(MailboxExpression expression)
- throws MailboxManagerException;
+ throws MailboxException;
- boolean existsMailbox(String mailboxName) throws MailboxManagerException;
+ boolean existsMailbox(String mailboxName) throws MailboxException;
/**
* Creates a new session.
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManagerProvider.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManagerProvider.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManagerProvider.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManagerProvider.java Wed Dec 31 05:42:24 2008
@@ -17,9 +17,8 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.manager;
+package org.apache.james.imap.mailbox;
-import org.apache.james.mailboxmanager.MailboxManagerException;
// TODO: remove this pointless interface
public interface MailboxManagerProvider {
@@ -29,6 +28,6 @@
*/
public static final String ROLE = "org.apache.james.mailboxmanager.manager.MailboxManagerProvider";
- public MailboxManager getMailboxManager() throws MailboxManagerException;
+ public MailboxManager getMailboxManager() throws MailboxException;
}
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManagerProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManagerProvider.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxNotFoundException.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxNotFoundException.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxNotFoundException.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxNotFoundException.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxNotFoundException.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxNotFoundException.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxNotFoundException.java Wed Dec 31 05:42:24 2008
@@ -17,13 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager;
+package org.apache.james.imap.mailbox;
/**
* Indicates that the failure is caused by a reference to a mailbox which does
* not exist.
*/
-public class MailboxNotFoundException extends MailboxManagerException {
+public class MailboxNotFoundException extends MailboxException {
private static final long serialVersionUID = -8493370806722264915L;
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxNotFoundException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxSession.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxSession.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxSession.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxSession.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxSession.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxSession.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxSession.java Wed Dec 31 05:42:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager;
+package org.apache.james.imap.mailbox;
/**
* Mailbox session.
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxSession.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageRange.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MessageRange.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageRange.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageRange.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MessageRange.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MessageRange.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageRange.java Wed Dec 31 05:42:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager;
+package org.apache.james.imap.mailbox;
/**
* Used to define a range of messages by uid or msn, or a individual message by
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageRange.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageRange.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MessageResult.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MessageResult.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MessageResult.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java Wed Dec 31 05:42:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager;
+package org.apache.james.imap.mailbox;
import java.io.IOException;
import java.nio.channels.WritableByteChannel;
@@ -30,7 +30,6 @@
import javax.mail.Flags;
import javax.mail.MessagingException;
-import org.apache.james.mailboxmanager.util.MessageResultUtils;
/**
* <p>
@@ -161,7 +160,7 @@
*/
FetchGroup getIncludedResults();
- MimeDescriptor getMimeDescriptor() throws MailboxManagerException;
+ MimeDescriptor getMimeDescriptor() throws MailboxException;
long getUid();
@@ -189,7 +188,7 @@
* for the Flags.
*
*/
- Flags getFlags() throws MailboxManagerException;
+ Flags getFlags() throws MailboxException;
int getSize();
@@ -199,7 +198,7 @@
* @return <code>Header</code> <code>Iterator</code>, or null if
* {@link FetchGroup#HEADERS} was not fetched
*/
- Iterator headers() throws MailboxManagerException;
+ Iterator headers() throws MailboxException;
/**
* Iterates the message headers for the given part in a multipart message.
@@ -209,9 +208,9 @@
* @return <code>Header</code> <code>Iterator</code>, or null when
* {@link FetchGroup#mimeHeaders()} does not include the index and
* when the mime part cannot be found
- * @throws MailboxManagerException
+ * @throws MailboxException
*/
- Iterator iterateHeaders(MimePath path) throws MailboxManagerException;
+ Iterator iterateHeaders(MimePath path) throws MailboxException;
/**
* Iterates the MIME headers for the given part in a multipart message.
@@ -221,9 +220,9 @@
* @return <code>Header</code> <code>Iterator</code>, or null when
* {@link FetchGroup#mimeHeaders()} does not include the index and
* when the mime part cannot be found
- * @throws MailboxManagerException
+ * @throws MailboxException
*/
- Iterator iterateMimeHeaders(MimePath path) throws MailboxManagerException;
+ Iterator iterateMimeHeaders(MimePath path) throws MailboxException;
/**
* A header.
@@ -236,7 +235,7 @@
* @return name of this header
* @throws MessagingException
*/
- public String getName() throws MailboxManagerException;
+ public String getName() throws MailboxException;
/**
* Gets the (unparsed) value of this header.
@@ -244,7 +243,7 @@
* @return value of this header
* @throws MessagingException
*/
- public String getValue() throws MailboxManagerException;
+ public String getValue() throws MailboxException;
}
/**
@@ -255,7 +254,7 @@
* {@link FetchGroup#FULL_CONTENT} has not been included in the
* results
*/
- Content getFullContent() throws MailboxManagerException;
+ Content getFullContent() throws MailboxException;
/**
* Gets the full content of the given mime part.
@@ -265,9 +264,9 @@
* @return <code>Content</code>, or null when
* {@link FetchGroup#mimeBodies()} did not been include the given
* index and when the mime part cannot be found
- * @throws MailboxManagerException
+ * @throws MailboxException
*/
- Content getFullContent(MimePath path) throws MailboxManagerException;
+ Content getFullContent(MimePath path) throws MailboxException;
/**
* Gets the body of the message excluding headers. The message data should
@@ -277,7 +276,7 @@
* {@link FetchGroup#FULL_CONTENT} has not been included in the
* results
*/
- Content getBody() throws MailboxManagerException;
+ Content getBody() throws MailboxException;
/**
* Gets the body of the given mime part.
@@ -287,9 +286,9 @@
* @return <code>Content</code>, or null when
* {@link FetchGroup#mimeBodies()} did not been include the given
* index and when the mime part cannot be found
- * @throws MailboxManagerException
+ * @throws MailboxException
*/
- Content getBody(MimePath path) throws MailboxManagerException;
+ Content getBody(MimePath path) throws MailboxException;
/**
* Gets the body of the given mime part.
@@ -299,9 +298,9 @@
* @return <code>Content</code>, or null when
* {@link FetchGroup#mimeBodies()} did not been include the given
* index and when the mime part cannot be found
- * @throws MailboxManagerException
+ * @throws MailboxException
*/
- Content getMimeBody(MimePath path) throws MailboxManagerException;
+ Content getMimeBody(MimePath path) throws MailboxException;
/**
* IMAP needs to know the size of the content before it starts to write it
@@ -322,7 +321,7 @@
*
* @param channel
* <code>Channel</code> open, not null
- * @throws MailboxManagerException
+ * @throws MailboxException
* @throws IOException
* when channel IO fails
*/
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SearchQuery.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/SearchQuery.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SearchQuery.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SearchQuery.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/SearchQuery.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/SearchQuery.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SearchQuery.java Wed Dec 31 05:42:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager;
+package org.apache.james.imap.mailbox;
import java.util.ArrayList;
import java.util.Arrays;
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SearchQuery.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SubscriptionException.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/manager/SubscriptionException.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SubscriptionException.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SubscriptionException.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/manager/SubscriptionException.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/manager/SubscriptionException.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SubscriptionException.java Wed Dec 31 05:42:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.manager;
+package org.apache.james.imap.mailbox;
import org.apache.james.api.imap.display.HumanReadableTextKey;
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SubscriptionException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedCriteriaException.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/UnsupportedCriteriaException.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedCriteriaException.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedCriteriaException.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/UnsupportedCriteriaException.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/UnsupportedCriteriaException.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedCriteriaException.java Wed Dec 31 05:42:24 2008
@@ -17,12 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager;
+package org.apache.james.imap.mailbox;
/**
* Indicates that a search criteria is not supported.
*/
-public class UnsupportedCriteriaException extends MailboxManagerException {
+public class UnsupportedCriteriaException extends MailboxException {
private static final long serialVersionUID = 3791907285083231285L;
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedCriteriaException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/package.html
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/FetchGroupImpl.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/FetchGroupImpl.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/FetchGroupImpl.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/FetchGroupImpl.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/FetchGroupImpl.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/FetchGroupImpl.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/FetchGroupImpl.java Wed Dec 31 05:42:24 2008
@@ -17,15 +17,15 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.impl;
+package org.apache.james.imap.mailbox.util;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.apache.james.mailboxmanager.MessageResult;
-import org.apache.james.mailboxmanager.MessageResult.FetchGroup;
-import org.apache.james.mailboxmanager.MessageResult.MimePath;
+import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
+import org.apache.james.imap.mailbox.MessageResult.MimePath;
/**
* Specifies a fetch group.
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/FetchGroupImpl.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/ListResultImpl.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/ListResultImpl.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/ListResultImpl.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/ListResultImpl.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/ListResultImpl.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/ListResultImpl.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/ListResultImpl.java Wed Dec 31 05:42:24 2008
@@ -17,9 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.impl;
+package org.apache.james.imap.mailbox.util;
-import org.apache.james.mailboxmanager.ListResult;
+import org.apache.james.imap.mailbox.ListResult;
public class ListResultImpl implements ListResult, Comparable {
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/ListResultImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/ListResultImpl.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventAnalyser.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/MailboxEventAnalyser.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventAnalyser.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventAnalyser.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/MailboxEventAnalyser.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/MailboxEventAnalyser.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventAnalyser.java Wed Dec 31 05:42:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.util;
+package org.apache.james.imap.mailbox.util;
import java.util.Iterator;
import java.util.Set;
@@ -25,7 +25,7 @@
import javax.mail.Flags;
-import org.apache.james.mailboxmanager.MailboxListener;
+import org.apache.james.imap.mailbox.MailboxListener;
public class MailboxEventAnalyser implements MailboxListener {
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventAnalyser.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcher.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MailboxEventDispatcher.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcher.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcher.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MailboxEventDispatcher.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MailboxEventDispatcher.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcher.java Wed Dec 31 05:42:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.impl;
+package org.apache.james.imap.mailbox.util;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -26,7 +26,7 @@
import javax.mail.Flags;
import javax.mail.Flags.Flag;
-import org.apache.james.mailboxmanager.MailboxListener;
+import org.apache.james.imap.mailbox.MailboxListener;
import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcher.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxListenerCollector.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MailboxListenerCollector.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxListenerCollector.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxListenerCollector.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MailboxListenerCollector.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MailboxListenerCollector.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxListenerCollector.java Wed Dec 31 05:42:24 2008
@@ -17,14 +17,14 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.impl;
+package org.apache.james.imap.mailbox.util;
import java.util.ArrayList;
import java.util.List;
import javax.mail.Flags;
-import org.apache.james.mailboxmanager.MailboxListener;
+import org.apache.james.imap.mailbox.MailboxListener;
public class MailboxListenerCollector implements MailboxListener {
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxListenerCollector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxListenerCollector.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageFlags.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MessageFlags.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageFlags.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageFlags.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MessageFlags.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MessageFlags.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageFlags.java Wed Dec 31 05:42:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.impl;
+package org.apache.james.imap.mailbox.util;
import java.util.Collection;
import java.util.Iterator;
@@ -25,7 +25,7 @@
import javax.mail.Flags;
import javax.mail.MessagingException;
-import org.apache.james.mailboxmanager.MessageResult;
+import org.apache.james.imap.mailbox.MessageResult;
/**
* Represents the flags for a message.
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageFlags.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageRangeImpl.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MessageRangeImpl.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageRangeImpl.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageRangeImpl.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MessageRangeImpl.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MessageRangeImpl.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageRangeImpl.java Wed Dec 31 05:42:24 2008
@@ -17,9 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.impl;
+package org.apache.james.imap.mailbox.util;
-import org.apache.james.mailboxmanager.MessageRange;
+import org.apache.james.imap.mailbox.MessageRange;
public class MessageRangeImpl implements MessageRange {
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageRangeImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageRangeImpl.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MessageResultImpl.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MessageResultImpl.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MessageResultImpl.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java Wed Dec 31 05:42:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.impl;
+package org.apache.james.imap.mailbox.util;
import java.util.ArrayList;
import java.util.Date;
@@ -29,9 +29,8 @@
import javax.mail.Flags;
import javax.mail.internet.MimeMessage;
-import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.mailboxmanager.MessageResult;
-import org.apache.james.mailboxmanager.util.MessageResultUtils;
+import org.apache.james.imap.mailbox.MailboxException;
+import org.apache.james.imap.mailbox.MessageResult;
/**
* Bean based implementation. {@link #getIncludedResults()} is updated when
@@ -74,7 +73,7 @@
}
public MessageResultImpl(MessageResult result)
- throws MailboxManagerException {
+ throws MailboxException {
setUid(result.getUid());
if (MessageResultUtils.isFlagsIncluded(result)) {
setFlags(result.getFlags());
@@ -228,7 +227,7 @@
return retValue;
}
- public Content getBody(MimePath path) throws MailboxManagerException {
+ public Content getBody(MimePath path) throws MailboxException {
final Content result;
final PartContent partContent = getPartContent(path);
if (partContent == null) {
@@ -239,7 +238,7 @@
return result;
}
- public Content getMimeBody(MimePath path) throws MailboxManagerException {
+ public Content getMimeBody(MimePath path) throws MailboxException {
final Content result;
final PartContent partContent = getPartContent(path);
if (partContent == null) {
@@ -250,7 +249,7 @@
return result;
}
- public Content getFullContent(MimePath path) throws MailboxManagerException {
+ public Content getFullContent(MimePath path) throws MailboxException {
final Content result;
final PartContent partContent = getPartContent(path);
if (partContent == null) {
@@ -262,7 +261,7 @@
}
public Iterator iterateHeaders(MimePath path)
- throws MailboxManagerException {
+ throws MailboxException {
final Iterator result;
final PartContent partContent = getPartContent(path);
if (partContent == null) {
@@ -274,7 +273,7 @@
}
public Iterator iterateMimeHeaders(MimePath path)
- throws MailboxManagerException {
+ throws MailboxException {
final Iterator result;
final PartContent partContent = getPartContent(path);
if (partContent == null) {
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultUtils.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/MessageResultUtils.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultUtils.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultUtils.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/MessageResultUtils.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/MessageResultUtils.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultUtils.java Wed Dec 31 05:42:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.util;
+package org.apache.james.imap.mailbox.util;
import java.util.ArrayList;
import java.util.Collection;
@@ -26,9 +26,9 @@
import javax.mail.MessagingException;
-import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.mailboxmanager.MessageResult;
-import org.apache.james.mailboxmanager.MessageResult.FetchGroup;
+import org.apache.james.imap.mailbox.MailboxException;
+import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
public class MessageResultUtils {
@@ -107,7 +107,7 @@
private static List matching(final Collection names,
final Iterator iterator, boolean not)
- throws MailboxManagerException {
+ throws MailboxException {
final List results = new ArrayList(names.size());
if (iterator != null) {
while (iterator.hasNext()) {
@@ -124,7 +124,7 @@
}
private static boolean contains(final Collection names,
- MessageResult.Header header) throws MailboxManagerException {
+ MessageResult.Header header) throws MailboxException {
boolean match = false;
final String headerName = header.getName();
if (headerName != null) {
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultUtils.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/PartContentDescriptorImpl.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/PartContentDescriptorImpl.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/PartContentDescriptorImpl.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/PartContentDescriptorImpl.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/PartContentDescriptorImpl.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/PartContentDescriptorImpl.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/PartContentDescriptorImpl.java Wed Dec 31 05:42:24 2008
@@ -17,10 +17,10 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.impl;
+package org.apache.james.imap.mailbox.util;
-import org.apache.james.mailboxmanager.MessageResult.MimePath;
-import org.apache.james.mailboxmanager.MessageResult.FetchGroup.PartContentDescriptor;
+import org.apache.james.imap.mailbox.MessageResult.MimePath;
+import org.apache.james.imap.mailbox.MessageResult.FetchGroup.PartContentDescriptor;
public class PartContentDescriptorImpl implements PartContentDescriptor {
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/PartContentDescriptorImpl.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidChangeTracker.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/UidChangeTracker.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidChangeTracker.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidChangeTracker.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/UidChangeTracker.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/UidChangeTracker.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidChangeTracker.java Wed Dec 31 05:42:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.impl;
+package org.apache.james.imap.mailbox.util;
import java.util.ArrayList;
import java.util.Collection;
@@ -31,12 +31,11 @@
import javax.mail.Flags;
import javax.mail.MessagingException;
-import org.apache.james.mailboxmanager.Constants;
-import org.apache.james.mailboxmanager.MailboxListener;
-import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.mailboxmanager.MessageResult;
-import org.apache.james.mailboxmanager.mailbox.Mailbox;
-import org.apache.james.mailboxmanager.util.UidRange;
+import org.apache.james.imap.mailbox.Constants;
+import org.apache.james.imap.mailbox.Mailbox;
+import org.apache.james.imap.mailbox.MailboxListener;
+import org.apache.james.imap.mailbox.MailboxException;
+import org.apache.james.imap.mailbox.MessageResult;
public class UidChangeTracker implements Constants {
@@ -96,11 +95,11 @@
* results
* @param sessionId
* id of the session upating the flags
- * @throws MailboxManagerException
+ * @throws MailboxException
* @see #flagsUpdated(MessageResult, long)
*/
public synchronized void flagsUpdated(Collection messageResults,
- long sessionId) throws MailboxManagerException {
+ long sessionId) throws MailboxException {
if (messageResults != null) {
for (final Iterator it = messageResults.iterator(); it.hasNext();) {
final MessageResult result = (MessageResult) it.next();
@@ -116,10 +115,10 @@
* result of update
* @param sessionId
* id of the session updating the flags
- * @throws MailboxManagerException
+ * @throws MailboxException
*/
public synchronized void flagsUpdated(MessageResult messageResult,
- long sessionId) throws MailboxManagerException {
+ long sessionId) throws MailboxException {
if (messageResult != null) {
final Flags flags = messageResult.getFlags();
final long uid = messageResult.getUid();
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidRange.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidRange.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidRange.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidRange.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidRange.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidRange.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidRange.java Wed Dec 31 05:42:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.util;
+package org.apache.james.imap.mailbox.util;
public class UidRange implements Comparable {
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidRange.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidRange.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidToMsnConverter.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidToMsnConverter.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidToMsnConverter.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidToMsnConverter.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidToMsnConverter.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidToMsnConverter.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidToMsnConverter.java Wed Dec 31 05:42:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.util;
+package org.apache.james.imap.mailbox.util;
import java.util.ArrayList;
import java.util.Collection;
@@ -28,7 +28,7 @@
import java.util.TreeMap;
import java.util.TreeSet;
-import org.apache.james.mailboxmanager.MailboxListener;
+import org.apache.james.imap.mailbox.MailboxListener;
public class UidToMsnConverter implements MailboxListener {
protected SortedMap msnToUid;
@@ -160,7 +160,7 @@
}
/**
- * @see org.apache.james.mailboxmanager.MailboxListener#event(org.apache.james.mailboxmanager.MailboxListener.Event)
+ * @see org.apache.james.imap.mailbox.MailboxListener#event(org.apache.james.imap.mailbox.MailboxListener.Event)
*/
public void event(Event event) {
if (event instanceof MessageEvent) {
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidToMsnConverter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultImplIncludedResultsTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultImplIncludedResultsTest.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultImplIncludedResultsTest.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultImplIncludedResultsTest.java Wed Dec 31 05:42:24 2008
@@ -24,9 +24,10 @@
import javax.mail.Flags;
-import org.apache.james.mailboxmanager.MessageResult.FetchGroup;
-import org.apache.james.mailboxmanager.impl.MessageResultImpl;
-import org.apache.james.mailboxmanager.util.MessageResultUtils;
+import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
+import org.apache.james.imap.mailbox.util.MessageResultImpl;
+import org.apache.james.imap.mailbox.util.MessageResultUtils;
import org.jmock.MockObjectTestCase;
public class MessageResultImplIncludedResultsTest extends MockObjectTestCase {
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultUtilsIsIncludedTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultUtilsIsIncludedTest.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultUtilsIsIncludedTest.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultUtilsIsIncludedTest.java Wed Dec 31 05:42:24 2008
@@ -19,9 +19,10 @@
package org.apache.james.mailboxmanager;
-import org.apache.james.mailboxmanager.MessageResult.FetchGroup;
-import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.util.MessageResultUtils;
+import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
+import org.apache.james.imap.mailbox.util.FetchGroupImpl;
+import org.apache.james.imap.mailbox.util.MessageResultUtils;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultUtilsTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultUtilsTest.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultUtilsTest.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultUtilsTest.java Wed Dec 31 05:42:24 2008
@@ -24,7 +24,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.james.mailboxmanager.util.MessageResultUtils;
+import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.imap.mailbox.util.MessageResultUtils;
import junit.framework.TestCase;
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MockMailboxListenerAdded.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MockMailboxListenerAdded.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MockMailboxListenerAdded.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MockMailboxListenerAdded.java Wed Dec 31 05:42:24 2008
@@ -19,6 +19,8 @@
package org.apache.james.mailboxmanager;
+import org.apache.james.imap.mailbox.MailboxListener;
+
public class MockMailboxListenerAdded extends MailboxListener.Added {
public long subjectUid;
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MockMailboxListenerFlagsUpdate.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MockMailboxListenerFlagsUpdate.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MockMailboxListenerFlagsUpdate.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MockMailboxListenerFlagsUpdate.java Wed Dec 31 05:42:24 2008
@@ -25,7 +25,7 @@
import javax.mail.Flags;
-import org.apache.james.mailboxmanager.MailboxListener.FlagsUpdated;
+import org.apache.james.imap.mailbox.MailboxListener.FlagsUpdated;
public class MockMailboxListenerFlagsUpdate extends FlagsUpdated {
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/EventCollector.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/EventCollector.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/EventCollector.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/EventCollector.java Wed Dec 31 05:42:24 2008
@@ -22,7 +22,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.james.mailboxmanager.MailboxListener;
+import org.apache.james.imap.mailbox.MailboxListener;
public class EventCollector implements MailboxListener {
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/MailboxEventDispatcherFlagsTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/MailboxEventDispatcherFlagsTest.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/MailboxEventDispatcherFlagsTest.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/MailboxEventDispatcherFlagsTest.java Wed Dec 31 05:42:24 2008
@@ -23,8 +23,9 @@
import javax.mail.Flags;
-import org.apache.james.mailboxmanager.MailboxListener;
-import org.apache.james.mailboxmanager.MessageResult;
+import org.apache.james.imap.mailbox.MailboxListener;
+import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.imap.mailbox.util.MailboxEventDispatcher;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/UidChangeTrackerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/UidChangeTrackerTest.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/UidChangeTrackerTest.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/UidChangeTrackerTest.java Wed Dec 31 05:42:24 2008
@@ -25,7 +25,11 @@
import junit.framework.TestCase;
-import org.apache.james.mailboxmanager.util.UidRange;
+import org.apache.james.imap.mailbox.util.MailboxListenerCollector;
+import org.apache.james.imap.mailbox.util.MessageFlags;
+import org.apache.james.imap.mailbox.util.MessageResultImpl;
+import org.apache.james.imap.mailbox.util.UidChangeTracker;
+import org.apache.james.imap.mailbox.util.UidRange;
public class UidChangeTrackerTest extends TestCase {
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/manager/MailboxExpressionTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/manager/MailboxExpressionTest.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/manager/MailboxExpressionTest.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/manager/MailboxExpressionTest.java Wed Dec 31 05:42:24 2008
@@ -19,7 +19,7 @@
package org.apache.james.mailboxmanager.manager;
-import org.apache.james.mailboxmanager.manager.MailboxExpression;
+import org.apache.james.imap.mailbox.MailboxExpression;
import junit.framework.TestCase;
Modified: james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/util/MailboxEventAnalyserTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/util/MailboxEventAnalyserTest.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/util/MailboxEventAnalyserTest.java (original)
+++ james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/util/MailboxEventAnalyserTest.java Wed Dec 31 05:42:24 2008
@@ -23,7 +23,8 @@
import javax.mail.Flags;
-import org.apache.james.mailboxmanager.MailboxListener;
+import org.apache.james.imap.mailbox.MailboxListener;
+import org.apache.james.imap.mailbox.util.MailboxEventAnalyser;
import org.apache.james.mailboxmanager.MockMailboxListenerAdded;
import org.apache.james.mailboxmanager.MockMailboxListenerFlagsUpdate;
import org.jmock.Mock;
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/AbstractImapRequestProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/AbstractImapRequestProcessor.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/AbstractImapRequestProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/AbstractImapRequestProcessor.java Wed Dec 31 05:42:24 2008
@@ -34,8 +34,8 @@
import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.mailboxmanager.MailboxExistsException;
-import org.apache.james.mailboxmanager.MailboxNotFoundException;
+import org.apache.james.imap.mailbox.MailboxExistsException;
+import org.apache.james.imap.mailbox.MailboxNotFoundException;
abstract public class AbstractImapRequestProcessor extends
AbstractChainedImapProcessor implements ImapConstants {
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/AbstractMailboxAwareProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/AbstractMailboxAwareProcessor.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/AbstractMailboxAwareProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/AbstractMailboxAwareProcessor.java Wed Dec 31 05:42:24 2008
@@ -21,10 +21,10 @@
import org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.mailboxmanager.MailboxSession;
-import org.apache.james.mailboxmanager.manager.MailboxManager;
-import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
+import org.apache.james.imap.mailbox.MailboxException;
+import org.apache.james.imap.mailbox.MailboxManager;
+import org.apache.james.imap.mailbox.MailboxManagerProvider;
+import org.apache.james.imap.mailbox.MailboxSession;
abstract public class AbstractMailboxAwareProcessor extends
AbstractImapRequestProcessor {
@@ -39,13 +39,13 @@
}
public String buildFullName(final ImapSession session, String mailboxName)
- throws MailboxManagerException {
+ throws MailboxException {
final String user = ImapSessionUtils.getUserName(session);
return buildFullName(mailboxName, user);
}
private String buildFullName(String mailboxName, String user)
- throws MailboxManagerException {
+ throws MailboxException {
if (!mailboxName.startsWith(NAMESPACE_PREFIX)) {
mailboxName = mailboxManagerProvider.getMailboxManager().resolve(
user, mailboxName);
@@ -54,7 +54,7 @@
}
public MailboxManager getMailboxManager(final ImapSession session)
- throws MailboxManagerException {
+ throws MailboxException {
// TODO: removed badly implemented and ineffective check that mailbox
// user matches current user
// TODO: add check into user login methods
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/ImapSessionUtils.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/ImapSessionUtils.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/ImapSessionUtils.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/ImapSessionUtils.java Wed Dec 31 05:42:24 2008
@@ -25,9 +25,9 @@
import org.apache.james.api.imap.message.response.ImapResponseMessage;
import org.apache.james.api.imap.process.ImapSession;
import org.apache.james.api.imap.process.ImapProcessor.Responder;
+import org.apache.james.imap.mailbox.Mailbox;
+import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.message.response.base.AbstractImapResponse;
-import org.apache.james.mailboxmanager.MailboxSession;
-import org.apache.james.mailboxmanager.mailbox.Mailbox;
public class ImapSessionUtils {
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxSessionImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxSessionImpl.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxSessionImpl.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxSessionImpl.java Wed Dec 31 05:42:24 2008
@@ -30,20 +30,20 @@
import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.api.imap.process.SelectedImapMailbox;
+import org.apache.james.imap.mailbox.Mailbox;
+import org.apache.james.imap.mailbox.MailboxException;
+import org.apache.james.imap.mailbox.MailboxSession;
+import org.apache.james.imap.mailbox.MessageRange;
+import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.imap.mailbox.util.FetchGroupImpl;
+import org.apache.james.imap.mailbox.util.MailboxEventAnalyser;
+import org.apache.james.imap.mailbox.util.MessageRangeImpl;
+import org.apache.james.imap.mailbox.util.UidToMsnConverter;
import org.apache.james.imap.message.response.imap4rev1.ExistsResponse;
import org.apache.james.imap.message.response.imap4rev1.ExpungeResponse;
import org.apache.james.imap.message.response.imap4rev1.FetchResponse;
import org.apache.james.imap.message.response.imap4rev1.RecentResponse;
import org.apache.james.imap.message.response.imap4rev1.status.UntaggedNoResponse;
-import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.mailboxmanager.MailboxSession;
-import org.apache.james.mailboxmanager.MessageRange;
-import org.apache.james.mailboxmanager.MessageResult;
-import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
-import org.apache.james.mailboxmanager.mailbox.Mailbox;
-import org.apache.james.mailboxmanager.util.MailboxEventAnalyser;
-import org.apache.james.mailboxmanager.util.UidToMsnConverter;
// TODO: deal with deleted or renamed mailboxes
public class SelectedMailboxSessionImpl extends AbstractLogEnabled implements
@@ -64,7 +64,7 @@
private final String name;
public SelectedMailboxSessionImpl(Mailbox mailbox, List uids,
- MailboxSession mailboxSession) throws MailboxManagerException {
+ MailboxSession mailboxSession) throws MailboxException {
this.mailbox = mailbox;
this.mailboxSession = mailboxSession;
recentUids = new TreeSet();
@@ -170,7 +170,7 @@
private void addFlagsResponses(final List responses, boolean useUid,
final Mailbox mailbox, MessageRange messageSet)
- throws MailboxManagerException {
+ throws MailboxException {
final Iterator it = mailbox.getMessages(messageSet,
FetchGroupImpl.FLAGS, mailboxSession);
while (it.hasNext()) {
@@ -217,7 +217,7 @@
// TODO: use factory
ExistsResponse response = new ExistsResponse(messageCount);
responses.add(response);
- } catch (MailboxManagerException e) {
+ } catch (MailboxException e) {
final String message = "Failed to retrieve exists count data";
handleResponseException(responses, e, message);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org