[MMBASE CVS] src/org/mmbase/framework ComponentRepository.java Framework.java Utils.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv20661/framework

Modified Files:
        ComponentRepository.java Framework.java Utils.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/framework


Index: ComponentRepository.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/ComponentRepository.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- ComponentRepository.java    2 Sep 2008 12:03:33 -0000       1.41
+++ ComponentRepository.java    4 Sep 2008 05:56:23 -0000       1.42
@@ -25,7 +25,7 @@
  * Components can be configured by placing their configuration in 
'config/components/'.
  *
  * @author Michiel Meeuwissen
- * @version $Id: ComponentRepository.java,v 1.41 2008/09/02 12:03:33 andre Exp 
$
+ * @version $Id: ComponentRepository.java,v 1.42 2008/09/04 05:56:23 michiel 
Exp $
  * @since MMBase-1.9
  */
 public class ComponentRepository {
@@ -38,8 +38,8 @@
     private static final Set<String> RECOGNIZED_NAMESPACES = new 
HashSet<String>();
 
     static {
-        XMLEntityResolver.registerSystemID(NAMESPACE_COMPONENT + ".xsd", 
XSD_COMPONENT, ComponentRepository.class);
-        XMLEntityResolver.registerSystemID(NAMESPACE_BLOCKTYPES + ".xsd", 
XSD_BLOCKTYPES, ComponentRepository.class);
+        
org.mmbase.util.xml.EntityResolver.registerSystemID(NAMESPACE_COMPONENT + 
".xsd", XSD_COMPONENT, ComponentRepository.class);
+        
org.mmbase.util.xml.EntityResolver.registerSystemID(NAMESPACE_BLOCKTYPES + 
".xsd", XSD_BLOCKTYPES, ComponentRepository.class);
         RECOGNIZED_NAMESPACES.addAll(Arrays.asList(NAMESPACE_COMPONENT, 
NAMESPACE_BLOCKTYPES));
     }
 


Index: Framework.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/Framework.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- Framework.java      1 Sep 2008 07:06:12 -0000       1.59
+++ Framework.java      4 Sep 2008 05:56:23 -0000       1.60
@@ -29,7 +29,7 @@
  * @author Michiel Meeuwissen
  * @author Nico Klasens
  * @author Andr&eacute; van Toly
- * @version $Id: Framework.java,v 1.59 2008/09/01 07:06:12 michiel Exp $
+ * @version $Id: Framework.java,v 1.60 2008/09/04 05:56:23 michiel Exp $
  * @since MMBase-1.9
  */
 public abstract class Framework {
@@ -46,7 +46,7 @@
     public static final String XSD = "framework.xsd";
     public static final String NAMESPACE = 
"http://www.mmbase.org/xmlns/framework";;
     static {
-        XMLEntityResolver.registerSystemID(NAMESPACE + ".xsd", XSD, 
Framework.class);
+        org.mmbase.util.xml.EntityResolver.registerSystemID(NAMESPACE + 
".xsd", XSD, Framework.class);
     }
 
 


Index: Utils.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/Utils.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Utils.java  26 Aug 2008 06:45:36 -0000      1.3
+++ Utils.java  4 Sep 2008 05:56:23 -0000       1.4
@@ -21,7 +21,7 @@
 
 /**
  * @author Michiel Meeuwissen
- * @version $Id: Utils.java,v 1.3 2008/08/26 06:45:36 michiel Exp $
+ * @version $Id: Utils.java,v 1.4 2008/09/04 05:56:23 michiel Exp $
  * @since MMBase-1.9
  */
 public abstract class Utils {
@@ -41,7 +41,7 @@
             log.debug("Parsing " + w.toString() + " of " +  renderer + " of " 
+ renderer.getBlock());
         }
         InputSource source = new InputSource(new StringReader(w.toString()));
-        XMLEntityResolver resolver = new XMLEntityResolver(true, baseClass);
+        EntityResolver resolver = new org.mmbase.util.xml.EntityResolver(true, 
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");
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs