Author: eric
Date: Mon Feb 20 10:54:21 2012
New Revision: 1291190
URL: http://svn.apache.org/viewvc?rev=1291190&view=rev
Log:
database.properties and maildir.properties are now accessible without
specifying subfolder/packages, simpler to override in the server configuration
(MAILBOX-166)
Added:
james/mailbox/trunk/spring/src/main/resources/database.properties
- copied unchanged from r1291153,
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/database.properties
james/mailbox/trunk/spring/src/main/resources/maildir.properties
- copied unchanged from r1291153,
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/maildir.properties
Removed:
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/database.properties
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-jpa.xml
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-maildir.xml
Modified:
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml?rev=1291190&r1=1291189&r2=1291190&view=diff
==============================================================================
---
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml
(original)
+++
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml
Mon Feb 20 10:54:21 2012
@@ -61,7 +61,7 @@
<bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="ignoreUnresolvablePlaceholders" value="true"/>
- <property name ="location"
value="classpath:META-INF/org/apache/james/database.properties"/>
+ <property name ="location" value="classpath:database.properties"/>
</bean>
<bean id="datasource" class="org.apache.commons.dbcp.BasicDataSource"
destroy-method="close">
<property name="driverClassName" value="${database.driverClassName}" />
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=1291190&r1=1291189&r2=1291190&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
Mon Feb 20 10:54:21 2012
@@ -30,7 +30,7 @@
<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"/>
+ <property name ="location" value="classpath:maildir.properties"/>
</bean>
<bean id="maildir-mailboxmanager"
class="org.apache.james.mailbox.store.StoreMailboxManager" init-method="init">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
