Author: eric
Date: Mon Feb 20 11:14:47 2012
New Revision: 1291197
URL: http://svn.apache.org/viewvc?rev=1291197&view=rev
Log:
More attempts to make the system configuration easily accessible and also
specific to james/mailbox (MAILBOX-166)
Added:
james/mailbox/trunk/jcr/src/main/resources/mailbox-jcr.cnd
- copied unchanged from r1291153,
james/mailbox/trunk/jcr/src/main/resources/org/apache/james/mailbox/jcr/imap.cnd
james/mailbox/trunk/spring/src/main/resources/james-database.properties
- copied unchanged from r1291190,
james/mailbox/trunk/spring/src/main/resources/database.properties
james/mailbox/trunk/spring/src/main/resources/mailbox-jcr.cnd
- copied unchanged from r1291153,
james/mailbox/trunk/spring/src/main/resources/org/apache/james/mailbox/jcr/imap.cnd
james/mailbox/trunk/spring/src/main/resources/mailbox-maildir.properties
- copied unchanged from r1291190,
james/mailbox/trunk/spring/src/main/resources/maildir.properties
Removed:
james/mailbox/trunk/jcr/src/main/resources/org/apache/james/mailbox/jcr/imap.cnd
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/jcr-repository.xml
james/mailbox/trunk/spring/src/main/resources/database.properties
james/mailbox/trunk/spring/src/main/resources/maildir.properties
james/mailbox/trunk/spring/src/main/resources/org/apache/james/mailbox/jcr/imap.cnd
Modified:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRUtils.java
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/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRUtils.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRUtils.java?rev=1291197&r1=1291196&r2=1291197&view=diff
==============================================================================
---
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRUtils.java
(original)
+++
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRUtils.java
Mon Feb 20 11:14:47 2012
@@ -70,7 +70,7 @@ public class JCRUtils implements JCRImap
public static void registerCnd(Session session) {
// Register the custom node types defined in the CND file
InputStream is = Thread.currentThread().getContextClassLoader()
-
.getResourceAsStream("org/apache/james/mailbox/jcr/imap.cnd");
+ .getResourceAsStream("mailbox-jcr.cnd");
try {
CndImporter.registerNodeTypes(new InputStreamReader(is), session);
} catch (Exception e) {
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=1291197&r1=1291196&r2=1291197&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 11:14:47 2012
@@ -61,7 +61,7 @@
<bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="ignoreUnresolvablePlaceholders" value="true"/>
- <property name ="location" value="classpath:database.properties"/>
+ <property name ="location"
value="classpath:james-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=1291197&r1=1291196&r2=1291197&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 11:14:47 2012
@@ -30,7 +30,7 @@
<bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="ignoreUnresolvablePlaceholders" value="true"/>
- <property name ="location" value="classpath:maildir.properties"/>
+ <property name ="location"
value="classpath:mailbox-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]
