Author: violetagg
Date: Tue Apr 16 20:15:28 2013
New Revision: 1468594
URL: http://svn.apache.org/r1468594
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54851
Merged revision 1468415 from tomcat/trunk:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54851
Directories without any web.xml fragments should not impact the status of
distributable. Patch provided by Trask Stalnaker.
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:r1468415
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=1468594&r1=1468593&r2=1468594&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
Tue Apr 16 20:15:28 2013
@@ -2719,6 +2719,10 @@ public class ContextConfig implements Li
new
InputSource(fragmentFile.toURI().toURL().toString());
source.setByteStream(stream);
parseWebXml(source, fragment, true);
+ } else {
+ // If there is no web.xml, normal folder no impact on
+ // distributable
+ fragment.setDistributable(true);
}
} finally {
fragment.setURL(file.toURI().toURL());
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=1468594&r1=1468593&r2=1468594&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Apr 16 20:15:28 2013
@@ -62,6 +62,11 @@
Update Tomcat's internal copy of Commons FileUpload to FileUpload 1.3.
(markt)
</update>
+ <fix>
+ <bug>54851</bug>: When scanning for web fragments, directories without
+ any web-fragment.xml should not impact the status of distributable
+ element. Patch provided by Trask Stalnaker. (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
