Author: kkolinko
Date: Thu Jan 9 06:57:28 2014
New Revision: 1556741
URL: http://svn.apache.org/r1556741
Log:
Merged r1556725 from tomcat/trunk:
https://issues.apache.org/bugzilla/show_bug.cgi?id=55671
Followup to r889966:
Fix a typo in log messages: genStrAsCharArray init param in Jasper has been
renamed to genStringAsCharArray in Tomcat 7.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1556725
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1556741&r1=1556740&r2=1556741&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Thu Jan 9 06:57:28 2014
@@ -173,7 +173,7 @@ jsp.warning.development=Warning: Invalid
jsp.warning.fork=Warning: Invalid value for the initParam fork. Will use the
default value of \"true\"
jsp.warning.reloading=Warning: Invalid value for the initParam reloading. Will
use the default value of \"true\"
jsp.warning.dumpSmap=Warning: Invalid value for the initParam dumpSmap. Will
use the default value of \"false\"
-jsp.warning.genchararray=Warning: Invalid value for the initParam
genStrAsCharArray. Will use the default value of \"false\"
+jsp.warning.genchararray=Warning: Invalid value for the initParam
genStringAsCharArray. Will use the default value of \"false\"
jsp.warning.suppressSmap=Warning: Invalid value for the initParam
suppressSmap. Will use the default value of \"false\"
jsp.warning.displaySourceFragment=Warning: Invalid value for the initParam
displaySourceFragment. Will use the default value of \"true\"
jsp.warning.maxLoadedJsps=Warning: Invalid value for the initParam
maxLoadedJsps. Will use the default value of \"-1\"
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1556741&r1=1556740&r2=1556741&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Thu Jan 9 06:57:28 2014
@@ -169,7 +169,7 @@ jsp.warning.development = Aviso\: valor
jsp.warning.fork = Aviso\: valor incorrecto para el initParam fork. Se
usar\u00E1 el valor por defecto de "true"
jsp.warning.reloading = Aviso\: valor incorrecto para el initParam reloading.
Se usar\u00E1 el valor por defecto de "true"
jsp.warning.dumpSmap = Aviso\: valor incorrecto para el initParam dumpSmap. Se
usar\u00E1 el valor por defecto de "false"
-jsp.warning.genchararray = Aviso\: valor incorrecto para el initParam
genStrAsCharArray. Se usar\u00E1 el valor por defecto de "false"
+jsp.warning.genchararray = Aviso\: valor incorrecto para el initParam
genStringAsCharArray. Se usar\u00E1 el valor por defecto de "false"
jsp.warning.suppressSmap = Aviso\: valor incorrecto para el initParam
suppressSmap. Se usar\u00E1 el valor por defecto de "false"
jsp.warning.displaySourceFragment = Aviso\: valor incorrecto para el initParam
displaySourceFragment. Se usar\u00E1 el valor por defecto de "verdadero"
jsp.warning.maxLoadedJsps = Aviso\: Valor inv\u00E1lido para el initParam
maxLoadedJsps. Usar\u00E9 el valor por defecto de "-1"
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1556741&r1=1556740&r2=1556741&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Thu Jan 9 06:57:28 2014
@@ -155,7 +155,7 @@ jsp.warning.development=\u8b66\u544a: in
jsp.warning.fork=\u8b66\u544a: initParam
fork\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\"true\"\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059
jsp.warning.reloading=\u8b66\u544a: initParam
reloading\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\"true\"\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059
jsp.warning.dumpSmap=\u8b66\u544a: initParam
dumpSmap\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\"false\"\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059
-jsp.warning.genchararray=\u8b66\u544a: initParam
genStrAsCharArray\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\"false\"\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059
+jsp.warning.genchararray=\u8b66\u544a: initParam
genStringAsCharArray\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\"false\"\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059
jsp.warning.suppressSmap=\u8b66\u544a: initParam
suppressSmap\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u5024
\"false\" \u3092\u4f7f\u7528\u3057\u307e\u3059
jsp.error.badtaglib=\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea {0}
\u3092\u30aa\u30fc\u30d7\u30f3\u3067\u304d\u307e\u305b\u3093: {1}
jsp.error.badGetReader=\u30b9\u30c8\u30ea\u30fc\u30e0\u304c\u30d0\u30c3\u30d5\u30a1\u30ea\u30f3\u30b0\u3055\u308c\u3066\u3044\u306a\u3044\u5834\u5408\u306b\u306f\u3001Reader\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1556741&r1=1556740&r2=1556741&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jan 9 06:57:28 2014
@@ -71,6 +71,11 @@
TLD files were swallowed. (markt)
</fix>
<fix>
+ <bug>55671</bug>: Correct typo in the log message for a wrong value of
+ genStringAsCharArray init-param of JspServlet. This parameter
+ had a different name in Tomcat 6. (kkolinko)
+ </fix>
+ <fix>
<bug>55973</bug>: Fix processing of XML schemas when validation is
enabled in Jasper. (kkolinko)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
