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 [2/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...
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MessageResult.java (from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MessageResult.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MessageResult.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java&r1=993085&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MessageResult.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
import java.util.Date;
import java.util.Iterator;
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MimeDescriptor.java (from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MimeDescriptor.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MimeDescriptor.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MimeDescriptor.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MimeDescriptor.java&r1=993085&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MimeDescriptor.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MimeDescriptor.java Mon Sep 6 18:09:32 2010
@@ -19,7 +19,7 @@
/**
*
*/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
import java.util.Iterator;
import java.util.List;
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/RequestAware.java (from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/RequestAware.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/RequestAware.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/RequestAware.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/RequestAware.java&r1=993085&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/RequestAware.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/RequestAware.java Mon Sep 6 18:09:32 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
/**
* Implementations of this interface are aware of processing requests
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/SearchQuery.java (from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SearchQuery.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/SearchQuery.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/SearchQuery.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SearchQuery.java&r1=993085&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SearchQuery.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/SearchQuery.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
import java.util.ArrayList;
import java.util.Arrays;
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java (from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/StandardMailboxMetaDataComparator.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/StandardMailboxMetaDataComparator.java&r1=993085&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/StandardMailboxMetaDataComparator.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java Mon Sep 6 18:09:32 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
import java.util.Comparator;
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/SubscriptionException.java (from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SubscriptionException.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/SubscriptionException.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/SubscriptionException.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SubscriptionException.java&r1=993100&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SubscriptionException.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/SubscriptionException.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
/**
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/SubscriptionManager.java (from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SubscriptionManager.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/SubscriptionManager.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/SubscriptionManager.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SubscriptionManager.java&r1=993085&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SubscriptionManager.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/SubscriptionManager.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
import java.util.Collection;
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/UnsupportedCriteriaException.java (from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedCriteriaException.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/UnsupportedCriteriaException.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/UnsupportedCriteriaException.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedCriteriaException.java&r1=993100&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedCriteriaException.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/UnsupportedCriteriaException.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
/**
* Indicates that a search criteria is not supported.
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/UnsupportedOperationException.java (from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedOperationException.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/UnsupportedOperationException.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/UnsupportedOperationException.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedOperationException.java&r1=993100&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedOperationException.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/UnsupportedOperationException.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
/**
* Indicates that an operation required is not supported
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/UnsupportedSearchException.java (from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedSearchException.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/UnsupportedSearchException.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/UnsupportedSearchException.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedSearchException.java&r1=993100&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedSearchException.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/UnsupportedSearchException.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
/**
Modified: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/FetchGroupImpl.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/FetchGroupImpl.java?rev=993114&r1=993085&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/FetchGroupImpl.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/FetchGroupImpl.java Mon Sep 6 18:09:32 2010
@@ -17,15 +17,15 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox.util;
+package org.apache.james.mailbox.util;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.apache.james.imap.mailbox.MessageResult;
-import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
-import org.apache.james.imap.mailbox.MessageResult.MimePath;
+import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.MessageResult.FetchGroup;
+import org.apache.james.mailbox.MessageResult.MimePath;
/**
* Specifies a fetch group.
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/MailboxEventDispatcher.java (from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcher.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/MailboxEventDispatcher.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/MailboxEventDispatcher.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcher.java&r1=993100&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcher.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/MailboxEventDispatcher.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox.util;
+package org.apache.james.mailbox.util;
import java.util.ArrayList;
import java.util.Collection;
@@ -29,8 +29,8 @@ import java.util.concurrent.CopyOnWriteA
import javax.mail.Flags;
import javax.mail.Flags.Flag;
-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;
/**
* Helper class to dispatch {@link Event}'s to registerend MailboxListener
@@ -109,7 +109,7 @@ public class MailboxEventDispatcher impl
/*
* (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) {
for (Iterator<MailboxListener> iter = listeners.iterator(); iter.hasNext();) {
@@ -149,7 +149,7 @@ public class MailboxEventDispatcher impl
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxListener.MessageEvent#getSubjectUid()
+ * @see org.apache.james.mailbox.MailboxListener.MessageEvent#getSubjectUid()
*/
public long getSubjectUid() {
return subjectUid;
@@ -221,7 +221,7 @@ public class MailboxEventDispatcher impl
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxListener.MessageEvent#getSubjectUid()
+ * @see org.apache.james.mailbox.MailboxListener.MessageEvent#getSubjectUid()
*/
public long getSubjectUid() {
return subjectUid;
@@ -229,7 +229,7 @@ public class MailboxEventDispatcher impl
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxListener.FlagsUpdated#flagsIterator()
+ * @see org.apache.james.mailbox.MailboxListener.FlagsUpdated#flagsIterator()
*/
public Iterator<Flag> flagsIterator() {
return new FlagsIterator();
@@ -237,7 +237,7 @@ public class MailboxEventDispatcher impl
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxListener.FlagsUpdated#getNewFlags()
+ * @see org.apache.james.mailbox.MailboxListener.FlagsUpdated#getNewFlags()
*/
public Flags getNewFlags() {
return newFlags;
@@ -323,7 +323,7 @@ public class MailboxEventDispatcher impl
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxListener.MailboxRenamed#getNewPath()
+ * @see org.apache.james.mailbox.MailboxListener.MailboxRenamed#getNewPath()
*/
public MailboxPath getNewPath() {
return newPath;
@@ -332,7 +332,7 @@ public class MailboxEventDispatcher impl
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxListener#isClosed()
+ * @see org.apache.james.mailbox.MailboxListener#isClosed()
*/
public boolean isClosed() {
return false;
Modified: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/MessageResultImpl.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/MessageResultImpl.java?rev=993114&r1=993085&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/MessageResultImpl.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/MessageResultImpl.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox.util;
+package org.apache.james.mailbox.util;
import java.util.Date;
import java.util.HashMap;
@@ -27,10 +27,10 @@ import java.util.Map;
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.mailbox.Content;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.MimeDescriptor;
/**
* Bean based implementation.
@@ -70,7 +70,7 @@ public class MessageResultImpl implement
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MessageResult#getUid()
+ * @see org.apache.james.mailbox.MessageResult#getUid()
*/
public long getUid() {
return uid;
@@ -79,7 +79,7 @@ public class MessageResultImpl implement
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MessageResult#getInternalDate()
+ * @see org.apache.james.mailbox.MessageResult#getInternalDate()
*/
public Date getInternalDate() {
return internalDate;
@@ -87,7 +87,7 @@ public class MessageResultImpl implement
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MessageResult#getFlags()
+ * @see org.apache.james.mailbox.MessageResult#getFlags()
*/
public Flags getFlags() {
return flags;
@@ -99,7 +99,7 @@ public class MessageResultImpl implement
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MessageResult#getSize()
+ * @see org.apache.james.mailbox.MessageResult#getSize()
*/
public long getSize() {
return size;
@@ -138,7 +138,7 @@ public class MessageResultImpl implement
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MessageResult#headers()
+ * @see org.apache.james.mailbox.MessageResult#headers()
*/
public Iterator<Header> headers() {
if (headers == null) {
@@ -160,7 +160,7 @@ public class MessageResultImpl implement
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MessageResult#getFullContent()
+ * @see org.apache.james.mailbox.MessageResult#getFullContent()
*/
public final Content getFullContent() {
return fullContent;
@@ -175,7 +175,7 @@ public class MessageResultImpl implement
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MessageResult#getBody()
+ * @see org.apache.james.mailbox.MessageResult#getBody()
*/
public final Content getBody() {
return body;
@@ -206,7 +206,7 @@ public class MessageResultImpl implement
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MessageResult#getBody(org.apache.james.imap.mailbox.MessageResult.MimePath)
+ * @see org.apache.james.mailbox.MessageResult#getBody(org.apache.james.mailbox.MessageResult.MimePath)
*/
public Content getBody(MimePath path) throws MailboxException {
final Content result;
@@ -221,7 +221,7 @@ public class MessageResultImpl implement
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MessageResult#getMimeBody(org.apache.james.imap.mailbox.MessageResult.MimePath)
+ * @see org.apache.james.mailbox.MessageResult#getMimeBody(org.apache.james.mailbox.MessageResult.MimePath)
*/
public Content getMimeBody(MimePath path) throws MailboxException {
final Content result;
@@ -236,7 +236,7 @@ public class MessageResultImpl implement
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MessageResult#getFullContent(org.apache.james.imap.mailbox.MessageResult.MimePath)
+ * @see org.apache.james.mailbox.MessageResult#getFullContent(org.apache.james.mailbox.MessageResult.MimePath)
*/
public Content getFullContent(MimePath path) throws MailboxException {
final Content result;
@@ -251,7 +251,7 @@ public class MessageResultImpl implement
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MessageResult#iterateHeaders(org.apache.james.imap.mailbox.MessageResult.MimePath)
+ * @see org.apache.james.mailbox.MessageResult#iterateHeaders(org.apache.james.mailbox.MessageResult.MimePath)
*/
public Iterator<Header> iterateHeaders(MimePath path)
throws MailboxException {
@@ -267,7 +267,7 @@ public class MessageResultImpl implement
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MessageResult#iterateMimeHeaders(org.apache.james.imap.mailbox.MessageResult.MimePath)
+ * @see org.apache.james.mailbox.MessageResult#iterateMimeHeaders(org.apache.james.mailbox.MessageResult.MimePath)
*/
public Iterator<Header> iterateMimeHeaders(MimePath path)
throws MailboxException {
@@ -381,7 +381,7 @@ public class MessageResultImpl implement
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MessageResult#getMimeDescriptor()
+ * @see org.apache.james.mailbox.MessageResult#getMimeDescriptor()
*/
public MimeDescriptor getMimeDescriptor() {
return mimeDescriptor;
Modified: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/PartContentDescriptorImpl.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/PartContentDescriptorImpl.java?rev=993114&r1=993085&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/PartContentDescriptorImpl.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/PartContentDescriptorImpl.java Mon Sep 6 18:09:32 2010
@@ -17,10 +17,10 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox.util;
+package org.apache.james.mailbox.util;
-import org.apache.james.imap.mailbox.MessageResult.MimePath;
-import org.apache.james.imap.mailbox.MessageResult.FetchGroup.PartContentDescriptor;
+import org.apache.james.mailbox.MessageResult.MimePath;
+import org.apache.james.mailbox.MessageResult.FetchGroup.PartContentDescriptor;
public class PartContentDescriptorImpl implements PartContentDescriptor {
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/SimpleMailboxMetaData.java (from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/SimpleMailboxMetaData.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/SimpleMailboxMetaData.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/SimpleMailboxMetaData.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/SimpleMailboxMetaData.java&r1=993100&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/SimpleMailboxMetaData.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/SimpleMailboxMetaData.java Mon Sep 6 18:09:32 2010
@@ -17,11 +17,11 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox.util;
+package org.apache.james.mailbox.util;
-import org.apache.james.imap.mailbox.MailboxMetaData;
-import org.apache.james.imap.mailbox.MailboxPath;
-import org.apache.james.imap.mailbox.StandardMailboxMetaDataComparator;
+import org.apache.james.mailbox.MailboxMetaData;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.StandardMailboxMetaDataComparator;
public class SimpleMailboxMetaData implements MailboxMetaData, Comparable<MailboxMetaData> {
@@ -68,7 +68,7 @@ public class SimpleMailboxMetaData imple
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxMetaData#getHierarchyDelimiter()
+ * @see org.apache.james.mailbox.MailboxMetaData#getHierarchyDelimiter()
*/
public String getHierarchyDelimiter() {
return delimiter;
@@ -76,7 +76,7 @@ public class SimpleMailboxMetaData imple
/*
* (non-Javadoc)
- * @see org.apache.james.imap.mailbox.MailboxMetaData#getPath()
+ * @see org.apache.james.mailbox.MailboxMetaData#getPath()
*/
public MailboxPath getPath() {
return path;
Copied: james/imap/trunk/mailbox/src/test/java/org/apache/james/mailbox/MailboxExpressionTest.java (from r993100, james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MailboxExpressionTest.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/test/java/org/apache/james/mailbox/MailboxExpressionTest.java?p2=james/imap/trunk/mailbox/src/test/java/org/apache/james/mailbox/MailboxExpressionTest.java&p1=james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MailboxExpressionTest.java&r1=993100&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MailboxExpressionTest.java (original)
+++ james/imap/trunk/mailbox/src/test/java/org/apache/james/mailbox/MailboxExpressionTest.java Mon Sep 6 18:09:32 2010
@@ -17,10 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
import static org.junit.Assert.*;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxQuery;
import org.junit.Test;
public class MailboxExpressionTest {
Modified: james/imap/trunk/mailbox/src/test/java/org/apache/james/mailbox/util/EventCollector.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/test/java/org/apache/james/mailbox/util/EventCollector.java?rev=993114&r1=991286&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/test/java/org/apache/james/mailbox/util/EventCollector.java (original)
+++ james/imap/trunk/mailbox/src/test/java/org/apache/james/mailbox/util/EventCollector.java Mon Sep 6 18:09:32 2010
@@ -17,12 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox.util;
+package org.apache.james.mailbox.util;
import java.util.ArrayList;
import java.util.List;
-import org.apache.james.imap.mailbox.MailboxListener;
+import org.apache.james.mailbox.MailboxListener;
public class EventCollector implements MailboxListener {
Copied: james/imap/trunk/mailbox/src/test/java/org/apache/james/mailbox/util/MailboxEventDispatcherFlagsTest.java (from r993100, james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/test/java/org/apache/james/mailbox/util/MailboxEventDispatcherFlagsTest.java?p2=james/imap/trunk/mailbox/src/test/java/org/apache/james/mailbox/util/MailboxEventDispatcherFlagsTest.java&p1=james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java&r1=993100&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java (original)
+++ james/imap/trunk/mailbox/src/test/java/org/apache/james/mailbox/util/MailboxEventDispatcherFlagsTest.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox.util;
+package org.apache.james.mailbox.util;
import static org.junit.Assert.*;
@@ -25,9 +25,10 @@ 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.imap.mailbox.MessageResult;
+import org.apache.james.mailbox.MailboxListener;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.util.MailboxEventDispatcher;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
Modified: james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirMailboxManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirMailboxManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirMailboxManager.java (original)
+++ james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirMailboxManager.java Mon Sep 6 18:09:32 2010
@@ -18,10 +18,6 @@
****************************************************************/
package org.apache.james.imap.maildir;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxPath;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.util.MailboxEventDispatcher;
import org.apache.james.imap.maildir.mail.model.MaildirMailbox;
import org.apache.james.imap.store.Authenticator;
import org.apache.james.imap.store.MailboxSessionMapperFactory;
@@ -29,6 +25,10 @@ import org.apache.james.imap.store.Store
import org.apache.james.imap.store.MapperStoreMessageManager;
import org.apache.james.imap.store.mail.MailboxMapper;
import org.apache.james.imap.store.mail.model.Mailbox;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.util.MailboxEventDispatcher;
public class MaildirMailboxManager extends StoreMailboxManager<Integer> {
Modified: james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirMailboxSessionMapperFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirMailboxSessionMapperFactory.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirMailboxSessionMapperFactory.java (original)
+++ james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirMailboxSessionMapperFactory.java Mon Sep 6 18:09:32 2010
@@ -18,9 +18,6 @@
****************************************************************/
package org.apache.james.imap.maildir;
-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.maildir.mail.MaildirMailboxMapper;
import org.apache.james.imap.maildir.mail.MaildirMessageMapper;
import org.apache.james.imap.maildir.user.MaildirSubscriptionMapper;
@@ -28,6 +25,9 @@ import org.apache.james.imap.store.Mailb
import org.apache.james.imap.store.mail.MailboxMapper;
import org.apache.james.imap.store.mail.MessageMapper;
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.SubscriptionException;
public class MaildirMailboxSessionMapperFactory extends
MailboxSessionMapperFactory<Integer> {
Modified: james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirMessageManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirMessageManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirMessageManager.java (original)
+++ james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirMessageManager.java Mon Sep 6 18:09:32 2010
@@ -25,8 +25,6 @@ import java.util.List;
import javax.mail.Flags;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.util.MailboxEventDispatcher;
import org.apache.james.imap.maildir.mail.model.MaildirHeader;
import org.apache.james.imap.maildir.mail.model.MaildirMessage;
import org.apache.james.imap.store.MailboxSessionMapperFactory;
@@ -35,6 +33,8 @@ import org.apache.james.imap.store.mail.
import org.apache.james.imap.store.mail.model.Mailbox;
import org.apache.james.imap.store.mail.model.MailboxMembership;
import org.apache.james.imap.store.mail.model.PropertyBuilder;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.util.MailboxEventDispatcher;
public class MaildirMessageManager extends MapperStoreMessageManager<Integer> {
Modified: james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirStore.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirStore.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirStore.java (original)
+++ james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirStore.java Mon Sep 6 18:09:32 2010
@@ -21,11 +21,11 @@ package org.apache.james.imap.maildir;
import java.io.File;
import java.io.IOException;
-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.maildir.mail.model.MaildirMailbox;
import org.apache.james.imap.store.mail.model.Mailbox;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxNotFoundException;
+import org.apache.james.mailbox.MailboxPath;
public class MaildirStore {
Modified: james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirSubscriptionManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirSubscriptionManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirSubscriptionManager.java (original)
+++ james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirSubscriptionManager.java Mon Sep 6 18:09:32 2010
@@ -18,10 +18,10 @@
****************************************************************/
package org.apache.james.imap.maildir;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.maildir.user.model.MaildirSubscription;
import org.apache.james.imap.store.StoreSubscriptionManager;
import org.apache.james.imap.store.user.model.Subscription;
+import org.apache.james.mailbox.MailboxSession;
public class MaildirSubscriptionManager extends StoreSubscriptionManager<Integer> {
Modified: james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/MaildirMailboxMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/MaildirMailboxMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/MaildirMailboxMapper.java (original)
+++ james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/MaildirMailboxMapper.java Mon Sep 6 18:09:32 2010
@@ -27,10 +27,6 @@ import java.util.regex.Pattern;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.NotImplementedException;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxExistsException;
-import org.apache.james.imap.mailbox.MailboxNotFoundException;
-import org.apache.james.imap.mailbox.MailboxPath;
import org.apache.james.imap.maildir.MaildirFolder;
import org.apache.james.imap.maildir.MaildirMessageName;
import org.apache.james.imap.maildir.MaildirStore;
@@ -38,6 +34,10 @@ import org.apache.james.imap.maildir.mai
import org.apache.james.imap.store.mail.MailboxMapper;
import org.apache.james.imap.store.mail.model.Mailbox;
import org.apache.james.imap.store.transaction.NonTransactionalMapper;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxExistsException;
+import org.apache.james.mailbox.MailboxNotFoundException;
+import org.apache.james.mailbox.MailboxPath;
public class MaildirMailboxMapper extends NonTransactionalMapper implements MailboxMapper<Integer> {
Modified: james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/MaildirMessageMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/MaildirMessageMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/MaildirMessageMapper.java (original)
+++ james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/MaildirMessageMapper.java Mon Sep 6 18:09:32 2010
@@ -35,12 +35,6 @@ import java.util.Map.Entry;
import javax.mail.util.SharedFileInputStream;
import org.apache.commons.io.FileUtils;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MessageRange;
-import org.apache.james.imap.mailbox.SearchQuery;
-import org.apache.james.imap.mailbox.MessageRange.Type;
-import org.apache.james.imap.mailbox.SearchQuery.Criterion;
-import org.apache.james.imap.mailbox.SearchQuery.NumericRange;
import org.apache.james.imap.maildir.MaildirFolder;
import org.apache.james.imap.maildir.MaildirMessageName;
import org.apache.james.imap.maildir.MaildirStore;
@@ -56,6 +50,12 @@ import org.apache.james.imap.store.mail.
import org.apache.james.imap.store.streaming.ConfigurableMimeTokenStream;
import org.apache.james.imap.store.streaming.CountingInputStream;
import org.apache.james.imap.store.transaction.NonTransactionalMapper;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MessageRange;
+import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.MessageRange.Type;
+import org.apache.james.mailbox.SearchQuery.Criterion;
+import org.apache.james.mailbox.SearchQuery.NumericRange;
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.descriptor.MaximalBodyDescriptor;
import org.apache.james.mime4j.parser.MimeEntityConfig;
@@ -131,7 +131,7 @@ public class MaildirMessageMapper extend
/*
* (non-Javadoc)
- * @see org.apache.james.imap.store.mail.MessageMapper#findInMailbox(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.imap.mailbox.MessageRange)
+ * @see org.apache.james.imap.store.mail.MessageMapper#findInMailbox(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.mailbox.MessageRange)
*/
public List<MailboxMembership<Integer>> findInMailbox(Mailbox<Integer> mailbox, MessageRange set)
throws MailboxException {
@@ -195,7 +195,7 @@ public class MaildirMessageMapper extend
/*
* (non-Javadoc)
- * @see org.apache.james.imap.store.mail.MessageMapper#findMarkedForDeletionInMailbox(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.imap.mailbox.MessageRange)
+ * @see org.apache.james.imap.store.mail.MessageMapper#findMarkedForDeletionInMailbox(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.mailbox.MessageRange)
*/
public List<MailboxMembership<Integer>> findMarkedForDeletionInMailbox(Mailbox<Integer> mailbox, MessageRange set) throws MailboxException {
List<MailboxMembership<Integer>> results = new ArrayList<MailboxMembership<Integer>>();
@@ -377,7 +377,7 @@ public class MaildirMessageMapper extend
/*
* (non-Javadoc)
- * @see org.apache.james.imap.store.mail.MessageMapper#searchMailbox(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.imap.mailbox.SearchQuery)
+ * @see org.apache.james.imap.store.mail.MessageMapper#searchMailbox(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.mailbox.SearchQuery)
*/
public Iterator<Long> searchMailbox(Mailbox<Integer> mailbox, SearchQuery query)
throws MailboxException {
Modified: james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/model/MaildirMailbox.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/model/MaildirMailbox.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/model/MaildirMailbox.java (original)
+++ james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/model/MaildirMailbox.java Mon Sep 6 18:09:32 2010
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.james.imap.maildir.mail.model;
-import org.apache.james.imap.mailbox.MailboxPath;
import org.apache.james.imap.store.mail.model.Mailbox;
+import org.apache.james.mailbox.MailboxPath;
public class MaildirMailbox implements Mailbox<Integer> {
Modified: james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/model/MaildirMessage.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/model/MaildirMessage.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/model/MaildirMessage.java (original)
+++ james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/model/MaildirMessage.java Mon Sep 6 18:09:32 2010
@@ -28,7 +28,6 @@ import java.util.List;
import javax.mail.Flags;
import org.apache.commons.lang.NotImplementedException;
-import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.maildir.MaildirMessageName;
import org.apache.james.imap.store.mail.model.AbstractMessage;
import org.apache.james.imap.store.mail.model.Message;
@@ -38,6 +37,7 @@ import org.apache.james.imap.store.mail.
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.StreamUtils;
+import org.apache.james.mailbox.MailboxException;
public class MaildirMessage extends AbstractMessage implements MailboxMembership<Integer> {
Modified: james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/user/MaildirSubscriptionMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/user/MaildirSubscriptionMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/user/MaildirSubscriptionMapper.java (original)
+++ james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/user/MaildirSubscriptionMapper.java Mon Sep 6 18:09:32 2010
@@ -30,11 +30,11 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.james.imap.mailbox.SubscriptionException;
import org.apache.james.imap.maildir.user.model.MaildirSubscription;
import org.apache.james.imap.store.transaction.NonTransactionalMapper;
import org.apache.james.imap.store.user.SubscriptionMapper;
import org.apache.james.imap.store.user.model.Subscription;
+import org.apache.james.mailbox.SubscriptionException;
public class MaildirSubscriptionMapper extends NonTransactionalMapper implements SubscriptionMapper {
Modified: james/imap/trunk/maildir/src/test/java/org/apache/james/imap/functional/maildir/MaildirStressTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/maildir/src/test/java/org/apache/james/imap/functional/maildir/MaildirStressTest.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/maildir/src/test/java/org/apache/james/imap/functional/maildir/MaildirStressTest.java (original)
+++ james/imap/trunk/maildir/src/test/java/org/apache/james/imap/functional/maildir/MaildirStressTest.java Mon Sep 6 18:09:32 2010
@@ -23,10 +23,10 @@ import java.io.IOException;
import org.apache.commons.io.FileUtils;
import org.apache.james.imap.functional.AbstractStressTest;
-import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.maildir.MaildirMailboxManager;
import org.apache.james.imap.maildir.MaildirMailboxSessionMapperFactory;
import org.apache.james.imap.store.StoreMailboxManager;
+import org.apache.james.mailbox.MailboxException;
import org.junit.After;
import org.junit.Before;
Modified: james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxManager.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxManager.java Mon Sep 6 18:09:32 2010
@@ -20,15 +20,15 @@
package org.apache.james.imap.inmemory;
import org.apache.james.imap.inmemory.mail.model.InMemoryMailbox;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxPath;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.util.MailboxEventDispatcher;
import org.apache.james.imap.store.Authenticator;
import org.apache.james.imap.store.MailboxSessionMapperFactory;
import org.apache.james.imap.store.StoreMailboxManager;
import org.apache.james.imap.store.MapperStoreMessageManager;
import org.apache.james.imap.store.mail.model.Mailbox;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.util.MailboxEventDispatcher;
public class InMemoryMailboxManager extends StoreMailboxManager<Long> {
Modified: james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxSessionMapperFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxSessionMapperFactory.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxSessionMapperFactory.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxSessionMapperFactory.java Mon Sep 6 18:09:32 2010
@@ -21,15 +21,15 @@ package org.apache.james.imap.inmemory;
import org.apache.james.imap.inmemory.mail.InMemoryMailboxMapper;
import org.apache.james.imap.inmemory.mail.InMemoryMessageMapper;
import org.apache.james.imap.inmemory.user.InMemorySubscriptionMapper;
-import org.apache.james.imap.mailbox.MailboxConstants;
-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.store.MailboxSessionMapperFactory;
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.MailboxConstants;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.SubscriptionException;
public class InMemoryMailboxSessionMapperFactory extends MailboxSessionMapperFactory<Long> {
Modified: james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryStoreMessageManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryStoreMessageManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryStoreMessageManager.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryStoreMessageManager.java Mon Sep 6 18:09:32 2010
@@ -29,13 +29,13 @@ import javax.mail.Flags;
import org.apache.james.imap.inmemory.mail.model.InMemoryMailbox;
import org.apache.james.imap.inmemory.mail.model.SimpleHeader;
import org.apache.james.imap.inmemory.mail.model.SimpleMailboxMembership;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.util.MailboxEventDispatcher;
import org.apache.james.imap.store.MailboxSessionMapperFactory;
import org.apache.james.imap.store.MapperStoreMessageManager;
import org.apache.james.imap.store.mail.model.Header;
import org.apache.james.imap.store.mail.model.MailboxMembership;
import org.apache.james.imap.store.mail.model.PropertyBuilder;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.util.MailboxEventDispatcher;
public class InMemoryStoreMessageManager extends MapperStoreMessageManager<Long> {
Modified: james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemorySubscriptionManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemorySubscriptionManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemorySubscriptionManager.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemorySubscriptionManager.java Mon Sep 6 18:09:32 2010
@@ -19,12 +19,12 @@
package org.apache.james.imap.inmemory;
import org.apache.james.imap.inmemory.user.model.InMemorySubscription;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.store.MailboxSessionMapperFactory;
import org.apache.james.imap.store.StoreSubscriptionManager;
import org.apache.james.imap.store.transaction.Mapper.Transaction;
import org.apache.james.imap.store.user.model.Subscription;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxSession;
/**
* Stores subscriptions in memory.
Modified: james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMailboxMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMailboxMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMailboxMapper.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMailboxMapper.java Mon Sep 6 18:09:32 2010
@@ -24,12 +24,12 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.james.imap.inmemory.mail.model.InMemoryMailbox;
-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.MailboxMapper;
import org.apache.james.imap.store.mail.model.Mailbox;
import org.apache.james.imap.store.transaction.NonTransactionalMapper;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxNotFoundException;
+import org.apache.james.mailbox.MailboxPath;
public class InMemoryMailboxMapper extends NonTransactionalMapper implements MailboxMapper<Long> {
Modified: james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMessageMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMessageMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMessageMapper.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMessageMapper.java Mon Sep 6 18:09:32 2010
@@ -28,15 +28,15 @@ import java.util.concurrent.ConcurrentHa
import org.apache.james.imap.inmemory.mail.model.InMemoryMailbox;
import org.apache.james.imap.inmemory.mail.model.SimpleMailboxMembership;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MessageRange;
-import org.apache.james.imap.mailbox.SearchQuery;
import org.apache.james.imap.store.MailboxMembershipComparator;
import org.apache.james.imap.store.SearchQueryIterator;
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.NonTransactionalMapper;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MessageRange;
+import org.apache.james.mailbox.SearchQuery;
public class InMemoryMessageMapper extends NonTransactionalMapper implements MessageMapper<Long> {
@@ -88,7 +88,7 @@ public class InMemoryMessageMapper exten
/*
* (non-Javadoc)
- * @see org.apache.james.imap.store.mail.MessageMapper#findInMailbox(java.lang.Object, org.apache.james.imap.mailbox.MessageRange)
+ * @see org.apache.james.imap.store.mail.MessageMapper#findInMailbox(java.lang.Object, org.apache.james.mailbox.MessageRange)
*/
@SuppressWarnings("unchecked")
public List<MailboxMembership<Long>> findInMailbox(Mailbox<Long> mailbox, MessageRange set) throws MailboxException {
@@ -132,7 +132,7 @@ public class InMemoryMessageMapper exten
/*
* (non-Javadoc)
- * @see org.apache.james.imap.store.mail.MessageMapper#findMarkedForDeletionInMailbox(org.apache.james.imap.mailbox.MessageRange)
+ * @see org.apache.james.imap.store.mail.MessageMapper#findMarkedForDeletionInMailbox(org.apache.james.mailbox.MessageRange)
*/
public List<MailboxMembership<Long>> findMarkedForDeletionInMailbox(Mailbox<Long> mailbox, MessageRange set) throws MailboxException {
final List<MailboxMembership<Long>> results = findInMailbox(mailbox, set);
@@ -190,7 +190,7 @@ public class InMemoryMessageMapper exten
/*
* (non-Javadoc)
- * @see org.apache.james.imap.store.mail.MessageMapper#searchMailbox(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.imap.mailbox.SearchQuery)
+ * @see org.apache.james.imap.store.mail.MessageMapper#searchMailbox(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.mailbox.SearchQuery)
*/
public Iterator<Long> searchMailbox(Mailbox<Long> mailbox, SearchQuery query) throws MailboxException {
List<MailboxMembership<?>> memberships = new ArrayList<MailboxMembership<?>>(getMembershipByUidForMailbox(mailbox).values());
Modified: james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/model/InMemoryMailbox.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/model/InMemoryMailbox.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/model/InMemoryMailbox.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/model/InMemoryMailbox.java Mon Sep 6 18:09:32 2010
@@ -21,8 +21,8 @@ package org.apache.james.imap.inmemory.m
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.james.imap.mailbox.MailboxPath;
import org.apache.james.imap.store.mail.model.Mailbox;
+import org.apache.james.mailbox.MailboxPath;
/**
* Mailbox data which is stored only in memory.
Modified: james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/user/model/InMemorySubscription.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/user/model/InMemorySubscription.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/user/model/InMemorySubscription.java (original)
+++ james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/user/model/InMemorySubscription.java Mon Sep 6 18:09:32 2010
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.james.imap.inmemory.user.model;
-import org.apache.james.imap.mailbox.MailboxSession.User;
import org.apache.james.imap.store.user.model.Subscription;
+import org.apache.james.mailbox.MailboxSession.User;
public class InMemorySubscription implements Subscription {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java Mon Sep 6 18:09:32 2010
@@ -35,21 +35,21 @@ 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.MailboxConstants;
-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.mailbox.MessageResult;
-import org.apache.james.imap.mailbox.util.FetchGroupImpl;
import org.apache.james.imap.message.response.ExistsResponse;
import org.apache.james.imap.message.response.ExpungeResponse;
import org.apache.james.imap.message.response.FetchResponse;
import org.apache.james.imap.message.response.RecentResponse;
import org.apache.james.imap.processor.base.AbstractChainedProcessor;
import org.apache.james.imap.processor.base.ImapSessionUtils;
+import org.apache.james.mailbox.MailboxConstants;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MessageManager;
+import org.apache.james.mailbox.MessageRange;
+import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.util.FetchGroupImpl;
abstract public class AbstractMailboxProcessor extends AbstractChainedProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java Mon Sep 6 18:09:32 2010
@@ -33,20 +33,20 @@ 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.MailboxException;
-import org.apache.james.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.MailboxNotFoundException;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.SearchQuery;
-import org.apache.james.imap.mailbox.MessageManager.MetaData;
import org.apache.james.imap.message.request.AbstractMailboxSelectionRequest;
import org.apache.james.imap.message.response.ExistsResponse;
import org.apache.james.imap.message.response.FlagsResponse;
import org.apache.james.imap.message.response.RecentResponse;
import org.apache.james.imap.processor.base.ImapSessionUtils;
import org.apache.james.imap.processor.base.SelectedMailboxImpl;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.MailboxNotFoundException;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MessageManager;
+import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.MessageManager.MetaData;
abstract class AbstractSelectionProcessor extends AbstractMailboxProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSubscriptionProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSubscriptionProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSubscriptionProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSubscriptionProcessor.java Mon Sep 6 18:09:32 2010
@@ -23,10 +23,10 @@ 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.SubscriptionManager;
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.SubscriptionManager;
/**
* Abstract base class which should be used by implementations which need to access the {@link SubscriptionManager}
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AppendProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AppendProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AppendProcessor.java Mon Sep 6 18:09:32 2010
@@ -35,14 +35,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.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.MailboxNotFoundException;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.message.request.AppendRequest;
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.MailboxNotFoundException;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MessageManager;
public class AppendProcessor extends AbstractMailboxProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java Mon Sep 6 18:09:32 2010
@@ -26,8 +26,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.AuthenticateRequest;
+import org.apache.james.mailbox.MailboxManager;
public class AuthenticateProcessor extends AbstractMailboxProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java Mon Sep 6 18:09:32 2010
@@ -33,9 +33,9 @@ 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.CapabilityRequest;
import org.apache.james.imap.message.response.CapabilityResponse;
+import org.apache.james.mailbox.MailboxManager;
public class CapabilityProcessor extends AbstractMailboxProcessor implements CapabilityImplementingProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CheckProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CheckProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CheckProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CheckProcessor.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.CheckRequest;
+import org.apache.james.mailbox.MailboxManager;
public class CheckProcessor extends AbstractMailboxProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CloseProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CloseProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CloseProcessor.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.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.CloseRequest;
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 CloseProcessor extends AbstractMailboxProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CopyProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CopyProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CopyProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CopyProcessor.java Mon Sep 6 18:09:32 2010
@@ -29,13 +29,13 @@ 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.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.imap.mailbox.MessageRange;
import org.apache.james.imap.message.request.CopyRequest;
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.MessageRange;
public class CopyProcessor extends AbstractMailboxProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CreateProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CreateProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CreateProcessor.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.MailboxException;
-import org.apache.james.imap.mailbox.MailboxExistsException;
-import org.apache.james.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.MailboxPath;
import org.apache.james.imap.message.request.CreateRequest;
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.MailboxPath;
public class CreateProcessor extends AbstractMailboxProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java Mon Sep 6 18:09:32 2010
@@ -22,9 +22,9 @@ 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.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.SubscriptionManager;
import org.apache.james.imap.processor.fetch.FetchProcessor;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.SubscriptionManager;
/**
* TODO: perhaps this should be a POJO
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java Mon Sep 6 18:09:32 2010
@@ -27,12 +27,12 @@ import org.apache.james.imap.api.message
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.api.process.SelectedMailbox;
-import org.apache.james.imap.mailbox.MailboxException;
-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.DeleteRequest;
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.MailboxNotFoundException;
+import org.apache.james.mailbox.MailboxPath;
public class DeleteProcessor extends AbstractMailboxProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExamineProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExamineProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExamineProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExamineProcessor.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.ExamineRequest;
+import org.apache.james.mailbox.MailboxManager;
public class ExamineProcessor extends AbstractSelectionProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java Mon Sep 6 18:09:32 2010
@@ -29,13 +29,13 @@ 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.ExpungeRequest;
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 ExpungeProcessor extends AbstractMailboxProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LSubProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LSubProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LSubProcessor.java Mon Sep 6 18:09:32 2010
@@ -30,17 +30,17 @@ 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.MailboxConstants;
-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.MailboxQuery;
-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.LsubRequest;
import org.apache.james.imap.message.response.LSubResponse;
import org.apache.james.imap.processor.base.ImapSessionUtils;
+import org.apache.james.mailbox.MailboxConstants;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxQuery;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.SubscriptionException;
+import org.apache.james.mailbox.SubscriptionManager;
public class LSubProcessor extends AbstractSubscriptionProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java Mon Sep 6 18:09:32 2010
@@ -31,17 +31,17 @@ 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.MailboxConstants;
-import org.apache.james.imap.mailbox.MailboxException;
-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.mailbox.MailboxQuery;
-import org.apache.james.imap.mailbox.MailboxMetaData.Children;
-import org.apache.james.imap.mailbox.util.SimpleMailboxMetaData;
import org.apache.james.imap.message.request.ListRequest;
import org.apache.james.imap.message.response.ListResponse;
import org.apache.james.imap.processor.base.ImapSessionUtils;
+import org.apache.james.mailbox.MailboxConstants;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.MailboxMetaData;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxQuery;
+import org.apache.james.mailbox.MailboxMetaData.Children;
+import org.apache.james.mailbox.util.SimpleMailboxMetaData;
public class ListProcessor extends AbstractMailboxProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LoginProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LoginProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LoginProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LoginProcessor.java Mon Sep 6 18:09:32 2010
@@ -26,14 +26,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.BadCredentialsException;
-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.MailboxPath;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.message.request.LoginRequest;
import org.apache.james.imap.processor.base.ImapSessionUtils;
+import org.apache.james.mailbox.BadCredentialsException;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxExistsException;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxSession;
/**
* Processes a <code>LOGIN</code> command.
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java Mon Sep 6 18:09:32 2010
@@ -26,11 +26,11 @@ 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.MailboxManager;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.message.request.LogoutRequest;
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;
public class LogoutProcessor extends AbstractMailboxProcessor {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java Mon Sep 6 18:09:32 2010
@@ -33,10 +33,10 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.message.request.NamespaceRequest;
import org.apache.james.imap.message.response.NamespaceResponse;
-import org.apache.james.imap.mailbox.MailboxConstants;
-import org.apache.james.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.MailboxSession;
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;
/**
* Processes a NAMESPACE command into a suitable set of responses.
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org