Author: markt
Date: Tue Jun 6 08:20:22 2017
New Revision: 1797748
URL: http://svn.apache.org/viewvc?rev=1797748&view=rev
Log:
Better document the meaning of the trimSpaces option for Jasper.
Modified:
tomcat/trunk/conf/web.xml
tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/Options.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/jasper-howto.xml
Modified: tomcat/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1797748&r1=1797747&r2=1797748&view=diff
==============================================================================
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Tue Jun 6 08:20:22 2017
@@ -232,8 +232,8 @@
<!-- suppressSmap Should the generation of SMAP info for JSR45 -->
<!-- debugging be suppressed? [false] -->
<!-- -->
- <!-- trimSpaces Should white spaces in template text between -->
- <!-- actions or directives be trimmed? [false] -->
+ <!-- trimSpaces Should template text that consists entirely of -->
+ <!-- whitespace be removed from the output? [false] -->
<!-- -->
<!-- xpoweredBy Determines whether X-Powered-By response -->
<!-- header is added by generated servlet. [false] -->
Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=1797748&r1=1797747&r2=1797748&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original)
+++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Tue Jun 6
08:20:22 2017
@@ -63,7 +63,7 @@ public final class EmbeddedServletOption
private boolean keepGenerated = true;
/**
- * Should white spaces between directives or actions be trimmed?
+ * Should template text that consists entirely of whitespace be removed?
*/
private boolean trimSpaces = false;
@@ -239,7 +239,7 @@ public final class EmbeddedServletOption
}
/**
- * Should white spaces between directives or actions be trimmed?
+ * Should template text that consists entirely of whitespace be removed?
*/
@Override
public boolean getTrimSpaces() {
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1797748&r1=1797747&r2=1797748&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Tue Jun 6 08:20:22 2017
@@ -438,7 +438,9 @@ public class JspC extends Task implement
}
/**
- * Sets the option to trim white spaces between directives or actions.
+ * Sets the option to remove template text that consists entirely of
+ * whitespace.
+ *
* @param ts New value
*/
public void setTrimSpaces(boolean ts) {
Modified: tomcat/trunk/java/org/apache/jasper/Options.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/Options.java?rev=1797748&r1=1797747&r2=1797748&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/Options.java (original)
+++ tomcat/trunk/java/org/apache/jasper/Options.java Tue Jun 6 08:20:22 2017
@@ -98,8 +98,8 @@ public interface Options {
public boolean isSmapDumped();
/**
- * @return <code>true</code> to trim white spaces between
- * directives or actions.
+ * @return <code>true</code> to remove template text that consists entirely
+ * of whitespace
*/
public boolean getTrimSpaces();
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=1797748&r1=1797747&r2=1797748&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Tue
Jun 6 08:20:22 2017
@@ -185,7 +185,7 @@ where options include:\n\
\ -ieplugin <clsid> Java Plugin classid for Internet Explorer\n\
\ -classpath <path> Overrides java.class.path system property\n\
\ -xpoweredBy Add X-Powered-By response header\n\
-\ -trimSpaces Trim spaces in template text between actions,
directives\n\
+\ -trimSpaces Remove template text that consists entirely of
whitespace\n\
\ -javaEncoding <enc> Set the encoding charset for Java classes (default
UTF-8)\n\
\ -source <version> Set the -source argument to the compiler (default
1.8)\n\
\ -target <version> Set the -target argument to the compiler (default
1.8)\n\
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1797748&r1=1797747&r2=1797748&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Tue Jun 6 08:20:22 2017
@@ -176,7 +176,7 @@ jspc.usage = Uso: jspc <opciones> [--] <
\ -ieplugin <clsid> Java Plugin classid para Internet Explorer\n\
\ -classpath <path> Pasa por alto la propiedad de sistema
java.class.path\n\
\ -xpoweredBy A\u00F1ade cabecera de respuesta X-Powered-By\n\
- \ -trimSpaces Trim spaces in template text between actions,
directives\n\
+ \ -trimSpaces Remove template text that consists entirely of
whitespace\n\
\ -javaEncoding <enc> Set the encoding charset for Java classes
(default UTF-8)\n\
\ -source <version> Set the -source argument to the compiler (default
1.8)\n\
\ -target <version> Set the -target argument to the compiler (default
1.8)\n
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=1797748&r1=1797747&r2=1797748&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
Tue Jun 6 08:20:22 2017
@@ -111,7 +111,7 @@ o\u00f9 les options comprennet:\n\
\ -webxml <file> Cr\u00e9ation d''un fichier web.xml complet pour
l''option -webapp.\n\
\ -ieplugin <clsid> Le classid du Plugin Java Plugin pour Internet
Explorer\n\
\ -sax2 <driverclassname> Le nom de classe du Driver SAX 2.0 \u00e0
utiliser\n\
-\ -trimSpaces Trim spaces in template text between actions,
directives\n\
+\ -trimSpaces Remove template text that consists entirely of
whitespace\n\
\ -javaEncoding <enc> Set the encoding charset for Java classes (default
UTF-8)\n\
\ -source <version> Set the -source argument to the compiler (default
1.8)\n\
\ -target <version> Set the -target argument to the compiler (default
1.8)\n\
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1797748&r1=1797747&r2=1797748&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Tue Jun 6 08:20:22 2017
@@ -152,8 +152,7 @@ JSP\u30d5\u30a1\u30a4\u30eb\u306e\u5834\
\ -ieplugin <clsid> Internet Explorer\u306eJava Plugin\u306eclassid\n\
\ -classpath <path>
java.class.path\u30b7\u30b9\u30c6\u30e0\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u4e0a\u66f8\u304d\n\
\ -xpoweredBy
X-Powered-By\u30ec\u30b9\u30dd\u30f3\u30b9\u30d8\u30c3\u30c0\u306e\u8ffd\u52a0\n\
-\ -trimSpaces
\u30a2\u30af\u30b7\u30e7\u30f3\u3084\u6307\u793a\u5b50\u306e\u9593\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30c6\u30ad\u30b9\u30c8\u4e2d\u306e\u30b9\u30da\u30fc\u30b9\u3092\u524a\u9664\n\
-\ -trimSpaces Trim spaces in template text between actions,
directives\n\
+\ -trimSpaces Remove template text that consists entirely of
whitespace\n\
\ -javaEncoding <enc> Set the encoding charset for Java classes (default
UTF-8)\n\
\ -source <version> Set the -source argument to the compiler (default
1.8)\n\
\ -target <version> Set the -target argument to the compiler (default
1.8)\n\
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1797748&r1=1797747&r2=1797748&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jun 6 08:20:22 2017
@@ -124,6 +124,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <fix>
+ Better document the meaning of the trimSpaces option for Jasper.
(markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<add>
Modified: tomcat/trunk/webapps/docs/jasper-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jasper-howto.xml?rev=1797748&r1=1797747&r2=1797748&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jasper-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jasper-howto.xml Tue Jun 6 08:20:22 2017
@@ -191,8 +191,9 @@ application. This option is ignored if r
debugging be suppressed? <code>true</code> or <code>false</code>, default
<code>false</code>.</li>
-<li><strong>trimSpaces</strong> - Should white spaces in template text between
-actions or directives be trimmed ?, default <code>false</code>.</li>
+<li><strong>trimSpaces</strong> - Should template text that consists entirely
of
+whitespace be removed? <code>true</code> or <code>false</code>, default
+<code>false</code>.</li>
<li><strong>xpoweredBy</strong> - Determines whether X-Powered-By response
header is added by generated servlet. <code>true</code> or <code>false</code>,
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
