From 1b414dd2d45817cba7fe6773873a0f5ff4fdfcd3 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sat, 8 Dec 2001 23:10:46 +0000 Subject: [PATCH] Revert to original API for ConfigurationHandler. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270098 13f79535-47bb-0310-9956-ffa450edef68 --- ...1126.jar => avalon-framework-20011209.jar} | Bin 48146 -> 46530 bytes .../builder/DefaultProjectBuilder.java | 6 +++--- .../components/deployer/DefaultDeployer.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename proposal/myrmidon/lib/{avalon-framework-20011126.jar => avalon-framework-20011209.jar} (58%) 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 12fa2f665f923d21c0f0b26736471862d6a51b3c..ba9ce7d5f0ce2e7b3289c93e9fa2324ae2521d53 100644 GIT binary patch delta 8891 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�kO}N!@@tQYD zY$cq5;VX%sZ^C<0ZaRM}fgKo2O@|>v2$B9h0R&*#d|(Dr**C{_q1l|^b3?WOh{xGt zAadu(g6NZ@1>$6mK8ReoY9I#ZYJ>PGR|Q1QJWUWo^VC6H$kPFlKVK2V;CxjOXY!Rn zWGYa`LDZV{zZxun!YU5@sJoFNom2SL ziUtqA&18n|1|4P;2efQYi2L`YCMhT{fB>7h&VzNM1E)!s1 zcGGyHg**mgh-_^k|DUmh5~zBlhzpdLVpCst>HWp7Zg+%Q1mfcVOLZHdDVG9U65>{% zuz|3hAw>V~_6`+L&{+isApMi3!8U}q8zNHluP9&BKSkU^d@tSu!=0+gA-QJ2aTO2HRz(1o zx&0I?kQTIo9GXai&C_ec}BTp+HtXBak0L@NZ?hX!Rzd5%JlG>+eyD7X~`-)KP%(nDvM$bwerD zQ-YKOg8C5-dS!;=0v+`?C5<6y%t(-a7lHThbl<<_=$C~kWdLz;Bd-5`ZbyL`mq-40 zWW_a*LvBak&{35CYGiRi7;q3ZCPFm--vf3h=8rQ5@G6E7P-(o$#ki3iVjTBJ9t+5A zBm^^WM$ilKe`v(oLJqQ2P2`a0iT|(wbs`LKZo1KdBTOzypb005`kKBOn0{#_UWkgs zA}+!IRtRyYnF>^<(gQ5bH(y~&&EycCHwcQKSXBWHaX5E9g{6>k?;s&zq+LJ#2f}i+ A8UO$Q delta 10520 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 E0aH?7&Hw-a 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 );