You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ad...@apache.org on 2016/11/18 09:54:09 UTC
[16/29] james-project git commit: JAMES-1842: Add more binding for
MessageId
JAMES-1842: Add more binding for MessageId
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/270a97f7
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/270a97f7
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/270a97f7
Branch: refs/heads/master
Commit: 270a97f7d99150eae6fb65491082485ed8f98037
Parents: d65e484
Author: Quynh Nguyen <qn...@linagora.com>
Authored: Fri Oct 28 12:50:20 2016 +0700
Committer: Quynh Nguyen <qn...@linagora.com>
Committed: Fri Nov 18 09:25:34 2016 +0700
----------------------------------------------------------------------
.../resources/META-INF/spring/mailbox-cassandra.xml | 4 +---
.../src/main/resources/META-INF/spring/mailbox-jpa.xml | 12 ++++--------
.../main/resources/META-INF/spring/mailbox-maildir.xml | 4 +---
.../main/resources/META-INF/spring/mailbox-memory.xml | 4 +---
.../main/resources/META-INF/spring/spring-mailbox.xml | 3 ++-
.../apache/james/modules/mailbox/JPAMailboxModule.java | 4 ++++
6 files changed, 13 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/270a97f7/mailbox/cassandra/src/main/resources/META-INF/spring/mailbox-cassandra.xml
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/resources/META-INF/spring/mailbox-cassandra.xml b/mailbox/cassandra/src/main/resources/META-INF/spring/mailbox-cassandra.xml
index 3d40aad..5078a18 100644
--- a/mailbox/cassandra/src/main/resources/META-INF/spring/mailbox-cassandra.xml
+++ b/mailbox/cassandra/src/main/resources/META-INF/spring/mailbox-cassandra.xml
@@ -34,7 +34,7 @@
<constructor-arg index="0" ref="cassandra-sessionMapperFactory"/>
<constructor-arg index="1" ref="authenticator"/>
<constructor-arg index="2" ref="cassandra-locker"/>
- <constructor-arg index="3" ref="cassandra-messageIdFactory" />
+ <constructor-arg index="3" ref="messageIdFactory" />
<property name="messageSearchIndex" ref="elasticsearch-listener"/>
<property name="quotaManager" ref="quotaManager"/>
<property name="quotaRootResolver" ref="quotaRootResolver"/>
@@ -42,8 +42,6 @@
<property name="delegatingMailboxListener" ref="delegating-listener"/>
</bean>
- <bean id="cassandra-messageIdFactory" class="org.apache.james.mailbox.store.mail.model.DefaultMessageId.Factory" />
-
<bean id ="cassandra-subscriptionManager"
class="org.apache.james.mailbox.cassandra.CassandraSubscriptionManager"
lazy-init="true">
http://git-wip-us.apache.org/repos/asf/james-project/blob/270a97f7/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml b/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml
index 223187c..a4fa05d 100644
--- a/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml
+++ b/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml
@@ -34,20 +34,16 @@
<bean id="jpa-mailboxmanager" class="org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager" init-method="init">
<constructor-arg index="0" ref="jpa-sessionMapperFactory"/>
<constructor-arg index="1" ref="authenticator"/>
- <constructor-arg index="2" ref="jpa-locker"/>
- <constructor-arg index="3" type="boolean" value="false"/>
- <constructor-arg index="4" ref="aclResolver"/>
- <constructor-arg index="5" ref="groupMembershipResolver"/>
- <constructor-arg index="6" ref="messageParser"/>
- <constructor-arg index="7" ref="jpa-messageIdFactory" />
+ <constructor-arg index="2" ref="aclResolver"/>
+ <constructor-arg index="3" ref="groupMembershipResolver"/>
+ <constructor-arg index="4" ref="messageParser"/>
+ <constructor-arg index="5" ref="messageIdFactory"/>
<property name="quotaManager" ref="quotaManager"/>
<property name="quotaRootResolver" ref="quotaRootResolver"/>
<property name="quotaUpdater" ref="quotaUpdater"/>
<property name="delegatingMailboxListener" ref="delegating-listener"/>
</bean>
- <bean id="jpa-messageIdFactory" class="org.apache.james.mailbox.store.mail.model.DefaultMessageId.Factory" />
-
<bean id ="jpa-subscriptionManager" class="org.apache.james.mailbox.jpa.JPASubscriptionManager">
<constructor-arg index="0" ref="jpa-sessionMapperFactory"/>
</bean>
http://git-wip-us.apache.org/repos/asf/james-project/blob/270a97f7/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml b/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml
index aaa1062..4e9ef7a 100644
--- a/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml
+++ b/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml
@@ -40,7 +40,7 @@
<constructor-arg index="3" ref="aclResolver"/>
<constructor-arg index="4" ref="groupMembershipResolver"/>
<constructor-arg index="5" ref="messageParser"/>
- <constructor-arg index="6" ref="maildir-messageIdFactory" />
+ <constructor-arg index="6" ref="messageIdFactory" />
<!-- <property name="messageSearchIndex" ref="lazyIndex"/> -->
<property name="quotaManager" ref="quotaManager"/>
<property name="quotaRootResolver" ref="quotaRootResolver"/>
@@ -48,8 +48,6 @@
<property name="delegatingMailboxListener" ref="delegating-listener"/>
</bean>
- <bean id="maildir-messageIdFactory" class="org.apache.james.mailbox.store.mail.model.DefaultMessageId.Factory" />
-
<bean id ="maildir-subscriptionManager" class="org.apache.james.mailbox.store.StoreSubscriptionManager">
<constructor-arg index="0" ref="maildir-sessionMapperFactory"/>
</bean>
http://git-wip-us.apache.org/repos/asf/james-project/blob/270a97f7/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml b/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml
index 1beac65..92b2824 100644
--- a/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml
+++ b/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml
@@ -38,15 +38,13 @@
<constructor-arg index="3" ref="aclResolver"/>
<constructor-arg index="4" ref="groupMembershipResolver"/>
<constructor-arg index="5" ref="messageParser"/>
- <constructor-arg index="6" ref="memory-messageIdFactory" />
+ <constructor-arg index="6" ref="messageIdFactory" />
<!-- <property name="messageSearchIndex" ref="lazyIndex"/> -->
<property name="quotaManager" ref="quotaManager"/>
<property name="quotaRootResolver" ref="quotaRootResolver"/>
<property name="quotaUpdater" ref="quotaUpdater"/>
</bean>
- <bean id="memory-messageIdFactory" class="org.apache.james.mailbox.store.mail.model.DefaultMessageId.Factory" />
-
<bean id ="memory-subscriptionManager" class="org.apache.james.mailbox.store.StoreSubscriptionManager">
<constructor-arg index="0" ref="memory-sessionMapperFactory"/>
</bean>
http://git-wip-us.apache.org/repos/asf/james-project/blob/270a97f7/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
----------------------------------------------------------------------
diff --git a/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml b/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
index 182d1c1..153e1a2 100644
--- a/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
+++ b/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
@@ -22,7 +22,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <!--
+ <bean id="messageIdFactory" class="org.apache.james.mailbox.store.mail.model.DefaultMessageId.Factory" />
+ <!--
Mailbox Managers
-->
http://git-wip-us.apache.org/repos/asf/james-project/blob/270a97f7/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java b/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java
index 7f5f6eb..52c4237 100644
--- a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java
+++ b/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java
@@ -44,6 +44,7 @@ import org.apache.james.mailbox.jpa.mail.JPAModSeqProvider;
import org.apache.james.mailbox.jpa.mail.JPAUidProvider;
import org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager;
import org.apache.james.mailbox.model.MailboxId;
+import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.store.Authenticator;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
import org.apache.james.mailbox.store.NoMailboxPathLocker;
@@ -52,6 +53,7 @@ import org.apache.james.mailbox.store.mail.MailboxMapperFactory;
import org.apache.james.mailbox.store.mail.MessageMapperFactory;
import org.apache.james.mailbox.store.mail.ModSeqProvider;
import org.apache.james.mailbox.store.mail.UidProvider;
+import org.apache.james.mailbox.store.mail.model.DefaultMessageId;
import org.apache.james.modules.Names;
import org.apache.james.utils.MailboxManagerDefinition;
import org.apache.james.utils.PropertiesProvider;
@@ -77,11 +79,13 @@ public class JPAMailboxModule extends AbstractModule {
bind(JPAId.Factory.class).in(Scopes.SINGLETON);
bind(SimpleGroupMembershipResolver.class).in(Scopes.SINGLETON);
bind(UnionMailboxACLResolver.class).in(Scopes.SINGLETON);
+ bind(DefaultMessageId.Factory.class).in(Scopes.SINGLETON);
bind(MessageMapperFactory.class).to(JPAMailboxSessionMapperFactory.class);
bind(MailboxMapperFactory.class).to(JPAMailboxSessionMapperFactory.class);
bind(AttachmentMapperFactory.class).to(JPAMailboxSessionMapperFactory.class);
bind(MailboxSessionMapperFactory.class).to(JPAMailboxSessionMapperFactory.class);
+ bind(MessageId.Factory.class).to(DefaultMessageId.Factory.class);
bind(ModSeqProvider.class).to(JPAModSeqProvider.class);
bind(UidProvider.class).to(JPAUidProvider.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org