james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nor...@apache.org
Subject svn commit: r960649 - in /james/server/trunk: mailets/src/main/java/org/apache/james/transport/matchers/ pop3server/src/main/java/org/apache/james/pop3server/core/ pop3server/src/test/java/org/apache/james/pop3server/
Date Mon, 05 Jul 2010 17:42:35 GMT
Author: norman
Date: Mon Jul  5 17:42:34 2010
New Revision: 960649

URL: http://svn.apache.org/viewvc?rev=960649&view=rev
Log:
change users' namespace to #private (IMAP-176). Thx to Tim-Christian Mundt for the patch :)

Modified:
    james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
    james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java

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=960649&r1=960648&r2=960649&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
Mon Jul  5 17:42:34 2010
@@ -30,6 +30,7 @@ import org.apache.commons.logging.Log;
 import org.apache.james.api.user.JamesUser;
 import org.apache.james.api.user.UsersRepository;
 import org.apache.james.imap.mailbox.Mailbox;
+import org.apache.james.imap.mailbox.MailboxConstants;
 import org.apache.james.imap.mailbox.MailboxManager;
 import org.apache.james.imap.mailbox.MailboxSession;
 import org.apache.james.imap.mailbox.MessageRange;
@@ -169,7 +170,7 @@ abstract public class AbstractStorageQuo
         	
         });
         manager.startProcessingRequest(session);
-        Mailbox mailbox = manager.getMailbox(manager.getUserNameSpacePrefix() + manager.getDelimiter()
+ "INBOX", session);
+        Mailbox mailbox = manager.getMailbox(MailboxConstants.USER_NAMESPACE + manager.getDelimiter()
+ "INBOX", session);
         Iterator<MessageResult> results = mailbox.getMessages(MessageRange.all(), new
FetchGroupImpl(FetchGroup.MINIMAL), session);
         
         while (results.hasNext()) {

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java?rev=960649&r1=960648&r2=960649&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
(original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
Mon Jul  5 17:42:34 2010
@@ -27,6 +27,7 @@ import javax.annotation.Resource;
 
 import org.apache.james.imap.mailbox.BadCredentialsException;
 import org.apache.james.imap.mailbox.Mailbox;
+import org.apache.james.imap.mailbox.MailboxConstants;
 import org.apache.james.imap.mailbox.MailboxException;
 import org.apache.james.imap.mailbox.MailboxManager;
 import org.apache.james.imap.mailbox.MailboxSession;
@@ -62,7 +63,7 @@ public class PassCmdHandler extends Rset
             try {
                 MailboxSession mSession = mailboxManager.login(session.getUser(), passArg,
session.getLogger());
                 StringBuffer sb = new StringBuffer();
-                sb.append(mailboxManager.getUserNameSpacePrefix());
+                sb.append(MailboxConstants.USER_NAMESPACE);
                 sb.append(mailboxManager.getDelimiter());
                 sb.append(session.getUser());
                 sb.append(mailboxManager.getDelimiter());

Modified: james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java?rev=960649&r1=960648&r2=960649&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
(original)
+++ james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
Mon Jul  5 17:42:34 2010
@@ -251,7 +251,7 @@ public abstract class AbstractAsyncPOP3S
         assertEquals("Found unexpected messages", 0, list.length);
 
         m_pop3Protocol.disconnect();
-        String mailboxName = "#mail.foo.INBOX";
+        String mailboxName = "#private.foo.INBOX";
         MailboxSession session = manager.login("foo", "bar", new SimpleLog("Test"));
         if (manager.mailboxExists(mailboxName, session) == false) {
             manager.createMailbox(mailboxName, session);
@@ -267,7 +267,7 @@ public abstract class AbstractAsyncPOP3S
         POP3MessageInfo p3i = m_pop3Protocol.listUniqueIdentifier(1);
         assertNotNull(p3i);
         
-        manager.deleteMailbox("#mail.foo.INBOX", session);
+        manager.deleteMailbox("#private.foo.INBOX", session);
 
 
     }
@@ -333,7 +333,7 @@ public abstract class AbstractAsyncPOP3S
 
         m_usersRepository.addUser("foo2", "bar2");
         
-        String mailboxName = "#mail.foo2.INBOX";
+        String mailboxName = "#private.foo2.INBOX";
         MailboxSession session = manager.login("foo2", "bar2", new SimpleLog("Test"));
         
         if (manager.mailboxExists(mailboxName, session) == false) {



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message