svn commit: r988165 [2/2] - in /james: imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/ imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/ i...

[eric]

Modified: 
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3NettySession.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3NettySession.java?rev=988165&r1=988164&r2=988165&view=diff
==============================================================================
--- 
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3NettySession.java
 (original)
+++ 
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3NettySession.java
 Mon Aug 23 16:02:23 2010
@@ -24,7 +24,7 @@ import java.util.Map;
 import javax.net.ssl.SSLEngine;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.imap.mailbox.Mailbox;
+import org.apache.james.imap.mailbox.MessageManager;
 import org.apache.james.pop3server.POP3HandlerConfigurationData;
 import org.apache.james.pop3server.POP3Session;
 import org.apache.james.protocols.impl.AbstractSession;
@@ -41,7 +41,7 @@ public class POP3NettySession extends Ab
 
     private int handlerState;
 
-    private Mailbox mailbox;
+    private MessageManager mailbox;
 
     public POP3NettySession(POP3HandlerConfigurationData configData, Log 
logger, ChannelHandlerContext handlerContext) {
         super(logger, handlerContext);
@@ -106,7 +106,7 @@ public class POP3NettySession extends Ab
      * (non-Javadoc)
      * @see org.apache.james.pop3server.POP3Session#getUserMailbox()
      */
-    public Mailbox getUserMailbox() {
+    public MessageManager getUserMailbox() {
         return mailbox;
     }
 
@@ -114,7 +114,7 @@ public class POP3NettySession extends Ab
      * (non-Javadoc)
      * @see 
org.apache.james.pop3server.POP3Session#setUserMailbox(org.apache.james.imap.mailbox.Mailbox)
      */
-    public void setUserMailbox(Mailbox mailbox) {
+    public void setUserMailbox(MessageManager mailbox) {
         this.mailbox = mailbox;
     }
 

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=988165&r1=988164&r2=988165&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 Aug 23 16:02:23 2010
@@ -43,7 +43,7 @@ import org.apache.james.api.user.UsersRe
 import org.apache.james.imap.api.MailboxPath;
 import org.apache.james.imap.inmemory.InMemoryMailboxManager;
 import org.apache.james.imap.inmemory.InMemoryMailboxSessionMapperFactory;
-import org.apache.james.imap.mailbox.Mailbox;
+import org.apache.james.imap.mailbox.MessageManager;
 import org.apache.james.imap.mailbox.MailboxConstants;
 import org.apache.james.imap.mailbox.MailboxSession;
 import org.apache.james.imap.store.Authenticator;
@@ -410,7 +410,7 @@ public abstract class AbstractAsyncPOP3S
         manager.deleteMailbox(mailboxPath, session);
     }
 
-    private void setupTestMails(MailboxSession session, Mailbox mailbox) 
throws MessagingException {
+    private void setupTestMails(MailboxSession session, MessageManager 
mailbox) throws MessagingException {
         byte[] content =        ("Return-path: ret...@test.com\r\n"+
                                  "Content-Transfer-Encoding: plain\r\n"+
                                  "Subject: test\r\n\r\n"+

Modified: 
james/server/trunk/spoolmanager/src/main/java/org/apache/james/MailboxManagerPoster.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/MailboxManagerPoster.java?rev=988165&r1=988164&r2=988165&view=diff
==============================================================================
--- 
james/server/trunk/spoolmanager/src/main/java/org/apache/james/MailboxManagerPoster.java
 (original)
+++ 
james/server/trunk/spoolmanager/src/main/java/org/apache/james/MailboxManagerPoster.java
 Mon Aug 23 16:02:23 2010
@@ -32,7 +32,7 @@ import javax.mail.internet.MimeMessage;
 
 import org.apache.commons.logging.Log;
 import org.apache.james.imap.api.MailboxPath;
-import org.apache.james.imap.mailbox.Mailbox;
+import org.apache.james.imap.mailbox.MessageManager;
 import org.apache.james.imap.mailbox.MailboxConstants;
 import org.apache.james.imap.mailbox.MailboxManager;
 import org.apache.james.imap.mailbox.MailboxSession;
@@ -119,7 +119,7 @@ public class MailboxManagerPoster implem
                             if ("INBOX".equalsIgnoreCase(destination) && 
!(mailboxManager.mailboxExists(path, session))) {
                                 mailboxManager.createMailbox(path, session);
                             }
-                            final Mailbox mailbox = 
mailboxManager.getMailbox(path, session);
+                            final MessageManager mailbox = 
mailboxManager.getMailbox(path, session);
                             
                             if (mailbox == null) {
                                 final String error = "Mailbox for user " + user



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