You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/09/06 20:09:39 UTC
svn commit: r993114 [1/4] - in /james/imap/trunk:
api/src/main/java/org/apache/james/imap/api/process/
deployment/src/test/java/org/apache/james/imap/functional/
jcr/src/main/java/org/apache/james/imap/jcr/
jcr/src/main/java/org/apache/james/imap/jcr/m...
Author: norman
Date: Mon Sep 6 18:09:32 2010
New Revision: 993114
URL: http://svn.apache.org/viewvc?rev=993114&view=rev
Log:
move mailbox package out of imap package (IMAP-208)
Added:
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/BadCredentialsException.java
- copied, changed from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/BadCredentialsException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/Content.java
- copied, changed from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Content.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/Headers.java
- copied, changed from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Headers.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxConstants.java
- copied, changed from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxConstants.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxException.java
- copied, changed from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxExistsException.java
- copied, changed from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExistsException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxListener.java
- copied, changed from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxListener.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxManager.java
- copied, changed from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxMetaData.java
- copied, changed from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxMetaData.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxNotFoundException.java
- copied, changed from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxNotFoundException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxPath.java
- copied, changed from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxPath.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxQuery.java
- copied, changed from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxQuery.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxSession.java
- copied, changed from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxSession.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MessageManager.java
- copied, changed from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageManager.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MessageRange.java
- copied, changed from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageRange.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MessageResult.java
- copied, changed from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MimeDescriptor.java
- copied, changed from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MimeDescriptor.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/RequestAware.java
- copied, changed from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/RequestAware.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/SearchQuery.java
- copied, changed from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SearchQuery.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java
- copied, changed from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/StandardMailboxMetaDataComparator.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/SubscriptionException.java
- copied, changed from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SubscriptionException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/SubscriptionManager.java
- copied, changed from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SubscriptionManager.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/UnsupportedCriteriaException.java
- copied, changed from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedCriteriaException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/UnsupportedOperationException.java
- copied, changed from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedOperationException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/UnsupportedSearchException.java
- copied, changed from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedSearchException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/
- copied from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/MailboxEventDispatcher.java
- copied, changed from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcher.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/SimpleMailboxMetaData.java
- copied, changed from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/SimpleMailboxMetaData.java
james/imap/trunk/mailbox/src/test/java/org/apache/james/mailbox/
james/imap/trunk/mailbox/src/test/java/org/apache/james/mailbox/MailboxExpressionTest.java
- copied, changed from r993100, james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MailboxExpressionTest.java
james/imap/trunk/mailbox/src/test/java/org/apache/james/mailbox/util/
- copied from r991286, james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/
james/imap/trunk/mailbox/src/test/java/org/apache/james/mailbox/util/MailboxEventDispatcherFlagsTest.java
- copied, changed from r993100, james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java
Removed:
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/BadCredentialsException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Content.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Headers.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxConstants.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExistsException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxListener.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxMetaData.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxNotFoundException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxPath.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxQuery.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxSession.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageManager.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageRange.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageResult.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MimeDescriptor.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/RequestAware.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SearchQuery.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/StandardMailboxMetaDataComparator.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SubscriptionException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/SubscriptionManager.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedCriteriaException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedOperationException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedSearchException.java
james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MailboxExpressionTest.java
Modified:
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/SelectedMailbox.java
james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/AbstractStressTest.java
james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ImapHostSystem.java
james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/InMemoryUserManager.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/AbstractJCRMapper.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/AbstractJCRScalingMapper.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/GlobalMailboxSessionJCRRepository.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxManager.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxSessionMapperFactory.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMessageManager.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRSubscriptionManager.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/MailboxSessionJCRRepository.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMailboxMapper.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMessageMapper.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMailbox.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java
james/imap/trunk/jcr/src/test/java/org/apache/james/imap/jcr/JCRHostSystem.java
james/imap/trunk/jcr/src/test/java/org/apache/james/imap/jcr/JCRStressTest.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSessionMapperFactory.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMessageManager.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPASubscriptionManager.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPATransactionalMapper.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMailboxMapper.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMessageMapper.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/JPAMailbox.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAMailboxMembership.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/openjpa/OpenJPAMailboxManager.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/openjpa/OpenJPAMessageManager.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/JPASubscriptionMapper.java
james/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/JPAHostSystem.java
james/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/JPAStressTest.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/FetchGroupImpl.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/MessageResultImpl.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/util/PartContentDescriptorImpl.java
james/imap/trunk/mailbox/src/test/java/org/apache/james/mailbox/util/EventCollector.java
james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirMailboxManager.java
james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirMailboxSessionMapperFactory.java
james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirMessageManager.java
james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirStore.java
james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/MaildirSubscriptionManager.java
james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/MaildirMailboxMapper.java
james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/MaildirMessageMapper.java
james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/model/MaildirMailbox.java
james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/mail/model/MaildirMessage.java
james/imap/trunk/maildir/src/main/java/org/apache/james/imap/maildir/user/MaildirSubscriptionMapper.java
james/imap/trunk/maildir/src/test/java/org/apache/james/imap/functional/maildir/MaildirStressTest.java
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxManager.java
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryMailboxSessionMapperFactory.java
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemoryStoreMessageManager.java
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/InMemorySubscriptionManager.java
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMailboxMapper.java
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/InMemoryMessageMapper.java
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/mail/model/InMemoryMailbox.java
james/imap/trunk/memory/src/main/java/org/apache/james/imap/inmemory/user/model/InMemorySubscription.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractSubscriptionProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CheckProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CopyProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExamineProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LoginProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/NoopProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SelectProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/ImapSessionUtils.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MailboxEventAnalyser.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/UidToMsnConverter.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerAdded.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/DelegatingMailboxListener.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxMetaData.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxPathLock.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MailboxSessionMapperFactory.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MapperStoreMessageManager.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MimeDescriptorImpl.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SearchQueryIterator.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/SimpleMailboxSession.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxPath.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMessageManager.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreSubscriptionManager.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MailboxMapper.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MessageMapper.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/AbstractFullContent.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/ByteContent.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/FullByteContent.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/InputStreamContent.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/InputStreamFullContent.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/streaming/PartContentBuilder.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/Mapper.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/NonTransactionalMapper.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/TransactionalMapper.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/user/SubscriptionMapper.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderMultipartAlternativeTest.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsMultipartMixedTest.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsRFC822Test.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsTest.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/LockException.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageFlags.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearches.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UidChangeTracker.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderMultipartAlternativeTest.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsMultipartMixedTest.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsRFC822Test.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsTest.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProviderSingleton.java
Modified: james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/SelectedMailbox.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/SelectedMailbox.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/SelectedMailbox.java (original)
+++ james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/SelectedMailbox.java Mon Sep 6 18:09:32 2010
@@ -21,7 +21,7 @@ package org.apache.james.imap.api.proces
import java.util.Collection;
-import org.apache.james.imap.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxPath;
/**
Modified: james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/AbstractStressTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/AbstractStressTest.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/AbstractStressTest.java (original)
+++ james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/AbstractStressTest.java Mon Sep 6 18:09:32 2010
@@ -28,12 +28,12 @@ import java.util.concurrent.atomic.Atomi
import javax.mail.Flags;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.imap.mailbox.MailboxPath;
-import org.apache.james.imap.mailbox.MessageManager;
-import org.apache.james.imap.mailbox.MailboxConstants;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.store.StoreMailboxManager;
+import org.apache.james.mailbox.MailboxConstants;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MessageManager;
import org.junit.Test;
public abstract class AbstractStressTest {
Modified: james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ImapHostSystem.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ImapHostSystem.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ImapHostSystem.java (original)
+++ james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ImapHostSystem.java Mon Sep 6 18:09:32 2010
@@ -32,9 +32,9 @@ import java.util.Set;
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.decode.ImapDecoder;
import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.mailbox.MailboxSession.User;
import org.apache.james.imap.main.ImapRequestStreamHandler;
import org.apache.james.imap.main.ImapSessionImpl;
+import org.apache.james.mailbox.MailboxSession.User;
import org.apache.james.test.functional.HostSystem;
public abstract class ImapHostSystem implements HostSystem {
Modified: james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/InMemoryUserManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/InMemoryUserManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/InMemoryUserManager.java (original)
+++ james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/InMemoryUserManager.java Mon Sep 6 18:09:32 2010
@@ -23,10 +23,10 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.SubscriptionException;
-import org.apache.james.imap.mailbox.SubscriptionManager;
import org.apache.james.imap.store.Authenticator;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.SubscriptionException;
+import org.apache.james.mailbox.SubscriptionManager;
/**
* Stores users in memory.
@@ -61,7 +61,7 @@ public class InMemoryUserManager impleme
user.addSubscription(mailbox);
}
- public Collection<String> subscriptions(org.apache.james.imap.mailbox.MailboxSession session) throws SubscriptionException {
+ public Collection<String> subscriptions(org.apache.james.mailbox.MailboxSession session) throws SubscriptionException {
MailboxSession.User u = session.getUser();
User user = (User) users.get(u.getUserName());
if (user == null) {
@@ -71,7 +71,7 @@ public class InMemoryUserManager impleme
return user.getSubscriptions();
}
- public void unsubscribe(org.apache.james.imap.mailbox.MailboxSession session, String mailbox)
+ public void unsubscribe(org.apache.james.mailbox.MailboxSession session, String mailbox)
throws SubscriptionException {
MailboxSession.User u = session.getUser();
User user = (User) users.get(u.getUserName());
Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/AbstractJCRMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/AbstractJCRMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/AbstractJCRMapper.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/AbstractJCRMapper.java Mon Sep 6 18:09:32 2010
@@ -22,9 +22,9 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.store.transaction.TransactionalMapper;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxSession;
/**
* Abstract Mapper base class for Level 1 Implementations of JCR. So no real transaction management is used.
Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/AbstractJCRScalingMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/AbstractJCRScalingMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/AbstractJCRScalingMapper.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/AbstractJCRScalingMapper.java Mon Sep 6 18:09:32 2010
@@ -23,7 +23,7 @@ import javax.jcr.RepositoryException;
import org.apache.commons.logging.Log;
import org.apache.jackrabbit.commons.JcrUtils;
-import org.apache.james.imap.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSession;
/**
* Abstract base class for Mapper's which support scaling
Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/GlobalMailboxSessionJCRRepository.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/GlobalMailboxSessionJCRRepository.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/GlobalMailboxSessionJCRRepository.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/GlobalMailboxSessionJCRRepository.java Mon Sep 6 18:09:32 2010
@@ -22,7 +22,7 @@ import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.james.imap.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSession;
/**
Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxManager.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxManager.java Mon Sep 6 18:09:32 2010
@@ -22,15 +22,15 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.imap.jcr.mail.JCRMailboxMapper;
import org.apache.james.imap.jcr.mail.model.JCRMailbox;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxPath;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.util.MailboxEventDispatcher;
import org.apache.james.imap.store.Authenticator;
import org.apache.james.imap.store.StoreMailboxManager;
import org.apache.james.imap.store.MapperStoreMessageManager;
import org.apache.james.imap.store.mail.model.Mailbox;
import org.apache.james.imap.store.transaction.Mapper;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.util.MailboxEventDispatcher;
/**
* JCR implementation of a MailboxManager
Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxSessionMapperFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxSessionMapperFactory.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxSessionMapperFactory.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMailboxSessionMapperFactory.java Mon Sep 6 18:09:32 2010
@@ -24,13 +24,13 @@ import org.apache.james.imap.jcr.mail.JC
import org.apache.james.imap.jcr.mail.JCRMessageMapper;
import org.apache.james.imap.jcr.user.JCRSubscriptionMapper;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.SubscriptionException;
import org.apache.james.imap.store.MailboxSessionMapperFactory;
import org.apache.james.imap.store.mail.MailboxMapper;
import org.apache.james.imap.store.mail.MessageMapper;
import org.apache.james.imap.store.user.SubscriptionMapper;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.SubscriptionException;
/**
* JCR implementation of a {@link MailboxSessionMapperFactory}
Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMessageManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMessageManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMessageManager.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRMessageManager.java Mon Sep 6 18:09:32 2010
@@ -29,12 +29,12 @@ import org.apache.commons.logging.Log;
import org.apache.james.imap.jcr.mail.model.JCRHeader;
import org.apache.james.imap.jcr.mail.model.JCRMailbox;
import org.apache.james.imap.jcr.mail.model.JCRMessage;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.util.MailboxEventDispatcher;
import org.apache.james.imap.store.MapperStoreMessageManager;
import org.apache.james.imap.store.mail.model.Header;
import org.apache.james.imap.store.mail.model.MailboxMembership;
import org.apache.james.imap.store.mail.model.PropertyBuilder;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.util.MailboxEventDispatcher;
/**
* JCR implementation of a {@link MapperStoreMessageManager}
Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRSubscriptionManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRSubscriptionManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRSubscriptionManager.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/JCRSubscriptionManager.java Mon Sep 6 18:09:32 2010
@@ -21,9 +21,9 @@ package org.apache.james.imap.jcr;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.imap.jcr.user.model.JCRSubscription;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.store.StoreSubscriptionManager;
import org.apache.james.imap.store.user.model.Subscription;
+import org.apache.james.mailbox.MailboxSession;
/**
* JCR implementation of a SubscriptionManager
Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/MailboxSessionJCRRepository.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/MailboxSessionJCRRepository.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/MailboxSessionJCRRepository.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/MailboxSessionJCRRepository.java Mon Sep 6 18:09:32 2010
@@ -23,8 +23,8 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.MailboxSession.User;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MailboxSession.User;
/**
* Manage JCR {@link Session}. It use the username and the password of
Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMailboxMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMailboxMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMailboxMapper.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMailboxMapper.java Mon Sep 6 18:09:32 2010
@@ -39,13 +39,13 @@ import org.apache.james.imap.jcr.Mailbox
import org.apache.james.imap.jcr.NodeLocker;
import org.apache.james.imap.jcr.NodeLocker.NodeLockedExecution;
import org.apache.james.imap.jcr.mail.model.JCRMailbox;
-import org.apache.james.imap.mailbox.MailboxConstants;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxNotFoundException;
-import org.apache.james.imap.mailbox.MailboxPath;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.store.mail.MailboxMapper;
import org.apache.james.imap.store.mail.model.Mailbox;
+import org.apache.james.mailbox.MailboxConstants;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxNotFoundException;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxSession;
/**
* JCR implementation of a MailboxMapper
Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMessageMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMessageMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMessageMapper.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMessageMapper.java Mon Sep 6 18:09:32 2010
@@ -44,17 +44,17 @@ import org.apache.james.imap.jcr.NodeLoc
import org.apache.james.imap.jcr.NodeLocker.NodeLockedExecution;
import org.apache.james.imap.jcr.mail.model.JCRMailbox;
import org.apache.james.imap.jcr.mail.model.JCRMessage;
-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.SearchQuery;
-import org.apache.james.imap.mailbox.MessageRange.Type;
-import org.apache.james.imap.mailbox.SearchQuery.Criterion;
-import org.apache.james.imap.mailbox.SearchQuery.NumericRange;
import org.apache.james.imap.store.SearchQueryIterator;
import org.apache.james.imap.store.mail.MessageMapper;
import org.apache.james.imap.store.mail.model.Mailbox;
import org.apache.james.imap.store.mail.model.MailboxMembership;
+import org.apache.james.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.MessageRange.Type;
+import org.apache.james.mailbox.SearchQuery.Criterion;
+import org.apache.james.mailbox.SearchQuery.NumericRange;
/**
* JCR implementation of a {@link MessageMapper}
@@ -373,7 +373,7 @@ public class JCRMessageMapper extends Ab
*
* @see
* org.apache.james.imap.store.mail.MessageMapper#findMarkedForDeletionInMailbox
- * (org.apache.james.imap.mailbox.MessageRange)
+ * (org.apache.james.mailbox.MessageRange)
*/
public List<MailboxMembership<String>> findMarkedForDeletionInMailbox(Mailbox<String> mailbox, MessageRange set) throws MailboxException {
try {
@@ -603,7 +603,7 @@ public class JCRMessageMapper extends Ab
/*
* (non-Javadoc)
- * @see org.apache.james.imap.store.mail.MessageMapper#searchMailbox(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.imap.mailbox.SearchQuery)
+ * @see org.apache.james.imap.store.mail.MessageMapper#searchMailbox(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.mailbox.SearchQuery)
*/
public Iterator<Long> searchMailbox(Mailbox<String> mailbox, SearchQuery query) throws MailboxException {
try {
Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMailbox.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMailbox.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMailbox.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMailbox.java Mon Sep 6 18:09:32 2010
@@ -26,8 +26,8 @@ import org.apache.jackrabbit.JcrConstant
import org.apache.jackrabbit.util.Text;
import org.apache.james.imap.jcr.JCRImapConstants;
import org.apache.james.imap.jcr.Persistent;
-import org.apache.james.imap.mailbox.MailboxPath;
import org.apache.james.imap.store.mail.model.Mailbox;
+import org.apache.james.mailbox.MailboxPath;
/**
Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java Mon Sep 6 18:09:32 2010
@@ -37,7 +37,6 @@ import org.apache.jackrabbit.JcrConstant
import org.apache.jackrabbit.commons.JcrUtils;
import org.apache.james.imap.jcr.JCRImapConstants;
import org.apache.james.imap.jcr.Persistent;
-import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.store.mail.model.AbstractMessage;
import org.apache.james.imap.store.mail.model.Message;
import org.apache.james.imap.store.mail.model.Header;
@@ -45,6 +44,7 @@ import org.apache.james.imap.store.mail.
import org.apache.james.imap.store.mail.model.Property;
import org.apache.james.imap.store.mail.model.PropertyBuilder;
import org.apache.james.imap.store.streaming.StreamUtils;
+import org.apache.james.mailbox.MailboxException;
/**
* JCR implementation of {@link Message}
Modified: james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java (original)
+++ james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java Mon Sep 6 18:09:32 2010
@@ -38,11 +38,11 @@ import org.apache.james.imap.jcr.Abstrac
import org.apache.james.imap.jcr.MailboxSessionJCRRepository;
import org.apache.james.imap.jcr.NodeLocker;
import org.apache.james.imap.jcr.user.model.JCRSubscription;
-import org.apache.james.imap.mailbox.MailboxConstants;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.SubscriptionException;
import org.apache.james.imap.store.user.SubscriptionMapper;
import org.apache.james.imap.store.user.model.Subscription;
+import org.apache.james.mailbox.MailboxConstants;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.SubscriptionException;
/**
* JCR implementation of a SubscriptionManager
Modified: james/imap/trunk/jcr/src/test/java/org/apache/james/imap/jcr/JCRHostSystem.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/test/java/org/apache/james/imap/jcr/JCRHostSystem.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/test/java/org/apache/james/imap/jcr/JCRHostSystem.java (original)
+++ james/imap/trunk/jcr/src/test/java/org/apache/james/imap/jcr/JCRHostSystem.java Mon Sep 6 18:09:32 2010
@@ -34,9 +34,9 @@ import org.apache.james.imap.jcr.JCRMail
import org.apache.james.imap.jcr.JCRSubscriptionManager;
import org.apache.james.imap.jcr.JCRUtils;
import org.apache.james.imap.jcr.JCRVmNodeLocker;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.main.DefaultImapDecoderFactory;
import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
+import org.apache.james.mailbox.MailboxSession;
import org.apache.james.test.functional.HostSystem;
import org.xml.sax.InputSource;
Modified: james/imap/trunk/jcr/src/test/java/org/apache/james/imap/jcr/JCRStressTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/test/java/org/apache/james/imap/jcr/JCRStressTest.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/test/java/org/apache/james/imap/jcr/JCRStressTest.java (original)
+++ james/imap/trunk/jcr/src/test/java/org/apache/james/imap/jcr/JCRStressTest.java Mon Sep 6 18:09:32 2010
@@ -32,8 +32,8 @@ import org.apache.james.imap.jcr.JCRMail
import org.apache.james.imap.jcr.JCRUtils;
import org.apache.james.imap.jcr.JCRVmNodeLocker;
import org.apache.james.imap.jcr.MailboxSessionJCRRepository;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.store.StoreMailboxManager;
+import org.apache.james.mailbox.MailboxSession;
import org.junit.After;
import org.junit.Before;
import org.xml.sax.InputSource;
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxManager.java Mon Sep 6 18:09:32 2010
@@ -20,15 +20,15 @@ package org.apache.james.imap.jpa;
import org.apache.james.imap.jpa.mail.model.JPAMailbox;
import org.apache.james.imap.jpa.user.model.JPASubscription;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxPath;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.store.Authenticator;
import org.apache.james.imap.store.StoreMailboxManager;
import org.apache.james.imap.store.mail.MailboxMapper;
import org.apache.james.imap.store.mail.model.Mailbox;
import org.apache.james.imap.store.transaction.TransactionalMapper;
import org.apache.james.imap.store.user.model.Subscription;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxPath;
+import org.apache.james.mailbox.MailboxSession;
/**
* JPA implementation of {@link StoreMailboxManager}
@@ -72,7 +72,7 @@ public abstract class JPAMailboxManager
/*
* (non-Javadoc)
- * @see org.apache.james.imap.store.StoreMailboxManager#createSubscription(org.apache.james.imap.mailbox.MailboxSession, java.lang.String)
+ * @see org.apache.james.imap.store.StoreMailboxManager#createSubscription(org.apache.james.mailbox.MailboxSession, java.lang.String)
*/
protected Subscription createSubscription(final MailboxSession session, final String mailbox) {
final Subscription newSubscription = new JPASubscription(session.getUser().getUserName(), mailbox);
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSessionMapperFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSessionMapperFactory.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSessionMapperFactory.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMailboxSessionMapperFactory.java Mon Sep 6 18:09:32 2010
@@ -24,12 +24,12 @@ import javax.persistence.EntityManagerFa
import org.apache.james.imap.jpa.mail.JPAMailboxMapper;
import org.apache.james.imap.jpa.mail.JPAMessageMapper;
import org.apache.james.imap.jpa.user.JPASubscriptionMapper;
-import org.apache.james.imap.mailbox.MailboxConstants;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.store.MailboxSessionMapperFactory;
import org.apache.james.imap.store.mail.MailboxMapper;
import org.apache.james.imap.store.mail.MessageMapper;
import org.apache.james.imap.store.user.SubscriptionMapper;
+import org.apache.james.mailbox.MailboxConstants;
+import org.apache.james.mailbox.MailboxSession;
/**
* JPA implementation of {@link MailboxSessionMapperFactory}
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMessageManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMessageManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMessageManager.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPAMessageManager.java Mon Sep 6 18:09:32 2010
@@ -27,13 +27,13 @@ import javax.mail.Flags;
import org.apache.james.imap.jpa.mail.model.JPAHeader;
import org.apache.james.imap.jpa.mail.model.openjpa.JPAMailboxMembership;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.util.MailboxEventDispatcher;
import org.apache.james.imap.store.MapperStoreMessageManager;
import org.apache.james.imap.store.mail.model.Header;
import org.apache.james.imap.store.mail.model.Mailbox;
import org.apache.james.imap.store.mail.model.MailboxMembership;
import org.apache.james.imap.store.mail.model.PropertyBuilder;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.util.MailboxEventDispatcher;
/**
* Abstract base class which should be used from JPA 2.0 implementations
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPASubscriptionManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPASubscriptionManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPASubscriptionManager.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPASubscriptionManager.java Mon Sep 6 18:09:32 2010
@@ -19,9 +19,9 @@
package org.apache.james.imap.jpa;
import org.apache.james.imap.jpa.user.model.JPASubscription;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.store.StoreSubscriptionManager;
import org.apache.james.imap.store.user.model.Subscription;
+import org.apache.james.mailbox.MailboxSession;
/**
* JPA implementation of {@link StoreSubscriptionManager}
@@ -35,7 +35,7 @@ public class JPASubscriptionManager exte
/*
* (non-Javadoc)
- * @see org.apache.james.imap.store.StoreSubscriptionManager#createSubscription(org.apache.james.imap.mailbox.MailboxSession, java.lang.String)
+ * @see org.apache.james.imap.store.StoreSubscriptionManager#createSubscription(org.apache.james.mailbox.MailboxSession, java.lang.String)
*/
protected Subscription createSubscription(final MailboxSession session, final String mailbox) {
final Subscription newSubscription = new JPASubscription(session.getUser().getUserName(), mailbox);
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPATransactionalMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPATransactionalMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPATransactionalMapper.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/JPATransactionalMapper.java Mon Sep 6 18:09:32 2010
@@ -23,8 +23,8 @@ import javax.persistence.EntityManagerFa
import javax.persistence.EntityTransaction;
import javax.persistence.PersistenceException;
-import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.store.transaction.TransactionalMapper;
+import org.apache.james.mailbox.MailboxException;
/**
* JPA implementation of TransactionMapper. This class is not thread-safe!
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMailboxMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMailboxMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMailboxMapper.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMailboxMapper.java Mon Sep 6 18:09:32 2010
@@ -29,12 +29,12 @@ import javax.persistence.RollbackExcepti
import org.apache.james.imap.jpa.JPATransactionalMapper;
import org.apache.james.imap.jpa.mail.model.JPAMailbox;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxExistsException;
-import org.apache.james.imap.mailbox.MailboxNotFoundException;
-import org.apache.james.imap.mailbox.MailboxPath;
import org.apache.james.imap.store.mail.MailboxMapper;
import org.apache.james.imap.store.mail.model.Mailbox;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxExistsException;
+import org.apache.james.mailbox.MailboxNotFoundException;
+import org.apache.james.mailbox.MailboxPath;
/**
* Data access management for mailbox.
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMessageMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMessageMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMessageMapper.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMessageMapper.java Mon Sep 6 18:09:32 2010
@@ -32,16 +32,16 @@ import org.apache.james.imap.jpa.mail.mo
import org.apache.james.imap.jpa.mail.model.openjpa.AbstractJPAMailboxMembership;
import org.apache.james.imap.jpa.mail.model.openjpa.JPAMailboxMembership;
import org.apache.james.imap.jpa.mail.model.openjpa.JPAStreamingMailboxMembership;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MessageRange;
-import org.apache.james.imap.mailbox.SearchQuery;
-import org.apache.james.imap.mailbox.MessageRange.Type;
-import org.apache.james.imap.mailbox.SearchQuery.Criterion;
-import org.apache.james.imap.mailbox.SearchQuery.NumericRange;
import org.apache.james.imap.store.SearchQueryIterator;
import org.apache.james.imap.store.mail.MessageMapper;
import org.apache.james.imap.store.mail.model.Mailbox;
import org.apache.james.imap.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MessageRange;
+import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.MessageRange.Type;
+import org.apache.james.mailbox.SearchQuery.Criterion;
+import org.apache.james.mailbox.SearchQuery.NumericRange;
/**
@@ -55,7 +55,7 @@ public class JPAMessageMapper extends JP
}
/**
- * @see org.apache.james.imap.store.mail.MessageMapper#findInMailbox(org.apache.james.imap.mailbox.MessageRange)
+ * @see org.apache.james.imap.store.mail.MessageMapper#findInMailbox(org.apache.james.mailbox.MessageRange)
*/
public List<MailboxMembership<Long>> findInMailbox(Mailbox<Long> mailbox, MessageRange set) throws MailboxException {
try {
@@ -112,7 +112,7 @@ public class JPAMessageMapper extends JP
}
/**
- * @see org.apache.james.imap.store.mail.MessageMapper#findMarkedForDeletionInMailbox(org.apache.james.imap.mailbox.MessageRange)
+ * @see org.apache.james.imap.store.mail.MessageMapper#findMarkedForDeletionInMailbox(org.apache.james.mailbox.MessageRange)
*/
public List<MailboxMembership<Long>> findMarkedForDeletionInMailbox(Mailbox<Long> mailbox, final MessageRange set) throws MailboxException {
try {
@@ -194,7 +194,7 @@ public class JPAMessageMapper extends JP
/*
*
* (non-Javadoc)
- * @see org.apache.james.imap.store.mail.MessageMapper#searchMailbox(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.imap.mailbox.SearchQuery)
+ * @see org.apache.james.imap.store.mail.MessageMapper#searchMailbox(org.apache.james.imap.store.mail.model.Mailbox, org.apache.james.mailbox.SearchQuery)
*/
@SuppressWarnings("unchecked")
public Iterator<Long> searchMailbox(Mailbox<Long> mailbox, SearchQuery query) throws MailboxException {
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/JPAMailbox.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/JPAMailbox.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/JPAMailbox.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/JPAMailbox.java Mon Sep 6 18:09:32 2010
@@ -26,8 +26,8 @@ import javax.persistence.Id;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
-import org.apache.james.imap.mailbox.MailboxPath;
import org.apache.james.imap.store.mail.model.Mailbox;
+import org.apache.james.mailbox.MailboxPath;
@Entity(name="Mailbox")
@NamedQueries({
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java Mon Sep 6 18:09:32 2010
@@ -32,10 +32,10 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import org.apache.james.imap.jpa.mail.model.JPAHeader;
-import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.store.mail.model.AbstractMailboxMembership;
import org.apache.james.imap.store.mail.model.MailboxMembership;
import org.apache.james.imap.store.mail.model.PropertyBuilder;
+import org.apache.james.mailbox.MailboxException;
import org.apache.openjpa.persistence.jdbc.Index;
@MappedSuperclass
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAMailboxMembership.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAMailboxMembership.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAMailboxMembership.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAMailboxMembership.java Mon Sep 6 18:09:32 2010
@@ -30,9 +30,9 @@ import javax.persistence.FetchType;
import javax.persistence.ManyToOne;
import org.apache.james.imap.jpa.mail.model.JPAHeader;
-import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.store.mail.model.Message;
import org.apache.james.imap.store.mail.model.PropertyBuilder;
+import org.apache.james.mailbox.MailboxException;
@Entity(name="Membership")
public class JPAMailboxMembership extends AbstractJPAMailboxMembership{
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java Mon Sep 6 18:09:32 2010
@@ -30,10 +30,10 @@ import javax.persistence.FetchType;
import javax.persistence.ManyToOne;
import org.apache.james.imap.jpa.mail.model.JPAHeader;
-import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.store.mail.model.Message;
import org.apache.james.imap.store.mail.model.MailboxMembership;
import org.apache.james.imap.store.mail.model.PropertyBuilder;
+import org.apache.james.mailbox.MailboxException;
@Entity(name="Membership")
public class JPAStreamingMailboxMembership extends AbstractJPAMailboxMembership{
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/openjpa/OpenJPAMailboxManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/openjpa/OpenJPAMailboxManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/openjpa/OpenJPAMailboxManager.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/openjpa/OpenJPAMailboxManager.java Mon Sep 6 18:09:32 2010
@@ -22,12 +22,12 @@ package org.apache.james.imap.jpa.openjp
import org.apache.james.imap.jpa.JPAMailboxManager;
import org.apache.james.imap.jpa.JPAMailboxSessionMapperFactory;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.util.MailboxEventDispatcher;
import org.apache.james.imap.store.Authenticator;
import org.apache.james.imap.store.MapperStoreMessageManager;
import org.apache.james.imap.store.mail.model.Mailbox;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.util.MailboxEventDispatcher;
/**
* OpenJPA implementation of MailboxManager
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/openjpa/OpenJPAMessageManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/openjpa/OpenJPAMessageManager.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/openjpa/OpenJPAMessageManager.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/openjpa/OpenJPAMessageManager.java Mon Sep 6 18:09:32 2010
@@ -30,12 +30,12 @@ import org.apache.james.imap.jpa.JPAMail
import org.apache.james.imap.jpa.JPAMessageManager;
import org.apache.james.imap.jpa.mail.model.JPAHeader;
import org.apache.james.imap.jpa.mail.model.openjpa.JPAStreamingMailboxMembership;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.util.MailboxEventDispatcher;
import org.apache.james.imap.store.mail.model.Header;
import org.apache.james.imap.store.mail.model.Mailbox;
import org.apache.james.imap.store.mail.model.MailboxMembership;
import org.apache.james.imap.store.mail.model.PropertyBuilder;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.util.MailboxEventDispatcher;
/**
* OpenJPA implementation of Mailbox
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/JPASubscriptionMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/JPASubscriptionMapper.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/JPASubscriptionMapper.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/user/JPASubscriptionMapper.java Mon Sep 6 18:09:32 2010
@@ -25,9 +25,9 @@ import javax.persistence.NoResultExcepti
import javax.persistence.PersistenceException;
import org.apache.james.imap.jpa.JPATransactionalMapper;
-import org.apache.james.imap.mailbox.SubscriptionException;
import org.apache.james.imap.store.user.SubscriptionMapper;
import org.apache.james.imap.store.user.model.Subscription;
+import org.apache.james.mailbox.SubscriptionException;
/**
* JPA implementation of a {@link SubscriptionMapper}. This class is not thread-safe!
Modified: james/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/JPAHostSystem.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/JPAHostSystem.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/JPAHostSystem.java (original)
+++ james/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/JPAHostSystem.java Mon Sep 6 18:09:32 2010
@@ -39,10 +39,10 @@ import org.apache.james.imap.jpa.mail.mo
import org.apache.james.imap.jpa.mail.model.openjpa.JPAMessage;
import org.apache.james.imap.jpa.openjpa.OpenJPAMailboxManager;
import org.apache.james.imap.jpa.user.model.JPASubscription;
-import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.mailbox.SubscriptionManager;
import org.apache.james.imap.main.DefaultImapDecoderFactory;
import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.SubscriptionManager;
import org.apache.james.test.functional.HostSystem;
import org.apache.openjpa.persistence.OpenJPAPersistence;
Modified: james/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/JPAStressTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/JPAStressTest.java?rev=993114&r1=993113&r2=993114&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/JPAStressTest.java (original)
+++ james/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/JPAStressTest.java Mon Sep 6 18:09:32 2010
@@ -34,9 +34,9 @@ import org.apache.james.imap.jpa.mail.mo
import org.apache.james.imap.jpa.mail.model.openjpa.JPAMessage;
import org.apache.james.imap.jpa.openjpa.OpenJPAMailboxManager;
import org.apache.james.imap.jpa.user.model.JPASubscription;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.store.StoreMailboxManager;
+import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxSession;
import org.apache.openjpa.persistence.OpenJPAPersistence;
import org.junit.After;
import org.junit.Before;
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/BadCredentialsException.java (from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/BadCredentialsException.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/BadCredentialsException.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/BadCredentialsException.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/BadCredentialsException.java&r1=993100&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/BadCredentialsException.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/BadCredentialsException.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
/**
* Indicates that the credentials for this operation were not acceptable.
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/Content.java (from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Content.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/Content.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/Content.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Content.java&r1=993085&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Content.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/Content.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
import java.io.IOException;
import java.nio.channels.WritableByteChannel;
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/Headers.java (from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Headers.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/Headers.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/Headers.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Headers.java&r1=993085&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/Headers.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/Headers.java Mon Sep 6 18:09:32 2010
@@ -17,13 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
import java.util.Iterator;
-import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
-import org.apache.james.imap.mailbox.MessageResult.Header;
+import org.apache.james.mailbox.MessageResult.FetchGroup;
+import org.apache.james.mailbox.MessageResult.Header;
/**
* TODO: remove when MessageResult is sorted out
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxConstants.java (from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxConstants.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxConstants.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxConstants.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxConstants.java&r1=993085&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxConstants.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxConstants.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
public interface MailboxConstants {
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxException.java (from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxException.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxException.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxException.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxException.java&r1=993100&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxException.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxException.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
import javax.mail.MessagingException;
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxExistsException.java (from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExistsException.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxExistsException.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxExistsException.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExistsException.java&r1=993100&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExistsException.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxExistsException.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
/**
* Indicates that the operation failed since the mailbox already exists.
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxListener.java (from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxListener.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxListener.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxListener.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxListener.java&r1=993100&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxListener.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxListener.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
import java.util.Iterator;
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxManager.java (from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxManager.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxManager.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java&r1=993100&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxManager.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxManager.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
import java.util.List;
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxMetaData.java (from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxMetaData.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxMetaData.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxMetaData.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxMetaData.java&r1=993100&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxMetaData.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxMetaData.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxNotFoundException.java (from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxNotFoundException.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxNotFoundException.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxNotFoundException.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxNotFoundException.java&r1=993100&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxNotFoundException.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxNotFoundException.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
/**
* Indicates that the failure is caused by a reference to a mailbox which does
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxPath.java (from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxPath.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxPath.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxPath.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxPath.java&r1=993100&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxPath.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxPath.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
import java.util.ArrayList;
import java.util.List;
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxQuery.java (from r993100, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxQuery.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxQuery.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxQuery.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxQuery.java&r1=993100&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxQuery.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxQuery.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
/**
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxSession.java (from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxSession.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxSession.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxSession.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxSession.java&r1=993085&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxSession.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MailboxSession.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
import java.util.Collection;
import java.util.List;
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MessageManager.java (from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageManager.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MessageManager.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MessageManager.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageManager.java&r1=993085&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageManager.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MessageManager.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
import java.io.InputStream;
import java.util.Date;
@@ -27,7 +27,7 @@ import java.util.Map;
import javax.mail.Flags;
-import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
+import org.apache.james.mailbox.MessageResult.FetchGroup;
/**
Copied: james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MessageRange.java (from r993085, james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageRange.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MessageRange.java?p2=james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MessageRange.java&p1=james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageRange.java&r1=993085&r2=993114&rev=993114&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MessageRange.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/mailbox/MessageRange.java Mon Sep 6 18:09:32 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.mailbox;
+package org.apache.james.mailbox;
/**
* Used to define a range of messages by uid or msn, or a individual message by
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org