package org.apache.velocity.tools.config;

/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
 *
 *   http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied.  See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */

import java.io.InputStream;
import java.io.IOException;
import org.xml.sax.SAXException;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.RuleSet;

/**
 * 
 *
 * @author Nathan Bubna
 * @version $Id: XmlFactoryConfiguration.java 511959 2007-02-26 19:24:39Z nbubna $
 */
public class XmlFactoryConfiguration extends FileFactoryConfiguration
{
    private RuleSet ruleSet;
    private boolean supportOldXml;

    public XmlFactoryConfiguration()
    {
        this(false);
    }

    public XmlFactoryConfiguration(boolean supportOldConfig)
    {
        setRuleSet(new XmlFactoryConfigurationRuleSet());
        this.supportOldXml = supportOldConfig;
    }

    /**
     * Sets the {@link RuleSet} this loader will use to
     * digest the xml toolbox.
     */
    public void setRuleSet(RuleSet rules)
    {
        this.ruleSet = rules;
    }

    /**
     * <p>Retrieves the rule set Digester should use to parse and load
     * the toolbox for this manager.</p>
     */
    public RuleSet getRuleSet()
    {
        return ruleSet;
    }


    /**
     * <p>Reads an XML document from an {@link InputStream}
     * and uses it to configure this {@link FactoryConfiguration}.</p>
     * 
     * @param input the InputStream to read from
     */
    public void read(InputStream input) throws IOException
    {
        Digester digester = new Digester();
        digester.setValidating(false);
        digester.setUseContextClassLoader(true);
        digester.push(this);
        digester.addRuleSet(getRuleSet());
        if (supportOldXml)
        {
            digester.addRuleSet(new OldXmlFactoryConfigurationRuleSet());
        }
        try
        {
            digester.parse(input);
        }
        catch (SAXException saxe)
        {
            throw new RuntimeException("InputStream could not be parsed", saxe);
        }
    }

}

@@ -2668,39 +2668,56 @@
 on(%22
-InputStream could not be parsed
+There was an error while parsing the InputStream
 %22, s

use a less misleading message for SAXExceptions during digestion