james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nor...@apache.org
Subject svn commit: r1237060 - in /james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox: hbase/host/ inmemory/host/ jcr/host/ jpa/host/ maildir/host/
Date Sat, 28 Jan 2012 13:44:39 GMT
Author: norman
Date: Sat Jan 28 13:44:38 2012
New Revision: 1237060

URL: http://svn.apache.org/viewvc?rev=1237060&view=rev
Log:
Adjust for latest mailbox code changes. See MAILBOX-151

Modified:
    james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java
    james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java
    james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/jcr/host/JCRHostSystem.java
    james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/jpa/host/JPAHostSystem.java
    james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java

Modified: james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java
URL: http://svn.apache.org/viewvc/james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java?rev=1237060&r1=1237059&r2=1237060&view=diff
==============================================================================
--- james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java
(original)
+++ james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java
Sat Jan 28 13:44:38 2012
@@ -30,8 +30,12 @@ import org.apache.james.imap.api.process
 import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
 import org.apache.james.imap.tester.ImapHostSystem;
 import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mailbox.MailboxACLResolver;
 import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.SimpleGroupMembershipResolver;
 import org.apache.james.mailbox.SubscriptionManager;
+import org.apache.james.mailbox.UnionMailboxACLResolver;
+import org.apache.james.mailbox.MailboxACLResolver.GroupMembershipResolver;
 import org.apache.james.mailbox.hbase.HBaseMailboxManager;
 import org.apache.james.mailbox.hbase.HBaseMailboxSessionMapperFactory;
 import org.apache.james.mailbox.hbase.mail.HBaseModSeqProvider;
@@ -83,7 +87,10 @@ public class HBaseHostSystem extends Ima
 
         final HBaseMailboxSessionMapperFactory mapperFactory = new HBaseMailboxSessionMapperFactory(
                 conf, uidProvider, modSeqProvider);
-        mailboxManager = new HBaseMailboxManager(mapperFactory, userManager);
+        MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
+        GroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver();
+        
+        mailboxManager = new HBaseMailboxManager(mapperFactory, userManager, aclResolver,
groupMembershipResolver);
         mailboxManager.init();
 
         SubscriptionManager subscriptionManager = new StoreSubscriptionManager(mapperFactory);

Modified: james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java
URL: http://svn.apache.org/viewvc/james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java?rev=1237060&r1=1237059&r2=1237060&view=diff
==============================================================================
--- james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java
(original)
+++ james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java
Sat Jan 28 13:44:38 2012
@@ -25,7 +25,11 @@ import org.apache.james.imap.main.Defaul
 import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
 import org.apache.james.imap.tester.ImapHostSystem;
 import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mailbox.MailboxACLResolver;
 import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.SimpleGroupMembershipResolver;
+import org.apache.james.mailbox.UnionMailboxACLResolver;
+import org.apache.james.mailbox.MailboxACLResolver.GroupMembershipResolver;
 import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
 import org.apache.james.mailbox.store.MockAuthenticator;
 import org.apache.james.mailbox.store.StoreMailboxManager;
@@ -59,7 +63,10 @@ public class InMemoryHostSystem extends 
     private void initFields() throws MailboxException {
         userManager = new MockAuthenticator();
         factory = new InMemoryMailboxSessionMapperFactory();
-        mailboxManager = new StoreMailboxManager<Long>(factory, userManager);
+        MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
+        GroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver();
+
+        mailboxManager = new StoreMailboxManager<Long>(factory, userManager, aclResolver,
groupMembershipResolver);
         mailboxManager.init();
 
         final ImapProcessor defaultImapProcessorFactory = DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager,
new StoreSubscriptionManager(factory));

Modified: james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/jcr/host/JCRHostSystem.java
URL: http://svn.apache.org/viewvc/james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/jcr/host/JCRHostSystem.java?rev=1237060&r1=1237059&r2=1237060&view=diff
==============================================================================
--- james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/jcr/host/JCRHostSystem.java
(original)
+++ james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/jcr/host/JCRHostSystem.java
Sat Jan 28 13:44:38 2012
@@ -29,7 +29,11 @@ import org.apache.james.imap.main.Defaul
 import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
 import org.apache.james.imap.tester.ImapHostSystem;
 import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mailbox.MailboxACLResolver;
 import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.SimpleGroupMembershipResolver;
+import org.apache.james.mailbox.UnionMailboxACLResolver;
+import org.apache.james.mailbox.MailboxACLResolver.GroupMembershipResolver;
 import org.apache.james.mailbox.jcr.GlobalMailboxSessionJCRRepository;
 import org.apache.james.mailbox.jcr.JCRMailboxManager;
 import org.apache.james.mailbox.jcr.JCRMailboxSessionMapperFactory;
@@ -77,7 +81,10 @@ public class JCRHostSystem extends ImapH
             JCRModSeqProvider modSeqProvider = new JCRModSeqProvider(locker, sessionRepos);
             JCRMailboxSessionMapperFactory mf = new JCRMailboxSessionMapperFactory(sessionRepos,
uidProvider, modSeqProvider);
 
-            mailboxManager = new JCRMailboxManager(mf, userManager, locker);
+            MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
+            GroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver();
+
+            mailboxManager = new JCRMailboxManager(mf, userManager, locker, aclResolver,
groupMembershipResolver);
             mailboxManager.init();
 
             final ImapProcessor defaultImapProcessorFactory = DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager,
new JCRSubscriptionManager(mf));

Modified: james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/jpa/host/JPAHostSystem.java
URL: http://svn.apache.org/viewvc/james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/jpa/host/JPAHostSystem.java?rev=1237060&r1=1237059&r2=1237060&view=diff
==============================================================================
--- james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/jpa/host/JPAHostSystem.java
(original)
+++ james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/jpa/host/JPAHostSystem.java
Sat Jan 28 13:44:38 2012
@@ -31,8 +31,12 @@ import org.apache.james.imap.main.Defaul
 import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
 import org.apache.james.imap.tester.ImapHostSystem;
 import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mailbox.MailboxACLResolver;
 import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.SimpleGroupMembershipResolver;
 import org.apache.james.mailbox.SubscriptionManager;
+import org.apache.james.mailbox.UnionMailboxACLResolver;
+import org.apache.james.mailbox.MailboxACLResolver.GroupMembershipResolver;
 import org.apache.james.mailbox.jpa.JPAMailboxSessionMapperFactory;
 import org.apache.james.mailbox.jpa.JPASubscriptionManager;
 import org.apache.james.mailbox.jpa.mail.JPAModSeqProvider;
@@ -109,7 +113,10 @@ public class JPAHostSystem extends ImapH
         JPAModSeqProvider modSeqProvider = new JPAModSeqProvider(locker, entityManagerFactory);
         JPAMailboxSessionMapperFactory mf = new JPAMailboxSessionMapperFactory(entityManagerFactory,
uidProvider, modSeqProvider);
 
-        mailboxManager = new OpenJPAMailboxManager(mf, userManager, locker, false);
+        MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
+        GroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver();
+
+        mailboxManager = new OpenJPAMailboxManager(mf, userManager, locker, false, aclResolver,
groupMembershipResolver);
         mailboxManager.init();
 
         SubscriptionManager subscriptionManager = new JPASubscriptionManager(mf);

Modified: james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java
URL: http://svn.apache.org/viewvc/james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java?rev=1237060&r1=1237059&r2=1237060&view=diff
==============================================================================
--- james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java
(original)
+++ james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java
Sat Jan 28 13:44:38 2012
@@ -27,7 +27,11 @@ import org.apache.james.imap.main.Defaul
 import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
 import org.apache.james.imap.tester.ImapHostSystem;
 import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mailbox.MailboxACLResolver;
 import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.SimpleGroupMembershipResolver;
+import org.apache.james.mailbox.UnionMailboxACLResolver;
+import org.apache.james.mailbox.MailboxACLResolver.GroupMembershipResolver;
 import org.apache.james.mailbox.maildir.MaildirMailboxSessionMapperFactory;
 import org.apache.james.mailbox.maildir.MaildirStore;
 import org.apache.james.mailbox.store.JVMMailboxPathLocker;
@@ -54,7 +58,11 @@ public class MaildirHostSystem extends I
         MaildirStore store = new MaildirStore(MAILDIR_HOME + "/%user", locker);
         mailboxSessionMapperFactory = new MaildirMailboxSessionMapperFactory(store);
         StoreSubscriptionManager sm = new StoreSubscriptionManager(mailboxSessionMapperFactory);
-        mailboxManager = new StoreMailboxManager<Integer>(mailboxSessionMapperFactory,
userManager, locker);
+        
+        MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
+        GroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver();
+
+        mailboxManager = new StoreMailboxManager<Integer>(mailboxSessionMapperFactory,
userManager, locker, aclResolver, groupMembershipResolver);
         mailboxManager.init();
 
         final ImapProcessor defaultImapProcessorFactory = DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager,
sm);



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message