Author: btellier
Date: Sat Nov 28 13:10:48 2015
New Revision: 1716967
URL: http://svn.apache.org/viewvc?rev=1716967&view=rev
Log:
MAILBOX-211 Spring configuration for Mailbox Id deserializer
Modified:
james/project/trunk/mailbox/cassandra/src/main/resources/META-INF/spring/mailbox-cassandra.xml
james/project/trunk/mailbox/hbase/src/main/resources/META-INF/spring/mailbox-hbase.xml
james/project/trunk/mailbox/jcr/src/main/resources/META-INF/spring/mailbox-jcr.xml
james/project/trunk/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml
james/project/trunk/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml
james/project/trunk/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml
james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java
Modified:
james/project/trunk/mailbox/cassandra/src/main/resources/META-INF/spring/mailbox-cassandra.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/cassandra/src/main/resources/META-INF/spring/mailbox-cassandra.xml?rev=1716967&r1=1716966&r2=1716967&view=diff
==============================================================================
---
james/project/trunk/mailbox/cassandra/src/main/resources/META-INF/spring/mailbox-cassandra.xml
(original)
+++
james/project/trunk/mailbox/cassandra/src/main/resources/META-INF/spring/mailbox-cassandra.xml
Sat Nov 28 13:10:48 2015
@@ -80,4 +80,6 @@
<constructor-arg index="0" ref="cassandra-session"/>
</bean>
+ <bean id="cassandra-mailbox-id-deserializer"
class="org.apache.james.mailbox.cassandra.CassandraMailboxIdDeserializer"/>
+
</beans>
Modified:
james/project/trunk/mailbox/hbase/src/main/resources/META-INF/spring/mailbox-hbase.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/hbase/src/main/resources/META-INF/spring/mailbox-hbase.xml?rev=1716967&r1=1716966&r2=1716967&view=diff
==============================================================================
---
james/project/trunk/mailbox/hbase/src/main/resources/META-INF/spring/mailbox-hbase.xml
(original)
+++
james/project/trunk/mailbox/hbase/src/main/resources/META-INF/spring/mailbox-hbase.xml
Sat Nov 28 13:10:48 2015
@@ -62,4 +62,6 @@
<alias name="jvm-locker" alias="hbase-locker"/>
+ <bean id="hbase-mailbox-id-deserializer"
class="org.apache.james.mailbox.hbase.HBaseMailboxIdDeserializer"/>
+
</beans>
Modified:
james/project/trunk/mailbox/jcr/src/main/resources/META-INF/spring/mailbox-jcr.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/jcr/src/main/resources/META-INF/spring/mailbox-jcr.xml?rev=1716967&r1=1716966&r2=1716967&view=diff
==============================================================================
---
james/project/trunk/mailbox/jcr/src/main/resources/META-INF/spring/mailbox-jcr.xml
(original)
+++
james/project/trunk/mailbox/jcr/src/main/resources/META-INF/spring/mailbox-jcr.xml
Sat Nov 28 13:10:48 2015
@@ -81,4 +81,6 @@
</bean>
<alias name="jvm-locker" alias="jcr-locker"/>
+ <bean id="jcr-mailbox-id-deserializer"
class="org.apache.james.mailbox.jcr.JCRMailboxIdDeserializer"/>
+
</beans>
Modified:
james/project/trunk/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml?rev=1716967&r1=1716966&r2=1716967&view=diff
==============================================================================
---
james/project/trunk/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml
(original)
+++
james/project/trunk/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml
Sat Nov 28 13:10:48 2015
@@ -83,4 +83,6 @@
<property name="showSql" value="false"/>
</bean>
+ <bean id="jpa-mailbox-id-deserializer"
class="org.apache.james.mailbox.jpa.JPAMailboxIdDeserializer"/>
+
</beans>
Modified:
james/project/trunk/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml?rev=1716967&r1=1716966&r2=1716967&view=diff
==============================================================================
---
james/project/trunk/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml
(original)
+++
james/project/trunk/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml
Sat Nov 28 13:10:48 2015
@@ -56,4 +56,6 @@
</bean>
<alias name="jvm-locker" alias="maildir-locker"/>
+ <bean id="maildir-mailbox-id-deserializer"
class="org.apache.james.mailbox.maildir.MaildirMailboxIdDeserializer"/>
+
</beans>
Modified:
james/project/trunk/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml?rev=1716967&r1=1716966&r2=1716967&view=diff
==============================================================================
---
james/project/trunk/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml
(original)
+++
james/project/trunk/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml
Sat Nov 28 13:10:48 2015
@@ -49,4 +49,6 @@
<alias name="jvm-locker" alias="memory-locker"/>
+ <bean id="memory-mailbox-id-deserializer"
class="org.apache.james.mailbox.inmemory.InMemoryMailboxIdDeserializer"/>
+
</beans>
Modified:
james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java?rev=1716967&r1=1716966&r2=1716967&view=diff
==============================================================================
---
james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java
(original)
+++
james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java
Sat Nov 28 13:10:48 2015
@@ -51,30 +51,37 @@ public class MailboxConfigurationBeanFac
String mailbox = null;
String subscription = null;
String messageMapperFactory = null;
+ String mailboxIdDeserializer = null;
if (provider.equalsIgnoreCase("jpa")) {
mailbox = "jpa-mailboxmanager";
subscription = "jpa-subscriptionManager";
messageMapperFactory = "jpa-sessionMapperFactory";
+ mailboxIdDeserializer = "jpa-mailbox-id-deserializer";
} else if (provider.equalsIgnoreCase("memory")) {
mailbox = "memory-mailboxmanager";
subscription = "memory-subscriptionManager";
messageMapperFactory = "memory-sessionMapperFactory";
+ mailboxIdDeserializer = "memory-mailbox-id-deserializer";
} else if (provider.equalsIgnoreCase("jcr")) {
mailbox = "jcr-mailboxmanager";
subscription = "jcr-subscriptionManager";
messageMapperFactory = "jcr-sessionMapperFactory";
+ mailboxIdDeserializer = "jcr-mailbox-id-deserializer";
} else if (provider.equalsIgnoreCase("maildir")) {
mailbox = "maildir-mailboxmanager";
subscription = "maildir-subscriptionManager";
messageMapperFactory = "maildir-sessionMapperFactory";
+ mailboxIdDeserializer = "maildir-mailbox-id-deserializer";
} else if (provider.equalsIgnoreCase("hbase")) {
mailbox = "hbase-mailboxmanager";
subscription = "hbase-subscriptionManager";
messageMapperFactory = "hbase-sessionMapperFactory";
+ mailboxIdDeserializer = "hbase-mailbox-id-deserializer";
} else if (provider.equalsIgnoreCase("cassandra")) {
mailbox = "cassandra-mailboxmanager";
subscription = "cassandra-subscriptionManager";
messageMapperFactory = "cassandra-sessionMapperFactory";
+ mailboxIdDeserializer = "cassandra-mailbox-id-deserializer";
}
if (mailbox == null)
@@ -82,6 +89,7 @@ public class MailboxConfigurationBeanFac
registry.registerAlias(mailbox, "mailboxmanager");
registry.registerAlias(subscription, "subscriptionManager");
registry.registerAlias(messageMapperFactory,
"messageMapperFactory");
+ registry.registerAlias(mailboxIdDeserializer,
"mailbox-id-deserializer");
} catch (ConfigurationException e) {
throw new FatalBeanException("Unable to config the
mailboxmanager", e);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
