tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mark Thomas <ma...@apache.org>
Subject Re: svn commit: r1831691 - in /tomcat/trunk: java/org/apache/jasper/JspC.java java/org/apache/jasper/resources/LocalStrings.properties webapps/docs/changelog.xml
Date Wed, 16 May 2018 13:47:33 GMT
On 16/05/18 14:31, Konstantin Kolinko wrote:
> 2018-05-16 13:03 GMT+03:00  <markt@apache.org>:
>> Author: markt
>> Date: Wed May 16 10:03:30 2018
>> New Revision: 1831691

<snip/>

> 1). There is an example in
> http://tomcat.apache.org/tomcat-9.0-doc/jasper-howto.html
> -> Web Application Compilation
> -> webXmlFragment="${webapp.path}/WEB-INF/generated_web.xml"
> 
> It needs updating?

Probably. I'll take a look.

>> Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
>> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1831691&r1=1831690&r2=1831691&view=diff
>> ==============================================================================
>> --- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties (original)
>> +++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Wed May
16 10:03:30 2018
>> @@ -178,6 +178,7 @@ where options include:\n\
>>  \    -compile              Compiles generated servlets\n\
>>  \    -failFast             Stop on first compile error\n\
>>  \    -webinc <file>        Creates a partial servlet mappings in the file\n\
>> +\    -webfrg <file>        Creates a complete web-fragment.xml the file\n\
> 
> 2) s/"the file"/"in the file", as in sibling options?

I'll fix that wording.

> 3) I do not see where JspC processes the "-webfrg" switch.
> 
> SWITCH_WEBAPP_FRG in JspC is declared, but not used.
> 
> A sibling "webinc" switch (SWITCH_WEBAPP_INC) is processed in
> #setArgs() (line 339).

I went back and forth naming. I may have missed that change. I'll take a
look and add it if necessary.

>> @@ -205,6 +206,22 @@ Automatically created by Apache Tomcat J
>>  jspc.webxml.footer=\n\
>>  </web-app>\n\
>>  \n
>> +jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
>> +<web-fragment xmlns="http://java.sun.com/xml/ns/javaee"\n\
>> +\    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
>> +\    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee\n\
>> +\                        http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"\n\
>> +\    version="3.0"\n\
> 
> 4) Update version, namespace, schema to 3.1 for Tomcat 8.0, 8.5,  4.0
> for Tomcat 9 ?

The web.xml generation sticks to Servlet 2.5. I decided to stick to the
lowest useable version number for the fragment as well since I could not
see any benefit in generating a file with later version number.

Thanks for the review.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message