diff --git a/proposal/myrmidon/lib/avalon-framework-20011126.jar b/proposal/myrmidon/lib/avalon-framework-20011209.jar similarity index 58% rename from proposal/myrmidon/lib/avalon-framework-20011126.jar rename to proposal/myrmidon/lib/avalon-framework-20011209.jar index 12fa2f665..ba9ce7d5f 100644 Binary files a/proposal/myrmidon/lib/avalon-framework-20011126.jar and b/proposal/myrmidon/lib/avalon-framework-20011209.jar differ diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java index 83733c7f1..632538552 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java @@ -20,7 +20,7 @@ import org.apache.avalon.excalibur.util.StringUtil; import org.apache.avalon.framework.ExceptionUtil; import org.apache.avalon.framework.configuration.Configuration; 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.parameters.Parameters; import org.apache.log.Logger; @@ -76,7 +76,7 @@ public class DefaultProjectBuilder return result; } - final ClassicSAXConfigurationHandler handler = new ClassicSAXConfigurationHandler(); + final SAXConfigurationHandler handler = new SAXConfigurationHandler(); process( systemID, handler ); @@ -93,7 +93,7 @@ public class DefaultProjectBuilder } protected void process( final URL systemID, - final ClassicSAXConfigurationHandler handler ) + final SAXConfigurationHandler handler ) throws Exception { final SAXParserFactory saxParserFactory = SAXParserFactory.newInstance(); diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java index 610108104..51cdd6a71 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java @@ -28,7 +28,7 @@ import org.apache.avalon.framework.activity.Initializable; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; 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.ConfigurationException; import org.apache.avalon.framework.logger.AbstractLogEnabled; @@ -89,7 +89,7 @@ public class DefaultDeployer final XMLReader parser = saxParser.getXMLReader(); //parser.setFeature( "http://xml.org/sax/features/namespace-prefixes", false ); - final ClassicSAXConfigurationHandler handler = new ClassicSAXConfigurationHandler(); + final SAXConfigurationHandler handler = new SAXConfigurationHandler(); parser.setContentHandler( handler ); parser.setErrorHandler( handler );