2011/6/8 Mark Thomas <ma...@apache.org>:
> On 07/06/2011 21:54, Rainer Jung wrote:
>> On 07.06.2011 21:39, Mark Thomas wrote:
>>> On 07/06/2011 20:24, Jess Holle wrote:
>>>> web apps whose web.xml does not specify distributable should certainly
>>>> not be treated as such -- that would be a spec violation and break lots
>>>> of web apps.
>>>
>>> How many times do I have to write this? This is NOT what is being
>>> proposed. All the proposed change does is fix a regression that prevents
>>> *any* web application for declaring itself as distributable.
>>
>> +1 to that change and to 7.0.15 is broken.
>
> I've confirmed with testing that the proposed fix does exactly what is
> intended and fixes the regression. I'll be committing it shortly.
>
I reviewed it and am revoking my veto wrt. Plan A.
+1 to the change to ContextConfig.java,
BTW, two minor thoughts wrt. o.a.c.startup.ContextConfig#webConfig()
1) Line 1208
// Parse host level web.xml if present
// Additive apart from welcome pages
webXml.setReplaceWelcomeFiles(true);
InputSource hostWebXml = getHostWebXmlSource();
parseWebXml(hostWebXml, webXmlDefaultFragment, false);
The "webXml.setReplaceWelcomeFiles(true);" call is needed, but from
the comment it seems to me that
webXmlDefaultFragment.setReplaceWelcomeFiles(true); is also needed
here,
because webXmlDefaultFragment is the argument to parseWebXml() call
and not webXml.
2)
Line 1223:
All of the code below
// Assuming 0 is safe for what is required in this case
double webXmlVersion = 0;
if (webXml.getVersion() != null) {
webXmlVersion = Double.parseDouble(webXml.getVersion());
}
if (webXmlVersion >= 3) {
Just can be replaced with one line
if (webXml.getMajorVersion() >= 3) {
Note, that webXml.getVersion() never returns null.
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
