svn commit: r1373623 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Aug 15 20:40:33 2012
New Revision: 1373623

URL: http://svn.apache.org/viewvc?rev=1373623&view=rev
Log:
Always make the final web.xml file available

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1373622

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1373623&r1=1373622&r2=1373623&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java 
Wed Aug 15 20:40:33 2012
@@ -1324,18 +1324,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);
@@ -1343,6 +1331,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) {

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1373623&r1=1373622&r2=1373623&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Aug 15 20:40:33 2012
@@ -144,6 +144,10 @@
         <code>&lt;jsp-property-group&gt;</code> elements having multiple
         <code>&lt;url-pattern&gt;</code> elements. (markt)
       </fix>
+      <add>
+        Always make the resulting web.xml available even if metadata-complete 
is
+        true. (markt)
+      </add>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org