Update of /var/cvs/src/org/mmbase/util/xml/applicationdata
In directory james.mmbase.org:/tmp/cvs-serv20661/util/xml/applicationdata
Modified Files:
ApplicationReader.java ApplicationWriter.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/applicationdata
Index: ApplicationReader.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/util/xml/applicationdata/ApplicationReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ApplicationReader.java 3 Sep 2008 23:17:25 -0000 1.1
+++ ApplicationReader.java 4 Sep 2008 05:56:23 -0000 1.2
@@ -11,14 +11,14 @@
import java.util.*;
import org.w3c.dom.*;
-import org.mmbase.util.XMLEntityResolver;
+import org.mmbase.util.xml.EntityResolver;
/**
* @javadoc
* @author Case Roole
* @author Rico Jansen
* @author Pierre van Rooden
- * @version $Id: ApplicationReader.java,v 1.1 2008/09/03 23:17:25 michiel Exp $
+ * @version $Id: ApplicationReader.java,v 1.2 2008/09/04 05:56:23 michiel Exp $
*/
public class ApplicationReader extends org.mmbase.util.xml.DocumentReader {
@@ -45,11 +45,11 @@
*/
public static void registerPublicIDs() {
// various builder dtd versions
- XMLEntityResolver.registerPublicID(PUBLIC_ID_APPLICATION_1_0,
DTD_APPLICATION_1_0, ApplicationReader.class);
- XMLEntityResolver.registerPublicID(PUBLIC_ID_APPLICATION_1_1,
DTD_APPLICATION_1_1, ApplicationReader.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_APPLICATION_1_0,
DTD_APPLICATION_1_0, ApplicationReader.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_APPLICATION_1_1,
DTD_APPLICATION_1_1, ApplicationReader.class);
// legacy public IDs (wrong, don't use these)
- XMLEntityResolver.registerPublicID(PUBLIC_ID_APPLICATION_1_0_FAULT,
DTD_APPLICATION_1_0, ApplicationReader.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_APPLICATION_1_0_FAULT,
DTD_APPLICATION_1_0, ApplicationReader.class);
}
private Element root;
Index: ApplicationWriter.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/util/xml/applicationdata/ApplicationWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ApplicationWriter.java 3 Sep 2008 23:17:25 -0000 1.1
+++ ApplicationWriter.java 4 Sep 2008 05:56:23 -0000 1.2
@@ -19,12 +19,13 @@
import org.mmbase.storage.search.SearchQueryException;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-import org.mmbase.util.*;
+import org.mmbase.util.xml.*;
+import org.mmbase.util.ResourceLoader;
/**
* @javadoc
* @author Daniel Ockeloen
- * @version $Id: ApplicationWriter.java,v 1.1 2008/09/03 23:17:25 michiel Exp $
+ * @version $Id: ApplicationWriter.java,v 1.2 2008/09/04 05:56:23 michiel Exp $
*/
public class ApplicationWriter extends org.mmbase.util.xml.DocumentWriter {
@@ -42,7 +43,7 @@
*/
public ApplicationWriter(ApplicationReader reader, MMBase mmbase) throws
DOMException {
super("application", ApplicationReader.PUBLIC_ID_APPLICATION,
- XMLEntityResolver.DOMAIN +
XMLEntityResolver.DTD_SUBPATH + ApplicationReader.DTD_APPLICATION);
+ EntityResolver.DOMAIN + EntityResolver.DTD_SUBPATH +
ApplicationReader.DTD_APPLICATION);
this.reader = reader;
this.mmbase = mmbase;
getMessageRetriever("org.mmbase.util.xml.resources.applicationwriter");
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
