Update of /var/cvs/src/org/mmbase/util/xml
In directory james.mmbase.org:/tmp/cvs-serv20661/util/xml
Modified Files:
BuilderReader.java BuilderWriter.java DocumentReader.java
ModuleReader.java ModuleWriter.java UtilReader.java
Log Message:
did find&replace to make code not use now deprecated XMLEntityResolver,
XMLErrorHandler
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/xml
Index: BuilderReader.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/xml/BuilderReader.java,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- BuilderReader.java 3 Sep 2008 23:17:25 -0000 1.106
+++ BuilderReader.java 4 Sep 2008 05:56:23 -0000 1.107
@@ -39,7 +39,7 @@
* @author Rico Jansen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: BuilderReader.java,v 1.106 2008/09/03 23:17:25 michiel Exp $
+ * @version $Id: BuilderReader.java,v 1.107 2008/09/04 05:56:23 michiel Exp $
*/
public class BuilderReader extends DocumentReader {
@@ -71,26 +71,26 @@
/**
* Register the namespace and XSD used by DataTypeConfigurer
- * This method is called by XMLEntityResolver.
+ * This method is called by EntityResolver.
*/
public static void registerSystemIDs() {
- XMLEntityResolver.registerSystemID(NAMESPACE_BUILDER_2_0 + ".xsd",
XSD_BUILDER_2_0, BuilderReader.class);
+ EntityResolver.registerSystemID(NAMESPACE_BUILDER_2_0 + ".xsd",
XSD_BUILDER_2_0, BuilderReader.class);
}
/**
* Register the Public Ids for DTDs used by BuilderReader
- * This method is called by XMLEntityResolver.
+ * This method is called by EntityResolver.
*/
public static void registerPublicIDs() {
// various builder dtd versions
- XMLEntityResolver.registerPublicID(PUBLIC_ID_BUILDER_1_0,
DTD_BUILDER_1_0, BuilderReader.class);
- XMLEntityResolver.registerPublicID(PUBLIC_ID_BUILDER_1_1,
DTD_BUILDER_1_1, BuilderReader.class);
- //XMLEntityResolver.registerPublicID("-//MMBase//DTD builder config
2.0//EN", "builder_2_0.dtd", BuilderReader.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_BUILDER_1_0,
DTD_BUILDER_1_0, BuilderReader.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_BUILDER_1_1,
DTD_BUILDER_1_1, BuilderReader.class);
+ //EntityResolver.registerPublicID("-//MMBase//DTD builder config
2.0//EN", "builder_2_0.dtd", BuilderReader.class);
// legacy public IDs (wrong, don't use these)
- XMLEntityResolver.registerPublicID(PUBLIC_ID_BUILDER_1_0_FAULT,
DTD_BUILDER_1_0, BuilderReader.class);
- XMLEntityResolver.registerPublicID(PUBLIC_ID_BUILDER_OLD,
DTD_BUILDER_1_0, BuilderReader.class);
- XMLEntityResolver.registerPublicID(PUBLIC_ID_BUILDER_1_1_FAULT,
DTD_BUILDER_1_1, BuilderReader.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_BUILDER_1_0_FAULT,
DTD_BUILDER_1_0, BuilderReader.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_BUILDER_OLD,
DTD_BUILDER_1_0, BuilderReader.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_BUILDER_1_1_FAULT,
DTD_BUILDER_1_1, BuilderReader.class);
}
/**
Index: BuilderWriter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/xml/BuilderWriter.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- BuilderWriter.java 11 Feb 2007 20:05:50 -0000 1.26
+++ BuilderWriter.java 4 Sep 2008 05:56:23 -0000 1.27
@@ -17,7 +17,7 @@
import org.mmbase.core.CoreField;
import org.mmbase.core.util.Fields;
import org.mmbase.datatypes.DataType;
-import org.mmbase.util.XMLEntityResolver;
+import org.mmbase.util.xml.EntityResolver;
import org.w3c.dom.*;
@@ -33,7 +33,7 @@
*
* @since MMBase-1.6
* @author Pierre van Rooden
- * @version $Id: BuilderWriter.java,v 1.26 2007/02/11 20:05:50 nklasens Exp $
+ * @version $Id: BuilderWriter.java,v 1.27 2008/09/04 05:56:23 michiel Exp $
*/
public class BuilderWriter extends DocumentWriter {
@@ -55,7 +55,7 @@
*/
public BuilderWriter(MMObjectBuilder builder) throws DOMException {
super("builder", BuilderReader.PUBLIC_ID_BUILDER,
- XMLEntityResolver.DOMAIN +
XMLEntityResolver.DTD_SUBPATH + BuilderReader.DTD_BUILDER);
+ EntityResolver.DOMAIN + EntityResolver.DTD_SUBPATH +
BuilderReader.DTD_BUILDER);
this.builder=builder;
getMessageRetriever("org.mmbase.util.xml.resources.builderwriter");
}
Index: DocumentReader.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/xml/DocumentReader.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- DocumentReader.java 3 Sep 2008 19:59:42 -0000 1.43
+++ DocumentReader.java 4 Sep 2008 05:56:23 -0000 1.44
@@ -12,8 +12,6 @@
import java.util.*;
import java.util.regex.Pattern;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.w3c.dom.*;
@@ -22,9 +20,6 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.mmbase.util.XMLEntityResolver;
-import org.mmbase.util.XMLErrorHandler;
-
import org.mmbase.util.logging.Logging;
import org.mmbase.util.logging.Logger;
@@ -40,7 +35,7 @@
* @author Rico Jansen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: DocumentReader.java,v 1.43 2008/09/03 19:59:42 michiel Exp $
+ * @version $Id: DocumentReader.java,v 1.44 2008/09/04 05:56:23 michiel Exp $
* @since MMBase-1.7
*/
public class DocumentReader {
@@ -63,10 +58,10 @@
/**
* Register the Public Ids for DTDs used by XMLBasicReader
- * This method is called by XMLEntityResolver.
+ * This method is called by EntityResolver.
*/
public static void registerPublicIDs() {
- XMLEntityResolver.registerPublicID(PUBLIC_ID_ERROR_1_0, DTD_ERROR_1_0,
DocumentReader.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_ERROR_1_0, DTD_ERROR_1_0,
DocumentReader.class);
}
protected Document document;
@@ -142,8 +137,8 @@
}
try {
systemId = source.getSystemId();
- XMLEntityResolver resolver = null;
- if (resolveBase != null) resolver = new
XMLEntityResolver(validating, resolveBase);
+ org.xml.sax.EntityResolver resolver = null;
+ if (resolveBase != null) resolver = new EntityResolver(validating,
resolveBase);
DocumentBuilder dbuilder = getDocumentBuilder(validating, null/*
no error handler */, resolver);
if(dbuilder == null) throw new RuntimeException("failure
retrieving document builder");
if (log != null && log.isDebugEnabled()) {
@@ -176,10 +171,10 @@
* @param resolver a EntityResolver class used for resolving the
document's dtd, pass null to use a default resolver
* @return a DocumentBuilder instance, or null if none could be created
*/
- private static DocumentBuilder createDocumentBuilder(boolean validating,
boolean xsd, ErrorHandler handler, EntityResolver resolver) {
+ private static DocumentBuilder createDocumentBuilder(boolean validating,
boolean xsd, org.xml.sax.ErrorHandler handler, org.xml.sax.EntityResolver
resolver) {
DocumentBuilder db;
- if (handler == null) handler = new XMLErrorHandler();
- if (resolver == null) resolver = new XMLEntityResolver(validating);
+ if (handler == null) handler = new ErrorHandler();
+ if (resolver == null) resolver = new EntityResolver(validating);
try {
// get a new documentbuilder...
DocumentBuilderFactory dfactory =
DocumentBuilderFactory.newInstance();
@@ -241,7 +236,7 @@
/**
* See [EMAIL PROTECTED] #getDocumentBuilder(boolean, ErrorHandler,
EntityResolver)}
*/
- public static DocumentBuilder getDocumentBuilder(boolean validating,
ErrorHandler handler, EntityResolver resolver) {
+ public static DocumentBuilder getDocumentBuilder(boolean validating,
org.xml.sax.ErrorHandler handler, org.xml.sax.EntityResolver resolver) {
return getDocumentBuilder(validating, false, handler, resolver);
}
@@ -256,7 +251,7 @@
* @return a DocumentBuilder instance, or null if none could be created
* @since MMBase-1.8.
*/
- public static DocumentBuilder getDocumentBuilder(boolean validating,
boolean xsd, ErrorHandler handler, EntityResolver resolver) {
+ public static DocumentBuilder getDocumentBuilder(boolean validating,
boolean xsd, org.xml.sax.ErrorHandler handler, org.xml.sax.EntityResolver
resolver) {
validating = validate(validating);
if (handler == null && resolver == null) {
String key = "" + validating + xsd;
Index: ModuleReader.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/xml/ModuleReader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ModuleReader.java 19 Jun 2007 14:00:54 -0000 1.8
+++ ModuleReader.java 4 Sep 2008 05:56:23 -0000 1.9
@@ -15,14 +15,14 @@
import org.xml.sax.InputSource;
import org.mmbase.util.LocalizedString;
-import org.mmbase.util.XMLEntityResolver;
+import org.mmbase.util.xml.EntityResolver;
/**
* @javadoc
* @since MMBase-1.8
* @author Daniel Ockeloen
* @author Pierre van Rooden
- * @version $Id: ModuleReader.java,v 1.8 2007/06/19 14:00:54 michiel Exp $
+ * @version $Id: ModuleReader.java,v 1.9 2008/09/04 05:56:23 michiel Exp $
*/
public class ModuleReader extends DocumentReader {
@@ -44,22 +44,22 @@
/**
* Register the namespace and XSD used by DataTypeConfigurer
- * This method is called by XMLEntityResolver.
+ * This method is called by EntityResolver.
*/
public static void registerSystemIDs() {
- XMLEntityResolver.registerSystemID(NAMESPACE_MODULE_2_0 + ".xsd",
XSD_MODULE_2_0, ModuleReader.class);
+ EntityResolver.registerSystemID(NAMESPACE_MODULE_2_0 + ".xsd",
XSD_MODULE_2_0, ModuleReader.class);
}
/**
* Register the Public Ids for DTDs used by ModuleReader
- * This method is called by XMLEntityResolver.
+ * This method is called by EntityResolver.
* @since MMBase-1.7
*/
public static void registerPublicIDs() {
- XMLEntityResolver.registerPublicID(PUBLIC_ID_MODULE_1_0,
DTD_MODULE_1_0, ModuleReader.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_MODULE_1_0, DTD_MODULE_1_0,
ModuleReader.class);
// legacy public IDs (wrong, don't use these)
- XMLEntityResolver.registerPublicID(PUBLIC_ID_MODULE_1_0_FAULT,
DTD_MODULE_1_0, ModuleReader.class);
- XMLEntityResolver.registerPublicID(PUBLIC_ID_MODULE_1_0_FAULT2,
DTD_MODULE_1_0, ModuleReader.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_MODULE_1_0_FAULT,
DTD_MODULE_1_0, ModuleReader.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_MODULE_1_0_FAULT2,
DTD_MODULE_1_0, ModuleReader.class);
}
public ModuleReader(InputSource is) {
Index: ModuleWriter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/xml/ModuleWriter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ModuleWriter.java 24 Feb 2007 21:57:50 -0000 1.9
+++ ModuleWriter.java 4 Sep 2008 05:56:23 -0000 1.10
@@ -13,13 +13,13 @@
import java.util.Map.Entry;
import org.mmbase.module.Module;
-import org.mmbase.util.XMLEntityResolver;
+import org.mmbase.util.xml.EntityResolver;
import org.w3c.dom.*;
/**
* @author Daniel Ockeloen
- * @version $Id: ModuleWriter.java,v 1.9 2007/02/24 21:57:50 nklasens Exp $
+ * @version $Id: ModuleWriter.java,v 1.10 2008/09/04 05:56:23 michiel Exp $
*/
public class ModuleWriter extends DocumentWriter {
@@ -35,7 +35,7 @@
*/
public ModuleWriter(Module module) throws DOMException {
super("module", ModuleReader.PUBLIC_ID_MODULE,
- XMLEntityResolver.DOMAIN +
XMLEntityResolver.DTD_SUBPATH + ModuleReader.DTD_MODULE);
+ EntityResolver.DOMAIN + EntityResolver.DTD_SUBPATH +
ModuleReader.DTD_MODULE);
this.module = module;
getMessageRetriever("org.mmbase.util.xml.resources.modulewriter");
}
Index: UtilReader.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/xml/UtilReader.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- UtilReader.java 2 Aug 2008 15:15:25 -0000 1.37
+++ UtilReader.java 4 Sep 2008 05:56:23 -0000 1.38
@@ -37,7 +37,7 @@
* @since MMBase-1.6.4
* @author Rob Vermeulen
* @author Michiel Meeuwissen
- * @version $Id: UtilReader.java,v 1.37 2008/08/02 15:15:25 michiel Exp $
+ * @version $Id: UtilReader.java,v 1.38 2008/09/04 05:56:23 michiel Exp $
*/
public class UtilReader {
@@ -57,10 +57,10 @@
/**
* Register the Public Ids for DTDs used by UtilReader
- * This method is called by XMLEntityResolver.
+ * This method is called by EntityResolver.
*/
public static void registerPublicIDs() {
- XMLEntityResolver.registerPublicID(PUBLIC_ID_UTIL_1_0, DTD_UTIL_1_0,
UtilReader.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_UTIL_1_0, DTD_UTIL_1_0,
UtilReader.class);
}
private static final Map<String, UtilReader> utilReaders = new
HashMap<String, UtilReader>(); // file-name -> utilreader
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
