You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@locus.apache.org on 2000/09/20 06:17:04 UTC
cvs commit: jakarta-struts/src/share/org/apache/struts/digester Digester.java
craigmcc 00/09/19 21:17:04
Modified: src/share/org/apache/struts/digester Digester.java
Log:
Update handling of registered local URLs so that it works with resources
loaded via Class.getResource().
Revision Changes Path
1.9 +13 -5 jakarta-struts/src/share/org/apache/struts/digester/Digester.java
Index: Digester.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/Digester.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Digester.java 2000/08/14 21:59:19 1.8
+++ Digester.java 2000/09/20 04:17:03 1.9
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/Digester.java,v 1.8 2000/08/14 21:59:19 craigmcc Exp $
- * $Revision: 1.8 $
- * $Date: 2000/08/14 21:59:19 $
+ * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/Digester.java,v 1.9 2000/09/20 04:17:03 craigmcc Exp $
+ * $Revision: 1.9 $
+ * $Date: 2000/09/20 04:17:03 $
*
* ====================================================================
*
@@ -142,7 +142,7 @@
* hard code the configuration logic.
*
* @author Craig McClanahan
- * @version $Revision: 1.8 $ $Date: 2000/08/14 21:59:19 $
+ * @version $Revision: 1.9 $ $Date: 2000/09/20 04:17:03 $
*/
public final class Digester extends HandlerBase {
@@ -611,7 +611,13 @@
// Return an input source to our alternative URL
if (debug >= 1)
log(" Resolving to alternate DTD '" + dtdURL + "'");
- return (new InputSource(dtdURL));
+ try {
+ URL url = new URL(dtdURL);
+ InputStream stream = url.openStream();
+ return (new InputSource(stream));
+ } catch (Exception e) {
+ throw new SAXException(e);
+ }
}
@@ -777,6 +783,8 @@
*/
public void register(String publicId, String dtdURL) {
+ if (debug >= 1)
+ log("register('" + publicId + "', '" + dtdURL + "'");
dtds.put(publicId, dtdURL);
}