donaldp 2002/11/16 05:38:03
Modified: configuration/src/java/org/apache/excalibur/configuration/validation
JarvConfigurationValidator.java
Log:
Decouple a little from ConfigurationUtil
Revision Changes Path
1.2 +8 -7
jakarta-avalon-excalibur/configuration/src/java/org/apache/excalibur/configuration/validation/JarvConfigurationValidator.java
Index: JarvConfigurationValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/configuration/src/java/org/apache/excalibur/configuration/validation/JarvConfigurationValidator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JarvConfigurationValidator.java 13 Nov 2002 03:24:51 -0000 1.1
+++ JarvConfigurationValidator.java 16 Nov 2002 13:38:03 -0000 1.2
@@ -54,20 +54,18 @@
*/
package org.apache.excalibur.configuration.validation;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
-import org.apache.excalibur.configuration.ConfigurationUtil;
-
+import org.apache.avalon.framework.logger.Logger;
import org.iso_relax.verifier.Schema;
import org.iso_relax.verifier.Verifier;
-import org.iso_relax.verifier.VerifierHandler;
import org.iso_relax.verifier.VerifierConfigurationException;
+import org.iso_relax.verifier.VerifierHandler;
import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXParseException;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
/**
*
@@ -101,7 +99,10 @@
throws ConfigurationException
{
final ValidationResult result = new ValidationResult();
- final Configuration branched = ConfigurationUtil.branch( configuration,
"root" );
+ final DefaultConfiguration branched =
+ new DefaultConfiguration( "root", configuration.getLocation() );
+ branched.addAll( configuration );
+ branched.makeReadOnly();
try
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
