Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv27948
Modified Files:
ContentTag.java DataTypeTag.java FormatterTag.java
Log Message:
removed useable of deprecated XMLEntityResolver, XMLErrorHandler
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
Index: ContentTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/ContentTag.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- ContentTag.java 25 Sep 2007 12:39:51 -0000 1.66
+++ ContentTag.java 4 Sep 2008 12:31:07 -0000 1.67
@@ -38,7 +38,7 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.7
- * @version $Id: ContentTag.java,v 1.66 2007/09/25 12:39:51 michiel Exp $
+ * @version $Id: ContentTag.java,v 1.67 2008/09/04 12:31:07 michiel Exp $
**/
public class ContentTag extends LocaleTag {
@@ -69,7 +69,7 @@
static {
try {
log = Logging.getLoggerInstance(ContentTag.class);
- org.mmbase.util.XMLEntityResolver.registerPublicID("-//MMBase//DTD
taglibcontent 1.0//EN", "taglibcontent_1_0.dtd", ContentTag.class);
+
org.mmbase.util.xml.EntityResolver.registerPublicID("-//MMBase//DTD
taglibcontent 1.0//EN", "taglibcontent_1_0.dtd", ContentTag.class);
ResourceWatcher watcher = new
ResourceWatcher(ResourceLoader.getConfigurationRoot().getChildResourceLoader("taglib"))
{
public void onChange(String resource) {
defaultEscapers.clear();
Index: DataTypeTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/DataTypeTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- DataTypeTag.java 19 Aug 2008 11:46:31 -0000 1.4
+++ DataTypeTag.java 4 Sep 2008 12:31:07 -0000 1.5
@@ -14,8 +14,8 @@
import org.mmbase.bridge.jsp.taglib.util.*;
import org.mmbase.bridge.jsp.taglib.containers.*;
-import org.mmbase.util.XMLEntityResolver;
-import org.mmbase.util.XMLErrorHandler;
+import org.mmbase.util.xml.EntityResolver;
+import org.mmbase.util.xml.ErrorHandler;
import java.io.StringReader;
@@ -32,7 +32,7 @@
/**
* This tags produces request scoped new datatypes. (To be used in conjuction
with mm:fieldinfo datatype='')
* @author Michiel Meeuwissen
- * @version $Id: DataTypeTag.java,v 1.4 2008/08/19 11:46:31 michiel Exp $
+ * @version $Id: DataTypeTag.java,v 1.5 2008/09/04 12:31:07 michiel Exp $
* @since MMBase-1.8.7
*/
public class DataTypeTag extends CloudReferrerTag {
@@ -101,8 +101,8 @@
if (body != null) buf.append(body);
buf.append("</datatype>");
try {
- XMLErrorHandler errorHandler = new XMLErrorHandler(false,
XMLErrorHandler.WARNING);
- XMLEntityResolver resolver = new XMLEntityResolver(true,
DataTypeReader.class);
+ org.xml.sax.ErrorHandler errorHandler = new ErrorHandler(false,
ErrorHandler.WARNING);
+ org.xml.sax.EntityResolver resolver = new EntityResolver(true,
DataTypeReader.class);
DocumentBuilder dbuilder =
org.mmbase.util.xml.DocumentReader.getDocumentBuilder(true, true,
errorHandler, resolver);
Element element = dbuilder.parse(new InputSource(new
StringReader(buf.toString()))).getDocumentElement();
Index: FormatterTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/FormatterTag.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- FormatterTag.java 17 Mar 2008 16:55:14 -0000 1.78
+++ FormatterTag.java 4 Sep 2008 12:31:07 -0000 1.79
@@ -42,7 +42,7 @@
*
* @since MMBase-1.6
* @author Michiel Meeuwissen
- * @version $Id: FormatterTag.java,v 1.78 2008/03/17 16:55:14 michiel Exp $
+ * @version $Id: FormatterTag.java,v 1.79 2008/09/04 12:31:07 michiel Exp $
*/
public class FormatterTag extends CloudReferrerTag implements ParamHandler {
@@ -120,8 +120,8 @@
documentBuilder = dfactory.newDocumentBuilder();
dfactory.setNamespaceAware(true);
documentBuilderNS = dfactory.newDocumentBuilder();
- org.xml.sax.ErrorHandler handler = new
org.mmbase.util.XMLErrorHandler();
- org.xml.sax.EntityResolver resolver = new
org.mmbase.util.XMLEntityResolver();
+ org.xml.sax.ErrorHandler handler = new
org.mmbase.util.xml.ErrorHandler();
+ org.xml.sax.EntityResolver resolver = new
org.mmbase.util.xml.EntityResolver();
documentBuilder.setErrorHandler(handler);
documentBuilder.setEntityResolver(resolver);
documentBuilderNS.setErrorHandler(handler);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
