Author: kkolinko
Date: Wed May 30 00:01:29 2012
New Revision: 1344057
URL: http://svn.apache.org/viewvc?rev=1344057&view=rev
Log:
Mention conf/web.xml processing changes in the Migration Guide.
Modified:
tomcat/site/trunk/docs/migration-7.html
tomcat/site/trunk/xdocs/migration-7.xml
Modified: tomcat/site/trunk/docs/migration-7.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1344057&r1=1344056&r2=1344057&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-7.html (original)
+++ tomcat/site/trunk/docs/migration-7.html Wed May 30 00:01:29 2012
@@ -240,6 +240,9 @@
<a href="#System_properties">System properties</a>
</li>
<li>
+<a href="#Processing_of_conf/web.xml_file">Processing of conf/web.xml file</a>
+</li>
+<li>
<a href="#Internal_APIs">Internal APIs</a>
</li>
</ol>
@@ -915,6 +918,40 @@ of Apache Tomcat.</p>
<table border="0" cellspacing="0" cellpadding="2" width="100%">
<tr>
+<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a
name="Processing of conf/web.xml file">
+<!--()--></a><a name="Processing_of_conf/web.xml_file"><strong>Processing of
conf/web.xml file</strong></a></font></td>
+</tr>
+<tr>
+<td>
+<blockquote>
+
+
+<p>Servlet 3.0 specification defines how web.xml file of an application
+ can be combined from web fragments and annotations. Processing of the
+ global <code>conf/web.xml</code> file that defines server-wide defaults
+ was changed as a result of implementing those rules. One noticeable
+ difference is that Filters defined in the global <code>conf/web.xml</code>
+ now follow the ones defined in a web application, instead of preceding
+ them. See issues
+ <a
href="https://issues.apache.org/bugzilla/show_bug.cgi?id=51754#c1";>51754</a>
+ and
+ <a
href="https://issues.apache.org/bugzilla/show_bug.cgi?id=52138#c4";>52138</a>
+ for clarifications.</p>
+
+
+</blockquote>
+</td>
+</tr>
+<tr>
+<td>
+<br>
+</td>
+</tr>
+</table>
+
+
+<table border="0" cellspacing="0" cellpadding="2" width="100%">
+<tr>
<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a
name="Internal APIs">
<!--()--></a><a name="Internal_APIs"><strong>Internal
APIs</strong></a></font></td>
</tr>
Modified: tomcat/site/trunk/xdocs/migration-7.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-7.xml?rev=1344057&r1=1344056&r2=1344057&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/migration-7.xml (original)
+++ tomcat/site/trunk/xdocs/migration-7.xml Wed May 30 00:01:29 2012
@@ -313,6 +313,22 @@ of Apache Tomcat.</p>
</subsection>
+ <subsection name="Processing of conf/web.xml file">
+
+ <p>Servlet 3.0 specification defines how web.xml file of an application
+ can be combined from web fragments and annotations. Processing of the
+ global <code>conf/web.xml</code> file that defines server-wide defaults
+ was changed as a result of implementing those rules. One noticeable
+ difference is that Filters defined in the global <code>conf/web.xml</code>
+ now follow the ones defined in a web application, instead of preceding
+ them. See issues
+ <a
href="https://issues.apache.org/bugzilla/show_bug.cgi?id=51754#c1";>51754</a>
+ and
+ <a
href="https://issues.apache.org/bugzilla/show_bug.cgi?id=52138#c4";>52138</a>
+ for clarifications.</p>
+
+ </subsection>
+
<subsection name="Internal APIs">
<p>Whilst the Tomcat 7 internal API is broadly compatible with Tomcat 6
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
