Author: eric
Date: Tue Sep 6 20:04:07 2011
New Revision: 1165813
URL: http://svn.apache.org/viewvc?rev=1165813&view=rev
Log:
Fix the maildir spring injection via external maildir.properties (MAILBOX-118)
Added:
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/maildir.properties
Modified:
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-maildir.xml
Added:
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/maildir.properties
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/maildir.properties?rev=1165813&view=auto
==============================================================================
---
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/maildir.properties
(added)
+++
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/maildir.properties
Tue Sep 6 20:04:07 2011
@@ -0,0 +1 @@
+maildir.folder=../var/store/maildir/%domain/%user
Modified:
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-maildir.xml
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-maildir.xml?rev=1165813&r1=1165812&r2=1165813&view=diff
==============================================================================
---
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-maildir.xml
(original)
+++
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-maildir.xml
Tue Sep 6 20:04:07 2011
@@ -28,6 +28,11 @@
WARNING: Maildir does only work on UNIX like operation systems
-->
+ <bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="ignoreUnresolvablePlaceholders" value="true"/>
+ <property name ="location"
value="classpath:META-INF/org/apache/james/maildir.properties"/>
+ </bean>
+
<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"/>
@@ -41,7 +46,7 @@
<constructor-arg index="0" ref="maildirStore"/>
</bean>
<bean id="maildirStore"
class="org.apache.james.mailbox.maildir.MaildirStore">
- <constructor-arg index="0" value="file://var/store/maildir/"/>
+ <constructor-arg index="0" value="${maildir.folder}"/>
</bean>
<alias name="jvm-locker" alias="maildir-locker"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
