Update of /var/cvs/src/org/mmbase/security/classsecurity
In directory james.mmbase.org:/tmp/cvs-serv20661/security/classsecurity
Modified Files:
ClassAuthentication.java ClassAuthenticationWrapper.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/security/classsecurity
Index: ClassAuthentication.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/security/classsecurity/ClassAuthentication.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- ClassAuthentication.java 21 Aug 2008 15:40:19 -0000 1.19
+++ ClassAuthentication.java 4 Sep 2008 05:56:23 -0000 1.20
@@ -29,7 +29,7 @@
* its configuration file, contains this configuration.
*
* @author Michiel Meeuwissen
- * @version $Id: ClassAuthentication.java,v 1.19 2008/08/21 15:40:19 michiel
Exp $
+ * @version $Id: ClassAuthentication.java,v 1.20 2008/09/04 05:56:23 michiel
Exp $
* @see ClassAuthenticationWrapper
* @since MMBase-1.8
*/
@@ -41,7 +41,7 @@
private static int MAX_DEPTH = 10;
static {
- XMLEntityResolver.registerPublicID(PUBLIC_ID_CLASSSECURITY_1_0,
DTD_CLASSSECURITY_1_0, ClassAuthentication.class);
+
org.mmbase.util.xml.EntityResolver.registerPublicID(PUBLIC_ID_CLASSSECURITY_1_0,
DTD_CLASSSECURITY_1_0, ClassAuthentication.class);
}
private static List<Login> authenticatedClasses = null;
@@ -79,8 +79,8 @@
if (! con.getDoInput()) continue;
InputSource in = new InputSource(con.getInputStream());
Document document = DocumentReader.getDocumentBuilder(true, //
validate aggresively, because no further error-handling will be done
- new
XMLErrorHandler(false, 0), // don't log, throw exception if not valid,
otherwise big chance on NPE and so on
- new
XMLEntityResolver(true, ClassAuthentication.class) // validate
+ new
org.mmbase.util.xml.ErrorHandler(false, 0), // don't log, throw exception if
not valid, otherwise big chance on NPE and so on
+ new
org.mmbase.util.xml.EntityResolver(true, ClassAuthentication.class) // validate
).parse(in);
NodeList authenticates =
document.getElementsByTagName("authenticate");
Index: ClassAuthenticationWrapper.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/security/classsecurity/ClassAuthenticationWrapper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ClassAuthenticationWrapper.java 30 Jan 2005 16:46:39 -0000 1.7
+++ ClassAuthenticationWrapper.java 4 Sep 2008 05:56:23 -0000 1.8
@@ -28,7 +28,7 @@
* can be linked to classes in this XML configuration file.
*
* @author Michiel Meeuwissen
- * @version $Id: ClassAuthenticationWrapper.java,v 1.7 2005/01/30 16:46:39
nico Exp $
+ * @version $Id: ClassAuthenticationWrapper.java,v 1.8 2008/09/04 05:56:23
michiel Exp $
* @since MMBase-1.8
*/
public class ClassAuthenticationWrapper extends Authentication {
@@ -64,8 +64,8 @@
InputSource in =
MMBaseCopConfig.securityLoader.getInputSource(configResource);
Document document = DocumentReader.getDocumentBuilder(
true, // validate aggresively, because no further
error-handling will be done
- new XMLErrorHandler(false, 0), // don't log, throw exception if
not valid, otherwise big chance on NPE and so on
- new XMLEntityResolver(true, getClass()) // validate
+ new org.mmbase.util.xml.ErrorHandler(false, 0), // don't log,
throw exception if not valid, otherwise big chance on NPE and so on
+ new org.mmbase.util.xml.EntityResolver(true, getClass()) //
validate
).parse(in);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
