Author: norman
Date: Sun Jul 3 19:19:25 2011
New Revision: 1142484
URL: http://svn.apache.org/viewvc?rev=1142484&view=rev
Log:
Upgrade to mailbox 0.3. See JAMES-1288
Modified:
james/app/trunk/src/main/config/james/context/james-mailbox-jcr-context.xml
james/app/trunk/src/main/config/james/context/james-mailbox-jpa-context.xml
james/app/trunk/src/main/config/james/context/james-mailbox-maildir-context.xml
james/app/trunk/src/main/config/james/context/james-mailbox-memory-context.xml
james/app/trunk/src/main/config/james/context/james-server-context.xml
Modified:
james/app/trunk/src/main/config/james/context/james-mailbox-jcr-context.xml
URL:
http://svn.apache.org/viewvc/james/app/trunk/src/main/config/james/context/james-mailbox-jcr-context.xml?rev=1142484&r1=1142483&r2=1142484&view=diff
==============================================================================
--- james/app/trunk/src/main/config/james/context/james-mailbox-jcr-context.xml
(original)
+++ james/app/trunk/src/main/config/james/context/james-mailbox-jcr-context.xml
Sun Jul 3 19:19:25 2011
@@ -26,28 +26,39 @@
<!--
Mailbox JCR
-->
+ <bean id="jcr-locker"
class="org.apache.james.mailbox.store.JVMMailboxPathLocker"/>
<bean id="jcr-mailboxmanager"
class="org.apache.james.mailbox.jcr.JCRMailboxManager" init-method="init">
<constructor-arg index="0" ref="jcr-sessionMapperFactory"/>
<constructor-arg index="1" ref="authenticator"/>
- <constructor-arg index="2" ref="jcr-uidProvider"/>
- <constructor-arg index="3" ref="locker"/>
+ <constructor-arg index="2" ref="jcr-locker"/>
</bean>
<bean id ="jcr-subscriptionManager"
class="org.apache.james.mailbox.jcr.JCRSubscriptionManager">
<constructor-arg index="0" ref="jcr-sessionMapperFactory"/>
</bean>
<bean id="jcr-sessionMapperFactory"
class="org.apache.james.mailbox.jcr.JCRMailboxSessionMapperFactory">
<constructor-arg index="0" ref="jcr-sessionJcrRepository"/>
+ <constructor-arg index="1" ref="jpa-uidProvider"/>
+ <constructor-arg index="2" ref="jpa-modSeqProvider"/>
</bean>
- <bean id="jcr-uidProvider"
class="org.apache.james.mailbox.jcr.mail.JCRCachingUidProvider">
- <constructor-arg index="0" ref="jcr-sessionJcrRepository"/>
- </bean>
+
<bean id ="jcr-sessionJcrRepository"
class="org.apache.james.mailbox.jcr.GlobalMailboxSessionJCRRepository"
depends-on="imapCndLoader">
<constructor-arg index="0" ref="jcrRepository"/>
<constructor-arg index="1" value="james"/>
<constructor-arg index="2" value="james"/>
<constructor-arg index="3" value="james"/>
</bean>
+
+ <bean id="jcr-uidProvider"
class="org.apache.james.mailbox.jcr.mail.JCRUidProvider">
+ <constructor-arg index="0" ref="jcr-locker"/>
+ <constructor-arg index="1" ref="jcr-sessionJcrRepository"/>
+ </bean>
+
+ <bean id="jcr-modSeqProvider"
class="org.apache.james.mailbox.jcr.mail.JCRModSeqProvider">
+ <constructor-arg index="0" ref="jcr-locker"/>
+ <constructor-arg index="1" ref="jcr-sessionJcrRepository"/>
+ </bean>
+
<bean id="jcrRepository" class="org.apache.jackrabbit.core.RepositoryImpl"
destroy-method="shutdown">
<constructor-arg index="0" ref="config" />
</bean>
Modified:
james/app/trunk/src/main/config/james/context/james-mailbox-jpa-context.xml
URL:
http://svn.apache.org/viewvc/james/app/trunk/src/main/config/james/context/james-mailbox-jpa-context.xml?rev=1142484&r1=1142483&r2=1142484&view=diff
==============================================================================
--- james/app/trunk/src/main/config/james/context/james-mailbox-jpa-context.xml
(original)
+++ james/app/trunk/src/main/config/james/context/james-mailbox-jpa-context.xml
Sun Jul 3 19:19:25 2011
@@ -22,26 +22,34 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
-
- <!--
+ <!--
Mailbox JPA
-->
-
+
+ <bean id="jpa-locker"
class="org.apache.james.mailbox.store.JVMMailboxPathLocker"/>
+
<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-uidProvider"/>
- <constructor-arg index="3" ref="locker"/>
- <constructor-arg index="4" value="${openjpa.streaming}"/>
+ <constructor-arg index="2" ref="jpa-locker"/>
+ <constructor-arg index="3" value="false"/>
</bean>
<bean id ="jpa-subscriptionManager"
class="org.apache.james.mailbox.jpa.JPASubscriptionManager">
<constructor-arg index="0" ref="jpa-sessionMapperFactory"/>
</bean>
<bean id="jpa-sessionMapperFactory"
class="org.apache.james.mailbox.jpa.JPAMailboxSessionMapperFactory">
<constructor-arg index="0" ref="entityManagerFactory"/>
+ <constructor-arg index="1" ref="jpa-uidProvider"/>
+ <constructor-arg index="2" ref="jpa-modSeqProvider"/>
</bean>
- <bean id="jpa-uidProvider"
class="org.apache.james.mailbox.jpa.mail.JPACachingUidProvider">
- <constructor-arg index="0" ref="entityManagerFactory"/>
+ <bean id="jpa-uidProvider"
class="org.apache.james.mailbox.jpa.mail.JPAUidProvider">
+ <constructor-arg index="0" ref="jpa-locker"/>
+ <constructor-arg index="1" ref="entityManagerFactory"/>
+ </bean>
+
+ <bean id="jpa-modSeqProvider"
class="org.apache.james.mailbox.jpa.mail.JPAModSeqProvider">
+ <constructor-arg index="0" ref="jpa-locker"/>
+ <constructor-arg index="1" ref="entityManagerFactory"/>
</bean>
</beans>
Modified:
james/app/trunk/src/main/config/james/context/james-mailbox-maildir-context.xml
URL:
http://svn.apache.org/viewvc/james/app/trunk/src/main/config/james/context/james-mailbox-maildir-context.xml?rev=1142484&r1=1142483&r2=1142484&view=diff
==============================================================================
---
james/app/trunk/src/main/config/james/context/james-mailbox-maildir-context.xml
(original)
+++
james/app/trunk/src/main/config/james/context/james-mailbox-maildir-context.xml
Sun Jul 3 19:19:25 2011
@@ -23,26 +23,31 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
+
<!--
Mailbox Maildir
-->
<!-- WARNING: Maildir does only work on UNIX like operation systems -->
-
- <bean id="maildir-mailboxmanager"
class="org.apache.james.mailbox.maildir.MaildirMailboxManager"
init-method="init">
+ <bean id="maildir-locker"
class="org.apache.james.mailbox.store.JVMMailboxPathLocker"/>
+ <bean id="maildir-mailboxmanager"
class="org.apache.james.mailbox.store.StoreMailboxManager" init-method="init">
<constructor-arg index="0" ref="maildir-sessionMapperFactory"/>
<constructor-arg index="1" ref="authenticator"/>
- <constructor-arg index="2" ref="maildir-uidProvider"/>
+ <constructor-arg index="2" ref="maildir-locker"/>
</bean>
- <bean id ="maildir-subscriptionManager"
class="org.apache.james.mailbox.maildir.MaildirSubscriptionManager">
+ <bean id ="maildir-subscriptionManager"
class="org.apache.james.mailbox.store.StoreSubscriptionManager">
+
<constructor-arg index="0" ref="maildir-sessionMapperFactory"/>
</bean>
<bean id="maildir-sessionMapperFactory"
class="org.apache.james.mailbox.maildir.MaildirMailboxSessionMapperFactory">
<constructor-arg index="0" ref="maildirStore"/>
</bean>
- <bean id="maildirStore" name="maildir-uidProvider"
class="org.apache.james.adapter.mailbox.maildir.MaildirStoreUtil"
factory-method="create">
+ <bean id="maildirStore"
class="org.apache.james.adapter.mailbox.maildir.MaildirStoreUtil"
factory-method="create">
<constructor-arg index="0" ref="filesystem"/>
<constructor-arg index="1" ref="usersrepository"/>
<constructor-arg index="2" value="file://var/store/maildir/"/>
+ <constructor-arg index="3" ref="maildir-locker"/>
</bean>
+
+
</beans>
Modified:
james/app/trunk/src/main/config/james/context/james-mailbox-memory-context.xml
URL:
http://svn.apache.org/viewvc/james/app/trunk/src/main/config/james/context/james-mailbox-memory-context.xml?rev=1142484&r1=1142483&r2=1142484&view=diff
==============================================================================
---
james/app/trunk/src/main/config/james/context/james-mailbox-memory-context.xml
(original)
+++
james/app/trunk/src/main/config/james/context/james-mailbox-memory-context.xml
Sun Jul 3 19:19:25 2011
@@ -23,21 +23,20 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
- <!--
+ <!--
Mailbox Memory
-->
<!-- WARNING: Memory does not persist the mailbox. -->
<!-- Information will be lost after server restart. -->
- <bean id="memory-mailboxmanager"
class="org.apache.james.mailbox.inmemory.InMemoryMailboxManager"
init-method="init">
+ <bean id="memory-mailboxmanager"
class="org.apache.james.mailbox.store.StoreMailboxManager" init-method="init">
<constructor-arg index="0" ref="memory-sessionMapperFactory"/>
<constructor-arg index="1" ref="authenticator"/>
- <constructor-arg index="2" ref="memory-uidProvider"/>
</bean>
- <bean id ="memory-subscriptionManager"
class="org.apache.james.mailbox.inmemory.InMemorySubscriptionManager">
+ <bean id ="memory-subscriptionManager"
class="org.apache.james.mailbox.store.StoreSubscriptionManager">
<constructor-arg index="0" ref="memory-sessionMapperFactory"/>
</bean>
<bean id="memory-sessionMapperFactory"
class="org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory" />
- <bean id="memory-uidProvider"
class="org.apache.james.mailbox.inmemory.mail.InMemoryCachingUidProvider" />
+
</beans>
Modified: james/app/trunk/src/main/config/james/context/james-server-context.xml
URL:
http://svn.apache.org/viewvc/james/app/trunk/src/main/config/james/context/james-server-context.xml?rev=1142484&r1=1142483&r2=1142484&view=diff
==============================================================================
--- james/app/trunk/src/main/config/james/context/james-server-context.xml
(original)
+++ james/app/trunk/src/main/config/james/context/james-server-context.xml Sun
Jul 3 19:19:25 2011
@@ -59,7 +59,7 @@
Configuration "Bean-Factory-Post-Processor"
responsible to register beans from James specific configuration files
-->
- <bean
class="org.apache.james.container.spring.lifecycle.ConfigurationBeanFactoryPostProcessor">
+ <bean
class="org.apache.james.container.spring.bean.factorypostprocessor.ConfigurationBeanFactoryPostProcessor">
<property name="beans">
<map>
<!-- User Repository-->
@@ -104,7 +104,7 @@
<property name="configurationProvider" ref="configurationprovider" />
<property name="order" value="1" />
</bean>
- <bean id="configurationprovider"
class="org.apache.james.container.spring.lifeycle.ConfigurationProviderImpl">
+ <bean id="configurationprovider"
class="org.apache.james.container.spring.lifecycle.ConfigurationProviderImpl">
<property name="configurationMappings">
<map>
<entry key="mailprocessor" value="mailetcontainer.processors"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
