- Standardize on the digester (which is apparently a bit faster than using DOM)....

  now handles all XML parsing in Catalina.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@390157 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/modeler/Registry.java b/java/org/apache/tomcat/util/modeler/Registry.java
index 92ddff2..6fdf23c 100644 (file)
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -773,7 +773,7 @@ public class Registry implements RegistryMBean, MBeanRegistration  {
         }\r
         \r
         if( sourceType==null ) {\r
-            sourceType="MbeansDescriptorsDOMSource";\r
+            sourceType="MbeansDescriptorsDigesterSource";\r
         }\r
         ModelerSource ds=getModelerSource(sourceType);\r
         List mbeans=ds.loadDescriptors(this, location, type, inputsource);\r
@@ -786,7 +786,7 @@ public class Registry implements RegistryMBean, MBeanRegistration  {
             return "MbeansDescriptorsSerSource";\r
         }\r
         else if( s.endsWith(".xml")) {\r
-            return "MbeansDescriptorsDOMSource";\r
+            return "MbeansDescriptorsDigesterSource";\r
         }\r
         return null;\r
     }\r
@@ -866,7 +866,7 @@ public class Registry implements RegistryMBean, MBeanRegistration  {
         searchedPaths.put( packageName,  dURL );\r
         try {\r
             if( descriptors.endsWith(".xml" ))\r
-                loadDescriptors("MbeansDescriptorsDOMSource", dURL, null);\r
+                loadDescriptors("MbeansDescriptorsDigesterSource", dURL, null);\r
             else\r
                 loadDescriptors("MbeansDescriptorsSerSource", dURL, null);\r
             return;\r
@@ -912,7 +912,7 @@ public class Registry implements RegistryMBean, MBeanRegistration  {
                 URL url=(URL)en.nextElement();\r
                 InputStream is=url.openStream();\r
                 if( log.isDebugEnabled()) log.debug("Loading " + url);\r
-                loadDescriptors("MBeansDescriptorDOMSource", is, null );\r
+                loadDescriptors("MbeansDescriptorsDigesterSource", is, null );\r
             }\r
         } catch( Exception ex ) {\r
             ex.printStackTrace();\r
@@ -957,7 +957,7 @@ public class Registry implements RegistryMBean, MBeanRegistration  {
     private ModelerSource getModelerSource( String type )\r
             throws Exception\r
     {\r
-        if( type==null ) type="MbeansDescriptorsDOMSource";\r
+        if( type==null ) type="MbeansDescriptorsDigesterSource";\r
         if( type.indexOf( ".") < 0 ) {\r
             type="org.apache.tomcat.util.modeler.modules." + type;\r
         }\r
@@ -1031,7 +1031,7 @@ public class Registry implements RegistryMBean, MBeanRegistration  {
     public void loadDescriptors( Object source )\r
             throws Exception\r
     {\r
-        loadDescriptors("MbeansDescriptorsDOMSource", source, null );\r
+        loadDescriptors("MbeansDescriptorsDigesterSource", source, null );\r
     }\r
 \r
     /** @deprecated - may still be used in code using pre-1.1 builds\r