Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49714

The annotation process of Jar doesn't influence distributable element of web.xml.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@982850 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
index 45b08cd..79f375b 100644 (file)
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -1674,6 +1674,8 @@ public class ContextConfig
         for(WebXml fragment : fragments) {
             if (!fragment.isMetadataComplete()) {
                 WebXml annotations = new WebXml();
+                // no impact on distributable
+                annotations.setDistributable(true);
                 URL url = fragment.getURL();
                 processAnnotationsUrl(url, annotations);
                 Set<WebXml> set = new HashSet<WebXml>();

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8446014..166dd06 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -42,6 +42,10 @@
         Allow glob patterns in the <code>jarsToSkip</code> configuration and add
         some debug logging to the jar scanner. (rjung)
       </update>
+      <fix>
+        <bug>49714</bug>: The annotation process of Jar doesn't influence 
+        distributable element of web.xml. (kfujino)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">