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:38 UTC
svn commit: r1242289 - in /james/server/trunk:
container-spring/src/main/java/org/apache/james/container/spring/mailbox/
container-spring/src/main/java/org/apache/james/container/spring/tool/
mailbox-adapter/src/main/java/org/apache/james/adapter/mailb...
Author: eric
Date: Thu Feb 9 12:13:37 2012
New Revision: 1242289
URL: http://svn.apache.org/viewvc?rev=1242289&view=rev
Log:
Structure mailbox classes into subpackages (MAILBOX-159) + Move GroupMembershipResolver into its own interface (MAILBOX-156)
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/mailbox/MailboxCopierManagement.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
james/server/trunk/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
james/server/trunk/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
james/server/trunk/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java
james/server/trunk/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
Modified: james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/mailbox/MailboxCopierManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/mailbox/MailboxCopierManagement.java?rev=1242289&r1=1242288&r2=1242289&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/mailbox/MailboxCopierManagement.java (original)
+++ james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/mailbox/MailboxCopierManagement.java Thu Feb 9 12:13:37 2012
@@ -24,9 +24,9 @@ import java.util.Map;
import javax.annotation.Resource;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.copier.MailboxCopier;
+import org.apache.james.mailbox.exception.MailboxException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
Modified: james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java?rev=1242289&r1=1242288&r2=1242289&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java (original)
+++ james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java Thu Feb 9 12:13:37 2012
@@ -30,12 +30,12 @@ import org.apache.james.core.MimeMessage
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.api.DomainListException;
import org.apache.james.lifecycle.api.LogEnabled;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MailboxExistsException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MailboxExistsException;
+import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailrepository.api.MailRepository;
import org.apache.james.mailrepository.api.MailRepositoryStore;
import org.apache.james.mailrepository.api.MailRepositoryStore.MailRepositoryStoreException;
Modified: james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java?rev=1242289&r1=1242288&r2=1242289&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java (original)
+++ james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java Thu Feb 9 12:13:37 2012
@@ -24,7 +24,7 @@ import javax.annotation.Resource;
import javax.mail.MessagingException;
import org.apache.james.domainlist.api.DomainListException;
-import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailrepository.api.MailRepositoryStore.MailRepositoryStoreException;
import org.apache.james.user.api.UsersRepositoryException;
Modified: james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java?rev=1242289&r1=1242288&r2=1242289&view=diff
==============================================================================
--- james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java (original)
+++ james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java Thu Feb 9 12:13:37 2012
@@ -27,12 +27,12 @@ import javax.management.NotCompliantMBea
import javax.management.StandardMBean;
import org.apache.james.lifecycle.api.LogEnabled;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxMetaData;
-import org.apache.james.mailbox.MailboxPath;
-import org.apache.james.mailbox.MailboxQuery;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxMetaData;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.MailboxQuery;
import org.slf4j.Logger;
/**
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java?rev=1242289&r1=1242288&r2=1242289&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java Thu Feb 9 12:13:37 2012
@@ -27,12 +27,12 @@ import javax.mail.internet.MimeMessage;
import org.apache.james.core.MimeMessageInputStream;
import org.apache.james.filesystem.api.FileSystem;
-import org.apache.james.mailbox.BadCredentialsException;
-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.BadCredentialsException;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.transport.util.MailetContextLog;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java?rev=1242289&r1=1242288&r2=1242289&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java Thu Feb 9 12:13:37 2012
@@ -27,16 +27,16 @@ import javax.annotation.Resource;
import javax.mail.MessagingException;
import org.apache.james.imap.processor.base.FetchGroupImpl;
-import org.apache.james.mailbox.BadCredentialsException;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxMetaData;
-import org.apache.james.mailbox.MailboxPath;
-import org.apache.james.mailbox.MailboxQuery;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.MessageResult;
+import org.apache.james.mailbox.exception.BadCredentialsException;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxMetaData;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.model.MailboxQuery;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.MessageResult;
import org.apache.james.transport.util.MailetContextLog;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
Modified: james/server/trunk/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java?rev=1242289&r1=1242288&r2=1242289&view=diff
==============================================================================
--- james/server/trunk/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java (original)
+++ james/server/trunk/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java Thu Feb 9 12:13:37 2012
@@ -24,10 +24,10 @@ import java.util.Date;
import javax.annotation.Resource;
-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.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.protocols.lib.Slf4jLoggerAdapter;
import org.apache.james.protocols.lmtp.hook.DeliverToRecipientHook;
import org.apache.james.protocols.smtp.MailAddress;
Modified: james/server/trunk/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java?rev=1242289&r1=1242288&r2=1242289&view=diff
==============================================================================
--- james/server/trunk/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java (original)
+++ james/server/trunk/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java Thu Feb 9 12:13:37 2012
@@ -22,12 +22,12 @@ import java.io.IOException;
import javax.annotation.Resource;
-import org.apache.james.mailbox.BadCredentialsException;
-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.BadCredentialsException;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.pop3server.mailbox.MailboxAdapter;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
Modified: james/server/trunk/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java?rev=1242289&r1=1242288&r2=1242289&view=diff
==============================================================================
--- james/server/trunk/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java (original)
+++ james/server/trunk/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java Thu Feb 9 12:13:37 2012
@@ -28,13 +28,13 @@ import java.util.Set;
import javax.mail.Flags;
-import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.MessageRange;
-import org.apache.james.mailbox.MessageResult;
-import org.apache.james.mailbox.MessageResult.FetchGroup;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MessageRange;
+import org.apache.james.mailbox.model.MessageResult;
+import org.apache.james.mailbox.model.MessageResult.FetchGroup;
import org.apache.james.protocols.pop3.mailbox.Mailbox;
import org.apache.james.protocols.pop3.mailbox.MessageMetaData;
Modified: james/server/trunk/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java?rev=1242289&r1=1242288&r2=1242289&view=diff
==============================================================================
--- james/server/trunk/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java (original)
+++ james/server/trunk/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java Thu Feb 9 12:13:37 2012
@@ -34,16 +34,16 @@ import org.apache.commons.net.pop3.POP3C
import org.apache.commons.net.pop3.POP3MessageInfo;
import org.apache.commons.net.pop3.POP3Reply;
import org.apache.james.filesystem.api.mock.MockFileSystem;
-import org.apache.james.mailbox.MailboxACLResolver;
-import org.apache.james.mailbox.MailboxACLResolver.GroupMembershipResolver;
-import org.apache.james.mailbox.MailboxConstants;
-import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.SimpleGroupMembershipResolver;
-import org.apache.james.mailbox.UnionMailboxACLResolver;
+import org.apache.james.mailbox.acl.GroupMembershipResolver;
+import org.apache.james.mailbox.acl.MailboxACLResolver;
+import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
+import org.apache.james.mailbox.acl.UnionMailboxACLResolver;
+import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
+import org.apache.james.mailbox.model.MailboxConstants;
+import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.Authenticator;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.pop3server.netty.POP3Server;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org