Author: remm Date: Thu Mar 30 07:10:13 2006 New Revision: 390157 URL: http://svn.apache.org/viewcvs?rev=390157&view=rev Log: - Standardize on the digester (which is apparently a bit faster than using DOM). This way, digester now handles all XML parsing in Catalina.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=390157&r1=390156&r2=390157&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java Thu Mar 30 07:10:13 2006 @@ -773,7 +773,7 @@ } if( sourceType==null ) { - sourceType="MbeansDescriptorsDOMSource"; + sourceType="MbeansDescriptorsDigesterSource"; } ModelerSource ds=getModelerSource(sourceType); List mbeans=ds.loadDescriptors(this, location, type, inputsource); @@ -786,7 +786,7 @@ return "MbeansDescriptorsSerSource"; } else if( s.endsWith(".xml")) { - return "MbeansDescriptorsDOMSource"; + return "MbeansDescriptorsDigesterSource"; } return null; } @@ -866,7 +866,7 @@ searchedPaths.put( packageName, dURL ); try { if( descriptors.endsWith(".xml" )) - loadDescriptors("MbeansDescriptorsDOMSource", dURL, null); + loadDescriptors("MbeansDescriptorsDigesterSource", dURL, null); else loadDescriptors("MbeansDescriptorsSerSource", dURL, null); return; @@ -912,7 +912,7 @@ URL url=(URL)en.nextElement(); InputStream is=url.openStream(); if( log.isDebugEnabled()) log.debug("Loading " + url); - loadDescriptors("MBeansDescriptorDOMSource", is, null ); + loadDescriptors("MbeansDescriptorsDigesterSource", is, null ); } } catch( Exception ex ) { ex.printStackTrace(); @@ -957,7 +957,7 @@ private ModelerSource getModelerSource( String type ) throws Exception { - if( type==null ) type="MbeansDescriptorsDOMSource"; + if( type==null ) type="MbeansDescriptorsDigesterSource"; if( type.indexOf( ".") < 0 ) { type="org.apache.tomcat.util.modeler.modules." + type; } @@ -1031,7 +1031,7 @@ public void loadDescriptors( Object source ) throws Exception { - loadDescriptors("MbeansDescriptorsDOMSource", source, null ); + loadDescriptors("MbeansDescriptorsDigesterSource", source, null ); } /** @deprecated - may still be used in code using pre-1.1 builds --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]