Author: eric
Date: Wed Sep 22 09:41:03 2010
New Revision: 999839
URL: http://svn.apache.org/viewvc?rev=999839&view=rev
Log:
Temporary fix for InMemory - to be reviewed (IMAP-217)
Modified:
james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java
james/imap/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryHostSystem.java
Modified:
james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java?rev=999839&r1=999838&r2=999839&view=diff
==============================================================================
---
james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
(original)
+++
james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
Wed Sep 22 09:41:03 2010
@@ -50,16 +50,4 @@ public class InMemoryMailboxManager exte
}
}
- /**
- * Delete every Mailbox which exists
- *
- * @throws MailboxException
- */
-
- public synchronized void deleteEverything() throws MailboxException {
- ((InMemoryMailboxSessionMapperFactory)
mailboxSessionMapperFactory).deleteAll();
- }
-
-
-
}
Modified:
james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java?rev=999839&r1=999838&r2=999839&view=diff
==============================================================================
---
james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java
(original)
+++
james/imap/trunk/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java
Wed Sep 22 09:41:03 2010
@@ -61,18 +61,5 @@ public class InMemoryMailboxSessionMappe
public SubscriptionMapper createSubscriptionMapper(MailboxSession session)
throws SubscriptionException {
return subscriptionMapper;
}
-
- public void deleteAll() throws MailboxException {
- final MailboxMapper<Long> mapper = mailboxMapper;
- mapper.execute(new Mapper.VoidTransaction() {
-
- public void runVoid() throws MailboxException {
- mapper.deleteAll();
- }
-
- });
- ((InMemoryMessageMapper) messageMapper).deleteAll();
- ((InMemorySubscriptionMapper) subscriptionMapper).deleteAll();
- }
}
Modified:
james/imap/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryHostSystem.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryHostSystem.java?rev=999839&r1=999838&r2=999839&view=diff
==============================================================================
---
james/imap/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryHostSystem.java
(original)
+++
james/imap/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryHostSystem.java
Wed Sep 22 09:41:03 2010
@@ -32,23 +32,17 @@ import org.apache.james.test.functional.
public class InMemoryHostSystem extends ImapHostSystem {
- private final InMemoryMailboxManager mailboxManager;
- private final InMemoryUserManager userManager;
- private final InMemoryMailboxSessionMapperFactory factory;
- static HostSystem build() throws Exception {
+ private InMemoryMailboxManager mailboxManager;
+ private InMemoryUserManager userManager;
+ private InMemoryMailboxSessionMapperFactory factory;
+
+ static HostSystem build() throws Exception {
InMemoryHostSystem host = new InMemoryHostSystem();
return host;
}
private InMemoryHostSystem() {
- userManager = new InMemoryUserManager();
- factory = new InMemoryMailboxSessionMapperFactory();
- mailboxManager = new InMemoryMailboxManager(factory, userManager);
- final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, new
InMemorySubscriptionManager(factory));
-
- configure(new DefaultImapDecoderFactory().buildImapDecoder(),
- new DefaultImapEncoderFactory().buildImapEncoder(),
- defaultImapProcessorFactory);
+ initFields();
}
public boolean addUser(String user, String password) throws Exception {
@@ -58,7 +52,17 @@ public class InMemoryHostSystem extends
@Override
protected void resetData() throws Exception {
- mailboxManager.deleteEverything();
+ initFields();
+ }
+
+ private void initFields() {
+ userManager = new InMemoryUserManager();
+ factory = new InMemoryMailboxSessionMapperFactory();
+ mailboxManager = new InMemoryMailboxManager(factory, userManager);
+ final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, new
InMemorySubscriptionManager(factory));
+ configure(new DefaultImapDecoderFactory().buildImapDecoder(),
+ new DefaultImapEncoderFactory().buildImapEncoder(),
+ defaultImapProcessorFactory);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
