From 61a0d48df49f09dd9645eb615c5d2d14bb60023c Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Fri, 30 Nov 2012 08:33:56 +1100 Subject: [PATCH] 395394 allow logging from boot classloader --- .../eclipse/jetty/xml/XmlConfiguration.java | 37 ++++++++----------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java index 66aa4ced6e2..5f71f28b31f 100644 --- a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java +++ b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java @@ -117,30 +117,23 @@ public class XmlConfiguration private synchronized static XmlParser initParser() { XmlParser parser = new XmlParser(); - try - { - URL config60 = Loader.getResource(XmlConfiguration.class,"org/eclipse/jetty/xml/configure_6_0.dtd",true); - URL config76 = Loader.getResource(XmlConfiguration.class,"org/eclipse/jetty/xml/configure_7_6.dtd",true); - parser.redirectEntity("configure.dtd",config76); - parser.redirectEntity("configure_1_0.dtd",config60); - parser.redirectEntity("configure_1_1.dtd",config60); - parser.redirectEntity("configure_1_2.dtd",config60); - parser.redirectEntity("configure_1_3.dtd",config60); - parser.redirectEntity("configure_6_0.dtd",config60); - parser.redirectEntity("configure_7_6.dtd",config76); + URL config60 = Loader.getResource(XmlConfiguration.class,"org/eclipse/jetty/xml/configure_6_0.dtd",true); + URL config76 = Loader.getResource(XmlConfiguration.class,"org/eclipse/jetty/xml/configure_7_6.dtd",true); + parser.redirectEntity("configure.dtd",config76); + parser.redirectEntity("configure_1_0.dtd",config60); + parser.redirectEntity("configure_1_1.dtd",config60); + parser.redirectEntity("configure_1_2.dtd",config60); + parser.redirectEntity("configure_1_3.dtd",config60); + parser.redirectEntity("configure_6_0.dtd",config60); + parser.redirectEntity("configure_7_6.dtd",config76); - parser.redirectEntity("http://jetty.mortbay.org/configure.dtd",config76); - parser.redirectEntity("http://jetty.eclipse.org/configure.dtd",config76); - parser.redirectEntity("http://www.eclipse.org/jetty/configure.dtd",config76); + parser.redirectEntity("http://jetty.mortbay.org/configure.dtd",config76); + parser.redirectEntity("http://jetty.eclipse.org/configure.dtd",config76); + parser.redirectEntity("http://www.eclipse.org/jetty/configure.dtd",config76); + + parser.redirectEntity("-//Mort Bay Consulting//DTD Configure//EN",config76); + parser.redirectEntity("-//Jetty//Configure//EN",config76); - parser.redirectEntity("-//Mort Bay Consulting//DTD Configure//EN",config76); - parser.redirectEntity("-//Jetty//Configure//EN",config76); - } - catch (ClassNotFoundException e) - { - LOG.warn(e.toString()); - LOG.debug(e); - } return parser; }