You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rd...@apache.org on 2008/12/31 14:42:27 UTC
svn commit: r730395 [1/4] - in /james/protocols/imap/trunk:
deployment/src/test/java/org/apache/james/imap/functional/
deployment/src/test/java/org/apache/james/imap/functional/jpa/
deployment/src/test/java/org/apache/james/mailboxmanager/torque/ jpa/s...
Author: rdonkin
Date: Wed Dec 31 05:42:24 2008
New Revision: 730395
URL: http://svn.apache.org/viewvc?rev=730395&view=rev
Log:
Repackage mailbox code
Added:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Constants.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/Constants.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Headers.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/Headers.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/ListResult.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/ListResult.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Mailbox.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/mailbox/Mailbox.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxException.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxManagerException.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExistsException.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxExistsException.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExpression.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/manager/MailboxExpression.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxListener.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxListener.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManager.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManagerProvider.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxNotFoundException.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxNotFoundException.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxSession.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxSession.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageRange.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MessageRange.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MessageResult.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SearchQuery.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/SearchQuery.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SubscriptionException.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/manager/SubscriptionException.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedCriteriaException.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/UnsupportedCriteriaException.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/package.html (props changed)
- copied unchanged from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/package.html
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/FetchGroupImpl.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/FetchGroupImpl.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/ListResultImpl.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/ListResultImpl.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventAnalyser.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/MailboxEventAnalyser.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcher.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MailboxEventDispatcher.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxListenerCollector.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MailboxListenerCollector.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageFlags.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MessageFlags.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageRangeImpl.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MessageRangeImpl.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/MessageResultImpl.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultUtils.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/MessageResultUtils.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/PartContentDescriptorImpl.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/PartContentDescriptorImpl.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidChangeTracker.java
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/UidChangeTracker.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidRange.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidRange.java
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/UidToMsnConverter.java (contents, props changed)
- copied, changed from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/util/UidToMsnConverter.java
Removed:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/
Modified:
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/SimpleMailboxManagerProvider.java
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jpa/SimpleUserManager.java
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxManagerSelfTestCase.java
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxSelfTestCase.java
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProviderSingleton.java
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerTest.java
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSelfTest.java
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxTest.java
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxTestCase.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ByteContent.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/FullContent.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSession.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAResultIterator.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageRowUtils.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearches.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MimeDescriptorImpl.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/OrFetchGroup.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/PartContentBuilder.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ResultHeader.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UnsupportedSearchException.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UserManager.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/MessageMapper.java
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsMultipartMixedTest.java
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsRFC822Test.java
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsTest.java
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultImplIncludedResultsTest.java
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultUtilsIsIncludedTest.java
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MessageResultUtilsTest.java
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MockMailboxListenerAdded.java
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/MockMailboxListenerFlagsUpdate.java
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/EventCollector.java
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/MailboxEventDispatcherFlagsTest.java
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/impl/UidChangeTrackerTest.java
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/manager/MailboxExpressionTest.java
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/mailboxmanager/util/MailboxEventAnalyserTest.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/AbstractImapRequestProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/AbstractMailboxAwareProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/ImapSessionUtils.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxSessionImpl.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractMailboxSelectionProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AppendProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/CloseProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/CopyProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/CreateProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/DeleteProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/ExamineProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/ExpungeProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/Imap4Rev1ProcessorFactory.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/LSubProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/ListProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/LoginProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/RenameProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/SearchProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/SelectProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/StatusProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/StoreProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/SubscribeProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/UnsubscribeProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/ContentBodyElement.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/EnvelopeBuilder.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/FetchResponseBuilder.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/HeaderBodyElement.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/MimeDescriptorStructure.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/fetch/MimePathImpl.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java
james/protocols/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/imap4rev1/LSubProcessorTest.java
james/protocols/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/imap4rev1/ListProcessorTest.java
james/protocols/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/imap4rev1/SearchProcessorTest.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/ByteContent.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/FullContent.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/Header.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearches.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MimeDescriptorImpl.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/OrFetchGroup.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/PartContentBuilder.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSession.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java
james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsMultipartMixedTest.java
james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsRFC822Test.java
james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsTest.java
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/SimpleMailboxManagerProvider.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/SimpleMailboxManagerProvider.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/SimpleMailboxManagerProvider.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/SimpleMailboxManagerProvider.java Wed Dec 31 05:42:24 2008
@@ -19,9 +19,9 @@
package org.apache.james.imap.functional;
-import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.mailboxmanager.manager.MailboxManager;
-import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
+import org.apache.james.imap.mailbox.MailboxException;
+import org.apache.james.imap.mailbox.MailboxManager;
+import org.apache.james.imap.mailbox.MailboxManagerProvider;
public class SimpleMailboxManagerProvider implements MailboxManagerProvider {
@@ -31,7 +31,7 @@
this.manager = manager;
}
- public MailboxManager getMailboxManager() throws MailboxManagerException {
+ public MailboxManager getMailboxManager() throws MailboxException {
return manager;
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jpa/SimpleUserManager.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jpa/SimpleUserManager.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jpa/SimpleUserManager.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jpa/SimpleUserManager.java Wed Dec 31 05:42:24 2008
@@ -24,7 +24,7 @@
import java.util.Map;
import org.apache.james.imap.jpa.UserManager;
-import org.apache.james.mailboxmanager.manager.SubscriptionException;
+import org.apache.james.imap.mailbox.SubscriptionException;
public class SimpleUserManager implements UserManager {
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxManagerSelfTestCase.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxManagerSelfTestCase.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxManagerSelfTestCase.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxManagerSelfTestCase.java Wed Dec 31 05:42:24 2008
@@ -25,11 +25,11 @@
import junit.framework.TestCase;
-import org.apache.james.mailboxmanager.ListResult;
-import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.mailboxmanager.manager.MailboxExpression;
-import org.apache.james.mailboxmanager.manager.MailboxManager;
-import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
+import org.apache.james.imap.mailbox.ListResult;
+import org.apache.james.imap.mailbox.MailboxException;
+import org.apache.james.imap.mailbox.MailboxExpression;
+import org.apache.james.imap.mailbox.MailboxManager;
+import org.apache.james.imap.mailbox.MailboxManagerProvider;
public abstract class AbstractMailboxManagerSelfTestCase extends TestCase {
@@ -37,7 +37,7 @@
protected MailboxManagerProvider mailboxManagerProvider;
- public void testCreateList() throws MailboxManagerException {
+ public void testCreateList() throws MailboxException {
ListResult[] listResult;
listResult = mailboxManager.list(new MailboxExpression("", "*", '*',
'%'));
@@ -60,7 +60,7 @@
}
}
- public void testListOne() throws MailboxManagerException {
+ public void testListOne() throws MailboxException {
mailboxManager.createMailbox("test1");
mailboxManager.createMailbox("INBOX");
mailboxManager.createMailbox("INBOX2");
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java Wed Dec 31 05:42:24 2008
@@ -19,7 +19,7 @@
package org.apache.james.mailboxmanager.torque;
-import org.apache.james.mailboxmanager.manager.MailboxManager;
+import org.apache.james.imap.mailbox.MailboxManager;
import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
import org.apache.torque.TorqueException;
import org.apache.torque.util.Criteria;
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxSelfTestCase.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxSelfTestCase.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxSelfTestCase.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxSelfTestCase.java Wed Dec 31 05:42:24 2008
@@ -30,14 +30,14 @@
import junit.framework.TestCase;
import org.apache.commons.collections.IteratorUtils;
-import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.mailboxmanager.MailboxSession;
-import org.apache.james.mailboxmanager.MessageResult;
-import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.MailboxListenerCollector;
-import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
-import org.apache.james.mailboxmanager.mailbox.Mailbox;
-import org.apache.james.mailboxmanager.manager.MailboxManager;
+import org.apache.james.imap.mailbox.Mailbox;
+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.MessageResult;
+import org.apache.james.imap.mailbox.util.FetchGroupImpl;
+import org.apache.james.imap.mailbox.util.MailboxListenerCollector;
+import org.apache.james.imap.mailbox.util.MessageRangeImpl;
public abstract class AbstractMailboxSelfTestCase extends TestCase {
@@ -61,7 +61,7 @@
assertNotNull(mailbox);
}
- public void testGetFirstUnseen() throws MailboxManagerException,
+ public void testGetFirstUnseen() throws MailboxException,
MessagingException {
assertNotNull(mailbox);
for (int i = 0; i < 5; i++) {
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java Wed Dec 31 05:42:24 2008
@@ -23,7 +23,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.james.mailboxmanager.manager.SubscriptionException;
+import org.apache.james.imap.mailbox.SubscriptionException;
public class SimpleUserManager implements UserManager {
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProviderSingleton.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProviderSingleton.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProviderSingleton.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProviderSingleton.java Wed Dec 31 05:42:24 2008
@@ -28,7 +28,7 @@
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.james.imap.functional.ImapHostSystem;
import org.apache.james.imap.functional.SimpleMailboxManagerProvider;
-import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
+import org.apache.james.imap.mailbox.MailboxManagerProvider;
import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
import org.apache.james.mailboxmanager.torque.om.MessageBodyPeer;
import org.apache.james.mailboxmanager.torque.om.MessageFlagsPeer;
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerTest.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerTest.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerTest.java Wed Dec 31 05:42:24 2008
@@ -20,7 +20,7 @@
import java.util.List;
-import org.apache.james.mailboxmanager.MailboxManagerException;
+import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.mailboxmanager.torque.om.MailboxRow;
import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
import org.apache.torque.TorqueException;
@@ -33,7 +33,7 @@
}
public void testCreateRenameDeleteMailbox() throws TorqueException,
- MailboxManagerException {
+ MailboxException {
mm.createMailbox("#users.tuser.INBOX");
List l = MailboxRowPeer.doSelect(new Criteria());
assertEquals(1, l.size());
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSelfTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSelfTest.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSelfTest.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSelfTest.java Wed Dec 31 05:42:24 2008
@@ -19,7 +19,7 @@
package org.apache.james.mailboxmanager.torque;
-import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
+import org.apache.james.imap.mailbox.MailboxManagerProvider;
import org.apache.torque.TorqueException;
public class TorqueMailboxSelfTest extends AbstractMailboxSelfTestCase {
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxTest.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxTest.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxTest.java Wed Dec 31 05:42:24 2008
@@ -26,11 +26,11 @@
import javax.mail.internet.MimeMessage;
import org.apache.commons.collections.IteratorUtils;
-import org.apache.james.mailboxmanager.MessageResult;
-import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.MailboxListenerCollector;
-import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
-import org.apache.james.mailboxmanager.mailbox.Mailbox;
+import org.apache.james.imap.mailbox.Mailbox;
+import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.imap.mailbox.util.FetchGroupImpl;
+import org.apache.james.imap.mailbox.util.MailboxListenerCollector;
+import org.apache.james.imap.mailbox.util.MessageRangeImpl;
import org.apache.james.mailboxmanager.torque.om.MailboxRow;
import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
import org.apache.james.mailboxmanager.torque.om.MessageRow;
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxTestCase.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxTestCase.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxTestCase.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxTestCase.java Wed Dec 31 05:42:24 2008
@@ -26,11 +26,11 @@
import javax.mail.internet.MimeMessage;
import org.apache.commons.collections.IteratorUtils;
-import org.apache.james.mailboxmanager.MessageResult;
-import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.MailboxListenerCollector;
-import org.apache.james.mailboxmanager.impl.MessageRangeImpl;
-import org.apache.james.mailboxmanager.mailbox.Mailbox;
+import org.apache.james.imap.mailbox.Mailbox;
+import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.imap.mailbox.util.FetchGroupImpl;
+import org.apache.james.imap.mailbox.util.MailboxListenerCollector;
+import org.apache.james.imap.mailbox.util.MessageRangeImpl;
import org.apache.james.mailboxmanager.torque.om.MailboxRow;
import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
import org.apache.james.mailboxmanager.torque.om.MessageRow;
Modified: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ByteContent.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ByteContent.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ByteContent.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ByteContent.java Wed Dec 31 05:42:24 2008
@@ -26,7 +26,7 @@
import java.nio.ByteBuffer;
import java.nio.channels.WritableByteChannel;
-import org.apache.james.mailboxmanager.MessageResult;
+import org.apache.james.imap.mailbox.MessageResult;
final class ByteContent implements MessageResult.Content {
Modified: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/FullContent.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/FullContent.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/FullContent.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/FullContent.java Wed Dec 31 05:42:24 2008
@@ -28,7 +28,7 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.james.mailboxmanager.MessageResult;
+import org.apache.james.imap.mailbox.MessageResult;
final class FullContent implements MessageResult.Content {
private final byte[] contents;
Modified: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailbox.java Wed Dec 31 05:42:24 2008
@@ -43,18 +43,18 @@
import org.apache.james.imap.jpa.om.Mailbox;
import org.apache.james.imap.jpa.om.Message;
import org.apache.james.imap.jpa.om.openjpa.OpenJPAMailboxMapper;
-import org.apache.james.mailboxmanager.MailboxListener;
-import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.mailboxmanager.MailboxSession;
-import org.apache.james.mailboxmanager.MessageRange;
-import org.apache.james.mailboxmanager.MessageResult;
-import org.apache.james.mailboxmanager.SearchQuery;
-import org.apache.james.mailboxmanager.MessageResult.FetchGroup;
-import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.UidChangeTracker;
-import org.apache.james.mailboxmanager.util.UidRange;
+import org.apache.james.imap.mailbox.MailboxListener;
+import org.apache.james.imap.mailbox.MailboxException;
+import org.apache.james.imap.mailbox.MailboxSession;
+import org.apache.james.imap.mailbox.MessageRange;
+import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.imap.mailbox.SearchQuery;
+import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
+import org.apache.james.imap.mailbox.util.FetchGroupImpl;
+import org.apache.james.imap.mailbox.util.UidChangeTracker;
+import org.apache.james.imap.mailbox.util.UidRange;
-public class JPAMailbox extends AbstractLogEnabled implements org.apache.james.mailboxmanager.mailbox.Mailbox {
+public class JPAMailbox extends AbstractLogEnabled implements org.apache.james.imap.mailbox.Mailbox {
private static final int INITIAL_SIZE_HEADERS = 32;
@@ -74,23 +74,23 @@
this.entityManagerFactory = entityManagerfactory;
}
- public String getName() throws MailboxManagerException {
+ public String getName() throws MailboxException {
return getMailboxRow().getName();
}
public int getMessageCount(MailboxSession mailboxSession)
- throws MailboxManagerException {
+ throws MailboxException {
try {
final MessageMapper messageMapper = new MessageMapper(entityManagerFactory.createEntityManager());
return (int) messageMapper.countMessagesInMailbox(mailboxId);
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
public MessageResult appendMessage(MimeMessage mimeMessage, Date internalDate,
FetchGroup fetchGroup, MailboxSession mailboxSession)
- throws MailboxManagerException {
+ throws MailboxException {
final Mailbox mailbox = reserveNextUid();
if (mailbox != null) {
@@ -115,19 +115,19 @@
mapper.save(message);
mapper.commit();
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
MessageResult messageResult = fillMessageResult(message, fetchGroup);
getUidChangeTracker().found(messageResult);
return messageResult;
} catch (IOException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
} catch (MessagingException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
} else {
// mailboxRow==null
- throw new MailboxManagerException("Mailbox has been deleted");
+ throw new MailboxException("Mailbox has been deleted");
}
}
@@ -160,26 +160,26 @@
return size;
}
- private Mailbox reserveNextUid() throws MailboxManagerException {
+ private Mailbox reserveNextUid() throws MailboxException {
final Mailbox mailbox;
try {
final MailboxMapper mapper = createMailboxMapper();
mailbox = mapper.consumeNextUid(mailboxId);
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
return mailbox;
}
public Iterator getMessages(final MessageRange set, FetchGroup fetchGroup,
- MailboxSession mailboxSession) throws MailboxManagerException {
+ MailboxSession mailboxSession) throws MailboxException {
UidRange range = uidRangeForMessageSet(set);
try {
final MessageMapper messageMapper = new MessageMapper(entityManagerFactory.createEntityManager());
final List<Message> rows = new ArrayList<Message>(messageMapper.findInMailbox(set, mailboxId));
return getMessages(fetchGroup, range, rows);
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
@@ -196,19 +196,19 @@
}
private static UidRange uidRangeForMessageSet(MessageRange set)
- throws MailboxManagerException {
+ throws MailboxException {
if (set.getType() == MessageRange.TYPE_UID) {
return new UidRange(set.getUidFrom(), set.getUidTo());
} else if (set.getType() == MessageRange.TYPE_ALL) {
return new UidRange(1, -1);
} else {
- throw new MailboxManagerException("unsupported MessageSet: "
+ throw new MailboxException("unsupported MessageSet: "
+ set.getType());
}
}
public MessageResult fillMessageResult(Message message, FetchGroup result) throws MessagingException,
- MailboxManagerException {
+ MailboxException {
return MessageRowUtils.loadMessageResult(message, result);
}
@@ -222,7 +222,7 @@
return permanentFlags;
}
- public long[] recent(boolean reset, MailboxSession mailboxSession) throws MailboxManagerException {
+ public long[] recent(boolean reset, MailboxSession mailboxSession) throws MailboxException {
try {
final MessageMapper mapper = new MessageMapper(entityManagerFactory.createEntityManager());
mapper.begin();
@@ -240,12 +240,12 @@
mapper.commit();
return results;
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
public MessageResult getFirstUnseen(FetchGroup fetchGroup,
- MailboxSession mailboxSession) throws MailboxManagerException {
+ MailboxSession mailboxSession) throws MailboxException {
try {
final MessageMapper messageMapper = new MessageMapper(entityManagerFactory.createEntityManager());
final List<Message> messageRows = messageMapper.findUnseenMessagesInMailboxOrderByUid(mailboxId);
@@ -261,29 +261,29 @@
}
return result;
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
} catch (MessagingException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
- public int getUnseenCount(MailboxSession mailboxSession) throws MailboxManagerException {
+ public int getUnseenCount(MailboxSession mailboxSession) throws MailboxException {
try {
final MessageMapper messageMapper = new MessageMapper(entityManagerFactory.createEntityManager());
final int count = (int) messageMapper.countUnseenMessagesInMailbox(mailboxId);
return count;
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
public Iterator expunge(MessageRange set, FetchGroup fetchGroup,
- MailboxSession mailboxSession) throws MailboxManagerException {
+ MailboxSession mailboxSession) throws MailboxException {
return doExpunge(set, fetchGroup);
}
private Iterator doExpunge(final MessageRange set, FetchGroup fetchGroup)
- throws MailboxManagerException {
+ throws MailboxException {
try {
// TODO put this into a serializable transaction
final MessageMapper mapper = new MessageMapper(entityManagerFactory.createEntityManager());
@@ -302,7 +302,7 @@
getUidChangeTracker().expunged(uids);
return messageResults.iterator();
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
@@ -319,14 +319,14 @@
public Iterator setFlags(Flags flags, boolean value, boolean replace,
MessageRange set, FetchGroup fetchGroup,
- MailboxSession mailboxSession) throws MailboxManagerException {
+ MailboxSession mailboxSession) throws MailboxException {
return doSetFlags(flags, value, replace, set, fetchGroup,
mailboxSession);
}
private Iterator doSetFlags(Flags flags, boolean value, boolean replace,
final MessageRange set, FetchGroup fetchGroup,
- MailboxSession mailboxSession) throws MailboxManagerException {
+ MailboxSession mailboxSession) throws MailboxException {
try {
// TODO put this into a serializeable transaction
final MessageMapper mapper = new MessageMapper(entityManagerFactory.createEntityManager());
@@ -353,18 +353,18 @@
FetchGroup.FLAGS);
final JPAResultIterator resultIterator = new JPAResultIterator(
messages, orFetchGroup);
- final org.apache.james.mailboxmanager.impl.MessageFlags[] messageFlags = resultIterator
+ final org.apache.james.imap.mailbox.util.MessageFlags[] messageFlags = resultIterator
.getMessageFlags();
mapper.commit();
tracker.flagsUpdated(messageFlags, mailboxSession.getSessionId());
tracker.found(uidRange, messageFlags);
return resultIterator;
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
- public void addListener(MailboxListener listener) throws MailboxManagerException {
+ public void addListener(MailboxListener listener) throws MailboxException {
tracker.addMailboxListener(listener);
}
@@ -372,18 +372,18 @@
tracker.removeMailboxListener(mailboxListener);
}
- public long getUidValidity(MailboxSession mailboxSession) throws MailboxManagerException {
+ public long getUidValidity(MailboxSession mailboxSession) throws MailboxException {
final long result = getMailboxRow().getUidValidity();
return result;
}
- public long getUidNext(MailboxSession mailboxSession) throws MailboxManagerException {
+ public long getUidNext(MailboxSession mailboxSession) throws MailboxException {
Mailbox mailbox = getMailboxRow();
if (mailbox != null) {
getUidChangeTracker().foundLastUid(mailbox.getLastUid());
return getUidChangeTracker().getLastUid() + 1;
} else {
- throw new MailboxManagerException("Mailbox has been deleted");
+ throw new MailboxException("Mailbox has been deleted");
}
}
@@ -391,12 +391,12 @@
return tracker;
}
- private Mailbox getMailboxRow() throws MailboxManagerException {
+ private Mailbox getMailboxRow() throws MailboxException {
try {
final MailboxMapper mapper = createMailboxMapper();
return mapper.findMailboxById(mailboxId);
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
@@ -406,7 +406,7 @@
}
public Iterator search(SearchQuery query, FetchGroup fetchGroup,
- MailboxSession mailboxSession) throws MailboxManagerException {
+ MailboxSession mailboxSession) throws MailboxException {
try {
final MessageMapper messageMapper = new MessageMapper(entityManagerFactory.createEntityManager());
final List<Message> messages = messageMapper.searchMailbox(mailboxId, query);
@@ -416,7 +416,7 @@
if (searches.isMatch(query, message)) {
filteredMessages.add(message);
}
- } catch (MailboxManagerException e) {
+ } catch (MailboxException e) {
getLog()
.info(
"Cannot test message against search criteria. Will continue to test other messages.",
@@ -428,7 +428,7 @@
return getResults(fetchGroup, filteredMessages);
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
@@ -441,7 +441,7 @@
searches.setLog(log);
}
- public void copyTo(MessageRange set, JPAMailbox toMailbox, MailboxSession session) throws MailboxManagerException {
+ public void copyTo(MessageRange set, JPAMailbox toMailbox, MailboxSession session) throws MailboxException {
try {
final MessageMapper mapper = new MessageMapper(entityManagerFactory.createEntityManager());
mapper.begin();
@@ -476,9 +476,9 @@
mapper.commit();
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
} catch (MessagingException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
Modified: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java Wed Dec 31 05:42:24 2008
@@ -35,16 +35,16 @@
import org.apache.james.imap.jpa.map.MailboxMapper;
import org.apache.james.imap.jpa.om.Mailbox;
import org.apache.james.imap.jpa.om.openjpa.OpenJPAMailboxMapper;
-import org.apache.james.mailboxmanager.ListResult;
-import org.apache.james.mailboxmanager.MailboxExistsException;
-import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.mailboxmanager.MailboxNotFoundException;
-import org.apache.james.mailboxmanager.MailboxSession;
-import org.apache.james.mailboxmanager.MessageRange;
-import org.apache.james.mailboxmanager.impl.ListResultImpl;
-import org.apache.james.mailboxmanager.manager.MailboxExpression;
-import org.apache.james.mailboxmanager.manager.MailboxManager;
-import org.apache.james.mailboxmanager.manager.SubscriptionException;
+import org.apache.james.imap.mailbox.ListResult;
+import org.apache.james.imap.mailbox.MailboxExistsException;
+import org.apache.james.imap.mailbox.MailboxException;
+import org.apache.james.imap.mailbox.MailboxExpression;
+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.MessageRange;
+import org.apache.james.imap.mailbox.SubscriptionException;
+import org.apache.james.imap.mailbox.util.ListResultImpl;
public class JPAMailboxManager extends AbstractLogEnabled implements MailboxManager {
@@ -65,13 +65,13 @@
this.entityManagerFactory = entityManagerFactory;
}
- public org.apache.james.mailboxmanager.mailbox.Mailbox getMailbox(String mailboxName, boolean autoCreate)
- throws MailboxManagerException {
+ public org.apache.james.imap.mailbox.Mailbox getMailbox(String mailboxName, boolean autoCreate)
+ throws MailboxException {
return doGetMailbox(mailboxName, autoCreate);
}
private JPAMailbox doGetMailbox(String mailboxName, boolean autoCreate)
- throws MailboxManagerException {
+ throws MailboxException {
if (autoCreate && !existsMailbox(mailboxName)) {
getLog().info("autocreated mailbox " + mailboxName);
createMailbox(mailboxName);
@@ -101,12 +101,12 @@
throw new MailboxNotFoundException(mailboxName);
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
public void createMailbox(String namespaceName)
- throws MailboxManagerException {
+ throws MailboxException {
getLog().debug("createMailbox " + namespaceName);
final int length = namespaceName.length();
if (length == 0) {
@@ -143,7 +143,7 @@
}
}
- private void doCreate(String namespaceName) throws MailboxManagerException {
+ private void doCreate(String namespaceName) throws MailboxException {
Mailbox mailbox = new Mailbox(namespaceName, Math.abs(random.nextInt()));
try {
final MailboxMapper mapper = createMailboxMapper();
@@ -151,12 +151,12 @@
mapper.save(mailbox);
mapper.commit();
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
public void deleteMailbox(String mailboxName, MailboxSession session)
- throws MailboxManagerException {
+ throws MailboxException {
getLog().info("deleteMailbox " + mailboxName);
synchronized (mailboxes) {
try {
@@ -176,13 +176,13 @@
} catch (NoResultException e) {
throw new MailboxNotFoundException(mailboxName);
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
}
public void renameMailbox(String from, String to)
- throws MailboxManagerException {
+ throws MailboxException {
getLog().debug("renameMailbox " + from + " to " + to);
try {
synchronized (mailboxes) {
@@ -220,21 +220,21 @@
} catch (NoResultException e) {
throw new MailboxNotFoundException(from);
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
public void copyMessages(MessageRange set, String from, String to,
- MailboxSession session) throws MailboxManagerException {
+ MailboxSession session) throws MailboxException {
JPAMailbox toMailbox = doGetMailbox(to, false);
JPAMailbox fromMailbox = doGetMailbox(from, false);
fromMailbox.copyTo(set, toMailbox, session);
}
public ListResult[] list(final MailboxExpression mailboxExpression)
- throws MailboxManagerException {
+ throws MailboxException {
final char localWildcard = mailboxExpression.getLocalWildcard();
final char freeWildcard = mailboxExpression.getFreeWildcard();
final String base = mailboxExpression.getBase();
@@ -268,7 +268,7 @@
Arrays.sort(results);
return results;
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
@@ -279,7 +279,7 @@
}
public boolean existsMailbox(String mailboxName)
- throws MailboxManagerException {
+ throws MailboxException {
try {
synchronized (mailboxes) {
final MailboxMapper mapper = createMailboxMapper();
@@ -291,18 +291,18 @@
if (count == 1) {
return true;
} else {
- throw new MailboxManagerException("Expected one mailbox but found " + count + " mailboxes");
+ throw new MailboxException("Expected one mailbox but found " + count + " mailboxes");
}
}
}
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
- public void deleteEverything() throws MailboxManagerException {
+ public void deleteEverything() throws MailboxException {
try {
final MailboxMapper mapper = createMailboxMapper();
mapper.begin();
@@ -310,7 +310,7 @@
mapper.commit();
mailboxes.clear();
} catch (PersistenceException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
Modified: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSession.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSession.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSession.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSession.java Wed Dec 31 05:42:24 2008
@@ -19,7 +19,7 @@
package org.apache.james.imap.jpa;
-import org.apache.james.mailboxmanager.MailboxSession;
+import org.apache.james.imap.mailbox.MailboxSession;
/**
* Describes a mailbox session.
Modified: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAResultIterator.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAResultIterator.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAResultIterator.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAResultIterator.java Wed Dec 31 05:42:24 2008
@@ -30,11 +30,11 @@
import javax.mail.internet.MimeMessage;
import org.apache.james.imap.jpa.om.Message;
-import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.mailboxmanager.MessageResult;
-import org.apache.james.mailboxmanager.MessageResult.FetchGroup;
-import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
-import org.apache.james.mailboxmanager.impl.MessageFlags;
+import org.apache.james.imap.mailbox.MailboxException;
+import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
+import org.apache.james.imap.mailbox.util.FetchGroupImpl;
+import org.apache.james.imap.mailbox.util.MessageFlags;
public class JPAResultIterator implements Iterator {
@@ -81,7 +81,7 @@
try {
result = MessageRowUtils.loadMessageResult(message, this.fetchGroup);
- } catch (MailboxManagerException e) {
+ } catch (MailboxException e) {
result = new UnloadedMessageResult(message, e);
}
return result;
@@ -103,7 +103,7 @@
private static final FetchGroup FETCH_GROUP = new FetchGroupImpl(
FetchGroup.INTERNAL_DATE | FetchGroup.SIZE);
- private final MailboxManagerException exception;
+ private final MailboxException exception;
private final Date internalDate;
@@ -112,7 +112,7 @@
private final long uid;
public UnloadedMessageResult(final Message message,
- final MailboxManagerException exception) {
+ final MailboxException exception) {
super();
internalDate = message.getInternalDate();
size = message.getSize();
@@ -120,11 +120,11 @@
this.exception = exception;
}
- public Flags getFlags() throws MailboxManagerException {
+ public Flags getFlags() throws MailboxException {
throw exception;
}
- public Content getFullContent() throws MailboxManagerException {
+ public Content getFullContent() throws MailboxException {
throw exception;
}
@@ -140,11 +140,11 @@
return null;
}
- public Content getBody() throws MailboxManagerException {
+ public Content getBody() throws MailboxException {
throw exception;
}
- public MimeMessage getMimeMessage() throws MailboxManagerException {
+ public MimeMessage getMimeMessage() throws MailboxException {
throw exception;
}
@@ -164,7 +164,7 @@
return 0;
}
- public Iterator headers() throws MailboxManagerException {
+ public Iterator headers() throws MailboxException {
throw exception;
}
@@ -176,36 +176,36 @@
}
public Content getMessageBody(MimePath path)
- throws MailboxManagerException {
+ throws MailboxException {
throw exception;
}
public Content getFullContent(MimePath path)
- throws MailboxManagerException {
+ throws MailboxException {
throw exception;
}
public Iterator iterateHeaders(MimePath path)
- throws MailboxManagerException {
+ throws MailboxException {
throw exception;
}
public Iterator iterateMimeHeaders(MimePath path)
- throws MailboxManagerException {
+ throws MailboxException {
throw exception;
}
- public Content getBody(MimePath path) throws MailboxManagerException {
+ public Content getBody(MimePath path) throws MailboxException {
throw exception;
}
public Content getMimeBody(MimePath path)
- throws MailboxManagerException {
+ throws MailboxException {
throw exception;
}
public MimeDescriptor getMimeDescriptor()
- throws MailboxManagerException {
+ throws MailboxException {
throw exception;
}
Modified: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageRowUtils.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageRowUtils.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageRowUtils.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageRowUtils.java Wed Dec 31 05:42:24 2008
@@ -34,13 +34,13 @@
import org.apache.james.imap.jpa.om.Header;
import org.apache.james.imap.jpa.om.Message;
-import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.mailboxmanager.MessageResult;
-import org.apache.james.mailboxmanager.MessageResult.Content;
-import org.apache.james.mailboxmanager.MessageResult.FetchGroup;
-import org.apache.james.mailboxmanager.MessageResult.MimePath;
-import org.apache.james.mailboxmanager.impl.MessageFlags;
-import org.apache.james.mailboxmanager.impl.MessageResultImpl;
+import org.apache.james.imap.mailbox.MailboxException;
+import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.imap.mailbox.MessageResult.Content;
+import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
+import org.apache.james.imap.mailbox.MessageResult.MimePath;
+import org.apache.james.imap.mailbox.util.MessageFlags;
+import org.apache.james.imap.mailbox.util.MessageResultImpl;
import org.apache.james.mime4j.MimeException;
public class MessageRowUtils {
@@ -101,7 +101,7 @@
}
public static MessageResult loadMessageResult(final Message message, final FetchGroup fetchGroup)
- throws MailboxManagerException {
+ throws MailboxException {
MessageResultImpl messageResult = new MessageResultImpl();
messageResult.setUid(message.getUid());
@@ -137,12 +137,12 @@
content -= FetchGroup.MIME_DESCRIPTOR;
}
if (content != 0) {
- throw new MailboxManagerException("Unsupported result: " + content);
+ throw new MailboxException("Unsupported result: " + content);
}
addPartContent(fetchGroup, message, messageResult);
} catch (IOException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
return messageResult;
@@ -155,7 +155,7 @@
}
private static void addFullContent(final Message messageRow, MessageResultImpl messageResult)
- throws MailboxManagerException {
+ throws MailboxException {
final List headers = messageResult.getHeaders();
final Content content = createFullContent(messageRow, headers);
messageResult.setFullContent(content);
@@ -175,7 +175,7 @@
private static void addPartContent(final FetchGroup fetchGroup,
Message message, MessageResultImpl messageResult)
- throws MailboxManagerException, IOException,
+ throws MailboxException, IOException,
MimeException {
Collection partContent = fetchGroup.getPartContentDescriptors();
if (partContent != null) {
@@ -190,7 +190,7 @@
private static void addPartContent(
FetchGroup.PartContentDescriptor descriptor, Message message,
MessageResultImpl messageResult) throws
- MailboxManagerException, IOException, MimeException {
+ MailboxException, IOException, MimeException {
final MimePath mimePath = descriptor.path();
final int content = descriptor.content();
if ((content & MessageResult.FetchGroup.FULL_CONTENT) > 0) {
@@ -331,7 +331,7 @@
private static void addFullContent(Message message,
MessageResultImpl messageResult, MimePath mimePath)
- throws MailboxManagerException, IOException,
+ throws MailboxException, IOException,
MimeException {
final int[] path = path(mimePath);
if (path == null) {
Modified: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearches.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearches.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearches.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearches.java Wed Dec 31 05:42:24 2008
@@ -36,9 +36,9 @@
import org.apache.commons.logging.LogFactory;
import org.apache.james.imap.jpa.om.Header;
import org.apache.james.imap.jpa.om.Message;
-import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.mailboxmanager.SearchQuery;
-import org.apache.james.mailboxmanager.SearchQuery.NumericRange;
+import org.apache.james.imap.mailbox.MailboxException;
+import org.apache.james.imap.mailbox.SearchQuery;
+import org.apache.james.imap.mailbox.SearchQuery.NumericRange;
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.field.datetime.DateTime;
import org.apache.james.mime4j.field.datetime.parser.DateTimeParser;
@@ -73,10 +73,10 @@
* @param row
* <code>MessageRow</code>, not null
* @return true if the row matches the given criteria, false otherwise
- * @throws MailboxManagerException
+ * @throws MailboxException
*/
public boolean isMatch(final SearchQuery query, final Message message)
- throws MailboxManagerException {
+ throws MailboxException {
final List criteria = query.getCriterias();
final Collection recentMessageUids = query.getRecentMessageUids();
boolean result = true;
@@ -101,10 +101,10 @@
* @param message
* <code>MessageRow</code>, not null
* @return true if the row matches the given criterion, false otherwise
- * @throws MailboxManagerException
+ * @throws MailboxException
*/
public boolean isMatch(SearchQuery.Criterion criterion, Message message,
- final Collection recentMessageUids) throws MailboxManagerException {
+ final Collection recentMessageUids) throws MailboxException {
final boolean result;
if (criterion instanceof SearchQuery.InternalDateCriterion) {
result = matches((SearchQuery.InternalDateCriterion) criterion, message);
@@ -130,7 +130,7 @@
return result;
}
- private boolean matches(SearchQuery.TextCriterion criterion, Message message) throws MailboxManagerException {
+ private boolean matches(SearchQuery.TextCriterion criterion, Message message) throws MailboxException {
try {
final SearchQuery.ContainsOperator operator = criterion
.getOperator();
@@ -145,7 +145,7 @@
throw new UnsupportedSearchException();
}
} catch (IOException e) {
- throw new MailboxManagerException(e);
+ throw new MailboxException(e);
}
}
@@ -175,7 +175,7 @@
}
private boolean matches(SearchQuery.ConjunctionCriterion criterion,
- Message message, final Collection recentMessageUids) throws MailboxManagerException {
+ Message message, final Collection recentMessageUids) throws MailboxException {
final int type = criterion.getType();
final List criteria = criterion.getCriteria();
switch (type) {
@@ -191,7 +191,7 @@
}
private boolean and(final List criteria, final Message message,
- final Collection recentMessageUids) throws MailboxManagerException {
+ final Collection recentMessageUids) throws MailboxException {
boolean result = true;
for (Iterator it = criteria.iterator(); it.hasNext();) {
final SearchQuery.Criterion criterion = (SearchQuery.Criterion) it
@@ -206,7 +206,7 @@
}
private boolean or(final List criteria, final Message message,
- final Collection recentMessageUids) throws MailboxManagerException {
+ final Collection recentMessageUids) throws MailboxException {
boolean result = false;
for (Iterator it = criteria.iterator(); it.hasNext();) {
final SearchQuery.Criterion criterion = (SearchQuery.Criterion) it
@@ -221,7 +221,7 @@
}
private boolean nor(final List criteria, final Message message,
- final Collection recentMessageUids) throws MailboxManagerException {
+ final Collection recentMessageUids) throws MailboxException {
boolean result = true;
for (Iterator it = criteria.iterator(); it.hasNext();) {
final SearchQuery.Criterion criterion = (SearchQuery.Criterion) it
Modified: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MimeDescriptorImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MimeDescriptorImpl.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MimeDescriptorImpl.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MimeDescriptorImpl.java Wed Dec 31 05:42:24 2008
@@ -27,8 +27,8 @@
import java.util.List;
import java.util.Map;
-import org.apache.james.mailboxmanager.MessageResult;
-import org.apache.james.mailboxmanager.MessageResult.MimeDescriptor;
+import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.imap.mailbox.MessageResult.MimeDescriptor;
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.descriptor.MaximalBodyDescriptor;
import org.apache.james.mime4j.parser.MimeTokenStream;
Modified: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/OrFetchGroup.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/OrFetchGroup.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/OrFetchGroup.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/OrFetchGroup.java Wed Dec 31 05:42:24 2008
@@ -21,7 +21,7 @@
import java.util.Set;
-import org.apache.james.mailboxmanager.MessageResult.FetchGroup;
+import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
/**
* Wraps a fetch group and ORs content.
Modified: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/PartContentBuilder.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/PartContentBuilder.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/PartContentBuilder.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/PartContentBuilder.java Wed Dec 31 05:42:24 2008
@@ -25,7 +25,7 @@
import java.util.Collections;
import java.util.List;
-import org.apache.james.mailboxmanager.MessageResult.Content;
+import org.apache.james.imap.mailbox.MessageResult.Content;
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.parser.MimeTokenStream;
Modified: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ResultHeader.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ResultHeader.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ResultHeader.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ResultHeader.java Wed Dec 31 05:42:24 2008
@@ -29,9 +29,9 @@
import javax.mail.MessagingException;
import org.apache.james.imap.jpa.om.Header;
-import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.mailboxmanager.MessageResult;
-import org.apache.james.mailboxmanager.MessageResult.Content;
+import org.apache.james.imap.mailbox.MailboxException;
+import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.imap.mailbox.MessageResult.Content;
final class ResultHeader implements MessageResult.Header, MessageResult.Content {
private final String name;
@@ -54,11 +54,11 @@
return this;
}
- public String getName() throws MailboxManagerException {
+ public String getName() throws MailboxException {
return name;
}
- public String getValue() throws MailboxManagerException {
+ public String getValue() throws MailboxException {
return value;
}
Modified: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UnsupportedSearchException.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UnsupportedSearchException.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UnsupportedSearchException.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UnsupportedSearchException.java Wed Dec 31 05:42:24 2008
@@ -19,12 +19,12 @@
package org.apache.james.imap.jpa;
-import org.apache.james.mailboxmanager.MailboxManagerException;
+import org.apache.james.imap.mailbox.MailboxException;
/**
* Indicates that the requested search is not supported by this implementation.
*/
-public class UnsupportedSearchException extends MailboxManagerException {
+public class UnsupportedSearchException extends MailboxException {
private static final long serialVersionUID = -7442949630563672557L;
Modified: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UserManager.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UserManager.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UserManager.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UserManager.java Wed Dec 31 05:42:24 2008
@@ -21,7 +21,7 @@
import java.util.Collection;
-import org.apache.james.mailboxmanager.manager.SubscriptionException;
+import org.apache.james.imap.mailbox.SubscriptionException;
public interface UserManager {
Modified: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/MessageMapper.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/MessageMapper.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/MessageMapper.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/map/MessageMapper.java Wed Dec 31 05:42:24 2008
@@ -23,10 +23,10 @@
import javax.persistence.EntityManager;
import org.apache.james.imap.jpa.om.Message;
-import org.apache.james.mailboxmanager.MessageRange;
-import org.apache.james.mailboxmanager.SearchQuery;
-import org.apache.james.mailboxmanager.SearchQuery.Criterion;
-import org.apache.james.mailboxmanager.SearchQuery.NumericRange;
+import org.apache.james.imap.mailbox.MessageRange;
+import org.apache.james.imap.mailbox.SearchQuery;
+import org.apache.james.imap.mailbox.SearchQuery.Criterion;
+import org.apache.james.imap.mailbox.SearchQuery.NumericRange;
public class MessageMapper extends Mapper {
Modified: james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsMultipartMixedTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsMultipartMixedTest.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsMultipartMixedTest.java (original)
+++ james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsMultipartMixedTest.java Wed Dec 31 05:42:24 2008
@@ -27,7 +27,7 @@
import org.apache.james.api.imap.ImapConstants;
import org.apache.james.imap.jpa.om.Message;
-import org.apache.james.mailboxmanager.SearchQuery;
+import org.apache.james.imap.mailbox.SearchQuery;
public class SearchUtilsMultipartMixedTest extends TestCase {
Modified: james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsRFC822Test.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsRFC822Test.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsRFC822Test.java (original)
+++ james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsRFC822Test.java Wed Dec 31 05:42:24 2008
@@ -27,7 +27,7 @@
import org.apache.james.api.imap.ImapConstants;
import org.apache.james.imap.jpa.om.Message;
-import org.apache.james.mailboxmanager.SearchQuery;
+import org.apache.james.imap.mailbox.SearchQuery;
public class SearchUtilsRFC822Test extends TestCase {
Modified: james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsTest.java?rev=730395&r1=730394&r2=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsTest.java (original)
+++ james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsTest.java Wed Dec 31 05:42:24 2008
@@ -29,7 +29,7 @@
import org.apache.james.api.imap.ImapConstants;
import org.apache.james.imap.jpa.om.Message;
-import org.apache.james.mailboxmanager.SearchQuery;
+import org.apache.james.imap.mailbox.SearchQuery;
public class SearchUtilsTest extends TestCase {
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Constants.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/Constants.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Constants.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Constants.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/Constants.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/Constants.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Constants.java Wed Dec 31 05:42:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager;
+package org.apache.james.imap.mailbox;
public interface Constants {
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Constants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Constants.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Headers.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/Headers.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Headers.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Headers.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/Headers.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/Headers.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Headers.java Wed Dec 31 05:42:24 2008
@@ -17,11 +17,11 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager;
+package org.apache.james.imap.mailbox;
import java.util.Iterator;
-import org.apache.james.mailboxmanager.MessageResult.FetchGroup;
+import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
/**
* TODO: remove when MessageResult is sorted out
@@ -33,5 +33,5 @@
* @return <code>Header</code> <code>Iterator</code>, or null if
* {@link FetchGroup#HEADERS} was not fetched
*/
- Iterator headers() throws MailboxManagerException;
+ Iterator headers() throws MailboxException;
}
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Headers.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/ListResult.java (from r730371, james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/ListResult.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/ListResult.java?p2=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/ListResult.java&p1=james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/ListResult.java&r1=730371&r2=730395&rev=730395&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/ListResult.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/ListResult.java Wed Dec 31 05:42:24 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager;
+package org.apache.james.imap.mailbox;
/**
* Returned by the list method of MailboxRepository and others
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/ListResult.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/ListResult.java
------------------------------------------------------------------------------
svn:mergeinfo =
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org