Author: berndf
Date: Thu Sep 20 12:37:51 2007
New Revision: 577891
URL: http://svn.apache.org/viewvc?rev=577891&view=rev
Log:
remove duplicated sql file checks in configure(), improve the centralized one.
defers schema checks to FileSystem implementations.
see JAMES-803. thanks to Zsombor.
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/context/AvalonContextUtilities.java
james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
james/server/trunk/core-library/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
james/server/trunk/core-library/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/context/AvalonContextUtilities.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/context/AvalonContextUtilities.java?rev=577891&r1=577890&r2=577891&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/context/AvalonContextUtilities.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/context/AvalonContextUtilities.java
Thu Sep 20 12:37:51 2007
@@ -69,7 +69,7 @@
}
String internalFileURL = fileURL.trim();
if (!(internalFileURL.startsWith(filePrefix))) {
- throw new IllegalArgumentException("The fileURL argument to
getFile doesn't start with the required file prefix - " + filePrefix);
+ throw new IllegalArgumentException("file URL '" + fileURL + "' is
missing required prefix '" + filePrefix + "'");
}
String fileName = fileURL.substring(filePrefixLength);
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.java?rev=577891&r1=577890&r2=577891&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.java
Thu Sep 20 12:37:51 2007
@@ -130,10 +130,6 @@
}
sqlFileName = arg0.getChild("sqlFile").getValue();
- if (!sqlFileName.startsWith("file://")) {
- throw new ConfigurationException
- ("Malformed sqlFile - Must be of the format
'file://<filename>'.");
- }
Configuration autoConf = arg0.getChild("autodetect");
if (autoConf != null) {
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java?rev=577891&r1=577890&r2=577891&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
Thu Sep 20 12:37:51 2007
@@ -237,10 +237,6 @@
String filestore = conf.getChild("filestore").getValue(null);
sqlFileName = conf.getChild("sqlFile").getValue();
- if (!sqlFileName.startsWith("file://")) {
- throw new ConfigurationException
- ("Malformed sqlFile - Must be of the format
'file://<filename>'.");
- }
try {
if (filestore != null) {
//prepare Configurations for stream repositories
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java?rev=577891&r1=577890&r2=577891&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
Thu Sep 20 12:37:51 2007
@@ -336,10 +336,6 @@
// Get the SQL file location
m_sqlFileName = configuration.getChild("sqlFile", true).getValue();
- if (!m_sqlFileName.startsWith("file://")) {
- throw new ConfigurationException(
- "Malformed sqlFile - Must be of the format
\"file://<filename>\".");
- }
// Get other sql parameters from the configuration object,
// if any.
Modified:
james/server/trunk/core-library/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java?rev=577891&r1=577890&r2=577891&view=diff
==============================================================================
---
james/server/trunk/core-library/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
(original)
+++
james/server/trunk/core-library/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
Thu Sep 20 12:37:51 2007
@@ -141,10 +141,6 @@
}
sqlFileName = arg0.getChild("sqlFile").getValue();
- if (!sqlFileName.startsWith("file://")) {
- throw new ConfigurationException
- ("Malformed sqlFile - Must be of the format
'file://<filename>'.");
- }
Configuration autoConf = arg0.getChild("autodetect");
if (autoConf != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
