Author: markt
Date: Wed Aug 15 20:38:19 2012
New Revision: 1373622
URL: http://svn.apache.org/viewvc?rev=1373622&view=rev
Log:
Always make the final webl.xml file available
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1373622&r1=1373621&r2=1373622&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed Aug 15
20:38:19 2012
@@ -1230,18 +1230,6 @@ public class ContextConfig implements Li
// Step 9. Apply merged web.xml to Context
if (ok) {
webXml.configureContext(context);
-
- // Step 9a. Make the merged web.xml available to other
- // components, specifically Jasper, to save those components
- // from having to re-generate it.
- // TODO Use a ServletContainerInitializer for Jasper
- String mergedWebXml = webXml.toXml();
- sContext.setAttribute(
- org.apache.tomcat.util.scan.Constants.MERGED_WEB_XML,
- mergedWebXml);
- if (context.getLogEffectiveWebXml()) {
- log.info("web.xml:\n" + mergedWebXml);
- }
}
} else {
webXml.merge(defaults);
@@ -1249,6 +1237,18 @@ public class ContextConfig implements Li
webXml.configureContext(context);
}
+ // Step 9a. Make the merged web.xml available to other
+ // components, specifically Jasper, to save those components
+ // from having to re-generate it.
+ // TODO Use a ServletContainerInitializer for Jasper
+ String mergedWebXml = webXml.toXml();
+ sContext.setAttribute(
+ org.apache.tomcat.util.scan.Constants.MERGED_WEB_XML,
+ mergedWebXml);
+ if (context.getLogEffectiveWebXml()) {
+ log.info("web.xml:\n" + mergedWebXml);
+ }
+
// Always need to look for static resources
// Step 10. Look for static resources packaged in JARs
if (ok) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
