Author: norman Date: Wed May 25 18:46:20 2011 New Revision: 1127626 URL: http://svn.apache.org/viewvc?rev=1127626&view=rev Log: Use mailbox-0.3
Modified: james/mailbox-integration-tester/trunk/pom.xml 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/pom.xml URL: http://svn.apache.org/viewvc/james/mailbox-integration-tester/trunk/pom.xml?rev=1127626&r1=1127625&r2=1127626&view=diff ============================================================================== --- james/mailbox-integration-tester/trunk/pom.xml (original) +++ james/mailbox-integration-tester/trunk/pom.xml Wed May 25 18:46:20 2011 @@ -66,6 +66,11 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox-api</artifactId> + <version>${version.james-mailbox}</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> <artifactId>apache-james-mailbox-store</artifactId> <version>${version.james-mailbox}</version> <type>test-jar</type> 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=1127626&r1=1127625&r2=1127626&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 Wed May 25 18:46:20 2011 @@ -29,7 +29,6 @@ import org.apache.james.mailbox.MailboxE import org.apache.james.mailbox.inmemory.InMemoryMailboxManager; import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory; import org.apache.james.mailbox.inmemory.InMemorySubscriptionManager; -import org.apache.james.mailbox.inmemory.mail.InMemoryCachingUidProvider; import org.apache.james.mailbox.store.MockAuthenticator; public class InMemoryHostSystem extends ImapHostSystem { @@ -60,8 +59,7 @@ public class InMemoryHostSystem extends private void initFields() throws MailboxException { userManager = new MockAuthenticator(); factory = new InMemoryMailboxSessionMapperFactory(); - InMemoryCachingUidProvider uidProvider = new InMemoryCachingUidProvider(); - mailboxManager = new InMemoryMailboxManager(factory, userManager, uidProvider); + mailboxManager = new InMemoryMailboxManager(factory, userManager); mailboxManager.init(); final ImapProcessor defaultImapProcessorFactory = DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, new InMemorySubscriptionManager(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=1127626&r1=1127625&r2=1127626&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 Wed May 25 18:46:20 2011 @@ -35,7 +35,6 @@ import org.apache.james.mailbox.jcr.JCRM import org.apache.james.mailbox.jcr.JCRMailboxSessionMapperFactory; import org.apache.james.mailbox.jcr.JCRSubscriptionManager; import org.apache.james.mailbox.jcr.JCRUtils; -import org.apache.james.mailbox.jcr.mail.JCRCachingUidProvider; import org.apache.james.mailbox.store.MockAuthenticator; import org.slf4j.LoggerFactory; import org.xml.sax.InputSource; @@ -70,10 +69,9 @@ public class JCRHostSystem extends ImapH JCRUtils.registerCnd(repository, workspace, user, pass); userManager = new MockAuthenticator(); - JCRCachingUidProvider uidProvider = new JCRCachingUidProvider(sessionRepos); JCRMailboxSessionMapperFactory mf = new JCRMailboxSessionMapperFactory(sessionRepos); - mailboxManager = new JCRMailboxManager(mf, userManager, uidProvider); + mailboxManager = new JCRMailboxManager(mf, userManager); 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=1127626&r1=1127625&r2=1127626&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 Wed May 25 18:46:20 2011 @@ -35,7 +35,6 @@ import org.apache.james.mailbox.MailboxS import org.apache.james.mailbox.SubscriptionManager; import org.apache.james.mailbox.jpa.JPAMailboxSessionMapperFactory; import org.apache.james.mailbox.jpa.JPASubscriptionManager; -import org.apache.james.mailbox.jpa.mail.JPACachingUidProvider; import org.apache.james.mailbox.jpa.mail.model.JPAHeader; import org.apache.james.mailbox.jpa.mail.model.JPAMailbox; import org.apache.james.mailbox.jpa.mail.model.JPAProperty; @@ -105,11 +104,10 @@ public class JPAHostSystem extends ImapH userManager = new MockAuthenticator(); entityManagerFactory = OpenJPAPersistence.getEntityManagerFactory(properties); - JPACachingUidProvider uidProvider = new JPACachingUidProvider(entityManagerFactory); JPAMailboxSessionMapperFactory mf = new JPAMailboxSessionMapperFactory(entityManagerFactory); - mailboxManager = new OpenJPAMailboxManager(mf, userManager, uidProvider); + mailboxManager = new OpenJPAMailboxManager(mf, userManager); 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=1127626&r1=1127625&r2=1127626&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 Wed May 25 18:46:20 2011 @@ -53,7 +53,7 @@ public class MaildirHostSystem extends I MaildirStore store = new MaildirStore(MAILDIR_HOME + "/%user"); mailboxSessionMapperFactory = new MaildirMailboxSessionMapperFactory(store); MaildirSubscriptionManager sm = new MaildirSubscriptionManager(mailboxSessionMapperFactory); - mailboxManager = new MaildirMailboxManager(mailboxSessionMapperFactory, userManager, store); + mailboxManager = new MaildirMailboxManager(mailboxSessionMapperFactory, userManager); mailboxManager.init(); final ImapProcessor defaultImapProcessorFactory = DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, sm); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org