From b25ce96904f9a4ab9d757913186d23ec1a0ac6c9 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 24 Oct 2003 08:59:58 +0000 Subject: [PATCH] Some typo fixes well formed != valid better debug support in ApacheCatalogResolver PRs: 24059, 24060, 24069, 24070, 24074 Submitted by: Jesse Glick git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275565 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/CoreTasks/subant.html | 2 +- docs/manual/CoreTasks/xmlproperty.html | 13 ++++++------- docs/manual/CoreTypes/zipfileset.html | 2 +- docs/manual/tasksoverview.html | 2 +- src/main/org/apache/tools/ant/AntClassLoader.java | 2 +- .../ant/types/resolver/ApacheCatalogResolver.java | 9 +++++++-- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/docs/manual/CoreTasks/subant.html b/docs/manual/CoreTasks/subant.html index 68aa8861a..36c00ba63 100644 --- a/docs/manual/CoreTasks/subant.html +++ b/docs/manual/CoreTasks/subant.html @@ -50,7 +50,7 @@ of ant for bulk project execution. This task must no be used outside of a - target if it invoces the same build file it is + target if it invokes the same build file it is part of.

diff --git a/docs/manual/CoreTasks/xmlproperty.html b/docs/manual/CoreTasks/xmlproperty.html index 3c337d34b..821f42edf 100644 --- a/docs/manual/CoreTasks/xmlproperty.html +++ b/docs/manual/CoreTasks/xmlproperty.html @@ -8,7 +8,7 @@

XmlProperty

Description

-Loads property values from a valid xml file. This XML property file: +Loads property values from a well-formed xml file. This XML property file: 

   <root>
     <properties>
@@ -16,7 +16,7 @@ Loads property values from a valid xml file.  This XML property file:
     </properties>
   </root>
-is roughly equivalent to this java property file: +is roughly equivalent to this Java property file: 
   root.properties.foo = bar
@@ -25,7 +25,7 @@ is roughly equivalent to this java property file: By default, this load does no processing of the input. In particular, unlike the Property task, property references -(i.e., ${foo}) are not resolved. +(i.e., ${foo}) are not resolved.

Semantic Attributes

@@ -98,7 +98,7 @@ is roughly equivalent to the following fragments in a build.xml file: validate - Validate the input file. + Validate the input file (e.g. by a DTD). Otherwise the XML must only be well-formed. No, default is false. @@ -250,11 +250,10 @@ is equivalent to the following entries in a build file: </classpath> -
+
-

Copyright © 2002 Apache Software Foundation. All rights +

Copyright © 2002-2003 Apache Software Foundation. All rights Reserved.

- diff --git a/docs/manual/CoreTypes/zipfileset.html b/docs/manual/CoreTypes/zipfileset.html index ddc76189f..1a9eeb053 100644 --- a/docs/manual/CoreTypes/zipfileset.html +++ b/docs/manual/CoreTypes/zipfileset.html @@ -21,7 +21,7 @@ is used, the zipfileset is populated with filesystem files found under

<zipfileset> supports all attributes of <fileset> + href="fileset.html">fileset> in addition to those listed below.

Since Ant 1.6, a zipfileset can be defined with the XmlProperty -

Loads property values from a valid XML file.

+

Loads property values from a well-formed XML file.

diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java index dd83d1ba0..6c04d269e 100644 --- a/src/main/org/apache/tools/ant/AntClassLoader.java +++ b/src/main/org/apache/tools/ant/AntClassLoader.java @@ -80,7 +80,7 @@ import org.apache.tools.ant.util.LoaderUtils; * class will then use this loader rather than the system class loader. * * @author Conor MacNeill - * @author Jesse Glick + * @author Jesse Glick * @author Magesh Umasankar */ public class AntClassLoader extends ClassLoader implements BuildListener { diff --git a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java index 0ffcb8268..fca576fa9 100644 --- a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java +++ b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java @@ -64,6 +64,7 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.XMLCatalog; import org.apache.tools.ant.types.ResourceLocation; +import org.apache.xml.resolver.Catalog; import org.apache.xml.resolver.CatalogManager; import org.apache.xml.resolver.tools.CatalogResolver; @@ -124,7 +125,7 @@ public class ApacheCatalogResolver extends CatalogResolver { CatalogManager.getStaticManager().setUseStaticCatalog(false); // debug - // System.setProperty("xml.catalog.verbosity", "4"); + // CatalogManager.getStaticManager().setVerbosity(4); } /** Set the XMLCatalog object to callback. */ @@ -138,7 +139,11 @@ public class ApacheCatalogResolver extends CatalogResolver { */ public void parseCatalog(String file) { - ApacheCatalog catalog = (ApacheCatalog) getCatalog(); + Catalog _catalog = getCatalog(); + if (!(_catalog instanceof ApacheCatalog)) { + throw new BuildException("Wrong catalog type found: " + _catalog.getClass().getName()); + } + ApacheCatalog catalog = (ApacheCatalog) _catalog; // Pass in reference to ourselves so we can be called back. catalog.setResolver(this);