Author: kfujino
Date: Fri Aug 6 02:19:28 2010
New Revision: 982850
URL: http://svn.apache.org/viewvc?rev=982850&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49714
The annotation process of Jar doesn't influence distributable element of
web.xml.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=982850&r1=982849&r2=982850&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Aug 6
02:19:28 2010
@@ -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>();
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=982850&r1=982849&r2=982850&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Aug 6 02:19:28 2010
@@ -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">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
