Author: norman
Date: Sat Jun 25 19:41:28 2011
New Revision: 1139600
URL: http://svn.apache.org/viewvc?rev=1139600&view=rev
Log:
Adjust for latest mailbox changes
Modified:
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
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=1139600&r1=1139599&r2=1139600&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 Jun 25 19:41:28 2011
@@ -35,6 +35,9 @@ 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.JCRModSeqProvider;
+import org.apache.james.mailbox.jcr.mail.JCRUidProvider;
+import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.MockAuthenticator;
import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
@@ -69,9 +72,12 @@ public class JCRHostSystem extends ImapH
JCRUtils.registerCnd(repository, workspace, user, pass);
userManager = new MockAuthenticator();
- JCRMailboxSessionMapperFactory mf = new
JCRMailboxSessionMapperFactory(sessionRepos);
+ JVMMailboxPathLocker locker = new JVMMailboxPathLocker();
+ JCRUidProvider uidProvider = new JCRUidProvider(locker,
sessionRepos);
+ JCRModSeqProvider modSeqProvider = new JCRModSeqProvider(locker,
sessionRepos);
+ JCRMailboxSessionMapperFactory mf = new
JCRMailboxSessionMapperFactory(sessionRepos, uidProvider, modSeqProvider);
- mailboxManager = new JCRMailboxManager(mf, userManager);
+ mailboxManager = new JCRMailboxManager(mf, userManager, locker);
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=1139600&r1=1139599&r2=1139600&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 Jun 25 19:41:28 2011
@@ -35,6 +35,8 @@ 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.JPAModSeqProvider;
+import org.apache.james.mailbox.jpa.mail.JPAUidProvider;
import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
import org.apache.james.mailbox.jpa.mail.model.JPAProperty;
import org.apache.james.mailbox.jpa.mail.model.JPAUserFlag;
@@ -42,6 +44,7 @@ import org.apache.james.mailbox.jpa.mail
import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage;
import org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager;
import org.apache.james.mailbox.jpa.user.model.JPASubscription;
+import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.MockAuthenticator;
import org.apache.openjpa.persistence.OpenJPAPersistence;
import org.slf4j.LoggerFactory;
@@ -101,11 +104,12 @@ public class JPAHostSystem extends ImapH
userManager = new MockAuthenticator();
entityManagerFactory =
OpenJPAPersistence.getEntityManagerFactory(properties);
+ JVMMailboxPathLocker locker = new JVMMailboxPathLocker();
+ JPAUidProvider uidProvider = new JPAUidProvider(locker,
entityManagerFactory);
+ JPAModSeqProvider modSeqProvider = new JPAModSeqProvider(locker,
entityManagerFactory);
+ JPAMailboxSessionMapperFactory mf = new
JPAMailboxSessionMapperFactory(entityManagerFactory, uidProvider,
modSeqProvider);
-
- JPAMailboxSessionMapperFactory mf = new
JPAMailboxSessionMapperFactory(entityManagerFactory);
-
- mailboxManager = new OpenJPAMailboxManager(mf, userManager);
+ mailboxManager = new OpenJPAMailboxManager(mf, userManager, locker,
false);
mailboxManager.init();
SubscriptionManager subscriptionManager = new
JPASubscriptionManager(mf);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
