View | Details | Raw Unified | Return to bug 57809
Collapse All | Expand All

(-)java/org/apache/tomcat/util/scan/Constants.java (-1 / +2 lines)
Lines 34-40 Link Here
34
    public static final String JAR_EXT = ".jar";
34
    public static final String JAR_EXT = ".jar";
35
    public static final String WEB_INF_LIB = "/WEB-INF/lib/";
35
    public static final String WEB_INF_LIB = "/WEB-INF/lib/";
36
36
37
    /* Context attributes - used to pass short-cuts to Jasper */
37
    /* No longer used */
38
    @Deprecated
38
    public static final String MERGED_WEB_XML =
39
    public static final String MERGED_WEB_XML =
39
        "org.apache.tomcat.util.scan.MergedWebXml";
40
        "org.apache.tomcat.util.scan.MergedWebXml";
40
}
41
}
(-)java/org/apache/catalina/startup/ContextConfig.java (-8 / +1 lines)
Lines 1181-1195 Link Here
1181
            configureContext(webXml);
1181
            configureContext(webXml);
1182
        }
1182
        }
1183
1183
1184
        // Step 9a. Make the merged web.xml available to other
1185
        // components, specifically Jasper, to save those components
1186
        // from having to re-generate it.
1187
        // TODO Use a ServletContainerInitializer for Jasper
1188
        String mergedWebXml = webXml.toXml();
1189
        sContext.setAttribute(
1190
               org.apache.tomcat.util.scan.Constants.MERGED_WEB_XML,
1191
               mergedWebXml);
1192
        if (context.getLogEffectiveWebXml()) {
1184
        if (context.getLogEffectiveWebXml()) {
1185
            String mergedWebXml = webXml.toXml();
1193
            log.info("web.xml:\n" + mergedWebXml);
1186
            log.info("web.xml:\n" + mergedWebXml);
1194
        }
1187
        }
1195
1188

Return to bug 57809