git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270098 13f79535-47bb-0310-9956-ffa450edef68master
@@ -20,7 +20,7 @@ import org.apache.avalon.excalibur.util.StringUtil; | |||||
import org.apache.avalon.framework.ExceptionUtil; | import org.apache.avalon.framework.ExceptionUtil; | ||||
import org.apache.avalon.framework.configuration.Configuration; | import org.apache.avalon.framework.configuration.Configuration; | ||||
import org.apache.avalon.framework.configuration.ConfigurationException; | import org.apache.avalon.framework.configuration.ConfigurationException; | ||||
import org.apache.avalon.framework.configuration.ClassicSAXConfigurationHandler; | |||||
import org.apache.avalon.framework.configuration.SAXConfigurationHandler; | |||||
import org.apache.avalon.framework.logger.AbstractLogEnabled; | import org.apache.avalon.framework.logger.AbstractLogEnabled; | ||||
import org.apache.avalon.framework.parameters.Parameters; | import org.apache.avalon.framework.parameters.Parameters; | ||||
import org.apache.log.Logger; | import org.apache.log.Logger; | ||||
@@ -76,7 +76,7 @@ public class DefaultProjectBuilder | |||||
return result; | return result; | ||||
} | } | ||||
final ClassicSAXConfigurationHandler handler = new ClassicSAXConfigurationHandler(); | |||||
final SAXConfigurationHandler handler = new SAXConfigurationHandler(); | |||||
process( systemID, handler ); | process( systemID, handler ); | ||||
@@ -93,7 +93,7 @@ public class DefaultProjectBuilder | |||||
} | } | ||||
protected void process( final URL systemID, | protected void process( final URL systemID, | ||||
final ClassicSAXConfigurationHandler handler ) | |||||
final SAXConfigurationHandler handler ) | |||||
throws Exception | throws Exception | ||||
{ | { | ||||
final SAXParserFactory saxParserFactory = SAXParserFactory.newInstance(); | final SAXParserFactory saxParserFactory = SAXParserFactory.newInstance(); | ||||
@@ -28,7 +28,7 @@ import org.apache.avalon.framework.activity.Initializable; | |||||
import org.apache.avalon.framework.component.ComponentException; | import org.apache.avalon.framework.component.ComponentException; | ||||
import org.apache.avalon.framework.component.ComponentManager; | import org.apache.avalon.framework.component.ComponentManager; | ||||
import org.apache.avalon.framework.component.Composable; | import org.apache.avalon.framework.component.Composable; | ||||
import org.apache.avalon.framework.configuration.ClassicSAXConfigurationHandler; | |||||
import org.apache.avalon.framework.configuration.SAXConfigurationHandler; | |||||
import org.apache.avalon.framework.configuration.Configuration; | import org.apache.avalon.framework.configuration.Configuration; | ||||
import org.apache.avalon.framework.configuration.ConfigurationException; | import org.apache.avalon.framework.configuration.ConfigurationException; | ||||
import org.apache.avalon.framework.logger.AbstractLogEnabled; | import org.apache.avalon.framework.logger.AbstractLogEnabled; | ||||
@@ -89,7 +89,7 @@ public class DefaultDeployer | |||||
final XMLReader parser = saxParser.getXMLReader(); | final XMLReader parser = saxParser.getXMLReader(); | ||||
//parser.setFeature( "http://xml.org/sax/features/namespace-prefixes", false ); | //parser.setFeature( "http://xml.org/sax/features/namespace-prefixes", false ); | ||||
final ClassicSAXConfigurationHandler handler = new ClassicSAXConfigurationHandler(); | |||||
final SAXConfigurationHandler handler = new SAXConfigurationHandler(); | |||||
parser.setContentHandler( handler ); | parser.setContentHandler( handler ); | ||||
parser.setErrorHandler( handler ); | parser.setErrorHandler( handler ); | ||||