Followup to r1138573
authorkkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Wed, 22 Jun 2011 23:39:58 +0000 (23:39 +0000)
committerkkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Wed, 22 Jun 2011 23:39:58 +0000 (23:39 +0000)
commit50bac24ed9c9088b182f7e8a6e2ce1126d1c7d61
tree7592798af8a33f7478aeaa579ab3538f084f1edf
parent610255bb2733f33b510e4c7722278ae9bd658ebd
Followup to r1138573
Improve support for embedding Tomcat 7.

Expose the string that was used to suppress loading default web.xml as a constant. Short-circuit the attempt to load the web.xml file when this magic value is used. Thus saving us from unneeded getResourceAsStream() call.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1138693 13f79535-47bb-0310-9956-ffa450edef68
java/org/apache/catalina/startup/Constants.java
java/org/apache/catalina/startup/ContextConfig.java
java/org/apache/catalina/startup/Tomcat.java
test/org/apache/catalina/core/TestStandardContextResources.java
webapps/docs/changelog.xml