You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2018/05/16 14:08:02 UTC
svn commit: r1831718 - in /tomcat/trunk: java/org/apache/jasper/JspC.java
java/org/apache/jasper/resources/LocalStrings.properties
webapps/docs/jasper-howto.xml
Author: markt
Date: Wed May 16 14:08:02 2018
New Revision: 1831718
URL: http://svn.apache.org/viewvc?rev=1831718&view=rev
Log:
Follow-up to 1831691
kkolinko review comments
Modified:
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/webapps/docs/jasper-howto.xml
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1831718&r1=1831717&r2=1831718&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Wed May 16 14:08:02 2018
@@ -341,6 +341,11 @@ public class JspC extends Task implement
if (webxmlFile != null) {
webxmlLevel = INC_WEBXML;
}
+ } else if (tok.equals(SWITCH_WEBAPP_FRG)) {
+ webxmlFile = nextArg();
+ if (webxmlFile != null) {
+ webxmlLevel = FRG_WEBXML;
+ }
} else if (tok.equals(SWITCH_WEBAPP_XML)) {
webxmlFile = nextArg();
if (webxmlFile != null) {
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=1831718&r1=1831717&r2=1831718&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Wed May 16 14:08:02 2018
@@ -178,7 +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\
+\ -webfrg <file> Creates a complete web-fragment.xml file\n\
\ -webxml <file> Creates a complete web.xml in the file\n\
\ -webxmlencoding <enc> Set the encoding charset used to read and write the web.xml\n\
\ file (default is UTF-8)\n\
Modified: tomcat/trunk/webapps/docs/jasper-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jasper-howto.xml?rev=1831718&r1=1831717&r2=1831718&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jasper-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jasper-howto.xml Wed May 16 14:08:02 2018
@@ -296,7 +296,7 @@ download) to precompile a webapp:
<jasper
validateXml="false"
uriroot="${webapp.path}"
- webXmlFragment="${webapp.path}/WEB-INF/generated_web.xml"
+ webXmlInclude="${webapp.path}/WEB-INF/generated_web.xml"
outputDir="${webapp.path}/WEB-INF/src" />
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org