donaldp 2002/11/12 17:11:59
Modified: src/java/org/apache/avalon/phoenix/components/configuration/validator
JarvConfigurationValidator.java
Log:
Decouple from ConfigurationUtil
Revision Changes Path
1.8 +6 -3
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/validator/JarvConfigurationValidator.java
Index: JarvConfigurationValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/validator/JarvConfigurationValidator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JarvConfigurationValidator.java 11 Sep 2002 12:44:56 -0000 1.7
+++ JarvConfigurationValidator.java 13 Nov 2002 01:11:59 -0000 1.8
@@ -21,11 +21,11 @@
import org.apache.avalon.framework.configuration.Configurable;
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.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.interfaces.ConfigurationValidator;
import org.apache.avalon.phoenix.interfaces.ConfigurationValidatorMBean;
-import org.apache.excalibur.configuration.ConfigurationUtil;
import org.iso_relax.verifier.Schema;
import org.iso_relax.verifier.Verifier;
import org.iso_relax.verifier.VerifierConfigurationException;
@@ -75,7 +75,8 @@
* </li>
* </ol>
*
- * @see
http://iso-relax.sourceforge.net/apiDoc/org/iso_relax/verifier/VerifierFactory.html#newInstance(java.lang.String)
+ * @see <a
href="http://iso-relax.sourceforge.net/apiDoc/org/iso_relax/verifier/VerifierFactory.html#newInstance(java.lang.String)">
+ *
http://iso-relax.sourceforge.net/apiDoc/org/iso_relax/verifier/VerifierFactory.html#newInstance(java.lang.String)</a>
*/
public void configure( Configuration configuration )
throws ConfigurationException
@@ -180,7 +181,9 @@
throws ConfigurationException
{
final Schema schema = (Schema)m_schemas.get( createKey( application, block
) );
- final Configuration branched = ConfigurationUtil.branch( configuration,
"root" );
+ final DefaultConfiguration branched = new DefaultConfiguration( "root" );
+ branched.addAll( configuration );
+ branched.makeReadOnly();
if( null == schema )
{
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
