You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by er...@apache.org on 2012/02/09 13:13:09 UTC
svn commit: r1242288 [1/4] - in /james/mailbox/trunk:
api/src/main/java/org/apache/james/mailbox/
api/src/main/java/org/apache/james/mailbox/acl/
api/src/main/java/org/apache/james/mailbox/exception/
api/src/main/java/org/apache/james/mailbox/model/ ap...
Author: eric
Date: Thu Feb 9 12:13:02 2012
New Revision: 1242288
URL: http://svn.apache.org/viewvc?rev=1242288&view=rev
Log:
Structure mailbox classes into subpackage (MAILBOX-159) + Move GroupMembershipResolver into its own interface (MAILBOX-156)
Added:
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/QuotaManager.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/quota/QuotaManager.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/GroupMembershipResolver.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxACLResolver.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/SimpleGroupMembershipResolver.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SimpleGroupMembershipResolver.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnionMailboxACLResolver.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/BadCredentialsException.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/BadCredentialsException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/InsufficientRightsException.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/InsufficientRightsException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxException.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxExistsException.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxExistsException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxNotFoundException.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxNotFoundException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxSecurityException.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxSecurityException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MessageRangeException.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageRangeException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/OverQuotaException.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/quota/OverQuotaException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/ReadOnlyException.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/ReadOnlyException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/SubscriptionException.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SubscriptionException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedCriteriaException.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedCriteriaException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedOperationException.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedOperationException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedRightException.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedRightException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedSearchException.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedSearchException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/Content.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/Content.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/Headers.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/Headers.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/InputStreamContent.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/InputStreamContent.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxACL.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxConstants.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxConstants.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxMetaData.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxPath.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxPath.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxQuery.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxQuery.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageMetaData.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageMetaData.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageRange.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageResult.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageResultIterator.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageResultIterator.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MimeDescriptor.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MimeDescriptor.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/Quota.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/quota/Quota.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SearchQuery.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/SimpleMailboxACL.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SimpleMailboxACL.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/UpdatedFlags.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UpdatedFlags.java
james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/acl/
james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/UnionMailboxACLResolverTest.java
james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/model/
james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/model/Rfc4314RightsTest.java
- copied, changed from r1242231, james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/Rfc4314RightsTest.java
Removed:
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/BadCredentialsException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/Content.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/Headers.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/InputStreamContent.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/InsufficientRightsException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxACL.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxACLResolver.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxConstants.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxExistsException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxMetaData.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxNotFoundException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxPath.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxQuery.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxSecurityException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageMetaData.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageRange.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageRangeException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageResult.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageResultIterator.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MimeDescriptor.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/ReadOnlyException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SearchQuery.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SimpleGroupMembershipResolver.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SimpleMailboxACL.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SubscriptionException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnionMailboxACLResolver.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedCriteriaException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedOperationException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedRightException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedSearchException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UpdatedFlags.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/quota/OverQuotaException.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/quota/Quota.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/quota/QuotaManager.java
james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/Rfc4314RightsTest.java
james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/UnionMailboxACLResolverTest.java
Modified:
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxListener.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxListenerSupport.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxManager.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxPathLocker.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageManager.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SubscriptionManager.java
james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/AbstractMailboxManagerTest.java
james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/AbstractStressTest.java
james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExceptionTest.java
james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExpressionTest.java
james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MessageRangeTest.java
james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java
james/mailbox/trunk/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxManager.java
james/mailbox/trunk/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java
james/mailbox/trunk/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMessageManager.java
james/mailbox/trunk/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseUtils.java
james/mailbox/trunk/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapper.java
james/mailbox/trunk/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessage.java
james/mailbox/trunk/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapper.java
james/mailbox/trunk/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseModSeqProvider.java
james/mailbox/trunk/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/HBaseUidProvider.java
james/mailbox/trunk/hbase/src/main/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailbox.java
james/mailbox/trunk/hbase/src/main/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapper.java
james/mailbox/trunk/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseClusterSingleton.java
james/mailbox/trunk/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseMailboxManagerTest.java
james/mailbox/trunk/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseUtilsTest.java
james/mailbox/trunk/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapperTest.java
james/mailbox/trunk/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMessageMapperTest.java
james/mailbox/trunk/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseUidAndModSeqProviderTest.java
james/mailbox/trunk/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/model/HBaseMailboxTest.java
james/mailbox/trunk/hbase/src/test/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapperTest.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRModSeqProvider.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRUidProvider.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java
james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java
james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPATransactionalMapper.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMailboxMapper.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAUidProvider.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAEncryptedMessage.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMessage.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMessage.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/user/JPASubscriptionMapper.java
james/mailbox/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java
james/mailbox/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAStressTest.java
james/mailbox/trunk/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
james/mailbox/trunk/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndexTest.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirStore.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMailbox.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java
james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTest.java
james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirStressTest.java
james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java
james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java
james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryModSeqProvider.java
james/mailbox/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryUidProvider.java
james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractDelegatingMailboxListener.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/AbstractMailboxPathLocker.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/HashMapDelegatingMailboxListener.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/JVMMailboxPathLocker.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/LazyMimeDescriptor.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxEventDispatcher.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxMetaData.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SimpleMessageMetaData.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxPath.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreSubscriptionManager.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingModSeqProvider.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractLockingUidProvider.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapper.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MailboxMapperFactory.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapper.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/MessageMapperFactory.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/ModSeqProvider.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/UidProvider.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMessage.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/FixedQuotaManager.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningQuotaManager.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/PerUserQuotaManager.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaImpl.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearchIndex.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/comparator/CombinedComparator.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/ByteContent.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/user/SubscriptionMapper.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/user/SubscriptionMapperFactory.java
james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/MailboxEventDispatcherFlagsTest.java
james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderComplexMultipartTest.java
james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderMultipartAlternativeTest.java
james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsMultipartMixedTest.java
james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsRFC822Test.java
james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java
james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/StoreMessageResultIteratorTest.java
james/mailbox/trunk/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopier.java
james/mailbox/trunk/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
james/mailbox/trunk/tool/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java
Modified: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxListener.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxListener.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxListener.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxListener.java Thu Feb 9 12:13:02 2012
@@ -22,6 +22,11 @@ package org.apache.james.mailbox;
import java.io.Serializable;
import java.util.List;
+import org.apache.james.mailbox.model.MailboxACL;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.MessageMetaData;
+import org.apache.james.mailbox.model.UpdatedFlags;
+
/**
* Listens to <code>Mailbox</code> events.<br>
Modified: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxListenerSupport.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxListenerSupport.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxListenerSupport.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxListenerSupport.java Thu Feb 9 12:13:02 2012
@@ -19,6 +19,9 @@
package org.apache.james.mailbox;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxPath;
+
/**
* Implementations of this interface supports {@link MailboxListener}. Its needed that the events get handled
* in the submitted order
Modified: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxManager.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxManager.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxManager.java Thu Feb 9 12:13:02 2012
@@ -21,6 +21,14 @@ package org.apache.james.mailbox;
import java.util.List;
+import org.apache.james.mailbox.exception.BadCredentialsException;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MailboxExistsException;
+import org.apache.james.mailbox.exception.MailboxNotFoundException;
+import org.apache.james.mailbox.model.MailboxMetaData;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.MailboxQuery;
+import org.apache.james.mailbox.model.MessageRange;
import org.slf4j.Logger;
/**
Modified: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxPathLocker.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxPathLocker.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxPathLocker.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxPathLocker.java Thu Feb 9 12:13:02 2012
@@ -21,6 +21,9 @@ package org.apache.james.mailbox;
import java.util.concurrent.locks.ReadWriteLock;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxPath;
+
/**
* The {@link MailboxPathLocker} is responsible to help to synchronize the
* access to a {@link MailboxPath} and execute an given {@link LockAwareExecution}
Modified: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageManager.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageManager.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageManager.java Thu Feb 9 12:13:02 2012
@@ -27,8 +27,15 @@ import java.util.Map;
import javax.mail.Flags;
-import org.apache.james.mailbox.MailboxACL.MailboxACLRight;
-import org.apache.james.mailbox.MessageResult.FetchGroup;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.UnsupportedCriteriaException;
+import org.apache.james.mailbox.model.MailboxACL;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.MessageResult;
+import org.apache.james.mailbox.model.MessageResultIterator;
+import org.apache.james.mailbox.model.SearchQuery;
+import org.apache.james.mailbox.model.MailboxACL.MailboxACLRight;
+import org.apache.james.mailbox.model.MessageResult.FetchGroup;
/**
* Interface which represent a Mailbox
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/QuotaManager.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/quota/QuotaManager.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/QuotaManager.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/QuotaManager.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/quota/QuotaManager.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/quota/QuotaManager.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/QuotaManager.java Thu Feb 9 12:13:02 2012
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailbox.quota;
+package org.apache.james.mailbox;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.Quota;
/**
Modified: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/StandardMailboxMetaDataComparator.java Thu Feb 9 12:13:02 2012
@@ -21,6 +21,9 @@ package org.apache.james.mailbox;
import java.io.Serializable;
import java.util.Comparator;
+import org.apache.james.mailbox.model.MailboxConstants;
+import org.apache.james.mailbox.model.MailboxMetaData;
+
/**
* Orders by name with INBOX first.
*/
Modified: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SubscriptionManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SubscriptionManager.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SubscriptionManager.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SubscriptionManager.java Thu Feb 9 12:13:02 2012
@@ -21,6 +21,8 @@ package org.apache.james.mailbox;
import java.util.Collection;
+import org.apache.james.mailbox.exception.SubscriptionException;
+
/**
* Subscribes mailboxes to users. This is only needed to implement if the Mailbox should be usable via
* IMAP. For POP3 only you don't need this at all.
Added: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/GroupMembershipResolver.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/GroupMembershipResolver.java?rev=1242288&view=auto
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/GroupMembershipResolver.java (added)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/GroupMembershipResolver.java Thu Feb 9 12:13:02 2012
@@ -0,0 +1,35 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.james.mailbox.acl;
+
+/**
+ * An interface for querying group memberships.
+ */
+public interface GroupMembershipResolver {
+
+ /**
+ * Tests if the given user is a member of the given group.
+ *
+ * @param user
+ * @param group
+ * @return
+ */
+ boolean isMember(String user, String group);
+
+}
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxACLResolver.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxACLResolver.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxACLResolver.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/MailboxACLResolver.java Thu Feb 9 12:13:02 2012
@@ -18,10 +18,12 @@
*
*/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.acl;
-import org.apache.james.mailbox.MailboxACL.MailboxACLRight;
-import org.apache.james.mailbox.MailboxACL.MailboxACLRights;
+import org.apache.james.mailbox.exception.UnsupportedRightException;
+import org.apache.james.mailbox.model.MailboxACL;
+import org.apache.james.mailbox.model.MailboxACL.MailboxACLRight;
+import org.apache.james.mailbox.model.MailboxACL.MailboxACLRights;
/**
* Implements the interpretation of ACLs.
@@ -31,7 +33,7 @@ import org.apache.james.mailbox.MailboxA
* to be granted to the identifier matching the user, one or more
* implementation-defined identifiers matching groups that include the user,
* and/or the identifier "anyone". How these rights are combined to determine
- * the user�s access is implementation defined. An implementation may choose,
+ * the users access is implementation defined. An implementation may choose,
* for example, to use the union of the rights granted to the applicable
* identifiers. An implementation may instead choose, for example, to use only
* those rights granted to the most specific identifier present in the ACL. A
@@ -42,20 +44,6 @@ import org.apache.james.mailbox.MailboxA
public interface MailboxACLResolver {
/**
- * FIXME: where does GroupMembershipResolver belong?
- */
- public interface GroupMembershipResolver {
- /**
- * Tests if the given user is a member of the given group.
- *
- * @param user
- * @param group
- * @return
- */
- boolean isMember(String user, String group);
- }
-
- /**
* Applies global ACL to the given <code>resourceACL</code>. From RFC 4314:
* An implementation [...] MAY force rights to always or never be granted to
* particular identifiers.
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/SimpleGroupMembershipResolver.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SimpleGroupMembershipResolver.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/SimpleGroupMembershipResolver.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/SimpleGroupMembershipResolver.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SimpleGroupMembershipResolver.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SimpleGroupMembershipResolver.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/SimpleGroupMembershipResolver.java Thu Feb 9 12:13:02 2012
@@ -18,12 +18,11 @@
*
*/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.acl;
import java.util.HashSet;
import java.util.Set;
-import org.apache.james.mailbox.MailboxACLResolver.GroupMembershipResolver;
/**
* In memory {@link GroupMembershipResolver} implementation. There is no
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnionMailboxACLResolver.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnionMailboxACLResolver.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnionMailboxACLResolver.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java Thu Feb 9 12:13:02 2012
@@ -18,16 +18,21 @@
*
*/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.acl;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.james.mailbox.MailboxACL.MailboxACLEntryKey;
-import org.apache.james.mailbox.MailboxACL.MailboxACLRight;
-import org.apache.james.mailbox.MailboxACL.MailboxACLRights;
-import org.apache.james.mailbox.MailboxACL.NameType;
+import org.apache.james.mailbox.exception.UnsupportedRightException;
+import org.apache.james.mailbox.model.MailboxACL;
+import org.apache.james.mailbox.model.SimpleMailboxACL;
+import org.apache.james.mailbox.model.MailboxACL.MailboxACLEntryKey;
+import org.apache.james.mailbox.model.MailboxACL.MailboxACLRight;
+import org.apache.james.mailbox.model.MailboxACL.MailboxACLRights;
+import org.apache.james.mailbox.model.MailboxACL.NameType;
+
+import com.sun.mail.mbox.Mailbox;
/**
* An implementation which works with the union of the rights granted to the
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/BadCredentialsException.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/BadCredentialsException.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/BadCredentialsException.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/BadCredentialsException.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/BadCredentialsException.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/BadCredentialsException.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/BadCredentialsException.java Thu Feb 9 12:13:02 2012
@@ -17,7 +17,8 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.exception;
+
/**
* Indicates that the credentials for this operation were not acceptable.
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/InsufficientRightsException.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/InsufficientRightsException.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/InsufficientRightsException.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/InsufficientRightsException.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/InsufficientRightsException.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/InsufficientRightsException.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/InsufficientRightsException.java Thu Feb 9 12:13:02 2012
@@ -18,7 +18,8 @@
*
*/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.exception;
+
/**
* Thrown when the rights granted to the given authenticated user do not suffice
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxException.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxException.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxException.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxException.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxException.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxException.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxException.java Thu Feb 9 12:13:02 2012
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.exception;
/**
* Mailbox services should throw this exception in case of unsuccessfull
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxExistsException.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxExistsException.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxExistsException.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxExistsException.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxExistsException.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxExistsException.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxExistsException.java Thu Feb 9 12:13:02 2012
@@ -17,7 +17,8 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.exception;
+
/**
* Indicates that the operation failed since the mailbox already exists.
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxNotFoundException.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxNotFoundException.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxNotFoundException.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxNotFoundException.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxNotFoundException.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxNotFoundException.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxNotFoundException.java Thu Feb 9 12:13:02 2012
@@ -17,7 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.exception;
+
+import org.apache.james.mailbox.model.MailboxPath;
/**
* Indicates that the failure is caused by a reference to a mailbox which does
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxSecurityException.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxSecurityException.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxSecurityException.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxSecurityException.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxSecurityException.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxSecurityException.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MailboxSecurityException.java Thu Feb 9 12:13:02 2012
@@ -18,7 +18,8 @@
*
*/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.exception;
+
/**
* Parent for security related exceptions.
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MessageRangeException.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageRangeException.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MessageRangeException.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MessageRangeException.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageRangeException.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageRangeException.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/MessageRangeException.java Thu Feb 9 12:13:02 2012
@@ -17,7 +17,8 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.exception;
+
/**
* Exception which should get thrown if an invalid message set was specified via
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/OverQuotaException.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/quota/OverQuotaException.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/OverQuotaException.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/OverQuotaException.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/quota/OverQuotaException.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/quota/OverQuotaException.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/OverQuotaException.java Thu Feb 9 12:13:02 2012
@@ -16,9 +16,8 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailbox.quota;
+package org.apache.james.mailbox.exception;
-import org.apache.james.mailbox.MailboxException;
/**
* {@link MailboxException} which identicate that a user was over-quota
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/ReadOnlyException.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/ReadOnlyException.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/ReadOnlyException.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/ReadOnlyException.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/ReadOnlyException.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/ReadOnlyException.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/ReadOnlyException.java Thu Feb 9 12:13:02 2012
@@ -17,7 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.exception;
+
+import org.apache.james.mailbox.model.MailboxPath;
/**
* {@link MailboxException} which should get thrown if someone tries to modify a READ-ONLY Mailbox
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/SubscriptionException.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SubscriptionException.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/SubscriptionException.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/SubscriptionException.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SubscriptionException.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SubscriptionException.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/SubscriptionException.java Thu Feb 9 12:13:02 2012
@@ -17,7 +17,8 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.exception;
+
/**
* Indicates exception during subscription processing.
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedCriteriaException.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedCriteriaException.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedCriteriaException.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedCriteriaException.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedCriteriaException.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedCriteriaException.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedCriteriaException.java Thu Feb 9 12:13:02 2012
@@ -17,7 +17,8 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.exception;
+
/**
* Indicates that a search criteria is not supported.
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedOperationException.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedOperationException.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedOperationException.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedOperationException.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedOperationException.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedOperationException.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedOperationException.java Thu Feb 9 12:13:02 2012
@@ -17,7 +17,8 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.exception;
+
/**
* Indicates that an operation required is not supported by this mailbox.
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedRightException.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedRightException.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedRightException.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedRightException.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedRightException.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedRightException.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedRightException.java Thu Feb 9 12:13:02 2012
@@ -18,9 +18,9 @@
*
*/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.exception;
-import org.apache.james.mailbox.MailboxACL.MailboxACLRight;
+import org.apache.james.mailbox.model.MailboxACL.MailboxACLRight;
/**
* Thrown when the current system does not support the given right.
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedSearchException.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedSearchException.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedSearchException.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedSearchException.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedSearchException.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UnsupportedSearchException.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/exception/UnsupportedSearchException.java Thu Feb 9 12:13:02 2012
@@ -17,7 +17,8 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.exception;
+
/**
* Indicates that the requested search is not supported by this implementation.
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/Content.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/Content.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/Content.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/Content.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/Content.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/Content.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/Content.java Thu Feb 9 12:13:02 2012
@@ -17,11 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.model;
import java.io.IOException;
import java.io.InputStream;
+import org.apache.james.mailbox.exception.MailboxException;
+
/**
* IMAP needs to know the size of the content before it starts to write it out.
* This interface allows direct writing whilst exposing total size.
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/Headers.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/Headers.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/Headers.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/Headers.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/Headers.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/Headers.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/Headers.java Thu Feb 9 12:13:02 2012
@@ -17,12 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.model;
import java.util.Iterator;
-import org.apache.james.mailbox.MessageResult.FetchGroup;
-import org.apache.james.mailbox.MessageResult.Header;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MessageResult.FetchGroup;
+import org.apache.james.mailbox.model.MessageResult.Header;
public interface Headers extends Content{
/**
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/InputStreamContent.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/InputStreamContent.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/InputStreamContent.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/InputStreamContent.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/InputStreamContent.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/InputStreamContent.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/InputStreamContent.java Thu Feb 9 12:13:02 2012
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.model;
import java.io.InputStream;
+
/**
* {@link Content} which offers the content via {@link InputStream} too
*
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxACL.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxACL.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxACL.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java Thu Feb 9 12:13:02 2012
@@ -17,10 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.model;
import java.util.Map;
+import org.apache.james.mailbox.exception.UnsupportedRightException;
+
/**
* Stores an Access Control List (ACL) applicable to a mailbox. Inspired by
* RFC4314 IMAP4 Access Control List (ACL) Extension.
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxConstants.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxConstants.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxConstants.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxConstants.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxConstants.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxConstants.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxConstants.java Thu Feb 9 12:13:02 2012
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.model;
/**
* Constants which are used within the mailbox api and implementations
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxMetaData.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxMetaData.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxMetaData.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxMetaData.java Thu Feb 9 12:13:02 2012
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.model;
/**
* Returned by the list method of MailboxRepository and others
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxPath.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxPath.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxPath.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxPath.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxPath.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxPath.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxPath.java Thu Feb 9 12:13:02 2012
@@ -17,11 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.model;
import java.util.ArrayList;
import java.util.List;
+import org.apache.james.mailbox.MailboxSession;
+
/**
* The path to a mailbox.
*/
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxQuery.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxQuery.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxQuery.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxQuery.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxQuery.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MailboxQuery.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MailboxQuery.java Thu Feb 9 12:13:02 2012
@@ -17,10 +17,11 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.model;
import java.util.regex.Pattern;
+
/**
* Expresses select criteria for mailboxes.
*/
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageMetaData.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageMetaData.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageMetaData.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageMetaData.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageMetaData.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageMetaData.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageMetaData.java Thu Feb 9 12:13:02 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.model;
import java.util.Date;
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageRange.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageRange.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageRange.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java Thu Feb 9 12:13:02 2012
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.model;
import java.util.ArrayList;
import java.util.Collection;
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageResult.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageResult.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageResult.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java Thu Feb 9 12:13:02 2012
@@ -17,12 +17,14 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.model;
import java.io.IOException;
import java.util.Iterator;
import java.util.Set;
+import org.apache.james.mailbox.exception.MailboxException;
+
/**
* <p>
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageResultIterator.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageResultIterator.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageResultIterator.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageResultIterator.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageResultIterator.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageResultIterator.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MessageResultIterator.java Thu Feb 9 12:13:02 2012
@@ -17,10 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.model;
import java.util.Iterator;
+import org.apache.james.mailbox.exception.MailboxException;
+
/**
* A special {@link Iterator} which allows to access the {@link MailboxException} if one was thrown while try to lazy fetch the {@link MessageResult}'s in batches
*
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MimeDescriptor.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MimeDescriptor.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MimeDescriptor.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MimeDescriptor.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MimeDescriptor.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MimeDescriptor.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/MimeDescriptor.java Thu Feb 9 12:13:02 2012
@@ -19,12 +19,13 @@
/**
*
*/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.model;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
public interface MimeDescriptor extends Headers{
/**
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/Quota.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/quota/Quota.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/Quota.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/Quota.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/quota/Quota.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/quota/Quota.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/Quota.java Thu Feb 9 12:13:02 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailbox.quota;
+package org.apache.james.mailbox.model;
/**
* A {@link Quota} restriction
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SearchQuery.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SearchQuery.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SearchQuery.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/SearchQuery.java Thu Feb 9 12:13:02 2012
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.model;
import java.util.ArrayList;
import java.util.Arrays;
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/SimpleMailboxACL.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SimpleMailboxACL.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/SimpleMailboxACL.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/SimpleMailboxACL.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SimpleMailboxACL.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/SimpleMailboxACL.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/SimpleMailboxACL.java Thu Feb 9 12:13:02 2012
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.model;
import java.util.Collections;
import java.util.HashMap;
@@ -26,6 +26,8 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
+import org.apache.james.mailbox.exception.UnsupportedRightException;
+
/**
* Default implementation of {@link MailboxACL}.
*
@@ -698,7 +700,7 @@ public class SimpleMailboxACL implements
* {@link MailboxACL#DEFAULT_NEGATIVE_MARKER} and
* {@link MailboxACL#DEFAULT_GROUP_MARKER}.
*
- * @see org.apache.james.mailbox.MailboxACL.MailboxACLEntryKey#serialize()
+ * @see org.apache.james.mailbox.model.MailboxACL.MailboxACLEntryKey#serialize()
*/
@Override
public String serialize() {
Copied: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/UpdatedFlags.java (from r1242231, james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UpdatedFlags.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/UpdatedFlags.java?p2=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/UpdatedFlags.java&p1=james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UpdatedFlags.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/UpdatedFlags.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/model/UpdatedFlags.java Thu Feb 9 12:13:02 2012
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.model;
import java.util.Arrays;
import java.util.Iterator;
Modified: james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/AbstractMailboxManagerTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/AbstractMailboxManagerTest.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/AbstractMailboxManagerTest.java (original)
+++ james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/AbstractMailboxManagerTest.java Thu Feb 9 12:13:02 2012
@@ -26,7 +26,11 @@ import javax.mail.Flags;
import junit.framework.Assert;
+import org.apache.james.mailbox.exception.BadCredentialsException;
+import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.mock.MockMailboxManager;
+import org.apache.james.mailbox.model.MailboxConstants;
+import org.apache.james.mailbox.model.MailboxPath;
import org.junit.Test;
import org.slf4j.LoggerFactory;
Modified: james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/AbstractStressTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/AbstractStressTest.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/AbstractStressTest.java (original)
+++ james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/AbstractStressTest.java Thu Feb 9 12:13:02 2012
@@ -32,12 +32,12 @@ import javax.mail.Flags;
import junit.framework.Assert;
-import org.apache.james.mailbox.MailboxConstants;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxConstants;
+import org.apache.james.mailbox.model.MailboxPath;
import org.junit.Test;
import org.slf4j.LoggerFactory;
Modified: james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExceptionTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExceptionTest.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExceptionTest.java (original)
+++ james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExceptionTest.java Thu Feb 9 12:13:02 2012
@@ -20,6 +20,7 @@ package org.apache.james.mailbox;
import junit.framework.Assert;
+import org.apache.james.mailbox.exception.MailboxException;
import org.junit.Test;
/**
Modified: james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExpressionTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExpressionTest.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExpressionTest.java (original)
+++ james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MailboxExpressionTest.java Thu Feb 9 12:13:02 2012
@@ -21,8 +21,8 @@ package org.apache.james.mailbox;
import static org.junit.Assert.*;
-import org.apache.james.mailbox.MailboxPath;
-import org.apache.james.mailbox.MailboxQuery;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.MailboxQuery;
import org.junit.Test;
public class MailboxExpressionTest {
Modified: james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MessageRangeTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MessageRangeTest.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MessageRangeTest.java (original)
+++ james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MessageRangeTest.java Thu Feb 9 12:13:02 2012
@@ -22,6 +22,8 @@ import java.util.Arrays;
import java.util.List;
import static org.junit.Assert.*;
+
+import org.apache.james.mailbox.model.MessageRange;
import org.junit.Test;
public class MessageRangeTest {
Copied: james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java (from r1242231, james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/UnionMailboxACLResolverTest.java)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java?p2=james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java&p1=james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/UnionMailboxACLResolverTest.java&r1=1242231&r2=1242288&rev=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/UnionMailboxACLResolverTest.java (original)
+++ james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/acl/UnionMailboxACLResolverTest.java Thu Feb 9 12:13:02 2012
@@ -18,12 +18,17 @@
*
*/
-package org.apache.james.mailbox;
+package org.apache.james.mailbox.acl;
-import org.apache.james.mailbox.MailboxACL.NameType;
-import org.apache.james.mailbox.MailboxACL.SpecialName;
-import org.apache.james.mailbox.SimpleMailboxACL.Rfc4314Rights;
-import org.apache.james.mailbox.SimpleMailboxACL.SimpleMailboxACLEntryKey;
+import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
+import org.apache.james.mailbox.acl.UnionMailboxACLResolver;
+import org.apache.james.mailbox.exception.UnsupportedRightException;
+import org.apache.james.mailbox.model.MailboxACL;
+import org.apache.james.mailbox.model.SimpleMailboxACL;
+import org.apache.james.mailbox.model.MailboxACL.NameType;
+import org.apache.james.mailbox.model.MailboxACL.SpecialName;
+import org.apache.james.mailbox.model.SimpleMailboxACL.Rfc4314Rights;
+import org.apache.james.mailbox.model.SimpleMailboxACL.SimpleMailboxACLEntryKey;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Modified: james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java?rev=1242288&r1=1242287&r2=1242288&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java (original)
+++ james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java Thu Feb 9 12:13:02 2012
@@ -24,11 +24,11 @@ import java.util.Calendar;
import javax.mail.Flags;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxPath;
import org.slf4j.LoggerFactory;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org