Author: rdonkin
Date: Sun Dec 2 13:25:10 2007
New Revision: 600376
URL: http://svn.apache.org/viewvc?rev=600376&view=rev
Log:
Switch to only one instance of MailboxManager. Factory now extends
TorqueMailboxManager. Not particularly satisfactory in the long run but
preserves compatibility for now.
Removed:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProviderTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/mock/MockMailboxManagerFactory.java
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/HostSystemFactory.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/imapserver/handler/session/BodyFetchSessionTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/CopySessionTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/CreateSessionTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/DeleteSessionTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/ExpungeSessionTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/RenameSessionTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/SessionTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/StatusSessionTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/UidFlagSizeFetchSessionTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/UidStoreSessionTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/mock/MailboxManagerProviderSingleton.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/mock/MockImapHandlerConfigurationData.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/AbstractTorqueTestCase.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
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/HostSystemFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/HostSystemFactory.java?rev=600376&r1=600375&r2=600376&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/HostSystemFactory.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/experimental/imapserver/HostSystemFactory.java
Sun Dec 2 13:25:10 2007
@@ -36,7 +36,7 @@
defaultImapProcessorFactory.buildImapProcessor(), new
ExperimentalHostSystem.Resetable() {
public void reset() throws Exception {
-
MailboxManagerProviderSingleton.getMailboxManagerProviderInstance().deleteEverything();
+ MailboxManagerProviderSingleton.reset();
}
});
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=600376&r1=600375&r2=600376&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 13:25:10 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.store.MailboxException;
import org.apache.james.mailboxmanager.GeneralMessageSet;
import org.apache.james.mailboxmanager.ListResult;
import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -73,11 +72,11 @@
public AbstractSessionTest() {
}
- public void setUp() throws MailboxException, MessagingException,
IOException, MailboxManagerException
+ public void setUp() throws Exception
{
MockImapHandlerConfigurationData theConfigData = new
MockImapHandlerConfigurationData();
- theConfigData.getMailboxManagerProvider().deleteEverything();
+ MockImapHandlerConfigurationData.reset();
session = new
ImapSessionImpl(theConfigData.getMailboxManagerProvider(),
theConfigData.getUsersRepository(), new MockImapHandler(),
HOST_NAME, HOST_ADDRESS);
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/BodyFetchSessionTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/BodyFetchSessionTest.java?rev=600376&r1=600375&r2=600376&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/BodyFetchSessionTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/BodyFetchSessionTest.java
Sun Dec 2 13:25:10 2007
@@ -30,7 +30,6 @@
import org.apache.james.imapserver.client.SelectCommand;
import org.apache.james.imapserver.client.fetch.FetchBody;
import org.apache.james.imapserver.client.fetch.FetchHeader;
-import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.imapserver.util.MessageGenerator;
import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -48,7 +47,7 @@
MimeMessage[] msgs= null;
long[] uids = null;
- public void setUp() throws MailboxException, MessagingException,
IOException, MailboxManagerException {
+ public void setUp() throws Exception {
super.setUp();
msgs=MessageGenerator.generateSimpleMessages(4);
createFolders(onlyInbox);
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/CopySessionTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/CopySessionTest.java?rev=600376&r1=600375&r2=600376&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/CopySessionTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/CopySessionTest.java
Sun Dec 2 13:25:10 2007
@@ -31,7 +31,6 @@
import org.apache.james.imapserver.client.LogoutClientCommand;
import org.apache.james.imapserver.client.MessageSet;
import org.apache.james.imapserver.client.SelectCommand;
-import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.imapserver.util.MessageGenerator;
import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -42,7 +41,7 @@
MimeMessage[] msgs= null;
long[] uids = null;
- public void setUp() throws MailboxException, MessagingException,
IOException, MailboxManagerException {
+ public void setUp() throws Exception {
super.setUp();
msgs=MessageGenerator.generateSimpleMessages(4);
createFolders(folders);
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/CreateSessionTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/CreateSessionTest.java?rev=600376&r1=600375&r2=600376&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/CreateSessionTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/CreateSessionTest.java
Sun Dec 2 13:25:10 2007
@@ -29,14 +29,13 @@
import org.apache.james.imapserver.client.LoginCommand;
import org.apache.james.imapserver.client.LogoutClientCommand;
import org.apache.james.imapserver.client.SelectCommand;
-import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.mailboxmanager.MailboxManagerException;
public class CreateSessionTest extends AbstractSessionTest {
String[] folders =
{USER_MAILBOX_ROOT+".INBOX",USER_MAILBOX_ROOT+".test",USER_MAILBOX_ROOT+".test1",USER_MAILBOX_ROOT+".test1.test1a",USER_MAILBOX_ROOT+".test1.test1b",USER_MAILBOX_ROOT+".test2.test2a",USER_MAILBOX_ROOT+".test2.test2b"};
- public void setUp() throws MailboxException, MessagingException,
IOException, MailboxManagerException {
+ public void setUp() throws Exception {
super.setUp();
createFolders(folders);
}
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/DeleteSessionTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/DeleteSessionTest.java?rev=600376&r1=600375&r2=600376&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/DeleteSessionTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/DeleteSessionTest.java
Sun Dec 2 13:25:10 2007
@@ -28,7 +28,6 @@
import org.apache.james.imapserver.client.DeleteClientCommand;
import org.apache.james.imapserver.client.LoginCommand;
import org.apache.james.imapserver.client.LogoutClientCommand;
-import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.imapserver.util.MessageGenerator;
import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -43,8 +42,7 @@
MimeMessage[] msgs = null;
- public void setUp() throws MailboxException, MessagingException,
- IOException, MailboxManagerException {
+ public void setUp() throws Exception {
super.setUp();
msgs = MessageGenerator.generateSimpleMessages(4);
createFolders(folders);
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/ExpungeSessionTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/ExpungeSessionTest.java?rev=600376&r1=600375&r2=600376&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/ExpungeSessionTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/ExpungeSessionTest.java
Sun Dec 2 13:25:10 2007
@@ -32,7 +32,6 @@
import org.apache.james.imapserver.client.ExpungeClientCommand;
import org.apache.james.imapserver.client.LoginCommand;
import org.apache.james.imapserver.client.SelectCommand;
-import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.imapserver.util.MessageGenerator;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.TestUtil;
@@ -45,8 +44,7 @@
long[] uids = null;
- public void setUp() throws MailboxException, MessagingException,
- IOException, MailboxManagerException {
+ public void setUp() throws Exception {
super.setUp();
createFolders(onlyInbox);
}
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/RenameSessionTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/RenameSessionTest.java?rev=600376&r1=600375&r2=600376&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/RenameSessionTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/RenameSessionTest.java
Sun Dec 2 13:25:10 2007
@@ -28,7 +28,6 @@
import org.apache.james.imapserver.client.LoginCommand;
import org.apache.james.imapserver.client.LogoutClientCommand;
import org.apache.james.imapserver.client.RenameClientCommand;
-import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.imapserver.util.MessageGenerator;
import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -43,8 +42,7 @@
MimeMessage[] msgs = null;
- public void setUp() throws MailboxException, MessagingException,
- IOException, MailboxManagerException {
+ public void setUp() throws Exception {
super.setUp();
msgs = MessageGenerator.generateSimpleMessages(2);
createFolders(folders);
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/SessionTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/SessionTest.java?rev=600376&r1=600375&r2=600376&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/SessionTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/SessionTest.java
Sun Dec 2 13:25:10 2007
@@ -32,7 +32,6 @@
import org.apache.james.imapserver.ProtocolException;
import org.apache.james.imapserver.client.LoginCommand;
-import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.imapserver.util.MessageGenerator;
import org.apache.james.imapserver.util.UnsolicitedResponseGenerator;
import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -44,7 +43,7 @@
String[] existing =
{USER_MAILBOX_ROOT+".INBOX",USER_MAILBOX_ROOT+".test",USER_MAILBOX_ROOT+".test1",USER_MAILBOX_ROOT+".test1.test1a",USER_MAILBOX_ROOT+".test1.test1b",USER_MAILBOX_ROOT+".test2.test2a",USER_MAILBOX_ROOT+".test2.test2b"};
Set existingSet = null;
- public void setUp() throws MailboxException, MessagingException,
IOException, MailboxManagerException
+ public void setUp() throws Exception
{
super.setUp();
existingSet=new HashSet(Arrays.asList(existing));
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/StatusSessionTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/StatusSessionTest.java?rev=600376&r1=600375&r2=600376&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/StatusSessionTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/StatusSessionTest.java
Sun Dec 2 13:25:10 2007
@@ -29,9 +29,7 @@
import org.apache.james.imapserver.client.LoginCommand;
import org.apache.james.imapserver.client.SelectCommand;
import org.apache.james.imapserver.client.StatusClientCommand;
-import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.imapserver.util.MessageGenerator;
-import org.apache.james.mailboxmanager.MailboxManagerException;
public class StatusSessionTest extends AbstractSessionTest {
@@ -43,7 +41,7 @@
private long f2_uidV;
private long f2_uidNext;
- public void setUp() throws MailboxManagerException, MailboxException,
MessagingException, IOException {
+ public void setUp() throws Exception {
super.setUp();
f2_msgs=MessageGenerator.generateSimpleMessages(4);
createFolders(folders);
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/UidFlagSizeFetchSessionTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/UidFlagSizeFetchSessionTest.java?rev=600376&r1=600375&r2=600376&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/UidFlagSizeFetchSessionTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/UidFlagSizeFetchSessionTest.java
Sun Dec 2 13:25:10 2007
@@ -30,7 +30,6 @@
import org.apache.james.imapserver.client.FetchCommand;
import org.apache.james.imapserver.client.LoginCommand;
import org.apache.james.imapserver.client.SelectCommand;
-import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.imapserver.util.MessageGenerator;
import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -41,7 +40,7 @@
MimeMessage[] msgs= null;
long[] uids = null;
- public void setUp() throws MailboxException, MessagingException,
IOException, MailboxManagerException {
+ public void setUp() throws Exception {
super.setUp();
msgs=MessageGenerator.generateSimpleMessages(10);
createFolders(onlyInbox);
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/UidStoreSessionTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/UidStoreSessionTest.java?rev=600376&r1=600375&r2=600376&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/UidStoreSessionTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/handler/session/UidStoreSessionTest.java
Sun Dec 2 13:25:10 2007
@@ -32,7 +32,6 @@
import org.apache.james.imapserver.client.MessageSet;
import org.apache.james.imapserver.client.SelectCommand;
import org.apache.james.imapserver.client.StoreClientCommand;
-import org.apache.james.imapserver.store.MailboxException;
import org.apache.james.imapserver.util.MessageGenerator;
import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -45,7 +44,7 @@
MimeMessage[] msgs= null;
long[] uids = null;
- public void setUp() throws MailboxException, MessagingException,
IOException, MailboxManagerException {
+ public void setUp() throws Exception {
super.setUp();
msgs=MessageGenerator.generateSimpleMessages(4);
createFolders(onlyInbox);
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/mock/MailboxManagerProviderSingleton.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/mock/MailboxManagerProviderSingleton.java?rev=600376&r1=600375&r2=600376&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/mock/MailboxManagerProviderSingleton.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/mock/MailboxManagerProviderSingleton.java
Sun Dec 2 13:25:10 2007
@@ -28,4 +28,7 @@
return
TorqueMailboxManagerProviderSingleton.getTorqueMailboxManagerProviderInstance();
}
+ public synchronized static void reset() throws Exception {
+ TorqueMailboxManagerProviderSingleton.reset();
+ }
}
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/mock/MockImapHandlerConfigurationData.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/mock/MockImapHandlerConfigurationData.java?rev=600376&r1=600375&r2=600376&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/mock/MockImapHandlerConfigurationData.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/imapserver/mock/MockImapHandlerConfigurationData.java
Sun Dec 2 13:25:10 2007
@@ -27,7 +27,10 @@
public class MockImapHandlerConfigurationData implements
ImapHandlerConfigurationData
{
-
+ public static void reset() throws Exception {
+ MailboxManagerProviderSingleton.reset();
+ }
+
public MailServer mailServer;
public UsersRepository usersRepository = new MockUsersRepository();
public MailboxManagerProvider mailboxManagerProvider;
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java?rev=600376&r1=600375&r2=600376&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java
Sun Dec 2 13:25:10 2007
@@ -19,6 +19,8 @@
package org.apache.james.mailboxmanager.mock;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.impl.DefaultMailboxManagerProvider;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
import org.apache.james.mailboxmanager.torque.TorqueMailboxManagerFactory;
@@ -26,21 +28,32 @@
public class TorqueMailboxManagerProviderSingleton {
-
+ private static TorqueMailboxManagerFactory torqueMailboxManagerFactory;
private static DefaultMailboxManagerProvider defaultMailboxManagerProvider;
public synchronized static MailboxManagerProvider
getTorqueMailboxManagerProviderInstance() throws Exception {
if (defaultMailboxManagerProvider==null) {
- TorqueMailboxManagerFactory torqueMailboxManagerFactory=new
TorqueMailboxManagerFactory() {{
+ getTorqueFactory();
+ defaultMailboxManagerProvider=new DefaultMailboxManagerProvider();
+
defaultMailboxManagerProvider.setMailboxManagerInstance(torqueMailboxManagerFactory);
+ }
+ return defaultMailboxManagerProvider;
+
+ }
+
+ private static TorqueMailboxManagerFactory getTorqueFactory() throws
ConfigurationException, Exception {
+ if (torqueMailboxManagerFactory == null) {
+ torqueMailboxManagerFactory=new TorqueMailboxManagerFactory() {{
setFileSystem(new MockFileSystem());
}};
torqueMailboxManagerFactory.configureDefaults();
torqueMailboxManagerFactory.initialize();
- defaultMailboxManagerProvider=new DefaultMailboxManagerProvider();
-
defaultMailboxManagerProvider.setMailboxManagerFactory(torqueMailboxManagerFactory);
}
- return defaultMailboxManagerProvider;
-
+ return torqueMailboxManagerFactory;
+ }
+
+ public static void reset() throws Exception {
+ getTorqueFactory().deleteEverything();
}
}
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/AbstractTorqueTestCase.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/AbstractTorqueTestCase.java?rev=600376&r1=600375&r2=600376&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/AbstractTorqueTestCase.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/torque/AbstractTorqueTestCase.java
Sun Dec 2 13:25:10 2007
@@ -31,7 +31,7 @@
super();
}
- public void setUp() throws TorqueException, MailboxManagerException,
Exception {
-
TorqueMailboxManagerProviderSingleton.getTorqueMailboxManagerProviderInstance().deleteEverything();
+ public void setUp() throws Exception {
+ TorqueMailboxManagerProviderSingleton.reset();
}
}
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=600376&r1=600375&r2=600376&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 13:25:10 2007
@@ -32,9 +32,9 @@
}
public void setUp() throws Exception {
+ TorqueMailboxManagerProviderSingleton.reset();
MailboxManagerProvider
mailboxManagerProvider=TorqueMailboxManagerProviderSingleton.getTorqueMailboxManagerProviderInstance();
- mailboxManagerProvider.deleteEverything();
- mailboxManager = mailboxManagerProvider .getMailboxManagerInstance();
+ 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=600376&r1=600375&r2=600376&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 13:25:10 2007
@@ -32,7 +32,7 @@
public void setUp() throws Exception {
mailboxManagerProvider=TorqueMailboxManagerProviderSingleton.getTorqueMailboxManagerProviderInstance();
- mailboxManagerProvider.deleteEverything();
+ TorqueMailboxManagerProviderSingleton.reset();
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=600376&r1=600375&r2=600376&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 13:25:10 2007
@@ -49,8 +49,7 @@
GeneralMailboxSession shadowMailbox = null;
protected void configureRepository() throws Exception {
- TorqueMailboxManagerProviderSingleton
- .getTorqueMailboxManagerProviderInstance().deleteEverything();
+ TorqueMailboxManagerProviderSingleton.reset();
MailboxManagerMailRepository mailboxManagerMailRepository = new
MailboxManagerMailRepository();
DefaultConfigurationBuilder db = new DefaultConfigurationBuilder();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
