Author: norman
Date: Tue May 18 05:38:23 2010
New Revision: 945505
URL: http://svn.apache.org/viewvc?rev=945505&view=rev
Log:
Revert changes made for JAMES-1005. This was fixed in the Mailbox
implementations, which is the right place. See IMAP-147
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NioPOP3Server.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3NettySession.java
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/NioPOP3ServerTest.java
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java?rev=945505&r1=945504&r2=945505&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java
Tue May 18 05:38:23 2010
@@ -23,7 +23,6 @@ package org.apache.james.pop3server;
import org.apache.james.imap.mailbox.Mailbox;
-import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.protocols.api.TLSSupportedSession;
/**
@@ -82,6 +81,13 @@ public interface POP3Session extends TLS
*
* @return mailbox content
*/
- Mailbox getUserMailbox() throws MailboxException;
+ Mailbox getUserMailbox();
+
+ /**
+ * Sets a new mailbox content
+ *
+ * @param userMailbox mailbox
+ */
+ void setUserMailbox(Mailbox mailbox);
}
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java?rev=945505&r1=945504&r2=945505&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java
Tue May 18 05:38:23 2010
@@ -124,7 +124,7 @@ public class ListCmdHandler implements C
response = new POP3Response(POP3Response.ERR_RESPONSE);
}
return response;
- }
+ }
/*
* (non-Javadoc)
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=945505&r1=945504&r2=945505&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
Tue May 18 05:38:23 2010
@@ -26,6 +26,7 @@ import java.util.List;
import javax.annotation.Resource;
import org.apache.james.imap.mailbox.BadCredentialsException;
+import org.apache.james.imap.mailbox.Mailbox;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MailboxManager;
import org.apache.james.imap.mailbox.MailboxSession;
@@ -60,9 +61,23 @@ public class PassCmdHandler extends Rset
String passArg = parameters;
try {
MailboxSession mSession =
mailboxManager.login(session.getUser(), passArg, session.getLogger());
-
+ StringBuffer sb = new StringBuffer();
+ sb.append(mailboxManager.getUserNameSpacePrefix());
+ sb.append(mailboxManager.getDelimiter());
+ sb.append(session.getUser());
+ sb.append(mailboxManager.getDelimiter());
+ sb.append("INBOX");
+ ;
+ String mailboxName = sb.toString();
+
+ // check if mailbox exists.. if not just create it
+ if (mailboxManager.mailboxExists(mailboxName, mSession) ==
false) {
+ mailboxManager.createMailbox(mailboxName, mSession);
+ }
+ Mailbox mailbox = mailboxManager.getMailbox(mailboxName,
mSession);
+
session.getState().put(POP3Session.MAILBOX_SESSION, mSession);
- //session.setUserMailbox(mailbox);
+ session.setUserMailbox(mailbox);
stat(session);
// Store the ipAddress to use it later for pop before smtp
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java?rev=945505&r1=945504&r2=945505&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java
Tue May 18 05:38:23 2010
@@ -83,7 +83,6 @@ public class QuitCmdHandler implements C
mailboxManager.logout(mailboxSession, false);
} catch (MailboxException e) {
// nothing todo on logout
- session.getLogger().info("Unable to logout from mailboxmanager",
e);
}
return response;
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NioPOP3Server.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NioPOP3Server.java?rev=945505&r1=945504&r2=945505&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NioPOP3Server.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/NioPOP3Server.java
Tue May 18 05:38:23 2010
@@ -18,12 +18,10 @@
****************************************************************/
package org.apache.james.pop3server.netty;
-import javax.annotation.Resource;
import javax.net.ssl.SSLContext;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.imap.mailbox.MailboxManager;
import org.apache.james.pop3server.POP3HandlerConfigurationData;
import org.apache.james.pop3server.POP3ServerMBean;
import org.apache.james.protocols.api.ProtocolHandlerChain;
@@ -52,8 +50,6 @@ public class NioPOP3Server extends Abstr
private ProtocolHandlerChain handlerChain;
- private MailboxManager manager;
-
public void setProtocolHandlerChain(ProtocolHandlerChain handlerChain) {
this.handlerChain = handlerChain;
}
@@ -139,7 +135,7 @@ public class NioPOP3Server extends Abstr
@Override
protected ChannelUpstreamHandler createHandler() {
- return new
POP3ChannelUpstreamHandler(NioPOP3Server.this.getProtocolHandlerChain(),
getPOP3HandlerConfiguration(), manager, getLogger(), getSSLContext());
+ return new
POP3ChannelUpstreamHandler(NioPOP3Server.this.getProtocolHandlerChain(),
getPOP3HandlerConfiguration(), getLogger(), getSSLContext());
}
@Override
@@ -181,9 +177,4 @@ public class NioPOP3Server extends Abstr
protected final POP3HandlerConfigurationData getPOP3HandlerConfiguration()
{
return theConfigData;
}
-
- @Resource(name = "mailboxmanager")
- public void setMailboxManager(MailboxManager manager) {
- this.manager = manager;
- }
}
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java?rev=945505&r1=945504&r2=945505&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java
Tue May 18 05:38:23 2010
@@ -21,7 +21,6 @@ package org.apache.james.pop3server.nett
import javax.net.ssl.SSLContext;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.mailbox.MailboxManager;
import org.apache.james.pop3server.POP3HandlerConfigurationData;
import org.apache.james.protocols.api.ProtocolHandlerChain;
import org.apache.james.protocols.api.ProtocolSession;
@@ -39,27 +38,25 @@ public class POP3ChannelUpstreamHandler
private final Log logger;
private final POP3HandlerConfigurationData conf;
private final SSLContext context;
- private MailboxManager manager;
- public POP3ChannelUpstreamHandler(ProtocolHandlerChain chain,
POP3HandlerConfigurationData conf, MailboxManager manager,Log logger,
SSLContext context) {
+ public POP3ChannelUpstreamHandler(ProtocolHandlerChain chain,
POP3HandlerConfigurationData conf, Log logger, SSLContext context) {
super(chain);
this.logger = logger;
this.conf = conf;
this.context = context;
- this.manager = manager;
}
- public POP3ChannelUpstreamHandler(ProtocolHandlerChain chain,
POP3HandlerConfigurationData conf, MailboxManager manager, Log logger) {
- this(chain, conf, manager, logger, null);
+ public POP3ChannelUpstreamHandler(ProtocolHandlerChain chain,
POP3HandlerConfigurationData conf, Log logger) {
+ this(chain, conf, logger, null);
}
@Override
protected ProtocolSession createSession(ChannelHandlerContext ctx) throws
Exception {
if (context != null) {
- return new POP3NettySession(conf, manager, logger, ctx,
context.createSSLEngine());
+ return new POP3NettySession(conf, logger, ctx,
context.createSSLEngine());
} else {
- return new POP3NettySession(conf, manager, logger, ctx);
+ return new POP3NettySession(conf, logger, ctx);
}
}
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=945505&r1=945504&r2=945505&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
Tue May 18 05:38:23 2010
@@ -24,11 +24,7 @@ import java.util.Map;
import javax.net.ssl.SSLEngine;
import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.display.HumanReadableText;
import org.apache.james.imap.mailbox.Mailbox;
-import org.apache.james.imap.mailbox.MailboxException;
-import org.apache.james.imap.mailbox.MailboxManager;
-import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.pop3server.POP3HandlerConfigurationData;
import org.apache.james.pop3server.POP3Session;
import org.apache.james.socket.netty.AbstractNettySession;
@@ -45,16 +41,15 @@ public class POP3NettySession extends Ab
private int handlerState;
- private MailboxManager manager;
+ private Mailbox mailbox;
- public POP3NettySession(POP3HandlerConfigurationData configData,
MailboxManager manager,Log logger, ChannelHandlerContext handlerContext) {
+ public POP3NettySession(POP3HandlerConfigurationData configData, Log
logger, ChannelHandlerContext handlerContext) {
super(logger, handlerContext);
this.configData = configData;
- this.manager = manager;
}
- public POP3NettySession(POP3HandlerConfigurationData configData,
MailboxManager manager, Log logger, ChannelHandlerContext handlerContext,
SSLEngine engine) {
+ public POP3NettySession(POP3HandlerConfigurationData configData, Log
logger, ChannelHandlerContext handlerContext, SSLEngine engine) {
super(logger, handlerContext, engine);
this.configData = configData;
}
@@ -111,25 +106,16 @@ public class POP3NettySession extends Ab
* (non-Javadoc)
* @see org.apache.james.pop3server.POP3Session#getUserMailbox()
*/
- public Mailbox getUserMailbox() throws MailboxException {
- StringBuffer sb = new StringBuffer();
- sb.append(manager.getUserNameSpacePrefix());
- sb.append(manager.getDelimiter());
- sb.append(getUser());
- sb.append(manager.getDelimiter());
- sb.append("INBOX");
- ;
- String mailboxName = sb.toString();
-
- MailboxSession session = (MailboxSession)
getState().get(MAILBOX_SESSION);
- if (session == null) throw new
MailboxException(HumanReadableText.INVALID_LOGIN);
- // check if mailbox exists.. if not just create it
- if (manager.mailboxExists(mailboxName,session) == false) {
- manager.createMailbox(mailboxName, session);
- }
- Mailbox mailbox = manager.getMailbox(mailboxName, session);
-
+ public Mailbox getUserMailbox() {
return mailbox;
}
+ /*
+ * (non-Javadoc)
+ * @see
org.apache.james.pop3server.POP3Session#setUserMailbox(org.apache.james.imap.mailbox.Mailbox)
+ */
+ public void setUserMailbox(Mailbox 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=945505&r1=945504&r2=945505&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
Tue May 18 05:38:23 2010
@@ -65,7 +65,7 @@ public abstract class AbstractAsyncPOP3S
protected DNSService dnsservice;
protected MockFileSystem fSystem;
protected ProtocolHandlerChainImpl chain;
- protected InMemoryMailboxManager manager;
+ private InMemoryMailboxManager manager;
public AbstractAsyncPOP3ServerTest() {
super("AsyncPOP3ServerTest");
Modified:
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/NioPOP3ServerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/NioPOP3ServerTest.java?rev=945505&r1=945504&r2=945505&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/NioPOP3ServerTest.java
(original)
+++
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/NioPOP3ServerTest.java
Tue May 18 05:38:23 2010
@@ -45,7 +45,6 @@ public class NioPOP3ServerTest extends A
log.setLevel(SimpleLog.LOG_LEVEL_DEBUG);
m_pop3Server.setLog(log);
m_pop3Server.setMailServer(m_mailServer);
- m_pop3Server.setMailboxManager(manager);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
