crossley 2002/10/31 03:00:51
Modified: src/java/org/apache/cocoon/components/resolver
ResolverImpl.java
Log:
Added debug messages to show the resolution attempt and the null result.
These are commented-out, so bring them back if you need them.
Changed path of default OASIS catalog, following move of stuff to /WEB-INF/
Revision Changes Path
1.13 +16 -3
xml-cocoon2/src/java/org/apache/cocoon/components/resolver/ResolverImpl.java
Index: ResolverImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/resolver/ResolverImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ResolverImpl.java 21 Sep 2002 02:18:00 -0000 1.12
+++ ResolverImpl.java 31 Oct 2002 11:00:51 -0000 1.13
@@ -84,7 +84,7 @@
* found at
* http://xml.apache.org/cocoon/userdocs/concepts/catalog.html
*
- * The catalog is by default loaded from "resources/entities/catalog".
+ * The catalog is by default loaded from "WEB-INF/entities/catalog".
* This can be configured by the "catalog" parameter in the cocoon.xconf:
* <resolver>
* <parameter name="catalog" value="mycatalog"/>
@@ -148,7 +148,7 @@
/* Load the built-in catalog */
String catalogFile = params.getParameter("catalog",
- "/resources/entities/catalog");
+ "/WEB-INF/entities/catalog");
try {
String catalogURL = null;
catalogURL = this.context.getRealPath(catalogFile);
@@ -226,6 +226,12 @@
*/
public InputSource resolveEntity(String publicId, String systemId)
throws SAXException, IOException {
+/*
+ if (this.getLogger().isDebugEnabled()) {
+ this.getLogger().debug("CER resolution: publicId="
+ + publicId + " systemId=" + systemId);
+ }
+*/
InputSource altInputSource = catalogResolver.resolveEntity(publicId,
systemId);
if (altInputSource != null) {
@@ -234,6 +240,13 @@
+ publicId + " " + altInputSource.getSystemId());
}
}
+/*
+ else {
+ if (this.getLogger().isDebugEnabled()) {
+ this.getLogger().debug("CER: altInputSource is null");
+ }
+ }
+*/
return altInputSource;
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
