Author: norman
Date: Sun Jan 31 18:51:38 2010
New Revision: 905096
URL: http://svn.apache.org/viewvc?rev=905096&view=rev
Log:
complete split of config.xml (JAMES-539)
Added:
james/server/trunk/spring-deployment/src/main/config/james/spoolrepository.xml
Removed:
james/server/trunk/spring-deployment/src/main/config/james/james-config.xml
Modified:
james/server/trunk/spring-deployment/src/main/config/james/James.xml
james/server/trunk/spring-deployment/src/main/config/james/bayesiananalyzermanagement.xml
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationProvider.java
Modified: james/server/trunk/spring-deployment/src/main/config/james/James.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/James.xml?rev=905096&r1=905095&r2=905096&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/James.xml
(original)
+++ james/server/trunk/spring-deployment/src/main/config/james/James.xml Sun
Jan 31 18:51:38 2010
@@ -18,7 +18,6 @@
under the License.
-->
<James>
-
<!-- CHECKME! -->
<!-- This is the postmaster email address for this mail server. -->
<!-- Set this to the appropriate email address for error reports -->
Modified:
james/server/trunk/spring-deployment/src/main/config/james/bayesiananalyzermanagement.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/bayesiananalyzermanagement.xml?rev=905096&r1=905095&r2=905096&view=diff
==============================================================================
---
james/server/trunk/spring-deployment/src/main/config/james/bayesiananalyzermanagement.xml
(original)
+++
james/server/trunk/spring-deployment/src/main/config/james/bayesiananalyzermanagement.xml
Sun Jan 31 18:51:38 2010
@@ -1,4 +1,4 @@
- <?xml version="1.0"?>
+<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
Added:
james/server/trunk/spring-deployment/src/main/config/james/spoolrepository.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/spoolrepository.xml?rev=905096&view=auto
==============================================================================
---
james/server/trunk/spring-deployment/src/main/config/james/spoolrepository.xml
(added)
+++
james/server/trunk/spring-deployment/src/main/config/james/spoolrepository.xml
Sun Jan 31 18:51:38 2010
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<!-- Spool repository configuration -->
+<!-- The spool repository is the location where incoming mails are temporarily
stored -->
+<!-- before being processed. -->
+<!--
+<spoolrepository destinationURL="file://var/mail/spool/" type="SPOOL"/>
+-->
+
+<!-- Alternative spool repository definition for JDBC use -->
+<!--
+<spoolrepository destinationURL="db://maildb/spool/spool" type="SPOOL"/>
+-->
+
+<!-- Alternative spool repository definition for JDBC use -->
+<!-- Stores message body in file system, rest in database -->
+<!-- TEMPORARY DEFAULT: dbfile using Derby -->
+<spoolrepository destinationURL="dbfile://maildb/spool/spool" type="SPOOL"/>
Modified:
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml?rev=905096&r1=905095&r2=905096&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
(original)
+++ james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
Sun Jan 31 18:51:38 2010
@@ -74,27 +74,18 @@
</property>
</bean>
- <bean id="configurationProvider"
-
class="org.apache.james.container.spring.lifecycle.SpringConfigurationProvider">
- <property name="configurationResource"
value="classpath:james-config.xml" />
- </bean>
-
+ <bean id="configurationProvider"
class="org.apache.james.container.spring.lifecycle.SpringConfigurationProvider"/>
+
<bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name = "location" value="classpath:database.properties"/>
</bean>
- <bean
-
class="org.apache.james.container.spring.lifecycle.LogEnabledBeanPostProcessor">
+ <bean
class="org.apache.james.container.spring.lifecycle.LogEnabledBeanPostProcessor">
<property name="logProvider" ref="logProvider" />
<property name="order" value="0" />
- <property name="mappings">
- <map>
- </map>
- </property>
</bean>
- <bean id="logProvider"
-
class="org.apache.james.container.spring.lifecycle.SpringLogProvider" />
+ <bean id="logProvider"
class="org.apache.james.container.spring.lifecycle.SpringLogProvider" />
<bean id="org.apache.james.LoaderService"
class="org.apache.james.container.spring.lifecycle.JSR250LoaderService">
Modified:
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationProvider.java?rev=905096&r1=905095&r2=905096&view=diff
==============================================================================
---
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationProvider.java
(original)
+++
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationProvider.java
Sun Jan 31 18:51:38 2010
@@ -24,7 +24,6 @@
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.james.container.spring.ConfigurationProvider;
-import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.ResourceLoaderAware;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
@@ -34,15 +33,9 @@
*
*
*/
-public class SpringConfigurationProvider implements ConfigurationProvider,
ResourceLoaderAware, InitializingBean{
+public class SpringConfigurationProvider implements ConfigurationProvider,
ResourceLoaderAware {
private ResourceLoader loader;
- private String configFile;
- private XMLConfiguration config;
-
- public void setConfigurationResource(String configFile) {
- this.configFile = configFile;
- }
/*
* (non-Javadoc)
@@ -58,7 +51,7 @@
throw new ConfigurationException("Unable to read config for
component " + name, e);
}
}
- return config.configurationAt(name);
+ throw new ConfigurationException("Unable to load configuration for
component " + name);
}
@@ -70,21 +63,6 @@
this.loader = loader;
}
-
- public void afterPropertiesSet() throws Exception {
- Resource resource = loader.getResource(configFile);
- if (!resource.exists()) {
- throw new RuntimeException("could not locate configuration file "
- + configFile);
- }
- try {
- config = getConfig(resource);
-
- } catch (Exception e1) {
- throw new RuntimeException("could not open configuration file "
- + configFile, e1);
- }
- }
private XMLConfiguration getConfig(Resource r) throws
ConfigurationException, IOException {
XMLConfiguration config = new XMLConfiguration();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
