Author: norman
Date: Mon Aug 15 11:38:41 2011
New Revision: 1157785
URL: http://svn.apache.org/viewvc?rev=1157785&view=rev
Log:
Cleanup to work with mailbox-0.3 and imap-0.2.1
Modified:
james/mailbox-integration-tester/tags/MAILBOX-0.3/pom.xml
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/main/resources/org/apache/james/imap/scripts/Authenticate.test
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/jcr/host/JCRHostSystem.java
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/jpa/host/JPAHostSystem.java
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java
Modified: james/mailbox-integration-tester/tags/MAILBOX-0.3/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailbox-integration-tester/tags/MAILBOX-0.3/pom.xml?rev=1157785&r1=1157784&r2=1157785&view=diff
==============================================================================
--- james/mailbox-integration-tester/tags/MAILBOX-0.3/pom.xml (original)
+++ james/mailbox-integration-tester/tags/MAILBOX-0.3/pom.xml Mon Aug 15
11:38:41 2011
@@ -31,9 +31,9 @@
<properties>
<javax.mail.groupId>javax.mail</javax.mail.groupId>
<javax.mail.artifactId>mail</javax.mail.artifactId>
- <version.james-imap>0.2-M2-SNAPSHOT</version.james-imap>
- <version.james-mailbox>0.3-SNAPSHOT</version.james-mailbox>
- <version.javax.mail>1.4.3</version.javax.mail>
+ <version.james-imap>0.2.1</version.james-imap>
+ <version.james-mailbox>0.3</version.james-mailbox>
+ <version.javax.mail>1.4.1</version.javax.mail>
<target.jdk>1.6</target.jdk>
</properties>
Modified:
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/main/resources/org/apache/james/imap/scripts/Authenticate.test
URL:
http://svn.apache.org/viewvc/james/mailbox-integration-tester/tags/MAILBOX-0.3/src/main/resources/org/apache/james/imap/scripts/Authenticate.test?rev=1157785&r1=1157784&r2=1157785&view=diff
==============================================================================
---
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/main/resources/org/apache/james/imap/scripts/Authenticate.test
(original)
+++
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/main/resources/org/apache/james/imap/scripts/Authenticate.test
Mon Aug 15 11:38:41 2011
@@ -24,4 +24,4 @@ C: abcd AUTHENTICATE
S: abcd BAD AUTHENTICATE failed. Illegal arguments.
C: abcd AUTHENTICATE KERBEROS_V4 extra
-S: abcd BAD AUTHENTICATE failed. Illegal arguments.
+S: abcd NO AUTHENTICATE failed. Authentication mechanism is unsupported.
Modified:
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java?rev=1157785&r1=1157784&r2=1157785&view=diff
==============================================================================
---
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java
(original)
+++
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java
Mon Aug 15 11:38:41 2011
@@ -26,14 +26,14 @@ import org.apache.james.imap.processor.m
import org.apache.james.imap.tester.ImapHostSystem;
import org.apache.james.imap.tester.base.HostSystem;
import org.apache.james.mailbox.MailboxException;
-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.store.MockAuthenticator;
+import org.apache.james.mailbox.store.StoreMailboxManager;
+import org.apache.james.mailbox.store.StoreSubscriptionManager;
public class InMemoryHostSystem extends ImapHostSystem {
- private InMemoryMailboxManager mailboxManager;
+ private StoreMailboxManager<Long> mailboxManager;
private MockAuthenticator userManager;
private InMemoryMailboxSessionMapperFactory factory;
@@ -59,10 +59,10 @@ public class InMemoryHostSystem extends
private void initFields() throws MailboxException {
userManager = new MockAuthenticator();
factory = new InMemoryMailboxSessionMapperFactory();
- mailboxManager = new InMemoryMailboxManager(factory, userManager);
+ mailboxManager = new StoreMailboxManager<Long>(factory, userManager);
mailboxManager.init();
- final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, new
InMemorySubscriptionManager(factory));
+ final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, new
StoreSubscriptionManager(factory));
configure(new DefaultImapDecoderFactory().buildImapDecoder(),
new DefaultImapEncoderFactory().buildImapEncoder(),
defaultImapProcessorFactory);
Modified:
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/jcr/host/JCRHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/jcr/host/JCRHostSystem.java?rev=1157785&r1=1157784&r2=1157785&view=diff
==============================================================================
---
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/jcr/host/JCRHostSystem.java
(original)
+++
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/jcr/host/JCRHostSystem.java
Mon Aug 15 11:38:41 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;
@@ -65,11 +68,15 @@ public class JCRHostSystem extends ImapH
repository = RepositoryImpl.create(config);
GlobalMailboxSessionJCRRepository sessionRepos = new
GlobalMailboxSessionJCRRepository(repository, workspace, user, pass);
+ JVMMailboxPathLocker locker = new JVMMailboxPathLocker();
+ JCRUidProvider uidProvider = new JCRUidProvider(locker,
sessionRepos);
+ JCRModSeqProvider modSeqProvider = new JCRModSeqProvider(locker,
sessionRepos);
+
// Register imap cnd file
JCRUtils.registerCnd(repository, workspace, user, pass);
userManager = new MockAuthenticator();
- JCRMailboxSessionMapperFactory mf = new
JCRMailboxSessionMapperFactory(sessionRepos);
+ JCRMailboxSessionMapperFactory mf = new
JCRMailboxSessionMapperFactory(sessionRepos, uidProvider, modSeqProvider);
mailboxManager = new JCRMailboxManager(mf, userManager);
mailboxManager.init();
Modified:
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/jpa/host/JPAHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/jpa/host/JPAHostSystem.java?rev=1157785&r1=1157784&r2=1157785&view=diff
==============================================================================
---
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/jpa/host/JPAHostSystem.java
(original)
+++
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/jpa/host/JPAHostSystem.java
Mon Aug 15 11:38:41 2011
@@ -35,7 +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.model.JPAHeader;
+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;
@@ -43,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;
@@ -93,7 +95,6 @@ public class JPAHostSystem extends ImapH
// Configure OpenJPA Metadata
properties.put("openjpa.MetaDataFactory", "jpa(Types=" +
- JPAHeader.class.getName() + ";" +
JPAMailbox.class.getName() + ";" +
AbstractJPAMessage.class.getName() + ";" +
JPAMessage.class.getName() + ";" +
@@ -105,7 +106,10 @@ public class JPAHostSystem extends ImapH
entityManagerFactory =
OpenJPAPersistence.getEntityManagerFactory(properties);
- JPAMailboxSessionMapperFactory mf = new
JPAMailboxSessionMapperFactory(entityManagerFactory);
+ JVMMailboxPathLocker locker = new JVMMailboxPathLocker();
+ JPAUidProvider uidProvider = new JPAUidProvider(locker,
entityManagerFactory);
+ JPAModSeqProvider modSeqProvider = new JPAModSeqProvider(locker,
entityManagerFactory);
+ JPAMailboxSessionMapperFactory mf = new
JPAMailboxSessionMapperFactory(entityManagerFactory, uidProvider,
modSeqProvider);
mailboxManager = new OpenJPAMailboxManager(mf, userManager);
mailboxManager.init();
Modified:
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java?rev=1157785&r1=1157784&r2=1157785&view=diff
==============================================================================
---
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java
(original)
+++
james/mailbox-integration-tester/tags/MAILBOX-0.3/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java
Mon Aug 15 11:38:41 2011
@@ -26,21 +26,20 @@ import org.apache.james.imap.encode.main
import org.apache.james.imap.main.DefaultImapDecoderFactory;
import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
import org.apache.james.imap.tester.ImapHostSystem;
-import org.apache.james.imap.tester.InMemoryUserManager;
import org.apache.james.imap.tester.base.HostSystem;
import org.apache.james.mailbox.MailboxException;
-import org.apache.james.mailbox.maildir.MaildirMailboxManager;
import org.apache.james.mailbox.maildir.MaildirMailboxSessionMapperFactory;
import org.apache.james.mailbox.maildir.MaildirStore;
-import org.apache.james.mailbox.maildir.MaildirSubscriptionManager;
import org.apache.james.mailbox.store.MockAuthenticator;
+import org.apache.james.mailbox.store.StoreMailboxManager;
+import org.apache.james.mailbox.store.StoreSubscriptionManager;
public class MaildirHostSystem extends ImapHostSystem {
public static final String META_DATA_DIRECTORY = "target/user-meta-data";
private static final String MAILDIR_HOME = "target/Maildir";
- private final MaildirMailboxManager mailboxManager;
+ private final StoreMailboxManager<Long> mailboxManager;
private final MockAuthenticator userManager;
private final MaildirMailboxSessionMapperFactory
mailboxSessionMapperFactory;
@@ -52,8 +51,8 @@ public class MaildirHostSystem extends I
userManager = new MockAuthenticator();
MaildirStore store = new MaildirStore(MAILDIR_HOME + "/%user");
mailboxSessionMapperFactory = new
MaildirMailboxSessionMapperFactory(store);
- MaildirSubscriptionManager sm = new
MaildirSubscriptionManager(mailboxSessionMapperFactory);
- mailboxManager = new
MaildirMailboxManager(mailboxSessionMapperFactory, userManager);
+ StoreSubscriptionManager sm = new
StoreSubscriptionManager(mailboxSessionMapperFactory);
+ mailboxManager = new StoreMailboxManager(mailboxSessionMapperFactory,
userManager);
mailboxManager.init();
final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, sm);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
