Attachment #31187 for bug #55671

View | Details | Raw Unified | Return to bug 55671
Collapse All | Expand All

Lines 196-202 Link Here

(-)a/conf/web.xml (-1 / +2 lines)
196	<!-- a separate JVM is used for JSP page compiles -->	196	<!-- a separate JVM is used for JSP page compiles -->
197	<!-- from the one Tomcat is running in. [true] -->	197	<!-- from the one Tomcat is running in. [true] -->
198	<!-- -->	198	<!-- -->
199	<!-- genStrAsCharArray Should text strings be generated as char -->	199	<!-- genStringAsCharArray -->
		200	<!-- Should text strings be generated as char -->
200	<!-- arrays, to improve performance in some cases? -->	201	<!-- arrays, to improve performance in some cases? -->
201	<!-- [false] -->	202	<!-- [false] -->
202	<!-- -->	203	<!-- -->




import org.apache.jasper.compiler.JspConfig;
import org.apache.jasper.compiler.TagPluginManager;
import org.apache.jasper.compiler.Localizer;
import org.apache.jasper.xmlparser.ParserUtils;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;


            }
        }

        String genCharArray = config.getInitParameter("genStringAsCharArray");
        if (genCharArray == null) {
            // Try the old name
            genCharArray = config.getInitParameter("genStrAsCharArray");
        }
        if (genCharArray != null) {
            if (genCharArray.equalsIgnoreCase("true")) {
                genStringAsCharArray = true;

Lines 174-180 jsp.warning.development=Warning: Invalid value for the initParam development. Wi Link Here

(-)a/java/org/apache/jasper/resources/LocalStrings.properties (-1 / +1 lines)
174	jsp.warning.fork=Warning: Invalid value for the initParam fork. Will use the default value of \"true\"	174	jsp.warning.fork=Warning: Invalid value for the initParam fork. Will use the default value of \"true\"
175	jsp.warning.reloading=Warning: Invalid value for the initParam reloading. Will use the default value of \"true\"	175	jsp.warning.reloading=Warning: Invalid value for the initParam reloading. Will use the default value of \"true\"
176	jsp.warning.dumpSmap=Warning: Invalid value for the initParam dumpSmap. Will use the default value of \"false\"	176	jsp.warning.dumpSmap=Warning: Invalid value for the initParam dumpSmap. Will use the default value of \"false\"
177	jsp.warning.genchararray=Warning: Invalid value for the initParam genStrAsCharArray. Will use the default value of \"false\"	177	jsp.warning.genchararray=Warning: Invalid value for the initParam genStringAsCharArray. Will use the default value of \"false\"
178	jsp.warning.suppressSmap=Warning: Invalid value for the initParam suppressSmap. Will use the default value of \"false\"	178	jsp.warning.suppressSmap=Warning: Invalid value for the initParam suppressSmap. Will use the default value of \"false\"
179	jsp.warning.displaySourceFragment=Warning: Invalid value for the initParam displaySourceFragment. Will use the default value of \"true\"	179	jsp.warning.displaySourceFragment=Warning: Invalid value for the initParam displaySourceFragment. Will use the default value of \"true\"
180	jsp.error.badtaglib=Unable to open taglibrary {0} : {1}	180	jsp.error.badtaglib=Unable to open taglibrary {0} : {1}

Lines 167-173 jsp.warning.development = Aviso\: valor incorrecto para el initParam development Link Here

(-)a/java/org/apache/jasper/resources/LocalStrings_es.properties (-1 / +1 lines)
167	jsp.warning.fork = Aviso\: valor incorrecto para el initParam fork. Se usar\u00E1 el valor por defecto de "true"	167	jsp.warning.fork = Aviso\: valor incorrecto para el initParam fork. Se usar\u00E1 el valor por defecto de "true"
168	jsp.warning.reloading = Aviso\: valor incorrecto para el initParam reloading. Se usar\u00E1 el valor por defecto de "true"	168	jsp.warning.reloading = Aviso\: valor incorrecto para el initParam reloading. Se usar\u00E1 el valor por defecto de "true"
169	jsp.warning.dumpSmap = Aviso\: valor incorrecto para el initParam dumpSmap. Se usar\u00E1 el valor por defecto de "false"	169	jsp.warning.dumpSmap = Aviso\: valor incorrecto para el initParam dumpSmap. Se usar\u00E1 el valor por defecto de "false"
170	jsp.warning.genchararray = Aviso\: valor incorrecto para el initParam genStrAsCharArray. Se usar\u00E1 el valor por defecto de "false"	170	jsp.warning.genchararray = Aviso\: valor incorrecto para el initParam genStringAsCharArray. Se usar\u00E1 el valor por defecto de "false"
171	jsp.warning.suppressSmap = Aviso\: valor incorrecto para el initParam suppressSmap. Se usar\u00E1 el valor por defecto de "false"	171	jsp.warning.suppressSmap = Aviso\: valor incorrecto para el initParam suppressSmap. Se usar\u00E1 el valor por defecto de "false"
172	jsp.warning.displaySourceFragment = Aviso\: valor incorrecto para el initParam displaySourceFragment. Se usar\u00E1 el valor por defecto de "verdadero"	172	jsp.warning.displaySourceFragment = Aviso\: valor incorrecto para el initParam displaySourceFragment. Se usar\u00E1 el valor por defecto de "verdadero"
173	jsp.error.badtaglib = No se puede abrir la biblioteca de tags {0}\: {1}	173	jsp.error.badtaglib = No se puede abrir la biblioteca de tags {0}\: {1}

Lines 158-164 jsp.warning.development=\u8b66\u544a: initParam development\u306e\u5024\u304c\u7 Link Here

(-)a/java/org/apache/jasper/resources/LocalStrings_ja.properties (-1 / +1 lines)
158	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	158	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
159	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	159	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
160	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	160	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
161	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	161	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
162	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	162	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
163	jsp.error.badtaglib=\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea {0} \u3092\u30aa\u30fc\u30d7\u30f3\u3067\u304d\u307e\u305b\u3093: {1}	163	jsp.error.badtaglib=\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea {0} \u3092\u30aa\u30fc\u30d7\u30f3\u3067\u304d\u307e\u305b\u3093: {1}
164	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	164	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

Lines 139-146 valid bean class? <code>true</code> or <code>false</code>, default Link Here

(-)a/webapps/docs/jasper-howto.xml (-2 / +4 lines)
139	performed in a separate JVM from Tomcat? <code>true</code> or	139	performed in a separate JVM from Tomcat? <code>true</code> or
140	<code>false</code>, default <code>true</code>.</li>	140	<code>false</code>, default <code>true</code>.</li>
141		141
142	<li><strong>genStrAsCharArray</strong> - Should text strings be generated as char	142	<li><strong>genStringAsCharArray</strong> - Should text strings be generated as
143	arrays, to improve performance in some cases? Default <code>false</code>.</li>	143	char arrays, to improve performance in some cases? Default
		144	<code>false</code>. The alternative name of <strong>genStrAsCharArray</strong>
		145	for this initialisation parameter is also supported.</li>
144		146
145	<li><strong>ieClassId</strong> - The class-id value to be sent to Internet	147	<li><strong>ieClassId</strong> - The class-id value to be sent to Internet
146	Explorer when using <jsp:plugin> tags. Default	148	Explorer when using <jsp:plugin> tags. Default

Return to bug 55671

Lines 27-33 import org.apache.jasper.compiler.TldLocationsCache; Link Here

(-)a/java/org/apache/jasper/EmbeddedServletOptions.java (-2 / +5 lines)
27	import org.apache.jasper.compiler.JspConfig;	27	import org.apache.jasper.compiler.JspConfig;
28	import org.apache.jasper.compiler.TagPluginManager;	28	import org.apache.jasper.compiler.TagPluginManager;
29	import org.apache.jasper.compiler.Localizer;	29	import org.apache.jasper.compiler.Localizer;
30	import org.apache.jasper.xmlparser.ParserUtils;
31	import org.apache.juli.logging.Log;	30	import org.apache.juli.logging.Log;
32	import org.apache.juli.logging.LogFactory;	31	import org.apache.juli.logging.LogFactory;
33		32
Lines 544-550 public final class EmbeddedServletOptions implements Options { Link Here
544	}	543	}
545	}	544	}
546		545
547	String genCharArray = config.getInitParameter("genStrAsCharArray");	546	String genCharArray = config.getInitParameter("genStringAsCharArray");
		547	if (genCharArray == null) {
		548	// Try the old name
		549	genCharArray = config.getInitParameter("genStrAsCharArray");
		550	}
548	if (genCharArray != null) {	551	if (genCharArray != null) {
549	if (genCharArray.equalsIgnoreCase("true")) {	552	if (genCharArray.equalsIgnoreCase("true")) {
550	genStringAsCharArray = true;	553	genStringAsCharArray = true;