@@ -190,8 +190,11 @@ public class XMLCatalog extends DataType
//-- Methods --------------------------------------------------------------- //-- Methods ---------------------------------------------------------------
/**
* Default constructor
*/
public XMLCatalog() { public XMLCatalog() {
setChecked( false );
setChecked(false);
} }
/** /**
@@ -233,6 +236,8 @@ public class XMLCatalog extends DataType
* is itself a reference to another catalog -- that is, a catalog * is itself a reference to another catalog -- that is, a catalog
* cannot both refer to another <em>and</em> contain elements or * cannot both refer to another <em>and</em> contain elements or
* other attributes. * other attributes.
*
* @return a Path instance to be configured.
*/ */
public Path createClasspath() { public Path createClasspath() {
if (isReference()) { if (isReference()) {
@@ -241,7 +246,7 @@ public class XMLCatalog extends DataType
if (this.classpath == null) { if (this.classpath == null) {
this.classpath = new Path(getProject()); this.classpath = new Path(getProject());
} }
setChecked( false );
setChecked(false);
return this.classpath.createPath(); return this.classpath.createPath();
} }
@@ -250,6 +255,8 @@ public class XMLCatalog extends DataType
* itself a reference to another catalog -- that is, a catalog * itself a reference to another catalog -- that is, a catalog
* cannot both refer to another <em>and</em> contain elements or * cannot both refer to another <em>and</em> contain elements or
* other attributes. * other attributes.
*
* @param classpath the classpath to use to look up entities.
*/ */
public void setClasspath(Path classpath) { public void setClasspath(Path classpath) {
if (isReference()) { if (isReference()) {
@@ -260,7 +267,7 @@ public class XMLCatalog extends DataType
} else { } else {
this.classpath.append(classpath); this.classpath.append(classpath);
} }
setChecked( false );
setChecked(false);
} }
/** /**
@@ -268,13 +275,15 @@ public class XMLCatalog extends DataType
* itself a reference to another catalog -- that is, a catalog * itself a reference to another catalog -- that is, a catalog
* cannot both refer to another <em>and</em> contain elements or * cannot both refer to another <em>and</em> contain elements or
* other attributes. * other attributes.
*
* @param r an Ant reference containing a classpath.
*/ */
public void setClasspathRef(Reference r) { public void setClasspathRef(Reference r) {
if (isReference()) { if (isReference()) {
throw tooManyAttributes(); throw tooManyAttributes();
} }
createClasspath().setRefid(r); createClasspath().setRefid(r);
setChecked( false );
setChecked(false);
} }
/** Creates a nested <code><catalogpath></code> element. /** Creates a nested <code><catalogpath></code> element.
@@ -282,6 +291,7 @@ public class XMLCatalog extends DataType
* catalog -- that is, a catalog cannot both refer to another * catalog -- that is, a catalog cannot both refer to another
* <em>and</em> contain elements or other attributes. * <em>and</em> contain elements or other attributes.
* *
* @return a path to be configured as the catalog path.
* @exception BuildException * @exception BuildException
* if this is a reference and no nested elements are allowed. * if this is a reference and no nested elements are allowed.
*/ */
@@ -292,7 +302,7 @@ public class XMLCatalog extends DataType
if (this.catalogPath == null) { if (this.catalogPath == null) {
this.catalogPath = new Path(getProject()); this.catalogPath = new Path(getProject());
} }
setChecked( false );
setChecked(false);
return this.catalogPath.createPath(); return this.catalogPath.createPath();
} }
@@ -301,13 +311,16 @@ public class XMLCatalog extends DataType
* itself a reference to another catalog -- that is, a catalog * itself a reference to another catalog -- that is, a catalog
* cannot both refer to another <em>and</em> contain elements or * cannot both refer to another <em>and</em> contain elements or
* other attributes. * other attributes.
*
* @param r an Ant reference containing a classpath to be used as
* the catalog path.
*/ */
public void setCatalogPathRef(Reference r) { public void setCatalogPathRef(Reference r) {
if (isReference()) { if (isReference()) {
throw tooManyAttributes(); throw tooManyAttributes();
} }
createCatalogPath().setRefid(r); createCatalogPath().setRefid(r);
setChecked( false );
setChecked(false);
} }
@@ -338,7 +351,7 @@ public class XMLCatalog extends DataType
} }
getElements().addElement(dtd); getElements().addElement(dtd);
setChecked( false );
setChecked(false);
} }
/** /**
@@ -384,7 +397,7 @@ public class XMLCatalog extends DataType
// Append the catalog path of the nested catalog // Append the catalog path of the nested catalog
Path nestedCatalogPath = catalog.getCatalogPath(); Path nestedCatalogPath = catalog.getCatalogPath();
createCatalogPath().append(nestedCatalogPath); createCatalogPath().append(nestedCatalogPath);
setChecked( false );
setChecked(false);
} }
/** /**
@@ -439,8 +452,8 @@ public class XMLCatalog extends DataType
getCatalogResolver().resolveEntity(publicId, systemId); getCatalogResolver().resolveEntity(publicId, systemId);
if (inputSource == null) { if (inputSource == null) {
log("No matching catalog entry found, parser will use: '" +
systemId + "'", Project.MSG_DEBUG);
log("No matching catalog entry found, parser will use: '"
+ systemId + "'", Project.MSG_DEBUG);
} }
return inputSource; return inputSource;
@@ -467,11 +480,11 @@ public class XMLCatalog extends DataType
log("resolve: '" + uri + "' with base: '" + base + "'", Project.MSG_DEBUG); log("resolve: '" + uri + "' with base: '" + base + "'", Project.MSG_DEBUG);
source = (SAXSource)getCatalogResolver().resolve(uri, base);
source = (SAXSource) getCatalogResolver().resolve(uri, base);
if (source == null) { if (source == null) {
log("No matching catalog entry found, parser will use: '" +
href + "'", Project.MSG_DEBUG);
log("No matching catalog entry found, parser will use: '"
+ href + "'", Project.MSG_DEBUG);
// //
// Cannot return a null source, because we have to call // Cannot return a null source, because we have to call
// setEntityResolver (see setEntityResolver javadoc comment) // setEntityResolver (see setEntityResolver javadoc comment)
@@ -481,14 +494,12 @@ public class XMLCatalog extends DataType
try { try {
if (base == null) { if (base == null) {
baseURL = fileUtils.getFileURL(getProject().getBaseDir()); baseURL = fileUtils.getFileURL(getProject().getBaseDir());
}
else {
} else {
baseURL = new URL(base); baseURL = new URL(base);
} }
URL url = (uri.length() == 0 ? baseURL : new URL(baseURL, uri)); URL url = (uri.length() == 0 ? baseURL : new URL(baseURL, uri));
source.setInputSource(new InputSource(url.toString())); source.setInputSource(new InputSource(url.toString()));
}
catch (MalformedURLException ex) {
} catch (MalformedURLException ex) {
// At this point we are probably in failure mode, but // At this point we are probably in failure mode, but
// try to use the bare URI as a last gasp // try to use the bare URI as a last gasp
source.setInputSource(new InputSource(uri)); source.setInputSource(new InputSource(uri));
@@ -530,19 +541,17 @@ public class XMLCatalog extends DataType
// available, so use it. // available, so use it.
// //
catalogResolver = new ApacheResolver(clazz, obj); catalogResolver = new ApacheResolver(clazz, obj);
}
catch (Throwable ex) {
} catch (Throwable ex) {
// //
// The xml-commons resolver library is not // The xml-commons resolver library is not
// available, so we can't use it. // available, so we can't use it.
// //
catalogResolver = new InternalResolver(); catalogResolver = new InternalResolver();
if (getCatalogPath() != null &&
getCatalogPath().list().length != 0) {
log("Warning: catalogpath listing external catalogs"+
" will be ignored",
Project.MSG_WARN);
log("Failed to load Apache resolver: "
if (getCatalogPath() != null
&& getCatalogPath().list().length != 0) {
log("Warning: catalogpath listing external catalogs"
+ " will be ignored", Project.MSG_WARN);
log("Failed to load Apache resolver: "
+ ex, Project.MSG_DEBUG); + ex, Project.MSG_DEBUG);
} }
} }
@@ -577,11 +586,9 @@ public class XMLCatalog extends DataType
spFactory.setNamespaceAware(true); spFactory.setNamespaceAware(true);
try { try {
reader = spFactory.newSAXParser().getXMLReader(); reader = spFactory.newSAXParser().getXMLReader();
}
catch (ParserConfigurationException ex) {
} catch (ParserConfigurationException ex) {
throw new TransformerException(ex); throw new TransformerException(ex);
}
catch (SAXException ex) {
} catch (SAXException ex) {
throw new TransformerException(ex); throw new TransformerException(ex);
} }
} }
@@ -603,7 +610,7 @@ public class XMLCatalog extends DataType
while (enum.hasMoreElements()) { while (enum.hasMoreElements()) {
Object o = enum.nextElement(); Object o = enum.nextElement();
if (o instanceof ResourceLocation) { if (o instanceof ResourceLocation) {
element = (ResourceLocation)o;
element = (ResourceLocation) o;
if (element.getPublicId().equals(publicId)) { if (element.getPublicId().equals(publicId)) {
return element; return element;
} }
@@ -652,8 +659,7 @@ public class XMLCatalog extends DataType
} else { } else {
try { try {
baseURL = fileUtils.getFileURL(getProject().getBaseDir()); baseURL = fileUtils.getFileURL(getProject().getBaseDir());
}
catch (MalformedURLException ex) {
} catch (MalformedURLException ex) {
throw new BuildException("Project basedir cannot be converted to a URL"); throw new BuildException("Project basedir cannot be converted to a URL");
} }
} }
@@ -663,8 +669,7 @@ public class XMLCatalog extends DataType
try { try {
url = new URL(baseURL, uri); url = new URL(baseURL, uri);
}
catch (MalformedURLException ex) {
} catch (MalformedURLException ex) {
// ignore // ignore
} }
@@ -678,11 +683,11 @@ public class XMLCatalog extends DataType
source = new InputSource(new FileInputStream(resFile)); source = new InputSource(new FileInputStream(resFile));
String sysid = JAXPUtils.getSystemId(resFile); String sysid = JAXPUtils.getSystemId(resFile);
source.setSystemId(sysid); source.setSystemId(sysid);
log("catalog entry matched a readable file: '" +
sysid + "'", Project.MSG_DEBUG);
} catch(FileNotFoundException ex) {
log("catalog entry matched a readable file: '"
+ sysid + "'", Project.MSG_DEBUG);
} catch (FileNotFoundException ex) {
// ignore // ignore
} catch(IOException ex) {
} catch (IOException ex) {
// ignore // ignore
} }
} }
@@ -721,8 +726,8 @@ public class XMLCatalog extends DataType
URL entryURL = loader.getResource(matchingEntry.getLocation()); URL entryURL = loader.getResource(matchingEntry.getLocation());
String sysid = entryURL.toExternalForm(); String sysid = entryURL.toExternalForm();
source.setSystemId(sysid); source.setSystemId(sysid);
log("catalog entry matched a resource in the classpath: '" +
sysid + "'", Project.MSG_DEBUG);
log("catalog entry matched a resource in the classpath: '"
+ sysid + "'", Project.MSG_DEBUG);
} }
return source; return source;
@@ -749,8 +754,7 @@ public class XMLCatalog extends DataType
} else { } else {
try { try {
baseURL = fileUtils.getFileURL(getProject().getBaseDir()); baseURL = fileUtils.getFileURL(getProject().getBaseDir());
}
catch (MalformedURLException ex) {
} catch (MalformedURLException ex) {
throw new BuildException("Project basedir cannot be converted to a URL"); throw new BuildException("Project basedir cannot be converted to a URL");
} }
} }
@@ -760,8 +764,7 @@ public class XMLCatalog extends DataType
try { try {
url = new URL(baseURL, uri); url = new URL(baseURL, uri);
}
catch (MalformedURLException ex) {
} catch (MalformedURLException ex) {
// ignore // ignore
} }
@@ -772,10 +775,10 @@ public class XMLCatalog extends DataType
source = new InputSource(is); source = new InputSource(is);
String sysid = url.toExternalForm(); String sysid = url.toExternalForm();
source.setSystemId(sysid); source.setSystemId(sysid);
log("catalog entry matched as a URL: '" +
sysid + "'", Project.MSG_DEBUG);
log("catalog entry matched as a URL: '"
+ sysid + "'", Project.MSG_DEBUG);
} }
} catch(IOException ex) {
} catch (IOException ex) {
// ignore // ignore
} }
} }
@@ -816,9 +819,9 @@ public class XMLCatalog extends DataType
if (matchingEntry != null) { if (matchingEntry != null) {
log("Matching catalog entry found for publicId: '" +
matchingEntry.getPublicId() + "' location: '" +
matchingEntry.getLocation() + "'",
log("Matching catalog entry found for publicId: '"
+ matchingEntry.getPublicId() + "' location: '"
+ matchingEntry.getLocation() + "'",
Project.MSG_DEBUG); Project.MSG_DEBUG);
result = filesystemLookup(matchingEntry); result = filesystemLookup(matchingEntry);
@@ -844,9 +847,9 @@ public class XMLCatalog extends DataType
if (matchingEntry != null) { if (matchingEntry != null) {
log("Matching catalog entry found for uri: '" +
matchingEntry.getPublicId() + "' location: '" +
matchingEntry.getLocation() + "'",
log("Matching catalog entry found for uri: '"
+ matchingEntry.getPublicId() + "' location: '"
+ matchingEntry.getLocation() + "'",
Project.MSG_DEBUG); Project.MSG_DEBUG);
// //
@@ -865,8 +868,7 @@ public class XMLCatalog extends DataType
URL baseURL = new URL(base); URL baseURL = new URL(base);
entryCopy = new ResourceLocation(); entryCopy = new ResourceLocation();
entryCopy.setBase(baseURL); entryCopy.setBase(baseURL);
}
catch (MalformedURLException ex) {
} catch (MalformedURLException ex) {
// ignore // ignore
} }
} }
@@ -926,24 +928,23 @@ public class XMLCatalog extends DataType
setXMLCatalog = setXMLCatalog =
resolverImplClass.getMethod("setXMLCatalog", resolverImplClass.getMethod("setXMLCatalog",
new Class[] new Class[]
{ XMLCatalog.class });
{XMLCatalog.class});
parseCatalog = parseCatalog =
resolverImplClass.getMethod("parseCatalog", resolverImplClass.getMethod("parseCatalog",
new Class[] new Class[]
{ String.class });
{String.class});
resolveEntity = resolveEntity =
resolverImplClass.getMethod("resolveEntity", resolverImplClass.getMethod("resolveEntity",
new Class[] new Class[]
{ String.class, String.class });
{String.class, String.class});
resolve = resolve =
resolverImplClass.getMethod("resolve", resolverImplClass.getMethod("resolve",
new Class[] new Class[]
{ String.class, String.class });
}
catch (NoSuchMethodException ex) {
{String.class, String.class});
} catch (NoSuchMethodException ex) {
throw new BuildException(ex); throw new BuildException(ex);
} }
@@ -961,9 +962,9 @@ public class XMLCatalog extends DataType
if (matchingEntry != null) { if (matchingEntry != null) {
log("Matching catalog entry found for publicId: '" +
matchingEntry.getPublicId() + "' location: '" +
matchingEntry.getLocation() + "'",
log("Matching catalog entry found for publicId: '"
+ matchingEntry.getPublicId() + "' location: '"
+ matchingEntry.getLocation() + "'",
Project.MSG_DEBUG); Project.MSG_DEBUG);
result = filesystemLookup(matchingEntry); result = filesystemLookup(matchingEntry);
@@ -975,16 +976,14 @@ public class XMLCatalog extends DataType
if (result == null) { if (result == null) {
try { try {
result = result =
(InputSource)resolveEntity.invoke(resolverImpl,
(InputSource) resolveEntity.invoke(resolverImpl,
new Object[] new Object[]
{ publicId, systemId });
}
catch (Exception ex) {
{publicId, systemId});
} catch (Exception ex) {
throw new BuildException(ex); throw new BuildException(ex);
} }
} }
}
else {
} else {
// //
// We didn't match a ResourceLocation, but since we // We didn't match a ResourceLocation, but since we
// only support PUBLIC and URI entry types internally, // only support PUBLIC and URI entry types internally,
@@ -995,11 +994,10 @@ public class XMLCatalog extends DataType
// //
try { try {
result = result =
(InputSource)resolveEntity.invoke(resolverImpl,
(InputSource) resolveEntity.invoke(resolverImpl,
new Object[] new Object[]
{ publicId, systemId });
}
catch (Exception ex) {
{publicId, systemId});
} catch (Exception ex) {
throw new BuildException(ex); throw new BuildException(ex);
} }
} }
@@ -1019,9 +1017,9 @@ public class XMLCatalog extends DataType
if (matchingEntry != null) { if (matchingEntry != null) {
log("Matching catalog entry found for uri: '" +
matchingEntry.getPublicId() + "' location: '" +
matchingEntry.getLocation() + "'",
log("Matching catalog entry found for uri: '"
+ matchingEntry.getPublicId() + "' location: '"
+ matchingEntry.getLocation() + "'",
Project.MSG_DEBUG); Project.MSG_DEBUG);
// //
@@ -1042,8 +1040,7 @@ public class XMLCatalog extends DataType
URL baseURL = new URL(base); URL baseURL = new URL(base);
entryCopy = new ResourceLocation(); entryCopy = new ResourceLocation();
entryCopy.setBase(baseURL); entryCopy.setBase(baseURL);
}
catch (MalformedURLException ex) {
} catch (MalformedURLException ex) {
// ignore // ignore
} }
} }
@@ -1061,16 +1058,14 @@ public class XMLCatalog extends DataType
} else { } else {
try { try {
result = result =
(SAXSource)resolve.invoke(resolverImpl,
(SAXSource) resolve.invoke(resolverImpl,
new Object[] new Object[]
{ href, base });
}
catch (Exception ex) {
{href, base});
} catch (Exception ex) {
throw new BuildException(ex); throw new BuildException(ex);
} }
} }
}
else {
} else {
// //
// We didn't match a ResourceLocation, but since we // We didn't match a ResourceLocation, but since we
// only support PUBLIC and URI entry types internally, // only support PUBLIC and URI entry types internally,
@@ -1081,11 +1076,10 @@ public class XMLCatalog extends DataType
// //
try { try {
result = result =
(SAXSource)resolve.invoke(resolverImpl,
(SAXSource) resolve.invoke(resolverImpl,
new Object[] new Object[]
{ href, base });
}
catch (Exception ex) {
{href, base});
} catch (Exception ex) {
throw new BuildException(ex); throw new BuildException(ex);
} }
} }
@@ -1101,32 +1095,31 @@ public class XMLCatalog extends DataType
*/ */
private void processExternalCatalogs() { private void processExternalCatalogs() {
if (externalCatalogsProcessed == false ) {
if (! externalCatalogsProcessed) {
try { try {
setXMLCatalog.invoke(resolverImpl, setXMLCatalog.invoke(resolverImpl,
new Object[] new Object[]
{ XMLCatalog.this });
}
catch (Exception ex) {
{XMLCatalog.this});
} catch (Exception ex) {
throw new BuildException(ex); throw new BuildException(ex);
} }
// Parse each catalog listed in nested <catalogpath> elements // Parse each catalog listed in nested <catalogpath> elements
Path catPath = getCatalogPath(); Path catPath = getCatalogPath();
if (catPath != null) { if (catPath != null) {
log("Using catalogpath '" + getCatalogPath()+"'", Project.MSG_DEBUG);
log("Using catalogpath '" + getCatalogPath() + "'",
Project.MSG_DEBUG);
String[] catPathList = getCatalogPath().list(); String[] catPathList = getCatalogPath().list();
for (int i=0; i< catPathList.length; i++) {
for (int i = 0; i < catPathList.length; i++) {
File catFile = new File(catPathList[i]); File catFile = new File(catPathList[i]);
log("Parsing "+catFile, Project.MSG_DEBUG);
log("Parsing " + catFile, Project.MSG_DEBUG);
try { try {
parseCatalog.invoke(resolverImpl, parseCatalog.invoke(resolverImpl,
new Object[] new Object[]
{ catFile.getPath() });
}
catch (Exception ex) {
{catFile.getPath()});
} catch (Exception ex) {
throw new BuildException(ex); throw new BuildException(ex);
} }
} }
Conor MacNeill