From 6348feec377da4fc3a96f79d5b9ac80ae093c92a Mon Sep 17 00:00:00 2001
From: pero <pero@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 28 Apr 2010 22:18:24 +0000
Subject: [PATCH] web.xml and fragments overwrite annotation parameters (s.
 Servlet API Sepc Nov 2009 Section 8.2.3.3 pages 80-84) not yet complete --
 filter support is missing!

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@939115 13f79535-47bb-0310-9956-ffa450edef68
---
 webapps/docs/changelog.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index af7debb74..69c28eedb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -28,6 +28,7 @@
     <author email="fhanik@apache.org">Filip Hanik</author>
     <author email="rjung@apache.org">Rainer Jung</author>
     <author email="kkolinko@apache.org">Konstantin Kolinko</author>
+    <author email="pero@apache.org">Peter Rossbach</author>
     <title>Changelog</title>
   </properties>
 
@@ -35,6 +36,13 @@
 <section name="Tomcat 7.0.0 (markt)">
   <subsection name="Catalina">
     <changelog>
+      <fix>
+        <rev>939114</rev>: Provide web.xml and fragments overwrite annotation parameters
+        (s. Servlet API 3.0 Spec at Nov 2009 Section 8.2.3.3 pages 80-84).
+        Check source at <code>ContextConfig.processAnnotationsFile(File,WebXml)</code>
+        and testcase <code>TestContextConfigAnnotation</code>.
+        --not yet complete-- (pero) 
+      </fix>
       <update>
         Improve and document VirtualWebappLoader. (rjung)
       </update>
-- 
2.11.0