Update of
/var/cvs/applications/packaging/src/org/mmbase/applications/packaging/util
In directory james.mmbase.org:/tmp/cvs-serv7304
Modified Files:
ExtendedDocumentReader.java
Log Message:
XMLBasicReader is deprecated
See also:
http://cvs.mmbase.org/viewcvs/applications/packaging/src/org/mmbase/applications/packaging/util
Index: ExtendedDocumentReader.java
===================================================================
RCS file:
/var/cvs/applications/packaging/src/org/mmbase/applications/packaging/util/ExtendedDocumentReader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ExtendedDocumentReader.java 21 Jun 2007 15:50:25 -0000 1.5
+++ ExtendedDocumentReader.java 3 Sep 2008 21:35:31 -0000 1.6
@@ -27,20 +27,20 @@
* @author Rico Jansen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: ExtendedDocumentReader.java,v 1.5 2007/06/21 15:50:25
nklasens Exp $
+ * @version $Id: ExtendedDocumentReader.java,v 1.6 2008/09/03 21:35:31 michiel
Exp $
*/
-public class ExtendedDocumentReader extends XMLBasicReader {
+public class ExtendedDocumentReader extends DocumentReader {
public ExtendedDocumentReader(String path) {
- super(path);
+ super(getInputSource(path));
}
public ExtendedDocumentReader(String path, boolean validating) {
- super(path, validating);
+ super(getInputSource(path), validating, null);
}
public ExtendedDocumentReader(String path, Class resolveBase) {
- super(path, resolveBase);
+ super(getInputSource(path), DocumentReader.validate(), resolveBase);
}
public ExtendedDocumentReader(InputSource source) {
@@ -59,6 +59,15 @@
super(source, validating, resolveBase);
}
+
+ protected static InputSource getInputSource(String path) {
+ try {
+ return ResourceLoader.getConfigurationRoot().getInputSource(path);
+ } catch (Exception ioe) {
+ return null;
+ }
+ }
+
public static DocumentBuilder getDocumentBuilder(boolean validating,
ErrorHandler handler, EntityResolver resolver) {
return DocumentReader.getDocumentBuilder(validating, handler,
resolver);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
