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 no...@apache.org on 2010/09/06 20:09:39 UTC
svn commit: r993114 [3/4] - in /james/imap/trunk:
api/src/main/java/org/apache/james/imap/api/process/
deployment/src/test/java/org/apache/james/imap/functional/
jcr/src/main/java/org/apache/james/imap/jcr/
jcr/src/main/java/org/apache/james/imap/jcr/m...
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/NoopProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/NoopProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/NoopProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/NoopProcessor.java Mon Sep 6 18:09:32 2010
@@ -25,8 +25,8 @@ 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.imap.mailbox.MailboxManager;
import org.apache.james.imap.message.request.NoopRequest;
+import org.apache.james.mailbox.MailboxManager;
public class NoopProcessor extends AbstractMailboxProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/RenameProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/RenameProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/RenameProcessor.java Mon Sep 6 18:09:32 2010
@@ -26,13 +26,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.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxExistsException;
-import org.apache.james.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.MailboxNotFoundException;
-import org.apache.james.imap.mailbox.MailboxPath;
import org.apache.james.imap.message.request.RenameRequest;
import org.apache.james.imap.processor.base.ImapSessionUtils;
+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;
public class RenameProcessor extends AbstractMailboxProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java Mon Sep 6 18:09:32 2010
@@ -39,14 +39,14 @@ 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.api.process.SelectedMailbox;
-import org.apache.james.imap.mailbox.MessageManager;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.SearchQuery;
-import org.apache.james.imap.mailbox.SearchQuery.Criterion;
import org.apache.james.imap.message.request.SearchRequest;
import org.apache.james.imap.message.response.SearchResponse;
import org.apache.james.imap.processor.base.ImapSessionUtils;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.MessageManager;
+import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.SearchQuery.Criterion;
public class SearchProcessor extends AbstractMailboxProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SelectProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SelectProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SelectProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SelectProcessor.java Mon Sep 6 18:09:32 2010
@@ -22,8 +22,8 @@ package org.apache.james.imap.processor;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.api.process.ImapProcessor;
-import org.apache.james.imap.mailbox.MailboxManager;
import org.apache.james.imap.message.request.SelectRequest;
+import org.apache.james.mailbox.MailboxManager;
public class SelectProcessor extends AbstractSelectionProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java Mon Sep 6 18:09:32 2010
@@ -28,14 +28,14 @@ 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.imap.mailbox.MailboxPath;
-import org.apache.james.imap.mailbox.MessageManager;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.message.request.StatusRequest;
import org.apache.james.imap.message.response.MailboxStatusResponse;
import org.apache.james.imap.processor.base.ImapSessionUtils;
+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;
public class StatusProcessor extends AbstractMailboxProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java Mon Sep 6 18:09:32 2010
@@ -32,14 +32,14 @@ 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.api.process.SelectedMailbox;
-import org.apache.james.imap.mailbox.MessageManager;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.MessageRange;
import org.apache.james.imap.message.request.StoreRequest;
import org.apache.james.imap.message.response.FetchResponse;
import org.apache.james.imap.processor.base.ImapSessionUtils;
+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;
public class StoreProcessor extends AbstractMailboxProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java Mon Sep 6 18:09:32 2010
@@ -26,12 +26,12 @@ 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.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.SubscriptionException;
-import org.apache.james.imap.mailbox.SubscriptionManager;
import org.apache.james.imap.message.request.SubscribeRequest;
import org.apache.james.imap.processor.base.ImapSessionUtils;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.SubscriptionException;
+import org.apache.james.mailbox.SubscriptionManager;
public class SubscribeProcessor extends AbstractSubscriptionProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java Mon Sep 6 18:09:32 2010
@@ -23,12 +23,12 @@ import org.apache.commons.logging.Log;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapSession;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.message.request.SystemMessage;
import org.apache.james.imap.processor.base.AbstractChainedProcessor;
import org.apache.james.imap.processor.base.ImapSessionUtils;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.MailboxSession;
/**
* Processes system messages unrelated to IMAP.
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java Mon Sep 6 18:09:32 2010
@@ -26,12 +26,12 @@ 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.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.SubscriptionException;
-import org.apache.james.imap.mailbox.SubscriptionManager;
import org.apache.james.imap.message.request.UnsubscribeRequest;
import org.apache.james.imap.processor.base.ImapSessionUtils;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.SubscriptionException;
+import org.apache.james.mailbox.SubscriptionManager;
public class UnsubscribeProcessor extends AbstractSubscriptionProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/ImapSessionUtils.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/ImapSessionUtils.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/ImapSessionUtils.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/ImapSessionUtils.java Mon Sep 6 18:09:32 2010
@@ -20,7 +20,7 @@
package org.apache.james.imap.processor.base;
import org.apache.james.imap.api.process.ImapSession;
-import org.apache.james.imap.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSession;
public class ImapSessionUtils {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MailboxEventAnalyser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MailboxEventAnalyser.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MailboxEventAnalyser.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MailboxEventAnalyser.java Mon Sep 6 18:09:32 2010
@@ -27,8 +27,8 @@ import java.util.TreeSet;
import javax.mail.Flags;
-import org.apache.james.imap.mailbox.MailboxListener;
-import org.apache.james.imap.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxListener;
+import org.apache.james.mailbox.MailboxPath;
/**
* {@link MailboxListener} implementation which will listen for {@link Event} notifications and
@@ -79,7 +79,7 @@ public class MailboxEventAnalyser implem
* Handle the given {@link Event} if it was fired for the mailbox we are observing
*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxListener#event(org.apache.james.imap.mailbox.MailboxListener.Event)
+ * @see org.apache.james.mailbox.MailboxListener#event(org.apache.james.mailbox.MailboxListener.Event)
*/
public void event(Event event) {
@@ -216,7 +216,7 @@ public class MailboxEventAnalyser implem
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxListener#isClosed()
+ * @see org.apache.james.mailbox.MailboxListener#isClosed()
*/
public boolean isClosed() {
return closed;
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java Mon Sep 6 18:09:32 2010
@@ -26,10 +26,10 @@ import java.util.Set;
import java.util.TreeSet;
import org.apache.james.imap.api.process.SelectedMailbox;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.MailboxPath;
-import org.apache.james.imap.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxSession;
/**
* Default implementation of {@link SelectedMailbox}
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/UidToMsnConverter.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/UidToMsnConverter.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/UidToMsnConverter.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/UidToMsnConverter.java Mon Sep 6 18:09:32 2010
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.SortedMap;
import java.util.TreeMap;
-import org.apache.james.imap.mailbox.MailboxListener;
+import org.apache.james.mailbox.MailboxListener;
//TODO: This is a major memory hog
//TODO: Each concurrent session requires one, and typical clients now open many
@@ -121,7 +121,7 @@ public class UidToMsnConverter implement
}
/**
- * @see org.apache.james.imap.mailbox.MailboxListener#event(org.apache.james.imap.mailbox.MailboxListener.Event)
+ * @see org.apache.james.mailbox.MailboxListener#event(org.apache.james.mailbox.MailboxListener.Event)
*/
public void event(Event event) {
if (event instanceof MessageEvent) {
@@ -139,7 +139,7 @@ public class UidToMsnConverter implement
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxListener#isClosed()
+ * @see org.apache.james.mailbox.MailboxListener#isClosed()
*/
public boolean isClosed() {
return closed;
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java Mon Sep 6 18:09:32 2010
@@ -25,8 +25,8 @@ package org.apache.james.imap.processor.
import java.io.IOException;
import java.nio.channels.WritableByteChannel;
-import org.apache.james.imap.mailbox.Content;
import org.apache.james.imap.message.response.FetchResponse.BodyElement;
+import org.apache.james.mailbox.Content;
final class ContentBodyElement implements BodyElement {
private final String name;
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java Mon Sep 6 18:09:32 2010
@@ -29,10 +29,10 @@ import javax.mail.MessagingException;
import org.apache.commons.logging.Log;
import org.apache.james.imap.api.ImapConstants;
-import org.apache.james.imap.mailbox.Headers;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MessageResult;
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.mime4j.field.address.Address;
import org.apache.james.mime4j.field.address.AddressList;
import org.apache.james.mime4j.field.address.DomainList;
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java Mon Sep 6 18:09:32 2010
@@ -34,19 +34,19 @@ 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.imap.mailbox.MessageManager;
-import org.apache.james.imap.mailbox.MailboxManager;
-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.UnsupportedCriteriaException;
-import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
-import org.apache.james.imap.mailbox.MessageResult.MimePath;
-import org.apache.james.imap.mailbox.util.FetchGroupImpl;
import org.apache.james.imap.message.request.FetchRequest;
import org.apache.james.imap.message.response.FetchResponse;
import org.apache.james.imap.processor.AbstractMailboxProcessor;
import org.apache.james.imap.processor.base.ImapSessionUtils;
+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.MessageResult;
+import org.apache.james.mailbox.UnsupportedCriteriaException;
+import org.apache.james.mailbox.MessageResult.FetchGroup;
+import org.apache.james.mailbox.MessageResult.MimePath;
+import org.apache.james.mailbox.util.FetchGroupImpl;
import org.apache.james.mime4j.field.address.parser.ParseException;
public class FetchProcessor extends AbstractMailboxProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java Mon Sep 6 18:09:32 2010
@@ -35,15 +35,15 @@ import org.apache.james.imap.api.message
import org.apache.james.imap.api.message.FetchData;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.api.process.SelectedMailbox;
-import org.apache.james.imap.mailbox.Content;
-import org.apache.james.imap.mailbox.MessageManager;
-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.MimeDescriptor;
import org.apache.james.imap.message.response.FetchResponse;
import org.apache.james.imap.processor.base.ImapSessionUtils;
+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.MessageResult;
+import org.apache.james.mailbox.MimeDescriptor;
import org.apache.james.mime4j.field.address.parser.ParseException;
final class FetchResponseBuilder {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java Mon Sep 6 18:09:32 2010
@@ -29,8 +29,8 @@ import java.util.Iterator;
import java.util.List;
import org.apache.james.imap.api.ImapConstants;
-import org.apache.james.imap.mailbox.MessageResult;
import org.apache.james.imap.message.response.FetchResponse.BodyElement;
+import org.apache.james.mailbox.MessageResult;
final class HeaderBodyElement implements BodyElement {
private final String name;
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java Mon Sep 6 18:09:32 2010
@@ -26,8 +26,8 @@ import java.util.List;
import javax.mail.MessagingException;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MessageResult;
public class MessageResultUtils {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java Mon Sep 6 18:09:32 2010
@@ -29,11 +29,11 @@ import java.util.Map;
import javax.mail.MessagingException;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MimeDescriptor;
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.mime4j.field.address.parser.ParseException;
final class MimeDescriptorStructure implements FetchResponse.Structure {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java Mon Sep 6 18:09:32 2010
@@ -24,7 +24,7 @@ package org.apache.james.imap.processor.
import java.util.Arrays;
-import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.mailbox.MessageResult;
final class MimePathImpl implements MessageResult.MimePath {
private final int[] positions;
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java Mon Sep 6 18:09:32 2010
@@ -22,12 +22,12 @@ package org.apache.james.imap.processor.
import org.apache.james.imap.api.message.response.StatusResponseFactory;
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapProcessorFactory;
-import org.apache.james.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.SubscriptionManager;
import org.apache.james.imap.message.response.UnpooledStatusResponseFactory;
import org.apache.james.imap.processor.DefaultProcessorChain;
import org.apache.james.imap.processor.base.ImapResponseMessageProcessor;
import org.apache.james.imap.processor.base.UnknownRequestProcessor;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.SubscriptionManager;
/**
*
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java (original)
+++ james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java Mon Sep 6 18:09:32 2010
@@ -31,13 +31,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.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.MailboxMetaData;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.SubscriptionManager;
import org.apache.james.imap.message.request.LsubRequest;
import org.apache.james.imap.message.response.LSubResponse;
import org.apache.james.imap.processor.base.ImapSessionUtils;
+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.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
@@ -242,7 +242,7 @@ public class LSubProcessorTest {
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxSession.User#getLocalePreferences()
+ * @see org.apache.james.mailbox.MailboxSession.User#getLocalePreferences()
*/
public List<Locale> getLocalePreferences() {
return new ArrayList<Locale>();
@@ -250,7 +250,7 @@ public class LSubProcessorTest {
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxSession.User#getPassword()
+ * @see org.apache.james.mailbox.MailboxSession.User#getPassword()
*/
public String getPassword() {
return "test";
@@ -258,7 +258,7 @@ public class LSubProcessorTest {
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxSession.User#getUserName()
+ * @see org.apache.james.mailbox.MailboxSession.User#getUserName()
*/
public String getUserName() {
return "test";
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java (original)
+++ james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java Mon Sep 6 18:09:32 2010
@@ -23,10 +23,10 @@ import org.apache.james.imap.api.ImapCom
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.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.MailboxMetaData;
-import org.apache.james.imap.mailbox.MailboxPath;
import org.apache.james.imap.message.response.ListResponse;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.MailboxMetaData;
+import org.apache.james.mailbox.MailboxPath;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java (original)
+++ james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java Mon Sep 6 18:09:32 2010
@@ -35,12 +35,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.api.process.ImapProcessor.Responder;
-import org.apache.james.imap.mailbox.MailboxConstants;
-import org.apache.james.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.message.request.NamespaceRequest;
import org.apache.james.imap.message.response.NamespaceResponse;
import org.apache.james.imap.processor.base.ImapSessionUtils;
+import org.apache.james.mailbox.MailboxConstants;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.MailboxSession;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java (original)
+++ james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java Mon Sep 6 18:09:32 2010
@@ -36,15 +36,15 @@ 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.api.process.SelectedMailbox;
-import org.apache.james.imap.mailbox.MailboxPath;
-import org.apache.james.imap.mailbox.MessageManager;
-import org.apache.james.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.SearchQuery;
-import org.apache.james.imap.mailbox.SearchQuery.Criterion;
import org.apache.james.imap.message.request.SearchRequest;
import org.apache.james.imap.message.response.SearchResponse;
import org.apache.james.imap.processor.base.ImapSessionUtils;
+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.Criterion;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerAdded.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerAdded.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerAdded.java (original)
+++ james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerAdded.java Mon Sep 6 18:09:32 2010
@@ -19,8 +19,8 @@
package org.apache.james.imap.processor.base;
-import org.apache.james.imap.mailbox.MailboxListener;
-import org.apache.james.imap.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxListener;
+import org.apache.james.mailbox.MailboxPath;
public class FakeMailboxListenerAdded extends MailboxListener.Added {
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java (original)
+++ james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java Mon Sep 6 18:09:32 2010
@@ -26,8 +26,8 @@ import java.util.List;
import javax.mail.Flags;
import javax.mail.Flags.Flag;
-import org.apache.james.imap.mailbox.MailboxPath;
-import org.apache.james.imap.mailbox.MailboxListener.FlagsUpdated;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxListener.FlagsUpdated;
public class FakeMailboxListenerFlagsUpdate extends FlagsUpdated {
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java (original)
+++ james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java Mon Sep 6 18:09:32 2010
@@ -28,8 +28,8 @@ import java.util.Iterator;
import javax.mail.Flags;
-import org.apache.james.imap.mailbox.MailboxListener;
-import org.apache.james.imap.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxListener;
+import org.apache.james.mailbox.MailboxPath;
import org.junit.Before;
import org.junit.Test;
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java (original)
+++ james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java Mon Sep 6 18:09:32 2010
@@ -26,8 +26,8 @@ import java.nio.channels.WritableByteCha
import java.util.ArrayList;
import java.util.List;
-import org.apache.james.imap.mailbox.MessageResult;
import org.apache.james.imap.processor.fetch.MessageResultUtils;
+import org.apache.james.mailbox.MessageResult;
import org.junit.Before;
import org.junit.Test;
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/DelegatingMailboxListener.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/DelegatingMailboxListener.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/DelegatingMailboxListener.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/DelegatingMailboxListener.java Mon Sep 6 18:09:32 2010
@@ -24,8 +24,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.james.imap.mailbox.MailboxListener;
-import org.apache.james.imap.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxListener;
+import org.apache.james.mailbox.MailboxPath;
/**
* Receive a {@link Event} and delegate it to an other {@link MailboxListener} depending on the registered name
@@ -49,7 +49,7 @@ public class DelegatingMailboxListener i
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxListener#event(org.apache.james.imap.mailbox.MailboxListener.Event)
+ * @see org.apache.james.mailbox.MailboxListener#event(org.apache.james.mailbox.MailboxListener.Event)
*/
public void event(Event event) {
List<MailboxListener> mListeners = listeners.get(event.getMailboxPath());
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxMetaData.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxMetaData.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxMetaData.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxMetaData.java Mon Sep 6 18:09:32 2010
@@ -24,7 +24,7 @@ import java.util.List;
import javax.mail.Flags;
-import org.apache.james.imap.mailbox.MessageManager;
+import org.apache.james.mailbox.MessageManager;
/**
@@ -113,7 +113,7 @@ public class MailboxMetaData implements
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.Mailbox.MetaData#getFirstUnseen()
+ * @see org.apache.james.mailbox.Mailbox.MetaData#getFirstUnseen()
*/
public Long getFirstUnseen() {
return firstUnseen;
@@ -121,7 +121,7 @@ public class MailboxMetaData implements
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.Mailbox.MetaData#isWriteable()
+ * @see org.apache.james.mailbox.Mailbox.MetaData#isWriteable()
*/
public boolean isWriteable() {
return writeable;
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxPathLock.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxPathLock.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxPathLock.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxPathLock.java Mon Sep 6 18:09:32 2010
@@ -24,7 +24,7 @@ import java.util.Map;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.james.imap.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxPath;
/**
*
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxSessionMapperFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxSessionMapperFactory.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxSessionMapperFactory.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxSessionMapperFactory.java Mon Sep 6 18:09:32 2010
@@ -18,14 +18,14 @@
****************************************************************/
package org.apache.james.imap.store;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.RequestAware;
-import org.apache.james.imap.mailbox.SubscriptionException;
import org.apache.james.imap.store.mail.MailboxMapper;
import org.apache.james.imap.store.mail.MessageMapper;
import org.apache.james.imap.store.transaction.Mapper;
import org.apache.james.imap.store.user.SubscriptionMapper;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.RequestAware;
+import org.apache.james.mailbox.SubscriptionException;
/**
* Maintain mapper instances by {@link MailboxSession}. So only one mapper instance is used
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MapperStoreMessageManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MapperStoreMessageManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MapperStoreMessageManager.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MapperStoreMessageManager.java Mon Sep 6 18:09:32 2010
@@ -28,20 +28,20 @@ import java.util.TreeSet;
import javax.mail.Flags;
import javax.mail.MessagingException;
-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.SearchQuery;
-import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
-import org.apache.james.imap.mailbox.util.MailboxEventDispatcher;
import org.apache.james.imap.store.mail.MessageMapper;
import org.apache.james.imap.store.mail.model.Mailbox;
import org.apache.james.imap.store.mail.model.MailboxMembership;
import org.apache.james.imap.store.transaction.Mapper;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MessageRange;
+import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.MessageResult.FetchGroup;
+import org.apache.james.mailbox.util.MailboxEventDispatcher;
/**
- * Abstract base class for {@link org.apache.james.imap.mailbox.MessageManager} implementations.
+ * Abstract base class for {@link org.apache.james.mailbox.MessageManager} implementations.
*
* This class provides a high-level api, and is most times the best to just extend
*
@@ -74,7 +74,7 @@ public abstract class MapperStoreMessage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.Mailbox#getMessageCount(org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.Mailbox#getMessageCount(org.apache.james.mailbox.MailboxSession)
*/
public long getMessageCount(MailboxSession mailboxSession) throws MailboxException {
return mapperFactory.getMessageMapper(mailboxSession).countMessagesInMailbox(getMailboxEntity());
@@ -85,7 +85,7 @@ public abstract class MapperStoreMessage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.Mailbox#getMessages(org.apache.james.imap.mailbox.MessageRange, org.apache.james.imap.mailbox.MessageResult.FetchGroup, org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.Mailbox#getMessages(org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.MessageResult.FetchGroup, org.apache.james.mailbox.MailboxSession)
*/
public Iterator<MessageResult> getMessages(final MessageRange set, FetchGroup fetchGroup,
MailboxSession mailboxSession) throws MailboxException {
@@ -151,7 +151,7 @@ public abstract class MapperStoreMessage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.store.AbstractStoreMessageManager#updateFlags(javax.mail.Flags, boolean, boolean, org.apache.james.imap.mailbox.MessageRange, org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.imap.store.AbstractStoreMessageManager#updateFlags(javax.mail.Flags, boolean, boolean, org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.MailboxSession)
*/
public Iterator<UpdatedFlag> updateFlags(final Flags flags, final boolean value, final boolean replace,
final MessageRange set, MailboxSession mailboxSession) throws MailboxException {
@@ -193,7 +193,7 @@ public abstract class MapperStoreMessage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.Mailbox#search(org.apache.james.imap.mailbox.SearchQuery, org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.Mailbox#search(org.apache.james.mailbox.SearchQuery, org.apache.james.mailbox.MailboxSession)
*/
public Iterator<Long> search(SearchQuery query, MailboxSession mailboxSession) throws MailboxException {
return mapperFactory.getMessageMapper(mailboxSession).searchMailbox(getMailboxEntity(), query);
@@ -224,7 +224,7 @@ public abstract class MapperStoreMessage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.store.AbstractStoreMessageManager#copy(org.apache.james.imap.mailbox.MessageRange, org.apache.james.imap.store.AbstractStoreMessageManager, org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.imap.store.AbstractStoreMessageManager#copy(org.apache.james.mailbox.MessageRange, org.apache.james.imap.store.AbstractStoreMessageManager, org.apache.james.mailbox.MailboxSession)
*/
protected Iterator<Long> copy(MessageRange set, StoreMessageManager<Id> toMailbox, MailboxSession session) throws MailboxException {
MapperStoreMessageManager<Id> to = (MapperStoreMessageManager<Id>) toMailbox;
@@ -242,7 +242,7 @@ public abstract class MapperStoreMessage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.store.AbstractStoreMessageManager#countUnseenMessagesInMailbox(org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.imap.store.AbstractStoreMessageManager#countUnseenMessagesInMailbox(org.apache.james.mailbox.MailboxSession)
*/
protected long countUnseenMessagesInMailbox(MailboxSession session) throws MailboxException {
MessageMapper<Id> messageMapper = mapperFactory.getMessageMapper(session);
@@ -253,7 +253,7 @@ public abstract class MapperStoreMessage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.store.AbstractStoreMessageManager#findFirstUnseenMessageUid(org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.imap.store.AbstractStoreMessageManager#findFirstUnseenMessageUid(org.apache.james.mailbox.MailboxSession)
*/
protected Long findFirstUnseenMessageUid(MailboxSession session) throws MailboxException{
MessageMapper<Id> messageMapper = mapperFactory.getMessageMapper(session);
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java Mon Sep 6 18:09:32 2010
@@ -34,12 +34,12 @@ import javax.mail.Flags;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.SearchQuery;
-import org.apache.james.imap.mailbox.UnsupportedSearchException;
-import org.apache.james.imap.mailbox.SearchQuery.NumericRange;
import org.apache.james.imap.store.mail.model.Header;
import org.apache.james.imap.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.UnsupportedSearchException;
+import org.apache.james.mailbox.SearchQuery.NumericRange;
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.field.datetime.DateTime;
import org.apache.james.mime4j.field.datetime.parser.DateTimeParser;
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MimeDescriptorImpl.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MimeDescriptorImpl.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MimeDescriptorImpl.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MimeDescriptorImpl.java Mon Sep 6 18:09:32 2010
@@ -28,13 +28,13 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.james.imap.mailbox.MessageResult;
-import org.apache.james.imap.mailbox.MimeDescriptor;
import org.apache.james.imap.store.mail.model.Message;
import org.apache.james.imap.store.mail.model.Property;
import org.apache.james.imap.store.mail.model.PropertyBuilder;
import org.apache.james.imap.store.streaming.ConfigurableMimeTokenStream;
import org.apache.james.imap.store.streaming.CountingInputStream;
+import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.MimeDescriptor;
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.descriptor.MaximalBodyDescriptor;
import org.apache.james.mime4j.parser.MimeEntityConfig;
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java Mon Sep 6 18:09:32 2010
@@ -26,10 +26,10 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.WritableByteChannel;
-import org.apache.james.imap.mailbox.Content;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MessageResult;
import org.apache.james.imap.store.mail.model.Header;
+import org.apache.james.mailbox.Content;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MessageResult;
public final class ResultHeader implements MessageResult.Header, Content {
private final String name;
@@ -50,7 +50,7 @@ public final class ResultHeader implemen
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MessageResult.Header#getName()
+ * @see org.apache.james.mailbox.MessageResult.Header#getName()
*/
public String getName() throws MailboxException {
return name;
@@ -58,7 +58,7 @@ public final class ResultHeader implemen
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MessageResult.Header#getValue()
+ * @see org.apache.james.mailbox.MessageResult.Header#getValue()
*/
public String getValue() throws MailboxException {
return value;
@@ -66,7 +66,7 @@ public final class ResultHeader implemen
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.Content#size()
+ * @see org.apache.james.mailbox.Content#size()
*/
public long size() {
return size;
@@ -74,7 +74,7 @@ public final class ResultHeader implemen
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.Content#writeTo(java.nio.channels.WritableByteChannel)
+ * @see org.apache.james.mailbox.Content#writeTo(java.nio.channels.WritableByteChannel)
*/
public void writeTo(WritableByteChannel channel) throws IOException {
writeAll(channel, ResultUtils.US_ASCII.encode(name));
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java Mon Sep 6 18:09:32 2010
@@ -26,12 +26,12 @@ import java.util.NoSuchElementException;
import javax.mail.Flags;
-import org.apache.james.imap.mailbox.Content;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MessageResult;
-import org.apache.james.imap.mailbox.MimeDescriptor;
-import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
import org.apache.james.imap.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.Content;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.MimeDescriptor;
+import org.apache.james.mailbox.MessageResult.FetchGroup;
/**
* {@link Iterator} implementation for {@link MessageResult}
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java Mon Sep 6 18:09:32 2010
@@ -31,18 +31,18 @@ import java.util.List;
import javax.swing.text.Document;
-import org.apache.james.imap.mailbox.Content;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MessageResult;
-import org.apache.james.imap.mailbox.MimeDescriptor;
-import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
-import org.apache.james.imap.mailbox.MessageResult.MimePath;
-import org.apache.james.imap.mailbox.util.MessageResultImpl;
import org.apache.james.imap.store.mail.model.Header;
import org.apache.james.imap.store.mail.model.MailboxMembership;
import org.apache.james.imap.store.streaming.InputStreamContent;
import org.apache.james.imap.store.streaming.PartContentBuilder;
import org.apache.james.imap.store.streaming.RewindableInputStream;
+import org.apache.james.mailbox.Content;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.MimeDescriptor;
+import org.apache.james.mailbox.MessageResult.FetchGroup;
+import org.apache.james.mailbox.MessageResult.MimePath;
+import org.apache.james.mailbox.util.MessageResultImpl;
import org.apache.james.mime4j.MimeException;
/**
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SearchQueryIterator.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SearchQueryIterator.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SearchQueryIterator.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SearchQueryIterator.java Mon Sep 6 18:09:32 2010
@@ -22,9 +22,9 @@ import java.util.Iterator;
import java.util.NoSuchElementException;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.SearchQuery;
import org.apache.james.imap.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.SearchQuery;
/**
* {@link Iterator} implementation which use a {@link MessageSearches} instance to lazy
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SimpleMailboxSession.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SimpleMailboxSession.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SimpleMailboxSession.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SimpleMailboxSession.java Mon Sep 6 18:09:32 2010
@@ -27,8 +27,8 @@ import java.util.Locale;
import java.util.Map;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.mailbox.MailboxConstants;
-import org.apache.james.imap.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxConstants;
+import org.apache.james.mailbox.MailboxSession;
/**
* Describes a mailbox session.
@@ -81,7 +81,7 @@ public class SimpleMailboxSession implem
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxSession#getLog()
+ * @see org.apache.james.mailbox.MailboxSession#getLog()
*/
public Log getLog() {
return log;
@@ -89,7 +89,7 @@ public class SimpleMailboxSession implem
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxSession#close()
+ * @see org.apache.james.mailbox.MailboxSession#close()
*/
public void close() {
open = false;
@@ -97,7 +97,7 @@ public class SimpleMailboxSession implem
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxSession#getSessionId()
+ * @see org.apache.james.mailbox.MailboxSession#getSessionId()
*/
public long getSessionId() {
return sessionId;
@@ -105,7 +105,7 @@ public class SimpleMailboxSession implem
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxSession#isOpen()
+ * @see org.apache.james.mailbox.MailboxSession#isOpen()
*/
public boolean isOpen() {
return open;
@@ -143,28 +143,28 @@ public class SimpleMailboxSession implem
}
/**
- * @see org.apache.james.imap.mailbox.MailboxSession#getOtherUsersSpace()
+ * @see org.apache.james.mailbox.MailboxSession#getOtherUsersSpace()
*/
public String getOtherUsersSpace() {
return otherUsersSpace;
}
/**
- * @see org.apache.james.imap.mailbox.MailboxSession#getPersonalSpace()
+ * @see org.apache.james.mailbox.MailboxSession#getPersonalSpace()
*/
public String getPersonalSpace() {
return personalSpace;
}
/**
- * @see org.apache.james.imap.mailbox.MailboxSession#getSharedSpace()
+ * @see org.apache.james.mailbox.MailboxSession#getSharedSpace()
*/
public Collection<String> getSharedSpaces() {
return sharedSpaces;
}
/**
- * @see org.apache.james.imap.mailbox.MailboxSession.User#getLocalePreferences()
+ * @see org.apache.james.mailbox.MailboxSession.User#getLocalePreferences()
*/
public List<Locale> getLocalePreferences() {
return localePreferences;
@@ -172,7 +172,7 @@ public class SimpleMailboxSession implem
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxSession#getAttributes()
+ * @see org.apache.james.mailbox.MailboxSession#getAttributes()
*/
public Map<Object, Object> getAttributes() {
return attributes;
@@ -180,7 +180,7 @@ public class SimpleMailboxSession implem
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxSession.User#getPassword()
+ * @see org.apache.james.mailbox.MailboxSession.User#getPassword()
*/
public String getPassword() {
return password;
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java Mon Sep 6 18:09:32 2010
@@ -29,25 +29,25 @@ import javax.mail.Flags;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.james.imap.mailbox.BadCredentialsException;
-import org.apache.james.imap.mailbox.MailboxConstants;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxExistsException;
-import org.apache.james.imap.mailbox.MailboxListener;
-import org.apache.james.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.MailboxMetaData;
-import org.apache.james.imap.mailbox.MailboxNotFoundException;
-import org.apache.james.imap.mailbox.MailboxPath;
-import org.apache.james.imap.mailbox.MailboxQuery;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.MessageRange;
-import org.apache.james.imap.mailbox.StandardMailboxMetaDataComparator;
-import org.apache.james.imap.mailbox.MailboxMetaData.Selectability;
-import org.apache.james.imap.mailbox.util.MailboxEventDispatcher;
-import org.apache.james.imap.mailbox.util.SimpleMailboxMetaData;
import org.apache.james.imap.store.mail.MailboxMapper;
import org.apache.james.imap.store.mail.model.Mailbox;
import org.apache.james.imap.store.transaction.Mapper;
+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.MailboxListener;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.MailboxMetaData;
+import org.apache.james.mailbox.MailboxNotFoundException;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxQuery;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MessageRange;
+import org.apache.james.mailbox.StandardMailboxMetaDataComparator;
+import org.apache.james.mailbox.MailboxMetaData.Selectability;
+import org.apache.james.mailbox.util.MailboxEventDispatcher;
+import org.apache.james.mailbox.util.SimpleMailboxMetaData;
/**
* This abstract base class of an {@link MailboxManager} implementation provides a high-level api for writing your own
@@ -100,7 +100,7 @@ public abstract class StoreMailboxManage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxManager#createSystemSession(java.lang.String, org.apache.commons.logging.Log)
+ * @see org.apache.james.mailbox.MailboxManager#createSystemSession(java.lang.String, org.apache.commons.logging.Log)
*/
public MailboxSession createSystemSession(String userName, Log log) {
return createSession(userName, null, log);
@@ -128,7 +128,7 @@ public abstract class StoreMailboxManage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxManager#getDelimiter()
+ * @see org.apache.james.mailbox.MailboxManager#getDelimiter()
*/
public final char getDelimiter() {
return MailboxConstants.DEFAULT_DELIMITER;
@@ -147,7 +147,7 @@ public abstract class StoreMailboxManage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxManager#login(java.lang.String, java.lang.String, org.apache.commons.logging.Log)
+ * @see org.apache.james.mailbox.MailboxManager#login(java.lang.String, java.lang.String, org.apache.commons.logging.Log)
*/
public MailboxSession login(String userid, String passwd, Log log) throws BadCredentialsException, MailboxException {
if (login(userid, passwd)) {
@@ -182,9 +182,9 @@ public abstract class StoreMailboxManage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxManager#getMailbox(org.apache.james.imap.api.MailboxPath, org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.MailboxManager#getMailbox(org.apache.james.imap.api.MailboxPath, org.apache.james.mailbox.MailboxSession)
*/
- public org.apache.james.imap.mailbox.MessageManager getMailbox(MailboxPath mailboxPath, MailboxSession session)
+ public org.apache.james.mailbox.MessageManager getMailbox(MailboxPath mailboxPath, MailboxSession session)
throws MailboxException {
final MailboxMapper<Id> mapper = mailboxSessionMapperFactory.getMailboxMapper(session);
Mailbox<Id> mailboxRow = mapper.findMailboxByPath(mailboxPath);
@@ -202,7 +202,7 @@ public abstract class StoreMailboxManage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxManager#createMailbox(org.apache.james.imap.api.MailboxPath, org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.MailboxManager#createMailbox(org.apache.james.imap.api.MailboxPath, org.apache.james.mailbox.MailboxSession)
*/
public void createMailbox(MailboxPath mailboxPath, MailboxSession mailboxSession)
throws MailboxException {
@@ -232,7 +232,7 @@ public abstract class StoreMailboxManage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxManager#deleteMailbox(org.apache.james.imap.api.MailboxPath, org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.MailboxManager#deleteMailbox(org.apache.james.imap.api.MailboxPath, org.apache.james.mailbox.MailboxSession)
*/
public void deleteMailbox(final MailboxPath mailboxPath, final MailboxSession session) throws MailboxException {
session.getLog().info("deleteMailbox " + mailboxPath);
@@ -256,7 +256,7 @@ public abstract class StoreMailboxManage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxManager#renameMailbox(org.apache.james.imap.api.MailboxPath, org.apache.james.imap.api.MailboxPath, org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.MailboxManager#renameMailbox(org.apache.james.imap.api.MailboxPath, org.apache.james.imap.api.MailboxPath, org.apache.james.mailbox.MailboxSession)
*/
public void renameMailbox(final MailboxPath from, final MailboxPath to, final MailboxSession session) throws MailboxException {
final Log log = getLog();
@@ -316,7 +316,7 @@ public abstract class StoreMailboxManage
}
copyMessages(range, fromPath, toPath, session);
- org.apache.james.imap.mailbox.MessageManager inbox = getMailbox(fromPath, session);
+ org.apache.james.mailbox.MessageManager inbox = getMailbox(fromPath, session);
inbox.setFlags(new Flags(Flags.Flag.DELETED), true, false, range, session);
inbox.expunge(range, session);
@@ -338,7 +338,7 @@ public abstract class StoreMailboxManage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxManager#copyMessages(org.apache.james.imap.mailbox.MessageRange, org.apache.james.imap.api.MailboxPath, org.apache.james.imap.api.MailboxPath, org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.MailboxManager#copyMessages(org.apache.james.mailbox.MessageRange, org.apache.james.imap.api.MailboxPath, org.apache.james.imap.api.MailboxPath, org.apache.james.mailbox.MailboxSession)
*/
@SuppressWarnings("unchecked")
public void copyMessages(MessageRange set, MailboxPath from, MailboxPath to, MailboxSession session) throws MailboxException {
@@ -350,7 +350,7 @@ public abstract class StoreMailboxManage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxManager#search(org.apache.james.imap.mailbox.MailboxQuery, org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.MailboxManager#search(org.apache.james.mailbox.MailboxQuery, org.apache.james.mailbox.MailboxSession)
*/
public List<MailboxMetaData> search(final MailboxQuery mailboxExpression, MailboxSession session)
throws MailboxException {
@@ -393,7 +393,7 @@ public abstract class StoreMailboxManage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxManager#mailboxExists(org.apache.james.imap.api.MailboxPath, org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.MailboxManager#mailboxExists(org.apache.james.imap.api.MailboxPath, org.apache.james.mailbox.MailboxSession)
*/
public boolean mailboxExists(MailboxPath mailboxPath, MailboxSession session) throws MailboxException {
try {
@@ -409,7 +409,7 @@ public abstract class StoreMailboxManage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxManager#addListener(org.apache.james.imap.api.MailboxPath, org.apache.james.imap.mailbox.MailboxListener, org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.MailboxManager#addListener(org.apache.james.imap.api.MailboxPath, org.apache.james.mailbox.MailboxListener, org.apache.james.mailbox.MailboxSession)
*/
public void addListener(MailboxPath path, MailboxListener listener, MailboxSession session) throws MailboxException {
delegatingListener.addListener(path, listener);
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxPath.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxPath.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxPath.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxPath.java Mon Sep 6 18:09:32 2010
@@ -19,8 +19,8 @@
package org.apache.james.imap.store;
-import org.apache.james.imap.mailbox.MailboxPath;
import org.apache.james.imap.store.mail.model.Mailbox;
+import org.apache.james.mailbox.MailboxPath;
public class StoreMailboxPath<Id> extends MailboxPath {
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMessageManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMessageManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMessageManager.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMessageManager.java Mon Sep 6 18:09:32 2010
@@ -36,12 +36,6 @@ import javax.mail.Flags;
import javax.mail.MessagingException;
import javax.mail.util.SharedFileInputStream;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxListener;
-import org.apache.james.imap.mailbox.MailboxNotFoundException;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.MessageRange;
-import org.apache.james.imap.mailbox.util.MailboxEventDispatcher;
import org.apache.james.imap.store.mail.MessageMapper;
import org.apache.james.imap.store.mail.model.Header;
import org.apache.james.imap.store.mail.model.Mailbox;
@@ -49,19 +43,25 @@ import org.apache.james.imap.store.mail.
import org.apache.james.imap.store.mail.model.PropertyBuilder;
import org.apache.james.imap.store.streaming.ConfigurableMimeTokenStream;
import org.apache.james.imap.store.streaming.CountingInputStream;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxListener;
+import org.apache.james.mailbox.MailboxNotFoundException;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MessageRange;
+import org.apache.james.mailbox.util.MailboxEventDispatcher;
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.descriptor.MaximalBodyDescriptor;
import org.apache.james.mime4j.parser.MimeEntityConfig;
import org.apache.james.mime4j.parser.MimeTokenStream;
/**
- * Abstract base class for {@link org.apache.james.imap.mailbox.MessageManager} implementations. This abstract
+ * Abstract base class for {@link org.apache.james.mailbox.MessageManager} implementations. This abstract
* class take care of dispatching events to the registered {@link MailboxListener} and so help
* with handling concurrent {@link MailboxSession}'s. So this is a perfect starting point when writing your
* own implementation and don't want to depend on {@link MessageMapper}.
*
*/
-public abstract class StoreMessageManager<Id> implements org.apache.james.imap.mailbox.MessageManager{
+public abstract class StoreMessageManager<Id> implements org.apache.james.mailbox.MessageManager{
private final Mailbox<Id> mailbox;
@@ -120,7 +120,7 @@ public abstract class StoreMessageManage
protected abstract Iterator<Long> deleteMarkedInMailbox(MessageRange range, MailboxSession session) throws MailboxException;
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.Mailbox#expunge(org.apache.james.imap.mailbox.MessageRange, org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.Mailbox#expunge(org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.MailboxSession)
*/
public Iterator<Long> expunge(final MessageRange set, MailboxSession mailboxSession) throws MailboxException {
List<Long> uids = new ArrayList<Long>();
@@ -135,7 +135,7 @@ public abstract class StoreMessageManage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.Mailbox#appendMessage(byte[], java.util.Date, org.apache.james.imap.mailbox.MailboxSession, boolean, javax.mail.Flags)
+ * @see org.apache.james.mailbox.Mailbox#appendMessage(byte[], java.util.Date, org.apache.james.mailbox.MailboxSession, boolean, javax.mail.Flags)
*/
public long appendMessage(final InputStream msgIn, final Date internalDate,
final MailboxSession mailboxSession,final boolean isRecent, final Flags flagsToBeSet)
@@ -374,7 +374,7 @@ public abstract class StoreMessageManage
* @see {@link Mailbox#getMetaData(boolean, MailboxSession, FetchGroup)}
*/
public MetaData getMetaData(boolean resetRecent, MailboxSession mailboxSession,
- org.apache.james.imap.mailbox.MessageManager.MetaData.FetchGroup fetchGroup) throws MailboxException {
+ org.apache.james.mailbox.MessageManager.MetaData.FetchGroup fetchGroup) throws MailboxException {
final List<Long> recent = recent(resetRecent, mailboxSession);
final Flags permanentFlags = getPermanentFlags();
final long uidValidity = getMailboxEntity().getUidValidity();
@@ -421,7 +421,7 @@ public abstract class StoreMessageManage
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.Mailbox#setFlags(javax.mail.Flags, boolean, boolean, org.apache.james.imap.mailbox.MessageRange, org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.Mailbox#setFlags(javax.mail.Flags, boolean, boolean, org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.MailboxSession)
*/
public Map<Long, Flags> setFlags(final Flags flags, final boolean value, final boolean replace,
final MessageRange set, MailboxSession mailboxSession) throws MailboxException {
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreSubscriptionManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreSubscriptionManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreSubscriptionManager.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreSubscriptionManager.java Mon Sep 6 18:09:32 2010
@@ -22,13 +22,13 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.SubscriptionException;
-import org.apache.james.imap.mailbox.SubscriptionManager;
import org.apache.james.imap.store.transaction.Mapper;
import org.apache.james.imap.store.user.SubscriptionMapper;
import org.apache.james.imap.store.user.model.Subscription;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.SubscriptionException;
+import org.apache.james.mailbox.SubscriptionManager;
/**
* Manages subscriptions.
@@ -45,7 +45,7 @@ public abstract class StoreSubscriptionM
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.SubscriptionManager#subscribe(org.apache.james.imap.mailbox.MailboxSession, java.lang.String)
+ * @see org.apache.james.mailbox.SubscriptionManager#subscribe(org.apache.james.mailbox.MailboxSession, java.lang.String)
*/
public void subscribe(final MailboxSession session, final String mailbox) throws SubscriptionException {
final SubscriptionMapper mapper = mapperFactory.getSubscriptionMapper(session);
@@ -78,7 +78,7 @@ public abstract class StoreSubscriptionM
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.SubscriptionManager#subscriptions(org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.SubscriptionManager#subscriptions(org.apache.james.mailbox.MailboxSession)
*/
public Collection<String> subscriptions(final MailboxSession session) throws SubscriptionException {
final SubscriptionMapper mapper = mapperFactory.getSubscriptionMapper(session);
@@ -92,7 +92,7 @@ public abstract class StoreSubscriptionM
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.SubscriptionManager#unsubscribe(org.apache.james.imap.mailbox.MailboxSession, java.lang.String)
+ * @see org.apache.james.mailbox.SubscriptionManager#unsubscribe(org.apache.james.mailbox.MailboxSession, java.lang.String)
*/
public void unsubscribe(final MailboxSession session, final String mailbox) throws SubscriptionException {
final SubscriptionMapper mapper = mapperFactory.getSubscriptionMapper(session);
@@ -114,7 +114,7 @@ public abstract class StoreSubscriptionM
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.SubscriptionManager#endProcessingRequest(org.apache.james.imap.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.SubscriptionManager#endProcessingRequest(org.apache.james.mailbox.MailboxSession)
*/
public void endProcessingRequest(MailboxSession session) {
mapperFactory.endProcessingRequest(session);
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MailboxMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MailboxMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MailboxMapper.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MailboxMapper.java Mon Sep 6 18:09:32 2010
@@ -20,11 +20,11 @@ package org.apache.james.imap.store.mail
import java.util.List;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxNotFoundException;
-import org.apache.james.imap.mailbox.MailboxPath;
import org.apache.james.imap.store.mail.model.Mailbox;
import org.apache.james.imap.store.transaction.Mapper;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxNotFoundException;
+import org.apache.james.mailbox.MailboxPath;
/**
* Mapper for {@link Mailbox} actions. A {@link MailboxMapper} has a lifecycle from the start of a request
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MessageMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MessageMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MessageMapper.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MessageMapper.java Mon Sep 6 18:09:32 2010
@@ -21,16 +21,16 @@ package org.apache.james.imap.store.mail
import java.util.Iterator;
import java.util.List;
-import org.apache.james.imap.mailbox.MessageRange;
-import org.apache.james.imap.mailbox.SearchQuery;
-import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.store.mail.model.Message;
import org.apache.james.imap.store.mail.model.Mailbox;
import org.apache.james.imap.store.mail.model.MailboxMembership;
import org.apache.james.imap.store.transaction.Mapper;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MessageRange;
+import org.apache.james.mailbox.SearchQuery;
/**
- * Maps {@link Message} in a {@link org.apache.james.imap.mailbox.MessageManager}. A {@link MessageMapper} has a lifecycle from the start of a request
+ * Maps {@link Message} in a {@link org.apache.james.mailbox.MessageManager}. A {@link MessageMapper} has a lifecycle from the start of a request
* to the end of the request.
*/
public interface MessageMapper<Id> extends Mapper {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org