diff --git a/docs/manual/CoreTypes/xmlcatalog.html b/docs/manual/CoreTypes/xmlcatalog.html index e57ee21bf..7581dd632 100644 --- a/docs/manual/CoreTypes/xmlcatalog.html +++ b/docs/manual/CoreTypes/xmlcatalog.html @@ -60,38 +60,38 @@ tasks, e.g. XML Validation and XSLT Transformation. The XML Validate task uses XMLCatalogs for entity resolution. The XSLT Transformation task uses XMLCatalogs for both entity and URI resolution.

-

XMLCatalogs are specified as either a reference to another XMLCatalog, -defined -previously in a build file, or as a list of dtd or -entity locations. In addition, external catalog files -may be specified in catalogfiles filesets, but they will -be ignored unless the resolver library from xml-commons is available -in the system classpath. 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. A separate classpath for -entity resolution may be specified inline via nested -classpath elements; otherwise the system classpath is -used for this as well.

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.

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 XMLCatalogs are specified as either a reference to another +XMLCatalog, defined previously in a build file, or as a list of +dtd or entity locations. In addition, +external catalog files may be specified in catalogfiles +filesets, but they will be ignored unless the resolver library from +xml-commons is available in the system classpath. 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. A separate classpath for entity resolution may be +specified inline via nested classpath elements; otherwise +the system classpath is used for this as well.

+

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.

+

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 plain text format or -XML format. If the xml-commons resolver library is not found in -the classpath, external catalog files, specified in -catalogfiles filesets, will be ignored and a warning will -be logged. In this case, however, processing of inline entries will -proceed normally.

Currently, only <dtd> and +XML format. If the xml-commons resolver library is not found in the +classpath, external catalog files, specified in catalogfiles +filesets, will be ignored and a warning will be logged. In this case, however, +processing of inline entries will proceed normally.

+

Currently, only <dtd> and <entity> elements may be specified inline; these -roughly correspond to OASIS catalog entry types PUBLIC -and URI respectively. By contrast, external catalog -files may use any of the entry types defined in the +roughly correspond to OASIS catalog entry types PUBLIC and +URI respectively. By contrast, external catalog files +may use any of the entry types defined in the +OASIS specification.

Entity/DTD/URI Resolution Algorithm