diff --git a/java/src/org/apache/xml/resolver/Resolver.java b/java/src/org/apache/xml/resolver/Resolver.java
index d9445f7..305d8f3 100644
--- a/java/src/org/apache/xml/resolver/Resolver.java
+++ b/java/src/org/apache/xml/resolver/Resolver.java
@@ -174,14 +174,14 @@ public class Resolver extends Catalog {
 
       entry.setEntryArg(1, fsi);
 
-      Debug.message(4, "URISUFFIX", suffix, fsi);
+      catalogManager.debug.message(4, "URISUFFIX", suffix, fsi);
     } else if (type == SYSTEMSUFFIX) {
       String suffix = normalizeURI(entry.getEntryArg(0));
       String fsi = makeAbsolute(normalizeURI(entry.getEntryArg(1)));
 
       entry.setEntryArg(1, fsi);
 
-      Debug.message(4, "SYSTEMSUFFIX", suffix, fsi);
+      catalogManager.debug.message(4, "SYSTEMSUFFIX", suffix, fsi);
     }
 
     super.addEntry(entry);
@@ -435,17 +435,17 @@ public class Resolver extends Catalog {
 	    return r;
 	} catch (CatalogException cex) {
 	  if (cex.getExceptionType() == CatalogException.UNPARSEABLE) {
-	    Debug.message(1, "Unparseable catalog: " + RFC2483);
+	    catalogManager.debug.message(1, "Unparseable catalog: " + RFC2483);
 	  } else if (cex.getExceptionType()
 		     == CatalogException.UNKNOWN_FORMAT) {
-	    Debug.message(1, "Unknown catalog format: " + RFC2483);
+	    catalogManager.debug.message(1, "Unknown catalog format: " + RFC2483);
 	  }
 	  return null;
 	} catch (MalformedURLException mue) {
-	    Debug.message(1, "Malformed resolver URL: " + RFC2483);
+	    catalogManager.debug.message(1, "Malformed resolver URL: " + RFC2483);
 	    return null;
 	} catch (IOException ie) {
-	    Debug.message(1, "I/O Exception opening resolver: " + RFC2483);
+	    catalogManager.debug.message(1, "I/O Exception opening resolver: " + RFC2483);
 	    return null;
 	}
     }
@@ -668,12 +668,12 @@ public class Resolver extends Catalog {
 		try {
 		    c.parseCatalog(catfile);
 		} catch (MalformedURLException mue) {
-		    Debug.message(1, "Malformed Catalog URL", catfile);
+		    catalogManager.debug.message(1, "Malformed Catalog URL", catfile);
 		} catch (FileNotFoundException fnfe) {
-		    Debug.message(1, "Failed to load catalog, file not found",
+		    catalogManager.debug.message(1, "Failed to load catalog, file not found",
 			  catfile);
 		} catch (IOException ioe) {
-		    Debug.message(1, "Failed to load catalog, I/O error", catfile);
+		    catalogManager.debug.message(1, "Failed to load catalog, I/O error", catfile);
 		}
 
 		catalogs.setElementAt(c, catPos);