Author: markt Date: Wed Jun 3 20:54:32 2009 New Revision: 781542 URL: http://svn.apache.org/viewvc?rev=781542&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45933 Don't use xml parser from web-app to process tld files
Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/TldConfig.java tomcat/container/tc5.5.x/webapps/docs/changelog.xml Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java?rev=781542&r1=781541&r2=781542&view=diff ============================================================================== --- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java Wed Jun 3 20:54:32 2009 @@ -4140,10 +4140,6 @@ ((Lifecycle) pipeline).start(); } - if(getProcessTlds()) { - processTlds(); - } - // Notify our interested LifecycleListeners lifecycle.fireLifecycleEvent(START_EVENT, null); @@ -4278,40 +4274,6 @@ } /** - * Processes TLDs. - * - * @throws LifecycleException If an error occurs - */ - protected void processTlds() throws LifecycleException { - TldConfig tldConfig = new TldConfig(); - tldConfig.setContext(this); - - // (1) check if the attribute has been defined - // on the context element. - tldConfig.setTldValidation(tldValidation); - tldConfig.setTldNamespaceAware(tldNamespaceAware); - - // (2) if the attribute wasn't defined on the context - // try the host. - if (!tldValidation) { - tldConfig.setTldValidation - (((StandardHost) getParent()).getXmlValidation()); - } - - if (!tldNamespaceAware) { - tldConfig.setTldNamespaceAware - (((StandardHost) getParent()).getXmlNamespaceAware()); - } - - try { - tldConfig.execute(); - } catch (Exception ex) { - log.error("Error reading tld listeners " - + ex.toString(), ex); - } - } - - /** * Stop this Context component. * * @exception LifecycleException if a shutdown error occurs @@ -5083,6 +5045,10 @@ return; } } + if (processTlds) { + this.addLifecycleListener(new TldConfig()); + } + super.init(); // Notify our interested LifecycleListeners Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties?rev=781542&r1=781541&r2=781542&view=diff ============================================================================== --- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties (original) +++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties Wed Jun 3 20:54:32 2009 @@ -87,6 +87,8 @@ hostConfig.undeploy=Undeploying context [{0}] hostConfig.undeploy.error=Error undeploying web application at context path {0} hostConfig.undeploying=Undeploying deployed web applications +tldConfig.cce=Lifecycle event data object {0} is not a Context +tldConfig.execute=Error processing TLD files for context path {0} userConfig.database=Exception loading user database userConfig.deploy=Deploying web application for user {0} userConfig.deploying=Deploying user web applications Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/TldConfig.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/TldConfig.java?rev=781542&r1=781541&r2=781542&view=diff ============================================================================== --- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/TldConfig.java (original) +++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/TldConfig.java Wed Jun 3 20:54:32 2009 @@ -49,20 +49,24 @@ import org.apache.catalina.Context; import org.apache.catalina.Globals; +import org.apache.catalina.Lifecycle; +import org.apache.catalina.LifecycleEvent; +import org.apache.catalina.LifecycleListener; import org.apache.catalina.core.StandardContext; +import org.apache.catalina.core.StandardHost; import org.apache.catalina.util.StringManager; import org.apache.tomcat.util.digester.Digester; import org.xml.sax.InputSource; /** - * Startup event listener for a <b>Context</b> that configures the properties - * of that Context, and the associated defined servlets. + * Startup event listener for a <b>Context</b> that configures application + * listeners configured in any TLD files. * * @author Craig R. McClanahan * @author Jean-Francois Arcand * @author Costin Manolache */ -public final class TldConfig { +public final class TldConfig implements LifecycleListener { // Names of JARs that are known not to contain any TLDs private static HashSet noTldJars; @@ -399,20 +403,6 @@ } /** - * Create (if necessary) and return a Digester configured to process a tag - * library descriptor, looking for additional listener classes to be - * registered. - */ - private static Digester createTldDigester() { - - return DigesterFactory.newDigester(tldValidation, - tldNamespaceAware, - new TldRuleSet()); - - } - - - /** * Scan the JAR file at the specified resource path for TLDs in the * <code>META-INF</code> subdirectory, and scan each TLD for application * event listeners that need to be registered. @@ -504,10 +494,6 @@ private void tldScanStream(InputSource resourceStream) throws Exception { - if (tldDigester == null){ - tldDigester = createTldDigester(); - } - synchronized (tldDigester) { try { tldDigester.push(this); @@ -726,4 +712,51 @@ return jarPathMap; } + + public void lifecycleEvent(LifecycleEvent event) { + // Identify the context we are associated with + try { + context = (Context) event.getLifecycle(); + } catch (ClassCastException e) { + log.error(sm.getString("tldConfig.cce", event.getLifecycle()), e); + return; + } + + if (event.getType().equals(Lifecycle.INIT_EVENT)) { + init(); + } else if (event.getType().equals(Lifecycle.START_EVENT)) { + try { + execute(); + } catch (Exception e) { + log.error(sm.getString( + "tldConfig.execute", context.getPath()), e); + } + } // Ignore the other event types - nothing to do + } + + private void init() { + if (tldDigester == null){ + // (1) check if the attribute has been defined + // on the context element. + setTldValidation(context.getTldValidation()); + setTldNamespaceAware(context.getTldNamespaceAware()); + + // (2) if the attribute wasn't defined on the context + // try the host. + if (!tldValidation) { + setTldValidation( + ((StandardHost) context.getParent()).getXmlValidation()); + } + + if (!tldNamespaceAware) { + setTldNamespaceAware( + ((StandardHost) context.getParent()).getXmlNamespaceAware()); + } + + tldDigester = DigesterFactory.newDigester(tldValidation, + tldNamespaceAware, + new TldRuleSet()); + tldDigester.getParser(); + } + } } Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=781542&r1=781541&r2=781542&view=diff ============================================================================== --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jun 3 20:54:32 2009 @@ -72,14 +72,18 @@ (markt) </fix> <fix> - <bug>46597</bug>: Port all cookie handling changes from Tomcat 6.0.x. - (markt) - </fix> - <fix> <bug>45628</bug>: JARs that do not declare any dependencies should always be considered as fulfilled. (markt) </fix> <fix> + <bug>45933</bug>: Don't use a web application provided parser to process + TLD files. (markt) + </fix> + <fix> + <bug>46597</bug>: Port all cookie handling changes from Tomcat 6.0.x. + (markt) + </fix> + <fix> Improve handling of situation where web application tries to configure logging at the context level but the security policy prevents this. (markt/rjung) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org