Repository: james-project Updated Branches: refs/heads/master be69ed1cf -> bfe79736e
JAMES-1745 Bind AttachmentMapper Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/7367a6fa Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7367a6fa Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7367a6fa Branch: refs/heads/master Commit: 7367a6fa28c0e0dc4cac54bc0559dce14a0cb68a Parents: be69ed1 Author: Antoine Duprat <[email protected]> Authored: Wed Jun 1 09:12:43 2016 +0200 Committer: Antoine Duprat <[email protected]> Committed: Thu Jun 2 11:28:41 2016 +0200 ---------------------------------------------------------------------- .../apache/james/mailbox/store/MailboxSessionMapperFactory.java | 3 ++- .../org/apache/james/modules/mailbox/CassandraMailboxModule.java | 2 ++ .../org/apache/james/modules/mailbox/MemoryMailboxModule.java | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/7367a6fa/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java index 7c3da7d..c5cc747 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java @@ -23,6 +23,7 @@ import org.apache.james.mailbox.RequestAware; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.SubscriptionException; import org.apache.james.mailbox.store.mail.AttachmentMapper; +import org.apache.james.mailbox.store.mail.AttachmentMapperFactory; import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.MailboxMapperFactory; import org.apache.james.mailbox.store.mail.MessageMapper; @@ -35,7 +36,7 @@ import org.apache.james.mailbox.store.user.SubscriptionMapperFactory; * Maintain mapper instances by {@link MailboxSession}. So only one mapper instance is used * in a {@link MailboxSession} */ -public abstract class MailboxSessionMapperFactory implements RequestAware, MailboxMapperFactory, MessageMapperFactory, SubscriptionMapperFactory{ +public abstract class MailboxSessionMapperFactory implements RequestAware, MailboxMapperFactory, MessageMapperFactory, AttachmentMapperFactory, SubscriptionMapperFactory{ protected final static String ATTACHMENTMAPPER = "ATTACHMENTMAPPER"; protected final static String MESSAGEMAPPER ="MESSAGEMAPPER"; http://git-wip-us.apache.org/repos/asf/james-project/blob/7367a6fa/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java index 67eb4e3..6d845e0 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java @@ -34,6 +34,7 @@ import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.store.Authenticator; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.NoMailboxPathLocker; +import org.apache.james.mailbox.store.mail.AttachmentMapperFactory; import org.apache.james.mailbox.store.mail.MailboxMapperFactory; import org.apache.james.mailbox.store.mail.MessageMapperFactory; import org.apache.james.mailbox.store.mail.ModSeqProvider; @@ -62,6 +63,7 @@ public class CassandraMailboxModule extends AbstractModule { bind(MessageMapperFactory.class).to(CassandraMailboxSessionMapperFactory.class); bind(MailboxMapperFactory.class).to(CassandraMailboxSessionMapperFactory.class); + bind(AttachmentMapperFactory.class).to(CassandraMailboxSessionMapperFactory.class); bind(MailboxSessionMapperFactory.class).to(CassandraMailboxSessionMapperFactory.class); bind(ModSeqProvider.class).to(CassandraModSeqProvider.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/7367a6fa/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java index 90c9d38..6a13bb6 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java @@ -39,6 +39,7 @@ import org.apache.james.mailbox.store.JVMMailboxPathLocker; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.StoreSubscriptionManager; import org.apache.james.mailbox.store.extractor.TextExtractor; +import org.apache.james.mailbox.store.mail.AttachmentMapperFactory; import org.apache.james.mailbox.store.mail.MailboxMapperFactory; import org.apache.james.mailbox.store.mail.MessageMapperFactory; import org.apache.james.mailbox.store.mail.ModSeqProvider; @@ -61,6 +62,7 @@ public class MemoryMailboxModule extends AbstractModule { bind(MessageMapperFactory.class).to(InMemoryMailboxSessionMapperFactory.class); bind(MailboxMapperFactory.class).to(InMemoryMailboxSessionMapperFactory.class); + bind(AttachmentMapperFactory.class).to(InMemoryMailboxSessionMapperFactory.class); bind(MailboxSessionMapperFactory.class).to(InMemoryMailboxSessionMapperFactory.class); bind(ModSeqProvider.class).to(InMemoryModSeqProvider.class); bind(UidProvider.class).to(InMemoryUidProvider.class); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
