Author: kkolinko
Date: Tue Feb 11 22:50:33 2014
New Revision: 1567433
URL: http://svn.apache.org/r1567433
Log:
Backport r1567429 from tomcat/trunk:
One more followup to r1567148
Assert that version of merged web.xml is dictated by webapp's web.xml file, not
by default one.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXml.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1567429
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXml.java?rev=1567433&r1=1567432&r2=1567433&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXml.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXml.java Tue
Feb 11 22:50:33 2014
@@ -176,6 +176,8 @@ public class TestWebXml {
Assert.assertEquals(0, handler.getErrors().size());
Assert.assertEquals(0, handler.getWarnings().size());
+
+ Assert.assertEquals(version, webxml.getVersion());
}
// A simplified copy of ContextConfig.getDefaultWebXmlFragment().
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
