Author: norman
Date: Wed Oct 28 18:25:07 2009
New Revision: 830710
URL: http://svn.apache.org/viewvc?rev=830710&view=rev
Log:
fix configuration stuff
Modified:
james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java
james/server/trunk/core-function/src/main/java/org/apache/james/domain/XMLDomainList.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/GuiceMailStore.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java
james/server/trunk/core-function/src/test/java/org/apache/james/domain/XMLDomainListTest.java
james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
Modified:
james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java?rev=830710&r1=830709&r2=830710&view=diff
==============================================================================
---
james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java
(original)
+++
james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java
Wed Oct 28 18:25:07 2009
@@ -169,7 +169,7 @@
setAsDNSJavaDefault = configuration.getBoolean( "setAsDNSJavaDefault"
,true );
// Get the DNS servers that this service will use for lookups
- final List<String> serversConfigurations = configuration.getList(
"servers/server" );
+ final List<String> serversConfigurations = configuration.getList(
"servers.server" );
for ( int i = 0; i < serversConfigurations.size(); i++ ) {
@@ -177,7 +177,7 @@
}
// Get the DNS servers that this service will use for lookups
- final List<String> searchPathsConfiguration = configuration.getList(
"searchpaths/searchpath" );
+ final List<String> searchPathsConfiguration = configuration.getList(
"searchpaths.searchpath" );
for ( int i = 0; i < searchPathsConfiguration.size(); i++ ) {
try {
Modified:
james/server/trunk/core-function/src/main/java/org/apache/james/domain/XMLDomainList.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/domain/XMLDomainList.java?rev=830710&r1=830709&r2=830710&view=diff
==============================================================================
---
james/server/trunk/core-function/src/main/java/org/apache/james/domain/XMLDomainList.java
(original)
+++
james/server/trunk/core-function/src/main/java/org/apache/james/domain/XMLDomainList.java
Wed Oct 28 18:25:07 2009
@@ -56,7 +56,7 @@
@SuppressWarnings("unchecked")
protected void configure() throws ConfigurationException {
- List<String> serverNameConfs = configuration.getList(
"domainnames/domainname" );
+ List<String> serverNameConfs = configuration.getList(
"domainnames.domainname" );
for ( int i = 0; i < serverNameConfs.size(); i++ ) {
addDomainInternal( serverNameConfs.get(i));
}
Modified:
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/GuiceMailStore.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/GuiceMailStore.java?rev=830710&r1=830709&r2=830710&view=diff
==============================================================================
---
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/GuiceMailStore.java
(original)
+++
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/GuiceMailStore.java
Wed Oct 28 18:25:07 2009
@@ -155,10 +155,12 @@
String protocol = protocols.get(i);
HierarchicalConfiguration defConf = null;
- if (repConf.containsKey("config")) {
+
+ if (repConf.getKeys("config").hasNext()) {
// Get the default configuration for these protocol/type
combinations.
defConf = repConf.configurationAt("config");
}
+
for ( int j = 0; j < types.size(); j++ )
{
Modified:
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java?rev=830710&r1=830709&r2=830710&view=diff
==============================================================================
---
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
(original)
+++
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
Wed Oct 28 18:25:07 2009
@@ -217,8 +217,9 @@
inMemorySizeLimit = configuration.getInt("inMemorySizeLimit",
409600000);
- String filestore = configuration.getString("config.filestore", null);
- sqlFileName = configuration.getString("config.sqlFile");
+ getLogger().info(ConfigurationUtils.toString(configuration));
+ String filestore = configuration.getString("filestore", null);
+ sqlFileName = configuration.getString("sqlFile");
try {
if (filestore != null) {
Modified:
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java?rev=830710&r1=830709&r2=830710&view=diff
==============================================================================
---
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java
(original)
+++
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java
Wed Oct 28 18:25:07 2009
@@ -195,7 +195,7 @@
+ destination, e);
}
- String checkType = conf.getString("@type");
+ String checkType = conf.getString("[...@type]");
if (!checkType.equals(TYPE)) {
String exceptionString = "Attempt to configure
JavaMailStoreMailRepository as "
+ checkType;
Modified:
james/server/trunk/core-function/src/test/java/org/apache/james/domain/XMLDomainListTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-function/src/test/java/org/apache/james/domain/XMLDomainListTest.java?rev=830710&r1=830709&r2=830710&view=diff
==============================================================================
---
james/server/trunk/core-function/src/test/java/org/apache/james/domain/XMLDomainListTest.java
(original)
+++
james/server/trunk/core-function/src/test/java/org/apache/james/domain/XMLDomainListTest.java
Wed Oct 28 18:25:07 2009
@@ -43,7 +43,7 @@
configuration.addProperty("autodetect", auto);
configuration.addProperty("autodetectIP", autoIP);
for (int i= 0; i< names.size(); i++) {
- configuration.addProperty("domainnames/domainname",
names.get(i).toString());
+ configuration.addProperty("domainnames.domainname",
names.get(i).toString());
}
return configuration;
}
Modified:
james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java?rev=830710&r1=830709&r2=830710&view=diff
==============================================================================
---
james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
(original)
+++
james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
Wed Oct 28 18:25:07 2009
@@ -55,7 +55,7 @@
DefaultConfigurationBuilder defaultConfiguration = new
DefaultConfigurationBuilder();
defaultConfiguration.addProperty("[...@destinationurl]","db://maildb/mr/testrepo");
-
defaultConfiguration.addProperty("config.sqlFile","file://conf/sqlResources.xml");
+
defaultConfiguration.addProperty("sqlFile","file://conf/sqlResources.xml");
defaultConfiguration.addProperty("[...@type]","MAIL");
mr.setFileSystem(fs);
mr.setStore(mockStore);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
