Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv20661/util
Modified Files:
Casting.java ResourceLoader.java XSLTransformer.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
Index: Casting.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/Casting.java,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- Casting.java 2 Sep 2008 11:18:34 -0000 1.116
+++ Casting.java 4 Sep 2008 05:56:23 -0000 1.117
@@ -16,7 +16,7 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.6
- * @version $Id: Casting.java,v 1.116 2008/09/02 11:18:34 michiel Exp $
+ * @version $Id: Casting.java,v 1.117 2008/09/04 05:56:23 michiel Exp $
*/
import java.util.*;
@@ -987,7 +987,7 @@
dfactory.setValidating(false);
dfactory.setNamespaceAware(true);
DOCUMENTBUILDER = dfactory.newDocumentBuilder();
- DOCUMENTBUILDER.setEntityResolver(new XMLEntityResolver(false));
+ DOCUMENTBUILDER.setEntityResolver(new
org.mmbase.util.xml.EntityResolver(false));
} catch (ParserConfigurationException pce) {
log.error("[sax parser]: " + pce.toString(), pce);
} catch (Exception e) {
@@ -1010,7 +1010,7 @@
}
try {
Document doc;
- final XMLErrorHandler errorHandler = new XMLErrorHandler(false,
org.mmbase.util.XMLErrorHandler.NEVER);
+ final org.mmbase.util.xml.ErrorHandler errorHandler = new
org.mmbase.util.xml.ErrorHandler(false, org.mmbase.util.xml.ErrorHandler.NEVER);
assert DOCUMENTBUILDER != null;
synchronized(DOCUMENTBUILDER) {
// dont log errors, and try to process as much as possible...
Index: ResourceLoader.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/ResourceLoader.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- ResourceLoader.java 13 Aug 2008 08:09:16 -0000 1.68
+++ ResourceLoader.java 4 Sep 2008 05:56:23 -0000 1.69
@@ -97,7 +97,7 @@
* <p>For property-files, the java-unicode-escaping is undone on loading, and
applied on saving, so there is no need to think of that.</p>
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: ResourceLoader.java,v 1.68 2008/08/13 08:09:16 michiel Exp $
+ * @version $Id: ResourceLoader.java,v 1.69 2008/09/04 05:56:23 michiel Exp $
*/
public class ResourceLoader extends ClassLoader {
@@ -781,7 +781,7 @@
InputSource source = getInputSource(url);
if (source == null) return null;
- XMLEntityResolver resolver = new XMLEntityResolver(validation,
baseClass);
+ org.xml.sax.EntityResolver resolver = new
org.mmbase.util.xml.EntityResolver(validation, baseClass);
DocumentBuilder dbuilder =
org.mmbase.util.xml.DocumentReader.getDocumentBuilder(validation, xsd,
null/* default error handler */, resolver);
if(dbuilder == null) throw new RuntimeException("failure retrieving
document builder");
Index: XSLTransformer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/XSLTransformer.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- XSLTransformer.java 7 Aug 2008 18:53:07 -0000 1.40
+++ XSLTransformer.java 4 Sep 2008 05:56:23 -0000 1.41
@@ -23,9 +23,9 @@
import org.mmbase.bridge.util.xml.Generator;
+
import org.mmbase.cache.xslt.*;
-import org.mmbase.util.xml.URIResolver;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -36,7 +36,7 @@
* @move org.mmbase.util.xml
* @author Case Roole, [EMAIL PROTECTED]
* @author Michiel Meeuwissen
- * @version $Id: XSLTransformer.java,v 1.40 2008/08/07 18:53:07 michiel Exp $
+ * @version $Id: XSLTransformer.java,v 1.41 2008/09/04 05:56:23 michiel Exp $
*/
public class XSLTransformer {
private static final Logger log =
Logging.getLoggerInstance(XSLTransformer.class);
@@ -142,13 +142,13 @@
URIResolver uri;
if (considerDir) {
try {
- uri = new URIResolver(new URL(xslFile, "."));
+ uri = new org.mmbase.util.xml.URIResolver(new URL(xslFile,
"."));
} catch (java.net.MalformedURLException mfe) {
// oddd..
throw new TransformerException(mfe.getMessage(), mfe);
}
} else {
- uri = new URIResolver();
+ uri = new org.mmbase.util.xml.URIResolver();
}
Templates cachedXslt = cache.getTemplates(xsl, uri);
if (log.isDebugEnabled()) {
@@ -193,14 +193,14 @@
if (! validation) {
log.service("disabled validation");
}
- XMLEntityResolver resolver = new XMLEntityResolver(validation);
+ org.xml.sax.EntityResolver resolver = new
org.mmbase.util.xml.EntityResolver(validation);
dfactory.setNamespaceAware(true);
if (params != null && Boolean.FALSE.equals(params.get(NS_AWARE))) {
dfactory.setNamespaceAware(false);
}
DocumentBuilder db = dfactory.newDocumentBuilder();
- XMLErrorHandler handler = new XMLErrorHandler();
+ org.xml.sax.ErrorHandler handler = new
org.mmbase.util.xml.ErrorHandler();
db.setErrorHandler(handler);
db.setEntityResolver(resolver);
org.w3c.dom.Document xmlDoc = db.parse(xmlFile);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
