You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2002/11/20 11:10:14 UTC
cvs commit: jakarta-ant/src/main/org/apache/tools/ant/types/resolver ApacheCatalog.java ApacheCatalogResolver.java
bodewig 2002/11/20 02:10:13
Modified: . WHATSNEW
docs/manual install.html
docs/manual/CoreTypes xmlcatalog.html
src/main/org/apache/tools/ant/types/resolver
ApacheCatalog.java ApacheCatalogResolver.java
Log:
Good-Bye resolver 1.0.
Revision Changes Path
1.324 +2 -2 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- WHATSNEW 18 Nov 2002 15:47:45 -0000 1.323
+++ WHATSNEW 20 Nov 2002 10:10:13 -0000 1.324
@@ -98,8 +98,8 @@
in the XML file.
* <xmlcatalog> will now support external catalogs according to the
- OASIS "Open Catalog" standard - if resolver.jar from Apache's
- xml-commons is in your CLASSPATH.
+ OASIS "Open Catalog" standard - if resolver.jar (newer than version
+ 1.0) from Apache's xml-commons is in your CLASSPATH.
* Starteam tasks now have support for revision labels and build labels.
Checkouts now have the option of using repository timestamps, instead
1.38 +7 -3 jakarta-ant/docs/manual/install.html
Index: install.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/install.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- install.html 14 Nov 2002 07:48:24 -0000 1.37
+++ install.html 20 Nov 2002 10:10:13 -0000 1.38
@@ -396,10 +396,14 @@
target="_top">http://www.clarkware.com/software/JDepend.html</a></td>
</tr>
<tr>
- <td>resolver.jar</td>
+ <td>resolver.jar <b>after the 1.0 release</b></td>
<td>xmlcatalog datatype <em>only if support for external catalog files is desired</em></td>
- <td><a href="http://xml.apache.org/dist/commons"
- target="_top">http://xml.apache.org/dist/commons</a></td>
+ <td><a href="http://xml.apache.org/dist/commons/"
+ target="_top">http://xml.apache.org/dist/commons</a> for released
+ versions, <a
+ href="http://gump.covalent.net/jars/latest/xml-commons/"
+ target="_top">http://gump.covalent.net/jars/latest/xml-commons/</a>
+ for a nightly snapshot.</td>
</tr>
</table>
<br>
1.4 +22 -19 jakarta-ant/docs/manual/CoreTypes/xmlcatalog.html
Index: xmlcatalog.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTypes/xmlcatalog.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmlcatalog.html 5 Nov 2002 16:33:28 -0000 1.3
+++ xmlcatalog.html 20 Nov 2002 10:10:13 -0000 1.4
@@ -66,29 +66,32 @@
<code>entity</code> locations. In addition, external catalog files
may be specified in <code>catalogfiles</code> filesets, but they will
be ignored unless the resolver library from xml-commons is available
-in the system classpath. A separate classpath for entity resolution
-may be specified inline via nested <code>classpath</code> elements;
-otherwise the system classpath is used for this as well.</p>
-<p>XMLCatalogs can also be nested inside other XMLCatalogs. For
-example, a "superset" XMLCatalog could be made by including several
-nested XMLCatalogs that referred to other, previously defined
-XMLCatalogs.</p>
-<p>Resource locations can be specified either in-line or in
-external catalog file(s), or both. In order to use an external
-catalog file, the xml-commons resolver library ("resolver.jar")
-must be in your path. External catalog files may be either <a
+in the system classpath. <b>Due to backwards incompatible changes in
+the resolver code after the release of resolver 1.0, Ant will not
+support resolver.jar in version 1.0 - we expect a resolver release 1.1
+to happen before Ant 1.6 gets released.</b> A separate classpath for
+entity resolution may be specified inline via nested
+<code>classpath</code> elements; otherwise the system classpath is
+used for this as well.</p> <p>XMLCatalogs can also be nested inside
+other XMLCatalogs. For example, a "superset" XMLCatalog could be made
+by including several nested XMLCatalogs that referred to other,
+previously defined XMLCatalogs.</p> <p>Resource locations can be
+specified either in-line or in external catalog file(s), or both. In
+order to use an external catalog file, the xml-commons resolver
+library ("resolver.jar") must be in your path. External catalog files
+may be either <a
href="http://oasis-open.org/committees/entity/background/9401.html">
plain text format</a> or <a
href="http://www.oasis-open.org/committees/entity/spec-2001-08-06.html">
-XML format</a>. If the xml-commons resolver library is not found in the
-classpath, external catalog files, specified in <code>catalogfiles</code>
-filesets, will be ignored and a warning will be logged. In this case, however,
-processing of inline entries will proceed normally.</p>
-<p>Currently, only <code><dtd></code> and
+XML format</a>. If the xml-commons resolver library is not found in
+the classpath, external catalog files, specified in
+<code>catalogfiles</code> filesets, will be ignored and a warning will
+be logged. In this case, however, processing of inline entries will
+proceed normally.</p> <p>Currently, only <code><dtd></code> and
<code><entity></code> elements may be specified inline; these
-roughly correspond to OASIS catalog entry types <code>PUBLIC</code> and
-<code>URI</code> respectively. By contrast, external catalog files
-may use any of the entry types defined in the
+roughly correspond to OASIS catalog entry types <code>PUBLIC</code>
+and <code>URI</code> respectively. By contrast, external catalog
+files may use any of the entry types defined in the
<a href="http://oasis-open.org/committees/entity/spec-2001-08-06.html">
+OASIS specification</a>.</p>
<h3><a name="ResolverAlgorithm">Entity/DTD/URI Resolution Algorithm</a></h3>
1.4 +5 -3 jakarta-ant/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java
Index: ApacheCatalog.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheCatalog.java 8 Nov 2002 10:27:39 -0000 1.3
+++ ApacheCatalog.java 20 Nov 2002 10:10:13 -0000 1.4
@@ -130,7 +130,8 @@
String systemid = normalizeURI(entry.getEntryArg(1));
if (resolver == null) {
- Debug.message(1, "Internal Error: null ApacheCatalogResolver");
+ catalogManager.debug
+ .message(1, "Internal Error: null ApacheCatalogResolver");
}
else {
resolver.addPublicEntry(publicid, systemid, base);
@@ -142,7 +143,8 @@
String altURI = normalizeURI(entry.getEntryArg(1));
if (resolver == null) {
- Debug.message(1, "Internal Error: null ApacheCatalogResolver");
+ catalogManager.debug
+ .message(1, "Internal Error: null ApacheCatalogResolver");
}
else {
resolver.addURIEntry(uri, altURI, base);
1.4 +4 -4 jakarta-ant/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java
Index: ApacheCatalogResolver.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheCatalogResolver.java 8 Nov 2002 10:27:39 -0000 1.3
+++ ApacheCatalogResolver.java 20 Nov 2002 10:10:13 -0000 1.4
@@ -114,14 +114,14 @@
// file in the ant jarfile with some default property
// settings. See CatalogManager.java for more details.
//
- CatalogManager.ignoreMissingProperties(true);
+ CatalogManager.getStaticManager().setIgnoreMissingProperties(true);
//
// Make sure CatalogResolver instantiates ApacheCatalog,
// rather than a plain Catalog
//
- System.setProperty("xml.catalog.className",
- ApacheCatalog.class.getName());
+ System.getProperties().put("xml.catalog.className",
+ ApacheCatalog.class.getName());
// debug
// System.setProperty("xml.catalog.verbosity", "4");
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>