Author: btellier
Date: Tue Sep 22 10:44:32 2015
New Revision: 1704569
URL: http://svn.apache.org/viewvc?rev=1704569&view=rev
Log:
MPT-26 Adapt to IMAP API changes
Modified:
james/mpt/trunk/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
james/mpt/trunk/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
james/mpt/trunk/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
james/mpt/trunk/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java
james/mpt/trunk/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java
james/mpt/trunk/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
james/mpt/trunk/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java
Modified:
james/mpt/trunk/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java?rev=1704569&r1=1704568&r2=1704569&view=diff
==============================================================================
---
james/mpt/trunk/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
(original)
+++
james/mpt/trunk/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
Tue Sep 22 10:44:32 2015
@@ -28,10 +28,16 @@ import org.apache.james.mailbox.cassandr
import org.apache.james.mailbox.cassandra.CassandraTypesProvider;
import org.apache.james.mailbox.cassandra.mail.CassandraModSeqProvider;
import org.apache.james.mailbox.cassandra.mail.CassandraUidProvider;
+import org.apache.james.mailbox.cassandra.quota.CassandraCurrentQuotaManager;
+import
org.apache.james.mailbox.cassandra.quota.CassandraPerUserMaxQuotaManager;
import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.quota.QuotaRootResolver;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.MockAuthenticator;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
+import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver;
+import org.apache.james.mailbox.store.quota.ListeningCurrentQuotaUpdater;
+import org.apache.james.mailbox.store.quota.StoreQuotaManager;
import org.apache.james.mpt.host.JamesImapHostSystem;
import org.apache.james.mpt.imapmailbox.MailboxCreationDelegate;
@@ -52,13 +58,33 @@ public class CassandraHostSystem extends
CassandraMailboxSessionMapperFactory mapperFactory = new
CassandraMailboxSessionMapperFactory(uidProvider, modSeqProvider, session, new
CassandraTypesProvider(session));
mailboxManager = new CassandraMailboxManager(mapperFactory,
userManager, new JVMMailboxPathLocker());
+ QuotaRootResolver quotaRootResolver = new
DefaultQuotaRootResolver(mapperFactory);
+
+ CassandraPerUserMaxQuotaManager perUserMaxQuotaManager = new
CassandraPerUserMaxQuotaManager(session);
+ perUserMaxQuotaManager.setDefaultMaxMessage(4096);
+ perUserMaxQuotaManager.setDefaultMaxStorage(5L * 1024L * 1024L *
1024L);
+
+ CassandraCurrentQuotaManager currentQuotaManager = new
CassandraCurrentQuotaManager(session);
+
+ StoreQuotaManager quotaManager = new StoreQuotaManager();
+ quotaManager.setMaxQuotaManager(perUserMaxQuotaManager);
+ quotaManager.setCurrentQuotaManager(currentQuotaManager);
+
+ ListeningCurrentQuotaUpdater quotaUpdater = new
ListeningCurrentQuotaUpdater();
+ quotaUpdater.setCurrentQuotaManager(currentQuotaManager);
+ quotaUpdater.setQuotaRootResolver(quotaRootResolver);
+
+ mailboxManager.setQuotaRootResolver(quotaRootResolver);
+ mailboxManager.setQuotaManager(quotaManager);
+ mailboxManager.setQuotaUpdater(quotaUpdater);
+
mailboxManager.init();
SubscriptionManager subscriptionManager = new
StoreSubscriptionManager(mapperFactory);
configure(new DefaultImapDecoderFactory().buildImapDecoder(),
new DefaultImapEncoderFactory().buildImapEncoder(),
-
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager,
subscriptionManager));
+
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager,
subscriptionManager, quotaManager, quotaRootResolver));
cassandraClusterSingleton.ensureAllTables();
}
Modified:
james/mpt/trunk/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java?rev=1704569&r1=1704568&r2=1704569&view=diff
==============================================================================
---
james/mpt/trunk/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
(original)
+++
james/mpt/trunk/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
Tue Sep 22 10:44:32 2015
@@ -50,6 +50,8 @@ import org.apache.james.mailbox.store.Mo
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
import org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
+import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver;
+import org.apache.james.mailbox.store.quota.NoQuotaManager;
import org.apache.james.mpt.host.JamesImapHostSystem;
import org.apache.james.mpt.imapmailbox.MailboxCreationDelegate;
@@ -116,7 +118,7 @@ public class ElasticSearchHostSystem ext
throw Throwables.propagate(e);
}
- final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, new
StoreSubscriptionManager(factory));
+ final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, new
StoreSubscriptionManager(factory), new NoQuotaManager(), new
DefaultQuotaRootResolver(factory));
configure(new DefaultImapDecoderFactory().buildImapDecoder(),
new DefaultImapEncoderFactory().buildImapEncoder(),
defaultImapProcessorFactory);
Modified:
james/mpt/trunk/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java?rev=1704569&r1=1704568&r2=1704569&view=diff
==============================================================================
---
james/mpt/trunk/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
(original)
+++
james/mpt/trunk/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
Tue Sep 22 10:44:32 2015
@@ -35,6 +35,7 @@ import org.apache.james.mailbox.acl.Grou
import org.apache.james.mailbox.acl.MailboxACLResolver;
import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.acl.UnionMailboxACLResolver;
+import org.apache.james.mailbox.hbase.HBaseId;
import org.apache.james.mailbox.hbase.HBaseMailboxManager;
import org.apache.james.mailbox.hbase.HBaseMailboxSessionMapperFactory;
import org.apache.james.mailbox.hbase.mail.HBaseModSeqProvider;
@@ -42,6 +43,8 @@ import org.apache.james.mailbox.hbase.ma
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.MockAuthenticator;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
+import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver;
+import org.apache.james.mailbox.store.quota.NoQuotaManager;
import org.apache.james.mpt.host.JamesImapHostSystem;
import org.apache.james.mpt.imapmailbox.MailboxCreationDelegate;
import org.slf4j.LoggerFactory;
@@ -97,7 +100,7 @@ public class HBaseHostSystem extends Jam
SubscriptionManager subscriptionManager = new
StoreSubscriptionManager(mapperFactory);
- final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager,
subscriptionManager);
+ final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager,
subscriptionManager, new NoQuotaManager(), new
DefaultQuotaRootResolver(mapperFactory));
resetUserMetaData();
Modified:
james/mpt/trunk/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java?rev=1704569&r1=1704568&r2=1704569&view=diff
==============================================================================
---
james/mpt/trunk/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java
(original)
+++
james/mpt/trunk/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java
Tue Sep 22 10:44:32 2015
@@ -30,22 +30,27 @@ import org.apache.james.mailbox.acl.Unio
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
+import org.apache.james.mailbox.inmemory.quota.InMemoryCurrentQuotaManager;
+import org.apache.james.mailbox.inmemory.quota.InMemoryPerUserMaxQuotaManager;
import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.quota.QuotaRootResolver;
import org.apache.james.mailbox.store.MockAuthenticator;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
+import org.apache.james.mailbox.store.quota.CurrentQuotaCalculator;
+import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver;
+import org.apache.james.mailbox.store.quota.ListeningCurrentQuotaUpdater;
+import org.apache.james.mailbox.store.quota.StoreQuotaManager;
import org.apache.james.mpt.host.JamesImapHostSystem;
import org.apache.james.mpt.imapmailbox.MailboxCreationDelegate;
public class InMemoryHostSystem extends JamesImapHostSystem {
private StoreMailboxManager<InMemoryId> mailboxManager;
- private MockAuthenticator userManager;
- private InMemoryMailboxSessionMapperFactory factory;
-
+ private MockAuthenticator userManager;
+
public static JamesImapHostSystem build() throws Exception {
- InMemoryHostSystem host = new InMemoryHostSystem();
- return host;
+ return new InMemoryHostSystem();
}
private InMemoryHostSystem() throws MailboxException {
@@ -64,14 +69,36 @@ public class InMemoryHostSystem extends
private void initFields() throws MailboxException {
userManager = new MockAuthenticator();
- factory = new InMemoryMailboxSessionMapperFactory();
+ InMemoryMailboxSessionMapperFactory factory = new
InMemoryMailboxSessionMapperFactory();
MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
GroupMembershipResolver groupMembershipResolver = new
SimpleGroupMembershipResolver();
mailboxManager = new StoreMailboxManager<InMemoryId>(factory,
userManager, aclResolver, groupMembershipResolver);
+ QuotaRootResolver quotaRootResolver = new
DefaultQuotaRootResolver(factory);
+
+ InMemoryPerUserMaxQuotaManager perUserMaxQuotaManager = new
InMemoryPerUserMaxQuotaManager();
+ perUserMaxQuotaManager.setDefaultMaxMessage(4096);
+ perUserMaxQuotaManager.setDefaultMaxStorage(5L * 1024L * 1024L *
1024L);
+
+ InMemoryCurrentQuotaManager currentQuotaManager = new
InMemoryCurrentQuotaManager(
+ new CurrentQuotaCalculator(factory, quotaRootResolver),
+ mailboxManager);
+
+ StoreQuotaManager quotaManager = new StoreQuotaManager();
+ quotaManager.setMaxQuotaManager(perUserMaxQuotaManager);
+ quotaManager.setCurrentQuotaManager(currentQuotaManager);
+
+ ListeningCurrentQuotaUpdater quotaUpdater = new
ListeningCurrentQuotaUpdater();
+ quotaUpdater.setCurrentQuotaManager(currentQuotaManager);
+ quotaUpdater.setQuotaRootResolver(quotaRootResolver);
+
+ mailboxManager.setQuotaRootResolver(quotaRootResolver);
+ mailboxManager.setQuotaManager(quotaManager);
+ mailboxManager.setQuotaUpdater(quotaUpdater);
+
mailboxManager.init();
- final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, new
StoreSubscriptionManager(factory));
+ final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, new
StoreSubscriptionManager(factory), quotaManager, quotaRootResolver);
configure(new DefaultImapDecoderFactory().buildImapDecoder(),
new DefaultImapEncoderFactory().buildImapEncoder(),
defaultImapProcessorFactory);
Modified:
james/mpt/trunk/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java?rev=1704569&r1=1704568&r2=1704569&view=diff
==============================================================================
---
james/mpt/trunk/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java
(original)
+++
james/mpt/trunk/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java
Tue Sep 22 10:44:32 2015
@@ -33,6 +33,7 @@ import org.apache.james.mailbox.acl.Mail
import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.acl.UnionMailboxACLResolver;
import org.apache.james.mailbox.jcr.GlobalMailboxSessionJCRRepository;
+import org.apache.james.mailbox.jcr.JCRId;
import org.apache.james.mailbox.jcr.JCRMailboxManager;
import org.apache.james.mailbox.jcr.JCRMailboxSessionMapperFactory;
import org.apache.james.mailbox.jcr.JCRSubscriptionManager;
@@ -42,6 +43,8 @@ import org.apache.james.mailbox.jcr.mail
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver;
+import org.apache.james.mailbox.store.quota.NoQuotaManager;
import org.apache.james.mpt.host.JamesImapHostSystem;
import org.apache.james.mpt.imapmailbox.MailboxCreationDelegate;
import org.slf4j.LoggerFactory;
@@ -88,7 +91,7 @@ public class JCRHostSystem extends James
mailboxManager = new JCRMailboxManager(mf, userManager, locker,
aclResolver, groupMembershipResolver);
mailboxManager.init();
- final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, new
JCRSubscriptionManager(mf));
+ final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, new
JCRSubscriptionManager(mf), new NoQuotaManager(), new
DefaultQuotaRootResolver(mf));
resetUserMetaData();
MailboxSession session =
mailboxManager.createSystemSession("test", LoggerFactory.getLogger("TestLog"));
mailboxManager.startProcessingRequest(session);
Modified:
james/mpt/trunk/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java?rev=1704569&r1=1704568&r2=1704569&view=diff
==============================================================================
---
james/mpt/trunk/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
(original)
+++
james/mpt/trunk/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
Tue Sep 22 10:44:32 2015
@@ -35,6 +35,7 @@ import org.apache.james.mailbox.acl.Grou
import org.apache.james.mailbox.acl.MailboxACLResolver;
import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.acl.UnionMailboxACLResolver;
+import org.apache.james.mailbox.jpa.JPAId;
import org.apache.james.mailbox.jpa.JPAMailboxSessionMapperFactory;
import org.apache.james.mailbox.jpa.JPASubscriptionManager;
import org.apache.james.mailbox.jpa.mail.JPAModSeqProvider;
@@ -49,6 +50,8 @@ import org.apache.james.mailbox.jpa.user
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver;
+import org.apache.james.mailbox.store.quota.NoQuotaManager;
import org.apache.james.mpt.host.JamesImapHostSystem;
import org.apache.james.mpt.imapmailbox.MailboxCreationDelegate;
import org.apache.openjpa.persistence.OpenJPAPersistence;
@@ -122,7 +125,7 @@ public class JPAHostSystem extends James
SubscriptionManager subscriptionManager = new
JPASubscriptionManager(mf);
- final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager,
subscriptionManager);
+ final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager,
subscriptionManager, new NoQuotaManager(), new DefaultQuotaRootResolver(mf));
resetUserMetaData();
Modified:
james/mpt/trunk/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java?rev=1704569&r1=1704568&r2=1704569&view=diff
==============================================================================
---
james/mpt/trunk/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java
(original)
+++
james/mpt/trunk/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java
Tue Sep 22 10:44:32 2015
@@ -38,6 +38,8 @@ import org.apache.james.mailbox.store.JV
import org.apache.james.mailbox.store.MockAuthenticator;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
+import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver;
+import org.apache.james.mailbox.store.quota.NoQuotaManager;
import org.apache.james.mpt.host.JamesImapHostSystem;
import org.apache.james.mpt.imapmailbox.MailboxCreationDelegate;
@@ -67,7 +69,7 @@ public class MaildirHostSystem extends J
mailboxManager = new
StoreMailboxManager<MaildirId>(mailboxSessionMapperFactory, userManager,
locker, aclResolver, groupMembershipResolver);
mailboxManager.init();
- final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, sm);
+ final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, sm, new
NoQuotaManager(), new DefaultQuotaRootResolver(mailboxSessionMapperFactory));
configure(new DefaultImapDecoderFactory().buildImapDecoder(),
new DefaultImapEncoderFactory().buildImapEncoder(),
defaultImapProcessorFactory);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
