bodewig 2003/10/24 02:00:29
Modified: docs/manual Tag: ANT_16_BRANCH tasksoverview.html
docs/manual/CoreTasks Tag: ANT_16_BRANCH subant.html
xmlproperty.html
docs/manual/CoreTypes Tag: ANT_16_BRANCH zipfileset.html
src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
AntClassLoader.java
src/main/org/apache/tools/ant/types/resolver Tag:
ANT_16_BRANCH ApacheCatalogResolver.java
Log:
Merge from HEAD
Revision Changes Path
No revision
No revision
1.22.2.4 +1 -1 ant/docs/manual/tasksoverview.html
Index: tasksoverview.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/tasksoverview.html,v
retrieving revision 1.22.2.3
retrieving revision 1.22.2.4
diff -u -r1.22.2.3 -r1.22.2.4
--- tasksoverview.html 14 Oct 2003 10:52:07 -0000 1.22.2.3
+++ tasksoverview.html 24 Oct 2003 09:00:28 -0000 1.22.2.4
@@ -1049,7 +1049,7 @@
<tr valign="top">
<td nowrap><a href="CoreTasks/xmlproperty.html">XmlProperty</a></td>
- <td><p>Loads property values from a valid XML file.</p></td>
+ <td><p>Loads property values from a well-formed XML file.</p></td>
</tr>
</table>
No revision
No revision
1.7.2.3 +1 -1 ant/docs/manual/CoreTasks/subant.html
Index: subant.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/subant.html,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- subant.html 9 Oct 2003 21:01:07 -0000 1.7.2.2
+++ subant.html 24 Oct 2003 09:00:29 -0000 1.7.2.3
@@ -51,7 +51,7 @@
of ant for bulk project execution.
<strong>This task must no be used outside of a
- <code>target</code> if it invoces the same build file it is
+ <code>target</code> if it invokes the same build file it is
part of.</strong>
</p>
1.4.2.2 +6 -7 ant/docs/manual/CoreTasks/xmlproperty.html
Index: xmlproperty.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/xmlproperty.html,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- xmlproperty.html 9 Oct 2003 21:01:07 -0000 1.4.2.1
+++ xmlproperty.html 24 Oct 2003 09:00:29 -0000 1.4.2.2
@@ -9,7 +9,7 @@
<h2><a name="xmlproperty">XmlProperty</a></h2>
<h3>Description</h3>
<p>
-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:
<pre>
<root>
<properties>
@@ -17,7 +17,7 @@
</properties>
</root>
</pre>
-is roughly equivalent to this java property file:
+is roughly equivalent to this Java property file:
<pre>
root.properties.foo = bar
</pre>
@@ -26,7 +26,7 @@
By default, this load
does <em>no</em> processing of the input. In particular, unlike the
<a href="property.html">Property task</a>, property references
-(i.e., ${foo}) are not resolved.
+(i.e., <samp>${foo}</samp>) are not resolved.
<p>
<a name="semanticAttributes">
<h3>Semantic Attributes</h3>
@@ -99,7 +99,7 @@
</tr>
<tr>
<td valign="top">validate</td>
- <td valign="top">Validate the input file.</td>
+ <td valign="top">Validate the input file (e.g. by a DTD). Otherwise the
XML must only be well-formed.</td>
<td valign="top" align="center">No, default is <i>false</i>.</td>
</tr>
<tr>
@@ -251,11 +251,10 @@
</classpath>
</pre>
-<hr/>
+<hr>
-<p align="center">Copyright © 2002 Apache Software Foundation. All
rights
+<p align="center">Copyright © 2002-2003 Apache Software Foundation. All
rights
Reserved.</p>
</body>
</html>
-
No revision
No revision
1.2.2.2 +1 -1 ant/docs/manual/CoreTypes/zipfileset.html
Index: zipfileset.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTypes/zipfileset.html,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- zipfileset.html 9 Oct 2003 21:01:10 -0000 1.2.2.1
+++ zipfileset.html 24 Oct 2003 09:00:29 -0000 1.2.2.2
@@ -22,7 +22,7 @@
</li>
</ul>
<p><code><zipfileset></code> supports all attributes of <code><<a
-
href="file:///C:/dev/gnu/ant/docs/manual/CoreTypes/fileset.html">fileset</a>></code>
+ href="fileset.html">fileset</a>></code>
in addition to those listed below.<br>
</p>
<p>Since Ant 1.6, a zipfileset can be defined with the <span
No revision
No revision
1.76.2.1 +1 -1 ant/src/main/org/apache/tools/ant/AntClassLoader.java
Index: AntClassLoader.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/AntClassLoader.java,v
retrieving revision 1.76
retrieving revision 1.76.2.1
diff -u -r1.76 -r1.76.2.1
--- AntClassLoader.java 9 Sep 2003 16:52:03 -0000 1.76
+++ AntClassLoader.java 24 Oct 2003 09:00:29 -0000 1.76.2.1
@@ -80,7 +80,7 @@
* class will then use this loader rather than the system class loader.
*
* @author Conor MacNeill
- * @author <a href="mailto:[EMAIL PROTECTED]">Jesse Glick</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Jesse Glick</a>
* @author Magesh Umasankar
*/
public class AntClassLoader extends ClassLoader implements BuildListener {
No revision
No revision
1.12.2.1 +8 -3
ant/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java
Index: ApacheCatalogResolver.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- ApacheCatalogResolver.java 21 Sep 2003 20:20:02 -0000 1.12
+++ ApacheCatalogResolver.java 24 Oct 2003 09:00:29 -0000 1.12.2.1
@@ -64,6 +64,7 @@
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 @@
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 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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
