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 no...@apache.org on 2011/05/14 22:24:25 UTC
svn commit: r1103212 - in /james/server/trunk:
container-spring/src/main/java/org/apache/james/container/spring/tool/
lmtpserver/src/main/java/org/apache/james/lmtpserver/
mailets/src/main/java/org/apache/james/transport/matchers/
pop3server/src/main/j...
Author: norman
Date: Sat May 14 20:24:24 2011
New Revision: 1103212
URL: http://svn.apache.org/viewvc?rev=1103212&view=rev
Log:
fix compile error after last mailbox refactoring
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java
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/POP3ServerTest.java
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=1103212&r1=1103211&r2=1103212&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 Sat May 14 20:24:24 2011
@@ -146,9 +146,9 @@ public class James23Importer implements
String userName30 = convert23UserTo30(userName23);
- MailboxPath mailboxPath = MailboxPath.inbox(userName30);
MailboxSession mailboxSession = mailboxManager.createSystemSession(userName30, log);
+ MailboxPath mailboxPath = MailboxPath.inbox(mailboxSession);
mailboxManager.startProcessingRequest(mailboxSession);
try {
Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java?rev=1103212&r1=1103211&r2=1103212&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java (original)
+++ james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java Sat May 14 20:24:24 2011
@@ -152,7 +152,7 @@ public class DataLineLMTPMessageHookHand
}
MailboxSession mailboxSession = mailboxManager.createSystemSession(username, session.getLogger());
- MailboxPath inbox = MailboxPath.inbox(username);
+ MailboxPath inbox = MailboxPath.inbox(mailboxSession);
mailboxManager.startProcessingRequest(mailboxSession);
@@ -160,7 +160,7 @@ public class DataLineLMTPMessageHookHand
if (mailboxManager.mailboxExists(inbox, mailboxSession) == false) {
mailboxManager.createMailbox(inbox, mailboxSession);
}
- mailboxManager.getMailbox(MailboxPath.inbox(username), mailboxSession).appendMessage(new MimeMessageInputStream(mail.getMessage()), new Date(), mailboxSession, true, null);
+ mailboxManager.getMailbox(MailboxPath.inbox(mailboxSession), mailboxSession).appendMessage(new MimeMessageInputStream(mail.getMessage()), new Date(), mailboxSession, true, null);
mailboxManager.endProcessingRequest(mailboxSession);
response = new SMTPResponse(SMTPRetCode.MAIL_OK, DSNStatus.getStatus(DSNStatus.SUCCESS, DSNStatus.CONTENT_OTHER) + " Message received");
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=1103212&r1=1103211&r2=1103212&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 Sat May 14 20:24:24 2011
@@ -135,7 +135,7 @@ abstract public class AbstractStorageQuo
// get all mailboxes for the user to calculate the size
// See JAMES-1198
- List<MailboxMetaData> mList = manager.search(new MailboxQuery(MailboxPath.inbox(username), "", session.getPathDelimiter()), session);
+ List<MailboxMetaData> mList = manager.search(new MailboxQuery(MailboxPath.inbox(session), "", session.getPathDelimiter()), session);
for (int i = 0; i < mList.size(); i++) {
MessageManager mailbox = manager.getMailbox(mList.get(i).getPath(), session);
Iterator<MessageResult> results = mailbox.getMessages(MessageRange.all(), new FetchGroupImpl(FetchGroup.MINIMAL), session);
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=1103212&r1=1103211&r2=1103212&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 Sat May 14 20:24:24 2011
@@ -66,7 +66,7 @@ public class PassCmdHandler extends Rset
// before in the session
mailboxManager.startProcessingRequest(mSession);
- MailboxPath mailboxPath = MailboxPath.inbox(session.getUser());
+ MailboxPath mailboxPath = MailboxPath.inbox(mSession);
// check if mailbox exists.. if not just create it
if (mailboxManager.mailboxExists(mailboxPath, mSession) == false) {
Modified: james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java?rev=1103212&r1=1103211&r2=1103212&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java (original)
+++ james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java Sat May 14 20:24:24 2011
@@ -696,10 +696,10 @@ public class POP3ServerTest extends Test
m_pop3Protocol.connect("127.0.0.1", m_pop3ListenerPort);
m_usersRepository.addUser("foo6", "bar6");
-
- MailboxPath mailboxPath = MailboxPath.inbox("foo6");
MailboxSession session = manager.login("foo6", "bar6", LoggerFactory.getLogger("Test"));
+ MailboxPath mailboxPath = MailboxPath.inbox(session);
+
manager.startProcessingRequest(session);
if (manager.mailboxExists(mailboxPath, session) == false) {
manager.createMailbox(mailboxPath, session);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org