Author: rdonkin
Date: Sun Dec 2 10:22:07 2007
New Revision: 600352
URL: http://svn.apache.org/viewvc?rev=600352&view=rev
Log:
Mailbox is no longer per user.
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerFactory.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/AbstractSessionTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/mock/MockMailboxManagerFactory.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueImapMailboxSelfTestCase.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerSelfTestCase.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/repository/TorqueMailboxManagerMailRepositoryNativeTestCase.java
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerFactory.java
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java?rev=600352&r1=600351&r2=600352&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java
Sun Dec 2 10:22:07 2007
@@ -19,8 +19,6 @@
package org.apache.james.mailboxmanager.impl;
-import java.util.Map;
-
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -65,17 +63,17 @@
}
public MailboxSession getInboxSession(User user) throws
MailboxManagerException {
- return
getMailboxManagerInstance(user).getMailboxSession(getInboxName(user),true);
+ return
getMailboxManagerInstance().getMailboxSession(getInboxName(user),true);
}
- public MailboxManager getMailboxManagerInstance(User user)
+ public MailboxManager getMailboxManagerInstance()
throws MailboxManagerException {
- return getMailboxManagerFactory().getMailboxManagerInstance(user);
+ return getMailboxManagerFactory().getMailboxManagerInstance();
}
public MailboxSession getMailboxSession(User authUser, String mailboxName,
boolean autoCreate) throws MailboxManagerException {
- return getMailboxManagerInstance(authUser).getMailboxSession(
+ return getMailboxManagerInstance().getMailboxSession(
mailboxName, autoCreate);
}
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerFactory.java?rev=600352&r1=600351&r2=600352&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerFactory.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerFactory.java
Sun Dec 2 10:22:07 2007
@@ -20,12 +20,10 @@
package org.apache.james.mailboxmanager.manager;
import org.apache.james.mailboxmanager.MailboxManagerException;
-import org.apache.james.services.User;
public interface MailboxManagerFactory {
- public MailboxManager getMailboxManagerInstance(User user)
- throws MailboxManagerException;
+ public MailboxManager getMailboxManagerInstance() throws
MailboxManagerException;
public void deleteEverything() throws MailboxManagerException;
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java?rev=600352&r1=600351&r2=600352&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/manager/MailboxManagerProvider.java
Sun Dec 2 10:22:07 2007
@@ -27,7 +27,7 @@
public interface MailboxManagerProvider {
- public MailboxManager getMailboxManagerInstance(User user) throws
MailboxManagerException;
+ public MailboxManager getMailboxManagerInstance() throws
MailboxManagerException;
/**
Modified:
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java?rev=600352&r1=600351&r2=600352&view=diff
==============================================================================
---
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java
(original)
+++
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractMailboxAwareProcessor.java
Sun Dec 2 10:22:07 2007
@@ -54,7 +54,7 @@
if (result == null) {
// TODO: handle null user
final User user = ImapSessionUtils.getUser(session);
- result = mailboxManagerProvider.getMailboxManagerInstance(user);
+ result = mailboxManagerProvider.getMailboxManagerInstance();
result.createInbox(user);
// TODO: reconsider decision not to sunchronise
// TODO: mailbox creation is ATM an expensive operation
Modified:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java?rev=600352&r1=600351&r2=600352&view=diff
==============================================================================
---
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java
(original)
+++
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapSessionImpl.java
Sun Dec 2 10:22:07 2007
@@ -202,7 +202,7 @@
if (mailboxManager!=null) {
mailboxManager.close();
}
-
mailboxManager=mailboxManagerProvider.getMailboxManagerInstance(user);
+ mailboxManager=mailboxManagerProvider.getMailboxManagerInstance();
mailboxManagerUser = user;
mailboxManager.createInbox(user);
}
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/AbstractSessionTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/AbstractSessionTest.java?rev=600352&r1=600351&r2=600352&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/AbstractSessionTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/AbstractSessionTest.java
Sun Dec 2 10:22:07 2007
@@ -48,7 +48,6 @@
import org.apache.james.imapserver.client.Command;
import org.apache.james.imapserver.mock.MockImapHandler;
import org.apache.james.imapserver.mock.MockImapHandlerConfigurationData;
-import org.apache.james.imapserver.mock.MockUser;
import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.mailboxmanager.GeneralMessageSet;
import org.apache.james.mailboxmanager.ListResult;
@@ -85,7 +84,7 @@
((LogEnabled)session).enableLogging(new MockLogger());
handler = new ImapRequestHandler();
handler.enableLogging(new MockLogger());
-
mailboxManager=theConfigData.getMailboxManagerProvider().getMailboxManagerInstance(new
MockUser());
+
mailboxManager=theConfigData.getMailboxManagerProvider().getMailboxManagerInstance();
}
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/mock/MockMailboxManagerFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/mock/MockMailboxManagerFactory.java?rev=600352&r1=600351&r2=600352&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/mock/MockMailboxManagerFactory.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/mock/MockMailboxManagerFactory.java
Sun Dec 2 10:22:07 2007
@@ -19,9 +19,7 @@
package org.apache.james.mailboxmanager.mock;
-import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configurable;
@@ -30,14 +28,11 @@
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.manager.MailboxManager;
import org.apache.james.mailboxmanager.manager.MailboxManagerFactory;
-import org.apache.james.services.User;
public class MockMailboxManagerFactory implements MailboxManagerFactory,
Configurable, Initializable {
public Configuration configuration;
- public Set mountPoints = new HashSet() ;
-
public int init=0;
public Map openMailboxSessionCountMap;
@@ -45,7 +40,7 @@
public void deleteEverything() throws MailboxManagerException {
}
- public MailboxManager getMailboxManagerInstance(User user) throws
MailboxManagerException {
+ public MailboxManager getMailboxManagerInstance() throws
MailboxManagerException {
return null;
}
@@ -55,16 +50,8 @@
}
- public void addMountPoint(String point) {
- mountPoints.add(point);
- }
-
public void initialize() throws Exception {
init++;
- }
-
- public Map getOpenMailboxSessionCountMap() {
- return openMailboxSessionCountMap;
}
}
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java?rev=600352&r1=600351&r2=600352&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java
Sun Dec 2 10:22:07 2007
@@ -20,7 +20,6 @@
package org.apache.james.mailboxmanager.torque;
import org.apache.james.mailboxmanager.manager.MailboxManager;
-import org.apache.james.mailboxmanager.mock.MockUser;
import
org.apache.james.mailboxmanager.mock.TorqueMailboxManagerProviderSingleton;
import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
import org.apache.torque.TorqueException;
@@ -36,7 +35,7 @@
public void setUp() throws Exception {
super.setUp();
assertEquals(0,MailboxRowPeer.doSelect(new Criteria()).size());
-
mm=TorqueMailboxManagerProviderSingleton.getTorqueMailboxManagerProviderInstance().getMailboxManagerInstance(new
MockUser());
+
mm=TorqueMailboxManagerProviderSingleton.getTorqueMailboxManagerProviderInstance().getMailboxManagerInstance();
}
public void tearDown() {
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueImapMailboxSelfTestCase.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueImapMailboxSelfTestCase.java?rev=600352&r1=600351&r2=600352&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueImapMailboxSelfTestCase.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueImapMailboxSelfTestCase.java
Sun Dec 2 10:22:07 2007
@@ -21,7 +21,6 @@
import org.apache.james.mailboxmanager.AbstractImapMailboxSelfTestCase;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
-import org.apache.james.mailboxmanager.mock.MockUser;
import
org.apache.james.mailboxmanager.mock.TorqueMailboxManagerProviderSingleton;
import org.apache.torque.TorqueException;
@@ -35,7 +34,7 @@
public void setUp() throws Exception {
MailboxManagerProvider
mailboxManagerProvider=TorqueMailboxManagerProviderSingleton.getTorqueMailboxManagerProviderInstance();
mailboxManagerProvider.deleteEverything();
- mailboxManager = mailboxManagerProvider .getMailboxManagerInstance(new
MockUser());
+ mailboxManager = mailboxManagerProvider .getMailboxManagerInstance();
super.setUp();
}
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerSelfTestCase.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerSelfTestCase.java?rev=600352&r1=600351&r2=600352&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerSelfTestCase.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerSelfTestCase.java
Sun Dec 2 10:22:07 2007
@@ -20,7 +20,6 @@
package org.apache.james.mailboxmanager.torque;
import org.apache.james.mailboxmanager.AbstractMailboxManagerSelfTestCase;
-import org.apache.james.mailboxmanager.mock.MockUser;
import
org.apache.james.mailboxmanager.mock.TorqueMailboxManagerProviderSingleton;
import org.apache.torque.TorqueException;
@@ -34,7 +33,7 @@
public void setUp() throws Exception {
mailboxManagerProvider=TorqueMailboxManagerProviderSingleton.getTorqueMailboxManagerProviderInstance();
mailboxManagerProvider.deleteEverything();
- mailboxManager = mailboxManagerProvider.getMailboxManagerInstance(new
MockUser());
+ mailboxManager = mailboxManagerProvider.getMailboxManagerInstance();
}
}
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/repository/TorqueMailboxManagerMailRepositoryNativeTestCase.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/repository/TorqueMailboxManagerMailRepositoryNativeTestCase.java?rev=600352&r1=600351&r2=600352&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/repository/TorqueMailboxManagerMailRepositoryNativeTestCase.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/repository/TorqueMailboxManagerMailRepositoryNativeTestCase.java
Sun Dec 2 10:22:07 2007
@@ -38,7 +38,6 @@
import org.apache.james.mailboxmanager.impl.GeneralMessageSetImpl;
import org.apache.james.mailboxmanager.mailbox.GeneralMailboxSession;
import org.apache.james.mailboxmanager.manager.MailboxManager;
-import org.apache.james.mailboxmanager.mock.MockUser;
import
org.apache.james.mailboxmanager.mock.TorqueMailboxManagerProviderSingleton;
import
org.apache.james.mailboxmanager.redundant.AbstractMailRepositoryNativeTestCase;
import org.apache.james.mailboxmanager.repository.MailboxManagerMailRepository;
@@ -136,7 +135,7 @@
try {
MailboxManager mailboxManager=
TorqueMailboxManagerProviderSingleton
.getTorqueMailboxManagerProviderInstance()
- .getMailboxManagerInstance(new MockUser());
+ .getMailboxManagerInstance();
if (!mailboxManager.existsMailbox(TUSER_INBOX)) {
mailboxManager.createMailbox(TUSER_INBOX);
}
Modified:
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java?rev=600352&r1=600351&r2=600352&view=diff
==============================================================================
---
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
(original)
+++
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
Sun Dec 2 10:22:07 2007
@@ -58,16 +58,13 @@
private static final char SQL_WILDCARD_CHAR = '%';
private final static Random random = new Random();
private MailboxCache mailboxCache;
-
- private User authUser;
protected Log log;
private final ReadWriteLock lock;
- public TorqueMailboxManager(final User authUser, final MailboxCache
mailboxCache, final ReadWriteLock lock, final Log log) {
+ public TorqueMailboxManager(final MailboxCache mailboxCache, final
ReadWriteLock lock, final Log log) {
this.mailboxCache=mailboxCache;
- this.authUser=authUser;
this.log=log;
this.lock = lock;
}
Modified:
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerFactory.java?rev=600352&r1=600351&r2=600352&view=diff
==============================================================================
---
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerFactory.java
(original)
+++
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerFactory.java
Sun Dec 2 10:22:07 2007
@@ -26,7 +26,6 @@
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Locale;
-import java.util.Map;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configurable;
@@ -51,7 +50,6 @@
import org.apache.james.mailboxmanager.torque.om.MessageRowPeer;
import org.apache.james.mailboxmanager.tracking.MailboxCache;
import org.apache.james.services.FileSystem;
-import org.apache.james.services.User;
import org.apache.james.util.SqlResources;
import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
@@ -85,12 +83,12 @@
lock = new WriterPreferenceReadWriteLock();
}
- public MailboxManager getMailboxManagerInstance(User user)
+ public MailboxManager getMailboxManagerInstance()
throws MailboxManagerException {
if (!initialized) {
throw new MailboxManagerException("must be initialized first!");
}
- return new TorqueMailboxManager(user, getMailboxCache(), lock,
getLog());
+ return new TorqueMailboxManager(getMailboxCache(), lock, getLog());
}
public void initialize() throws Exception {
@@ -214,7 +212,7 @@
}
public void deleteEverything() throws MailboxManagerException {
- ((TorqueMailboxManager) getMailboxManagerInstance(null))
+ ((TorqueMailboxManager) getMailboxManagerInstance())
.deleteEverything();
mailboxCache = null;
}
@@ -246,14 +244,4 @@
protected void setFileSystem(FileSystem system) {
this.fileSystem = system;
}
-
- public void addMountPoint(String point) {
- // TODO Auto-generated method stub
-
- }
-
- public Map getOpenMailboxSessionCountMap() {
- return getMailboxCache().getOpenMailboxSessionCountMap();
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
