Author: eric
Date: Sun Jan 23 10:26:19 2011
New Revision: 1062364
URL: http://svn.apache.org/viewvc?rev=1062364&view=rev
Log:
Allow the maildir list for default configuration.
Modified:
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
Modified:
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java?rev=1062364&r1=1062363&r2=1062364&view=diff
==============================================================================
---
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
(original)
+++
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
Sun Jan 23 10:26:19 2011
@@ -189,25 +189,21 @@ public class MaildirMailboxMapper extend
*/
public List<Mailbox<Integer>> list() throws MailboxException {
- File maildirRoot = maildirStore.getMaildirRoot();
- List<Mailbox<Integer>> mailboxList = new ArrayList<Mailbox<Integer>>();
+ File maildirRoot = maildirStore.getMaildirRoot();
+ List<Mailbox<Integer>> mailboxList = new ArrayList<Mailbox<Integer>>();
- if (maildirStore.getMaildirLocation().endsWith("/" +
MaildirStore.PATH_DOMAIN + "/" + MaildirStore.PATH_USER)) {
- File[] domains = maildirRoot.listFiles();
- for (File domain: domains) {
- File[] users = domain.listFiles();
- visitUsersForMailboxList(domain, users, mailboxList);
- }
- return mailboxList;
- }
-
- if ((maildirStore.getMaildirLocation().endsWith("/" +
MaildirStore.PATH_USER)) || (maildirStore.getMaildirLocation().endsWith("/" +
MaildirStore.PATH_FULLUSER))) {
+ if (maildirStore.getMaildirLocation().endsWith("/" +
MaildirStore.PATH_FULLUSER)) {
File[] users = maildirRoot.listFiles();
visitUsersForMailboxList(null, users, mailboxList);
return mailboxList;
}
- throw new UnsupportedOperationException("The MaildirLocation must end
with /%domain/%user, /%user or /%fulluser.");
+ File[] domains = maildirRoot.listFiles();
+ for (File domain: domains) {
+ File[] users = domain.listFiles();
+ visitUsersForMailboxList(domain, users, mailboxList);
+ }
+ return mailboxList;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
