You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by er...@apache.org on 2012/02/09 13:13:09 UTC
svn commit: r1242288 [3/4] - in /james/mailbox/trunk:
api/src/main/java/org/apache/james/mailbox/
api/src/main/java/org/apache/james/mailbox/acl/
api/src/main/java/org/apache/james/mailbox/exception/
api/src/main/java/org/apache/james/mailbox/model/ ap...
Modified: james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTest.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTest.java (original)
+++ james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTest.java Thu Feb 9 12:13:02 2012
@@ -26,13 +26,13 @@ import java.io.UnsupportedEncodingExcept
import org.apache.commons.io.FileUtils;
import org.apache.james.mailbox.AbstractMailboxManagerTest;
-import org.apache.james.mailbox.BadCredentialsException;
-import org.apache.james.mailbox.MailboxACLResolver;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MailboxExistsException;
-import org.apache.james.mailbox.SimpleGroupMembershipResolver;
-import org.apache.james.mailbox.UnionMailboxACLResolver;
-import org.apache.james.mailbox.MailboxACLResolver.GroupMembershipResolver;
+import org.apache.james.mailbox.acl.GroupMembershipResolver;
+import org.apache.james.mailbox.acl.MailboxACLResolver;
+import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
+import org.apache.james.mailbox.acl.UnionMailboxACLResolver;
+import org.apache.james.mailbox.exception.BadCredentialsException;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MailboxExistsException;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.junit.After;
Modified: james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirStressTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirStressTest.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirStressTest.java (original)
+++ james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirStressTest.java Thu Feb 9 12:13:02 2012
@@ -23,12 +23,12 @@ import java.io.IOException;
import org.apache.commons.io.FileUtils;
import org.apache.james.mailbox.AbstractStressTest;
-import org.apache.james.mailbox.MailboxACLResolver;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.SimpleGroupMembershipResolver;
-import org.apache.james.mailbox.UnionMailboxACLResolver;
-import org.apache.james.mailbox.MailboxACLResolver.GroupMembershipResolver;
+import org.apache.james.mailbox.acl.GroupMembershipResolver;
+import org.apache.james.mailbox.acl.MailboxACLResolver;
+import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
+import org.apache.james.mailbox.acl.UnionMailboxACLResolver;
+import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.junit.After;
Modified: james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java (original)
+++ james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java Thu Feb 9 12:13:02 2012
@@ -18,9 +18,9 @@
****************************************************************/
package org.apache.james.mailbox.inmemory;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.SubscriptionException;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.SubscriptionException;
import org.apache.james.mailbox.inmemory.mail.InMemoryMailboxMapper;
import org.apache.james.mailbox.inmemory.mail.InMemoryMessageMapper;
import org.apache.james.mailbox.inmemory.mail.InMemoryModSeqProvider;
Modified: james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java (original)
+++ james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java Thu Feb 9 12:13:02 2012
@@ -24,9 +24,9 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MailboxNotFoundException;
-import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MailboxNotFoundException;
+import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
@@ -53,7 +53,7 @@ public class InMemoryMailboxMapper imple
}
/**
- * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxByPath(org.apache.james.mailbox.MailboxPath)
+ * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxByPath(org.apache.james.mailbox.model.MailboxPath)
*/
public synchronized Mailbox<Long> findMailboxByPath(MailboxPath path) throws MailboxException, MailboxNotFoundException {
Mailbox<Long> result = null;
@@ -72,7 +72,7 @@ public class InMemoryMailboxMapper imple
}
/**
- * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxWithPathLike(org.apache.james.mailbox.MailboxPath)
+ * @see org.apache.james.mailbox.store.mail.MailboxMapper#findMailboxWithPathLike(org.apache.james.mailbox.model.MailboxPath)
*/
public List<Mailbox<Long>> findMailboxWithPathLike(MailboxPath path) throws MailboxException {
final String regex = path.getName().replace("%", ".*");
Modified: james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java (original)
+++ james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java Thu Feb 9 12:13:02 2012
@@ -30,10 +30,10 @@ import java.util.concurrent.ConcurrentHa
import javax.mail.Flags;
import javax.mail.Flags.Flag;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.MessageMetaData;
-import org.apache.james.mailbox.MessageRange;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MessageMetaData;
+import org.apache.james.mailbox.model.MessageRange;
import org.apache.james.mailbox.store.SimpleMessageMetaData;
import org.apache.james.mailbox.store.mail.AbstractMessageMapper;
import org.apache.james.mailbox.store.mail.ModSeqProvider;
@@ -91,7 +91,7 @@ public class InMemoryMessageMapper exten
/**
- * @see org.apache.james.mailbox.store.mail.MessageMapper#findInMailbox(org.apache.james.mailbox.store.mail.model.Mailbox, org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.store.mail.MessageMapper.FetchType, int)
+ * @see org.apache.james.mailbox.store.mail.MessageMapper#findInMailbox(org.apache.james.mailbox.store.mail.model.Mailbox, org.apache.james.mailbox.model.MessageRange, org.apache.james.mailbox.store.mail.MessageMapper.FetchType, int)
*/
public Iterator<Message<Long>> findInMailbox(Mailbox<Long> mailbox, MessageRange set, FetchType ftype, int max) throws MailboxException {
List<Message<Long>> results;
Modified: james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryModSeqProvider.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryModSeqProvider.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryModSeqProvider.java (original)
+++ james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryModSeqProvider.java Thu Feb 9 12:13:02 2012
@@ -23,8 +23,8 @@ import java.util.concurrent.ConcurrentHa
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.store.mail.ModSeqProvider;
import org.apache.james.mailbox.store.mail.model.Mailbox;
Modified: james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryUidProvider.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryUidProvider.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryUidProvider.java (original)
+++ james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryUidProvider.java Thu Feb 9 12:13:02 2012
@@ -23,8 +23,8 @@ import java.util.concurrent.ConcurrentHa
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.store.mail.UidProvider;
import org.apache.james.mailbox.store.mail.model.Mailbox;
Modified: james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java (original)
+++ james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java Thu Feb 9 12:13:02 2012
@@ -18,14 +18,14 @@
****************************************************************/
package org.apache.james.mailbox.inmemory;
-import org.apache.james.mailbox.BadCredentialsException;
-import org.apache.james.mailbox.MailboxACLResolver;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.AbstractMailboxManagerTest;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.SimpleGroupMembershipResolver;
-import org.apache.james.mailbox.UnionMailboxACLResolver;
-import org.apache.james.mailbox.MailboxACLResolver.GroupMembershipResolver;
+import org.apache.james.mailbox.acl.GroupMembershipResolver;
+import org.apache.james.mailbox.acl.MailboxACLResolver;
+import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
+import org.apache.james.mailbox.acl.UnionMailboxACLResolver;
+import org.apache.james.mailbox.exception.BadCredentialsException;
+import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.store.MockAuthenticator;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.junit.After;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractDelegatingMailboxListener.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractDelegatingMailboxListener.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractDelegatingMailboxListener.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractDelegatingMailboxListener.java Thu Feb 9 12:13:02 2012
@@ -22,11 +22,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxListener;
import org.apache.james.mailbox.MailboxListenerSupport;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxPath;
public abstract class AbstractDelegatingMailboxListener implements MailboxListener, MailboxListenerSupport{
@@ -92,7 +92,7 @@ public abstract class AbstractDelegating
}
/**
- * @see org.apache.james.mailbox.MailboxListenerSupport#addListener(org.apache.james.mailbox.MailboxPath, org.apache.james.mailbox.MailboxListener, org.apache.james.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.MailboxListenerSupport#addListener(org.apache.james.mailbox.model.MailboxPath, org.apache.james.mailbox.MailboxListener, org.apache.james.mailbox.MailboxSession)
*/
public void addListener(MailboxPath path, MailboxListener listener, MailboxSession session) throws MailboxException {
Map<MailboxPath, List<MailboxListener>> listeners = getListeners();
@@ -129,7 +129,7 @@ public abstract class AbstractDelegating
}
/**
- * @see org.apache.james.mailbox.MailboxListenerSupport#removeListener(org.apache.james.mailbox.MailboxPath, org.apache.james.mailbox.MailboxListener, org.apache.james.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.MailboxListenerSupport#removeListener(org.apache.james.mailbox.model.MailboxPath, org.apache.james.mailbox.MailboxListener, org.apache.james.mailbox.MailboxSession)
*/
public void removeListener(MailboxPath mailboxPath, MailboxListener listener, MailboxSession session) throws MailboxException {
Map<MailboxPath, List<MailboxListener>> listeners = getListeners();
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractMailboxPathLocker.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractMailboxPathLocker.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractMailboxPathLocker.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractMailboxPathLocker.java Thu Feb 9 12:13:02 2012
@@ -18,16 +18,16 @@
****************************************************************/
package org.apache.james.mailbox.store;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxPathLocker;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxPath;
public abstract class AbstractMailboxPathLocker implements MailboxPathLocker{
/**
- * @see org.apache.james.mailbox.MailboxPathLocker#executeWithLock(org.apache.james.mailbox.MailboxSession, org.apache.james.mailbox.MailboxPath, org.apache.james.mailbox.MailboxPathLocker.LockAwareExecution)
+ * @see org.apache.james.mailbox.MailboxPathLocker#executeWithLock(org.apache.james.mailbox.MailboxSession, org.apache.james.mailbox.model.MailboxPath, org.apache.james.mailbox.MailboxPathLocker.LockAwareExecution)
*/
public <T> T executeWithLock(MailboxSession session, MailboxPath path, LockAwareExecution<T> execution) throws MailboxException {
return executeWithLock(session, path, execution, true);
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/HashMapDelegatingMailboxListener.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/HashMapDelegatingMailboxListener.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/HashMapDelegatingMailboxListener.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/HashMapDelegatingMailboxListener.java Thu Feb 9 12:13:02 2012
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Map;
import org.apache.james.mailbox.MailboxListener;
-import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.model.MailboxPath;
/**
* Receive a {@link org.apache.james.mailbox.MailboxListener.Event} and delegate it to an other
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/JVMMailboxPathLocker.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/JVMMailboxPathLocker.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/JVMMailboxPathLocker.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/JVMMailboxPathLocker.java Thu Feb 9 12:13:02 2012
@@ -24,10 +24,10 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxPathLocker;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxPath;
/**
*
@@ -42,7 +42,7 @@ public final class JVMMailboxPathLocker
/**
- * @see org.apache.james.mailbox.store.AbstractMailboxPathLocker#lock(org.apache.james.mailbox.MailboxSession, org.apache.james.mailbox.MailboxPath, boolean)
+ * @see org.apache.james.mailbox.store.AbstractMailboxPathLocker#lock(org.apache.james.mailbox.MailboxSession, org.apache.james.mailbox.model.MailboxPath, boolean)
*/
protected void lock(MailboxSession session, MailboxPath path, boolean writeLock) throws MailboxException {
ReadWriteLock lock = paths.get(path);
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/LazyMimeDescriptor.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/LazyMimeDescriptor.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/LazyMimeDescriptor.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/LazyMimeDescriptor.java Thu Feb 9 12:13:02 2012
@@ -26,10 +26,10 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MessageResult;
-import org.apache.james.mailbox.MessageResult.Header;
-import org.apache.james.mailbox.MimeDescriptor;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MessageResult;
+import org.apache.james.mailbox.model.MimeDescriptor;
+import org.apache.james.mailbox.model.MessageResult.Header;
import org.apache.james.mailbox.store.mail.model.Message;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxEventDispatcher.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxEventDispatcher.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxEventDispatcher.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxEventDispatcher.java Thu Feb 9 12:13:02 2012
@@ -26,10 +26,10 @@ import java.util.SortedMap;
import org.apache.james.mailbox.MailboxListener;
import org.apache.james.mailbox.MailboxListener.MailboxAdded;
import org.apache.james.mailbox.MailboxListener.MailboxDeletion;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.MessageMetaData;
-import org.apache.james.mailbox.UpdatedFlags;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.MessageMetaData;
+import org.apache.james.mailbox.model.UpdatedFlags;
import org.apache.james.mailbox.store.mail.model.Mailbox;
/**
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java Thu Feb 9 12:13:02 2012
@@ -24,8 +24,8 @@ import java.util.List;
import javax.mail.Flags;
-import org.apache.james.mailbox.MailboxACL;
import org.apache.james.mailbox.MessageManager;
+import org.apache.james.mailbox.model.MailboxACL;
/**
* Describes the current state of a mailbox.
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java Thu Feb 9 12:13:02 2012
@@ -18,10 +18,10 @@
****************************************************************/
package org.apache.james.mailbox.store;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.RequestAware;
-import org.apache.james.mailbox.SubscriptionException;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.SubscriptionException;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.MailboxMapperFactory;
import org.apache.james.mailbox.store.mail.MessageMapper;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java Thu Feb 9 12:13:02 2012
@@ -29,11 +29,11 @@ import java.util.Map;
import javax.mail.Flags;
-import org.apache.james.mailbox.Content;
-import org.apache.james.mailbox.Headers;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MessageResult;
-import org.apache.james.mailbox.MimeDescriptor;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.Content;
+import org.apache.james.mailbox.model.Headers;
+import org.apache.james.mailbox.model.MessageResult;
+import org.apache.james.mailbox.model.MimeDescriptor;
import org.apache.james.mailbox.store.mail.model.Message;
import org.apache.james.mailbox.store.streaming.InputStreamContent;
import org.apache.james.mailbox.store.streaming.InputStreamContent.Type;
@@ -62,28 +62,28 @@ public class MessageResultImpl implement
}
/**
- * @see org.apache.james.mailbox.MessageResult#getUid()
+ * @see org.apache.james.mailbox.model.MessageResult#getUid()
*/
public long getUid() {
return message.getUid();
}
/**
- * @see org.apache.james.mailbox.MessageResult#getInternalDate()
+ * @see org.apache.james.mailbox.model.MessageResult#getInternalDate()
*/
public Date getInternalDate() {
return message.getInternalDate();
}
/**
- * @see org.apache.james.mailbox.MessageResult#getFlags()
+ * @see org.apache.james.mailbox.model.MessageResult#getFlags()
*/
public Flags getFlags() {
return message.createFlags();
}
/**
- * @see org.apache.james.mailbox.MessageResult#getSize()
+ * @see org.apache.james.mailbox.model.MessageResult#getSize()
*/
public long getSize() {
return message.getFullContentOctets();
@@ -132,7 +132,7 @@ public class MessageResultImpl implement
}
/**
- * @see org.apache.james.mailbox.MessageResult#getFullContent()
+ * @see org.apache.james.mailbox.model.MessageResult#getFullContent()
*/
public final Content getFullContent() throws IOException {
if (fullContent == null) {
@@ -142,7 +142,7 @@ public class MessageResultImpl implement
}
/**
- * @see org.apache.james.mailbox.MessageResult#getBody()
+ * @see org.apache.james.mailbox.model.MessageResult#getBody()
*/
public final Content getBody() throws IOException {
if (bodyContent == null) {
@@ -167,7 +167,7 @@ public class MessageResultImpl implement
/**
* @see
- * org.apache.james.mailbox.MessageResult#getBody(org.apache.james.mailbox.MessageResult.MimePath)
+ * org.apache.james.mailbox.model.MessageResult#getBody(org.apache.james.mailbox.model.MessageResult.MimePath)
*/
public Content getBody(MimePath path) throws MailboxException {
final Content result;
@@ -182,7 +182,7 @@ public class MessageResultImpl implement
/**
* @see
- * org.apache.james.mailbox.MessageResult#getMimeBody(org.apache.james.mailbox.MessageResult.MimePath)
+ * org.apache.james.mailbox.model.MessageResult#getMimeBody(org.apache.james.mailbox.model.MessageResult.MimePath)
*/
public Content getMimeBody(MimePath path) throws MailboxException {
final Content result;
@@ -197,7 +197,7 @@ public class MessageResultImpl implement
/**
* @see
- * org.apache.james.mailbox.MessageResult#getFullContent(org.apache.james.mailbox.MessageResult.MimePath)
+ * org.apache.james.mailbox.model.MessageResult#getFullContent(org.apache.james.mailbox.model.MessageResult.MimePath)
*/
public Content getFullContent(MimePath path) throws MailboxException {
final Content result;
@@ -212,7 +212,7 @@ public class MessageResultImpl implement
/**
* @see
- * org.apache.james.mailbox.MessageResult#iterateHeaders(org.apache.james.mailbox.MessageResult.MimePath)
+ * org.apache.james.mailbox.model.MessageResult#iterateHeaders(org.apache.james.mailbox.model.MessageResult.MimePath)
*/
public Iterator<Header> iterateHeaders(MimePath path) throws MailboxException {
final Iterator<Header> result;
@@ -227,7 +227,7 @@ public class MessageResultImpl implement
/**
* @see
- * org.apache.james.mailbox.MessageResult#iterateMimeHeaders(org.apache.james.mailbox.MessageResult.MimePath)
+ * org.apache.james.mailbox.model.MessageResult#iterateMimeHeaders(org.apache.james.mailbox.model.MessageResult.MimePath)
*/
public Iterator<Header> iterateMimeHeaders(MimePath path) throws MailboxException {
final Iterator<Header> result;
@@ -334,7 +334,7 @@ public class MessageResultImpl implement
}
/**
- * @see org.apache.james.mailbox.MessageResult#getMimeDescriptor()
+ * @see org.apache.james.mailbox.model.MessageResult#getMimeDescriptor()
*/
public MimeDescriptor getMimeDescriptor() throws MailboxException {
@@ -357,7 +357,7 @@ public class MessageResultImpl implement
}
/**
- * @see org.apache.james.mailbox.MessageMetaData#getModSeq()
+ * @see org.apache.james.mailbox.model.MessageMetaData#getModSeq()
*/
public long getModSeq() {
return message.getModSeq();
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java Thu Feb 9 12:13:02 2012
@@ -30,9 +30,9 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MessageResult;
-import org.apache.james.mailbox.MimeDescriptor;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MessageResult;
+import org.apache.james.mailbox.model.MimeDescriptor;
import org.apache.james.mailbox.store.streaming.CountingInputStream;
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.message.DefaultBodyDescriptorBuilder;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java Thu Feb 9 12:13:02 2012
@@ -27,8 +27,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MessageResult;
public final class ResultHeader implements MessageResult.Header {
private final String name;
@@ -45,21 +45,21 @@ public final class ResultHeader implemen
}
/**
- * @see org.apache.james.mailbox.MessageResult.Header#getName()
+ * @see org.apache.james.mailbox.model.MessageResult.Header#getName()
*/
public String getName() throws MailboxException {
return name;
}
/**
- * @see org.apache.james.mailbox.MessageResult.Header#getValue()
+ * @see org.apache.james.mailbox.model.MessageResult.Header#getValue()
*/
public String getValue() throws MailboxException {
return value;
}
/**
- * @see org.apache.james.mailbox.Content#size()
+ * @see org.apache.james.mailbox.model.Content#size()
*/
public long size() {
return size;
@@ -70,7 +70,7 @@ public final class ResultHeader implemen
}
/**
- * @see org.apache.james.mailbox.InputStreamContent#getInputStream()
+ * @see org.apache.james.mailbox.model.InputStreamContent#getInputStream()
*/
public InputStream getInputStream() throws IOException {
return new ByteArrayInputStream((name + ": " + value).getBytes(US_ASCII));
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java Thu Feb 9 12:13:02 2012
@@ -26,11 +26,11 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.james.mailbox.Content;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MessageResult;
-import org.apache.james.mailbox.MessageResult.FetchGroup;
-import org.apache.james.mailbox.MessageResult.MimePath;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.Content;
+import org.apache.james.mailbox.model.MessageResult;
+import org.apache.james.mailbox.model.MessageResult.FetchGroup;
+import org.apache.james.mailbox.model.MessageResult.MimePath;
import org.apache.james.mailbox.store.mail.model.Message;
import org.apache.james.mailbox.store.streaming.PartContentBuilder;
import org.apache.james.mime4j.MimeException;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java Thu Feb 9 12:13:02 2012
@@ -19,9 +19,9 @@
package org.apache.james.mailbox.store;
-import org.apache.james.mailbox.MailboxMetaData;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.StandardMailboxMetaDataComparator;
+import org.apache.james.mailbox.model.MailboxMetaData;
+import org.apache.james.mailbox.model.MailboxPath;
public class SimpleMailboxMetaData implements MailboxMetaData, Comparable<MailboxMetaData> {
@@ -66,14 +66,14 @@ public class SimpleMailboxMetaData imple
}
/**
- * @see org.apache.james.mailbox.MailboxMetaData#getHierarchyDelimiter()
+ * @see org.apache.james.mailbox.model.MailboxMetaData#getHierarchyDelimiter()
*/
public char getHierarchyDelimiter() {
return delimiter;
}
/**
- * @see org.apache.james.mailbox.MailboxMetaData#getPath()
+ * @see org.apache.james.mailbox.model.MailboxMetaData#getPath()
*/
public MailboxPath getPath() {
return path;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java Thu Feb 9 12:13:02 2012
@@ -26,8 +26,8 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import org.apache.james.mailbox.MailboxConstants;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.model.MailboxConstants;
import org.slf4j.Logger;
/**
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMessageMetaData.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMessageMetaData.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMessageMetaData.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMessageMetaData.java Thu Feb 9 12:13:02 2012
@@ -23,7 +23,7 @@ import java.util.Date;
import javax.mail.Flags;
-import org.apache.james.mailbox.MessageMetaData;
+import org.apache.james.mailbox.model.MessageMetaData;
import org.apache.james.mailbox.store.mail.model.Message;
@@ -47,28 +47,28 @@ public class SimpleMessageMetaData imple
}
/**
- * @see org.apache.james.mailbox.MessageMetaData#getFlags()
+ * @see org.apache.james.mailbox.model.MessageMetaData#getFlags()
*/
public Flags getFlags() {
return flags;
}
/**
- * @see org.apache.james.mailbox.MessageMetaData#getSize()
+ * @see org.apache.james.mailbox.model.MessageMetaData#getSize()
*/
public long getSize() {
return size;
}
/**
- * @see org.apache.james.mailbox.MessageMetaData#getInternalDate()
+ * @see org.apache.james.mailbox.model.MessageMetaData#getInternalDate()
*/
public Date getInternalDate() {
return internalDate;
}
/**
- * @see org.apache.james.mailbox.MessageMetaData#getUid()
+ * @see org.apache.james.mailbox.model.MessageMetaData#getUid()
*/
public long getUid() {
return uid;
@@ -91,7 +91,7 @@ public class SimpleMessageMetaData imple
}
/**
- * @see org.apache.james.mailbox.MessageMetaData#getModSeq()
+ * @see org.apache.james.mailbox.model.MessageMetaData#getModSeq()
*/
public long getModSeq() {
return modSeq;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java Thu Feb 9 12:13:02 2012
@@ -26,27 +26,27 @@ import java.util.List;
import java.util.Locale;
import java.util.Random;
-import org.apache.james.mailbox.BadCredentialsException;
-import org.apache.james.mailbox.MailboxACLResolver;
-import org.apache.james.mailbox.MailboxACLResolver.GroupMembershipResolver;
-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.MailboxMetaData.Selectability;
-import org.apache.james.mailbox.MailboxNotFoundException;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxPathLocker;
import org.apache.james.mailbox.MailboxPathLocker.LockAwareExecution;
-import org.apache.james.mailbox.MailboxQuery;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MailboxSession.SessionType;
import org.apache.james.mailbox.MailboxSessionIdGenerator;
-import org.apache.james.mailbox.MessageRange;
import org.apache.james.mailbox.RequestAware;
import org.apache.james.mailbox.StandardMailboxMetaDataComparator;
+import org.apache.james.mailbox.acl.GroupMembershipResolver;
+import org.apache.james.mailbox.acl.MailboxACLResolver;
+import org.apache.james.mailbox.exception.BadCredentialsException;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MailboxExistsException;
+import org.apache.james.mailbox.exception.MailboxNotFoundException;
+import org.apache.james.mailbox.model.MailboxConstants;
+import org.apache.james.mailbox.model.MailboxMetaData;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.MailboxQuery;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.MailboxMetaData.Selectability;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
@@ -486,7 +486,7 @@ public class StoreMailboxManager<Id> imp
}
/**
- * @see org.apache.james.mailbox.MailboxManager#search(org.apache.james.mailbox.MailboxQuery, org.apache.james.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.MailboxManager#search(org.apache.james.mailbox.model.MailboxQuery, org.apache.james.mailbox.MailboxSession)
*/
public List<MailboxMetaData> search(final MailboxQuery mailboxExpression, MailboxSession session)
throws MailboxException {
@@ -587,7 +587,7 @@ public class StoreMailboxManager<Id> imp
}
/**
- * @see org.apache.james.mailbox.MailboxListenerSupport#removeListener(org.apache.james.mailbox.MailboxPath, org.apache.james.mailbox.MailboxListener, org.apache.james.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.MailboxListenerSupport#removeListener(org.apache.james.mailbox.model.MailboxPath, org.apache.james.mailbox.MailboxListener, org.apache.james.mailbox.MailboxSession)
*/
public void removeListener(MailboxPath mailboxPath, MailboxListener listener, MailboxSession session) throws MailboxException {
delegatingListener.removeListener(mailboxPath, listener, session);
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxPath.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxPath.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxPath.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxPath.java Thu Feb 9 12:13:02 2012
@@ -19,7 +19,7 @@
package org.apache.james.mailbox.store;
-import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.mail.model.Mailbox;
public class StoreMailboxPath<Id> extends MailboxPath {
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java Thu Feb 9 12:13:02 2012
@@ -38,24 +38,24 @@ import javax.mail.util.SharedFileInputSt
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.TeeInputStream;
-import org.apache.james.mailbox.MailboxACL;
-import org.apache.james.mailbox.MailboxACL.MailboxACLRight;
-import org.apache.james.mailbox.MailboxACLResolver;
-import org.apache.james.mailbox.MailboxACLResolver.GroupMembershipResolver;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxListener;
import org.apache.james.mailbox.MailboxPathLocker;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MailboxSession.User;
import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.MessageMetaData;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.MessageResult.FetchGroup;
-import org.apache.james.mailbox.MessageResultIterator;
-import org.apache.james.mailbox.ReadOnlyException;
-import org.apache.james.mailbox.SearchQuery;
-import org.apache.james.mailbox.UnsupportedRightException;
-import org.apache.james.mailbox.UpdatedFlags;
+import org.apache.james.mailbox.acl.GroupMembershipResolver;
+import org.apache.james.mailbox.acl.MailboxACLResolver;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.ReadOnlyException;
+import org.apache.james.mailbox.exception.UnsupportedRightException;
+import org.apache.james.mailbox.model.MailboxACL;
+import org.apache.james.mailbox.model.MessageMetaData;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.MessageResultIterator;
+import org.apache.james.mailbox.model.SearchQuery;
+import org.apache.james.mailbox.model.UpdatedFlags;
+import org.apache.james.mailbox.model.MailboxACL.MailboxACLRight;
+import org.apache.james.mailbox.model.MessageResult.FetchGroup;
import org.apache.james.mailbox.store.mail.MessageMapper;
import org.apache.james.mailbox.store.mail.MessageMapper.FetchType;
import org.apache.james.mailbox.store.mail.MessageMapperFactory;
@@ -202,7 +202,7 @@ public class StoreMessageManager<Id> imp
}
/**
- * @see org.apache.james.mailbox.MessageManager#expunge(org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.MessageManager#expunge(org.apache.james.mailbox.model.MessageRange, org.apache.james.mailbox.MailboxSession)
*/
public Iterator<Long> expunge(final MessageRange set, MailboxSession mailboxSession) throws MailboxException {
if (!isWriteable(mailboxSession)) {
@@ -489,7 +489,7 @@ public class StoreMessageManager<Id> imp
}
/**
- * @see org.apache.james.mailbox.MessageManager#setFlags(javax.mail.Flags, boolean, boolean, org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.MessageManager#setFlags(javax.mail.Flags, boolean, boolean, org.apache.james.mailbox.model.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 {
@@ -568,7 +568,7 @@ public class StoreMessageManager<Id> imp
}
/**
- * @see org.apache.james.mailbox.MessageManager#getMessages(org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.MessageResult.FetchGroup, org.apache.james.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.MessageManager#getMessages(org.apache.james.mailbox.model.MessageRange, org.apache.james.mailbox.model.MessageResult.FetchGroup, org.apache.james.mailbox.MailboxSession)
*/
public MessageResultIterator getMessages(final MessageRange set, FetchGroup fetchGroup, MailboxSession mailboxSession) throws MailboxException {
final MessageMapper<Id> messageMapper = mapperFactory.getMessageMapper(mailboxSession);
@@ -626,7 +626,7 @@ public class StoreMessageManager<Id> imp
}
/**
- * @see org.apache.james.mailbox.MessageManager#search(org.apache.james.mailbox.SearchQuery, org.apache.james.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.MessageManager#search(org.apache.james.mailbox.model.SearchQuery, org.apache.james.mailbox.MailboxSession)
*/
public Iterator<Long> search(SearchQuery query, MailboxSession mailboxSession) throws MailboxException {
return index.search(mailboxSession, getMailboxEntity(), query);
@@ -651,7 +651,7 @@ public class StoreMessageManager<Id> imp
}
/**
- * @see org.apache.james.mailbox.store.AbstractStoreMessageManager#copy(org.apache.james.mailbox.MessageRange, org.apache.james.mailbox.store.AbstractStoreMessageManager, org.apache.james.mailbox.MailboxSession)
+ * @see org.apache.james.mailbox.store.AbstractStoreMessageManager#copy(org.apache.james.mailbox.model.MessageRange, org.apache.james.mailbox.store.AbstractStoreMessageManager, org.apache.james.mailbox.MailboxSession)
*/
private SortedMap<Long, MessageMetaData> copy(MessageRange set, final StoreMessageManager<Id> to, final MailboxSession session) throws MailboxException {
MessageMapper<Id> messageMapper = mapperFactory.getMessageMapper(session);
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java Thu Feb 9 12:13:02 2012
@@ -24,15 +24,15 @@ import java.util.NoSuchElementException;
import javax.mail.Flags;
-import org.apache.james.mailbox.Content;
-import org.apache.james.mailbox.Headers;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.MessageRange.Type;
-import org.apache.james.mailbox.MessageResult;
-import org.apache.james.mailbox.MessageResult.FetchGroup;
-import org.apache.james.mailbox.MessageResultIterator;
-import org.apache.james.mailbox.MimeDescriptor;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.Content;
+import org.apache.james.mailbox.model.Headers;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.MessageResult;
+import org.apache.james.mailbox.model.MessageResultIterator;
+import org.apache.james.mailbox.model.MimeDescriptor;
+import org.apache.james.mailbox.model.MessageRange.Type;
+import org.apache.james.mailbox.model.MessageResult.FetchGroup;
import org.apache.james.mailbox.store.mail.MessageMapper;
import org.apache.james.mailbox.store.mail.MessageMapper.FetchType;
import org.apache.james.mailbox.store.mail.model.Mailbox;
@@ -53,7 +53,7 @@ public class StoreMessageResultIterator<
private MessageMapper<Id> mapper;
private FetchType ftype;
- public StoreMessageResultIterator(MessageMapper<Id> mapper, Mailbox<Id> mailbox, MessageRange range, int batchSize, org.apache.james.mailbox.MessageResult.FetchGroup group) {
+ public StoreMessageResultIterator(MessageMapper<Id> mapper, Mailbox<Id> mailbox, MessageRange range, int batchSize, org.apache.james.mailbox.model.MessageResult.FetchGroup group) {
this.mailbox = mailbox;
this.group = group;
this.mapper = mapper;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java Thu Feb 9 12:13:02 2012
@@ -22,11 +22,11 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.RequestAware;
-import org.apache.james.mailbox.SubscriptionException;
import org.apache.james.mailbox.SubscriptionManager;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.SubscriptionException;
import org.apache.james.mailbox.store.transaction.Mapper;
import org.apache.james.mailbox.store.user.SubscriptionMapper;
import org.apache.james.mailbox.store.user.SubscriptionMapperFactory;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingModSeqProvider.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingModSeqProvider.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingModSeqProvider.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingModSeqProvider.java Thu Feb 9 12:13:02 2012
@@ -18,10 +18,10 @@
****************************************************************/
package org.apache.james.mailbox.store.mail;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxPathLocker;
import org.apache.james.mailbox.MailboxPathLocker.LockAwareExecution;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.store.StoreMailboxPath;
import org.apache.james.mailbox.store.mail.model.Mailbox;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingUidProvider.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingUidProvider.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingUidProvider.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingUidProvider.java Thu Feb 9 12:13:02 2012
@@ -18,10 +18,10 @@
****************************************************************/
package org.apache.james.mailbox.store.mail;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxPathLocker;
import org.apache.james.mailbox.MailboxPathLocker.LockAwareExecution;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.store.StoreMailboxPath;
import org.apache.james.mailbox.store.mail.model.Mailbox;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java Thu Feb 9 12:13:02 2012
@@ -24,11 +24,11 @@ import java.util.List;
import javax.mail.Flags;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.MessageMetaData;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.UpdatedFlags;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MessageMetaData;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.UpdatedFlags;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.Message;
import org.apache.james.mailbox.store.transaction.TransactionalMapper;
@@ -70,7 +70,7 @@ public abstract class AbstractMessageMap
/**
- * @see org.apache.james.mailbox.store.mail.MessageMapper#updateFlags(org.apache.james.mailbox.store.mail.model.Mailbox, javax.mail.Flags, boolean, boolean, org.apache.james.mailbox.MessageRange)
+ * @see org.apache.james.mailbox.store.mail.MessageMapper#updateFlags(org.apache.james.mailbox.store.mail.model.Mailbox, javax.mail.Flags, boolean, boolean, org.apache.james.mailbox.model.MessageRange)
*/
public Iterator<UpdatedFlags> updateFlags(final Mailbox<Id> mailbox, final Flags flags, final boolean value, final boolean replace, final MessageRange set) throws MailboxException {
final List<UpdatedFlags> updatedFlags = new ArrayList<UpdatedFlags>();
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java Thu Feb 9 12:13:02 2012
@@ -20,9 +20,9 @@ package org.apache.james.mailbox.store.m
import java.util.List;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MailboxNotFoundException;
-import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MailboxNotFoundException;
+import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.transaction.Mapper;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapperFactory.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapperFactory.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapperFactory.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapperFactory.java Thu Feb 9 12:13:02 2012
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.james.mailbox.store.mail;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.MailboxException;
public interface MailboxMapperFactory<Id> {
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java Thu Feb 9 12:13:02 2012
@@ -24,10 +24,10 @@ import java.util.Map;
import javax.mail.Flags;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MessageMetaData;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.UpdatedFlags;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MessageMetaData;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.UpdatedFlags;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.Message;
import org.apache.james.mailbox.store.mail.model.Property;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapperFactory.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapperFactory.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapperFactory.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapperFactory.java Thu Feb 9 12:13:02 2012
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.james.mailbox.store.mail;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.MailboxException;
public interface MessageMapperFactory<Id> {
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/ModSeqProvider.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/ModSeqProvider.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/ModSeqProvider.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/ModSeqProvider.java Thu Feb 9 12:13:02 2012
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.james.mailbox.store.mail;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.store.mail.model.Mailbox;
/**
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/UidProvider.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/UidProvider.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/UidProvider.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/UidProvider.java Thu Feb 9 12:13:02 2012
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.james.mailbox.store.mail;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.store.mail.model.Mailbox;
/**
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java Thu Feb 9 12:13:02 2012
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.mailbox.store.mail.model;
-import org.apache.james.mailbox.MailboxACL;
+import org.apache.james.mailbox.model.MailboxACL;
/**
* Models long term mailbox data.
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java Thu Feb 9 12:13:02 2012
@@ -18,9 +18,9 @@
****************************************************************/
package org.apache.james.mailbox.store.mail.model.impl;
-import org.apache.james.mailbox.MailboxACL;
-import org.apache.james.mailbox.MailboxPath;
-import org.apache.james.mailbox.SimpleMailboxACL;
+import org.apache.james.mailbox.model.MailboxACL;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.SimpleMailboxACL;
import org.apache.james.mailbox.store.mail.model.Mailbox;
public class SimpleMailbox<Id> implements Mailbox<Id> {
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java Thu Feb 9 12:13:02 2012
@@ -30,7 +30,7 @@ import javax.mail.internet.SharedInputSt
import javax.mail.util.SharedByteArrayInputStream;
import org.apache.commons.io.IOUtils;
-import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.store.mail.model.AbstractMessage;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.Message;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/FixedQuotaManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/FixedQuotaManager.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/FixedQuotaManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/FixedQuotaManager.java Thu Feb 9 12:13:02 2012
@@ -18,9 +18,9 @@
****************************************************************/
package org.apache.james.mailbox.store.quota;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.quota.Quota;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.Quota;
import org.apache.james.mailbox.store.StoreMailboxManager;
/**
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningQuotaManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningQuotaManager.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningQuotaManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningQuotaManager.java Thu Feb 9 12:13:02 2012
@@ -23,13 +23,13 @@ import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxListener;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.quota.Quota;
-import org.apache.james.mailbox.quota.QuotaManager;
+import org.apache.james.mailbox.QuotaManager;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.Quota;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.mail.model.Mailbox;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/PerUserQuotaManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/PerUserQuotaManager.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/PerUserQuotaManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/PerUserQuotaManager.java Thu Feb 9 12:13:02 2012
@@ -21,9 +21,9 @@ package org.apache.james.mailbox.store.q
import java.util.HashMap;
import java.util.Map;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.quota.Quota;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.Quota;
import org.apache.james.mailbox.store.StoreMailboxManager;
/**
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaImpl.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaImpl.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaImpl.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaImpl.java Thu Feb 9 12:13:02 2012
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.mailbox.store.quota;
-import org.apache.james.mailbox.quota.Quota;
+import org.apache.james.mailbox.model.Quota;
public final class QuotaImpl implements Quota{
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java Thu Feb 9 12:13:02 2012
@@ -23,10 +23,10 @@ import java.util.concurrent.ConcurrentHa
import javax.mail.Flags;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.SearchQuery;
import org.apache.james.mailbox.store.mail.MessageMapper.FetchType;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.Message;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java Thu Feb 9 12:13:02 2012
@@ -23,11 +23,11 @@ import java.util.List;
import javax.mail.Flags;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxListener;
-import org.apache.james.mailbox.UpdatedFlags;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.MessageRange;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.UpdatedFlags;
import org.apache.james.mailbox.store.MailboxEventDispatcher.AddedImpl;
import org.apache.james.mailbox.store.MailboxEventDispatcher.ExpungedImpl;
import org.apache.james.mailbox.store.MailboxEventDispatcher.FlagsUpdatedImpl;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearchIndex.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearchIndex.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearchIndex.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearchIndex.java Thu Feb 9 12:13:02 2012
@@ -21,9 +21,9 @@ package org.apache.james.mailbox.store.s
import java.util.Iterator;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.SearchQuery;
import org.apache.james.mailbox.store.mail.model.Mailbox;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java Thu Feb 9 12:13:02 2012
@@ -36,13 +36,13 @@ import java.util.TreeSet;
import javax.mail.Flags;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MessageResult.Header;
-import org.apache.james.mailbox.SearchQuery;
-import org.apache.james.mailbox.SearchQuery.AddressType;
-import org.apache.james.mailbox.SearchQuery.DateResolution;
-import org.apache.james.mailbox.UnsupportedSearchException;
-import org.apache.james.mailbox.SearchQuery.NumericRange;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.UnsupportedSearchException;
+import org.apache.james.mailbox.model.SearchQuery;
+import org.apache.james.mailbox.model.MessageResult.Header;
+import org.apache.james.mailbox.model.SearchQuery.AddressType;
+import org.apache.james.mailbox.model.SearchQuery.DateResolution;
+import org.apache.james.mailbox.model.SearchQuery.NumericRange;
import org.apache.james.mailbox.store.ResultUtils;
import org.apache.james.mailbox.store.mail.model.Message;
import org.apache.james.mailbox.store.search.comparator.CombinedComparator;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java Thu Feb 9 12:13:02 2012
@@ -23,13 +23,13 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.SearchQuery;
-import org.apache.james.mailbox.SearchQuery.Criterion;
-import org.apache.james.mailbox.SearchQuery.NumericRange;
-import org.apache.james.mailbox.SearchQuery.UidCriterion;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.SearchQuery;
+import org.apache.james.mailbox.model.SearchQuery.Criterion;
+import org.apache.james.mailbox.model.SearchQuery.NumericRange;
+import org.apache.james.mailbox.model.SearchQuery.UidCriterion;
import org.apache.james.mailbox.store.mail.MessageMapper;
import org.apache.james.mailbox.store.mail.MessageMapper.FetchType;
import org.apache.james.mailbox.store.mail.MessageMapperFactory;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java Thu Feb 9 12:13:02 2012
@@ -23,8 +23,8 @@ import java.util.Comparator;
import java.util.List;
import java.util.Locale;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MessageResult.Header;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MessageResult.Header;
import org.apache.james.mailbox.store.ResultUtils;
import org.apache.james.mailbox.store.mail.model.Message;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/comparator/CombinedComparator.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/comparator/CombinedComparator.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/comparator/CombinedComparator.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/comparator/CombinedComparator.java Thu Feb 9 12:13:02 2012
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
-import org.apache.james.mailbox.SearchQuery.Sort;
+import org.apache.james.mailbox.model.SearchQuery.Sort;
import org.apache.james.mailbox.store.mail.model.Message;
/**
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java Thu Feb 9 12:13:02 2012
@@ -26,7 +26,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.james.mailbox.Content;
+import org.apache.james.mailbox.model.Content;
public final class ByteContent implements Content {
@@ -40,7 +40,7 @@ public final class ByteContent implement
}
/**
- * @see org.apache.james.mailbox.Content#size()
+ * @see org.apache.james.mailbox.model.Content#size()
*/
public long size() {
return size;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java Thu Feb 9 12:13:02 2012
@@ -26,10 +26,10 @@ import java.io.SequenceInputStream;
import java.util.Iterator;
import java.util.List;
-import org.apache.james.mailbox.Content;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MessageResult;
-import org.apache.james.mailbox.MessageResult.Header;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.Content;
+import org.apache.james.mailbox.model.MessageResult;
+import org.apache.james.mailbox.model.MessageResult.Header;
/**
* Abstract base class for {@link Content} implementations which hold the headers and
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java Thu Feb 9 12:13:02 2012
@@ -21,7 +21,7 @@ package org.apache.james.mailbox.store.s
import java.io.IOException;
import java.io.InputStream;
-import org.apache.james.mailbox.Content;
+import org.apache.james.mailbox.model.Content;
import org.apache.james.mailbox.store.mail.model.Message;
/**
@@ -43,7 +43,7 @@ public final class InputStreamContent im
}
/**
- * @see org.apache.james.mailbox.Content#size()
+ * @see org.apache.james.mailbox.model.Content#size()
*/
public long size() {
switch (type) {
@@ -56,7 +56,7 @@ public final class InputStreamContent im
}
/**
- * @see org.apache.james.mailbox.InputStreamContent#getInputStream()
+ * @see org.apache.james.mailbox.model.InputStreamContent#getInputStream()
*/
public InputStream getInputStream() throws IOException {
// wrap the streams in a BoundedInputStream to make sure it really match with the stored size.
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java Thu Feb 9 12:13:02 2012
@@ -26,10 +26,10 @@ import java.util.Collections;
import java.util.List;
import org.apache.commons.io.IOUtils;
-import org.apache.james.mailbox.Content;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MessageResult;
-import org.apache.james.mailbox.MessageResult.Header;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.Content;
+import org.apache.james.mailbox.model.MessageResult;
+import org.apache.james.mailbox.model.MessageResult.Header;
import org.apache.james.mailbox.store.ResultHeader;
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.stream.EntityState;
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java Thu Feb 9 12:13:02 2012
@@ -19,7 +19,7 @@
package org.apache.james.mailbox.store.transaction;
-import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.exception.MailboxException;
/**
* Mapper which execute units of work in a {@link Transaction}
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java Thu Feb 9 12:13:02 2012
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.mailbox.store.transaction;
-import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.exception.MailboxException;
/**
* A Mapper which does no transaction handling. It just executes the execute() method
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java Thu Feb 9 12:13:02 2012
@@ -19,7 +19,7 @@
package org.apache.james.mailbox.store.transaction;
-import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.exception.MailboxException;
/**
*
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org