From 1f1598622f8231aa51426f8835ae8ec57d7297c3 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 1 Jan 2008 15:38:38 +0000 Subject: [PATCH] Align docs for Jasper options. Put in alphabetical order, add some missing ones, remove an unused one and address feedback provided on users list. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@607860 13f79535-47bb-0310-9956-ffa450edef68 --- conf/web.xml | 94 +++++++------- java/org/apache/jasper/EmbeddedServletOptions.java | 27 ---- java/org/apache/jasper/JspC.java | 5 - java/org/apache/jasper/Options.java | 5 - .../jasper/resources/LocalStrings.properties | 1 - .../jasper/resources/LocalStrings_es.properties | 1 - .../jasper/resources/LocalStrings_fr.properties | 1 - .../jasper/resources/LocalStrings_ja.properties | 1 - webapps/docs/jasper-howto.xml | 139 +++++++++++++-------- 9 files changed, 135 insertions(+), 139 deletions(-) diff --git a/conf/web.xml b/conf/web.xml index 4d35a42f1..679abd72f 100644 --- a/conf/web.xml +++ b/conf/web.xml @@ -136,21 +136,8 @@ - - - - - - - - - - - - - - - + + @@ -159,18 +146,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -185,41 +207,27 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + - - + + - - - - + + - - - - + + diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java b/java/org/apache/jasper/EmbeddedServletOptions.java index bfcb9aa34..5c1211efe 100644 --- a/java/org/apache/jasper/EmbeddedServletOptions.java +++ b/java/org/apache/jasper/EmbeddedServletOptions.java @@ -78,13 +78,6 @@ public final class EmbeddedServletOptions implements Options { private boolean mappedFile = true; /** - * Do you want stack traces and such displayed in the client's - * browser? If this is false, such messages go to the standard - * error or a log file if the standard error is redirected. - */ - private boolean sendErrorToClient = false; - - /** * Do we want to include debugging information in the class file? */ private boolean classDebugInfo = true; @@ -223,13 +216,6 @@ public final class EmbeddedServletOptions implements Options { } /** - * Should errors be sent to client or thrown into stderr? - */ - public boolean getSendErrorToClient() { - return sendErrorToClient; - } - - /** * Should class files be compiled with debug information? */ public boolean getClassDebugInfo() { @@ -466,19 +452,6 @@ public final class EmbeddedServletOptions implements Options { } } - String senderr = config.getInitParameter("sendErrToClient"); - if (senderr != null) { - if (senderr.equalsIgnoreCase("true")) { - this.sendErrorToClient = true; - } else if (senderr.equalsIgnoreCase("false")) { - this.sendErrorToClient = false; - } else { - if (log.isWarnEnabled()) { - log.warn(Localizer.getMessage("jsp.warning.sendErrToClient")); - } - } - } - String debugInfo = config.getInitParameter("classdebuginfo"); if (debugInfo != null) { if (debugInfo.equalsIgnoreCase("true")) { diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java index 52435ba0b..d21fbb782 100644 --- a/java/org/apache/jasper/JspC.java +++ b/java/org/apache/jasper/JspC.java @@ -414,11 +414,6 @@ public class JspC implements Options { return null; } - public boolean getSendErrorToClient() { - // implied send to System.err - return true; - } - public void setClassDebugInfo( boolean b ) { classDebugInfo=b; } diff --git a/java/org/apache/jasper/Options.java b/java/org/apache/jasper/Options.java index 3148255cb..cff52c855 100644 --- a/java/org/apache/jasper/Options.java +++ b/java/org/apache/jasper/Options.java @@ -56,11 +56,6 @@ public interface Options { public boolean getMappedFile(); /** - * Should errors be sent to client or thrown into stderr? - */ - public boolean getSendErrorToClient(); - - /** * Should we include debug information in compiled class? */ public boolean getClassDebugInfo(); diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties index e2a22f7f6..9cdba8867 100644 --- a/java/org/apache/jasper/resources/LocalStrings.properties +++ b/java/org/apache/jasper/resources/LocalStrings.properties @@ -166,7 +166,6 @@ jsp.warning.xpoweredBy=Warning: Invalid value for the initParam xpoweredBy. Will jsp.warning.enablePooling=Warning: Invalid value for the initParam enablePooling. Will use the default value of \"true\" jsp.warning.invalidTagPoolSize=Warning: Invalid value for the init parameter named tagPoolSize. Will use default size of {0} jsp.warning.mappedFile=Warning: Invalid value for the initParam mappedFile. Will use the default value of \"false\" -jsp.warning.sendErrToClient=Warning: Invalid value for the initParam sendErrToClient. Will use the default value of \"false\" jsp.warning.classDebugInfo=Warning: Invalid value for the initParam classdebuginfo. Will use the default value of \"false\" jsp.warning.checkInterval=Warning: Invalid value for the initParam checkInterval. Will use the default value of \"300\" seconds jsp.warning.modificationTestInterval=Warning: Invalid value for the initParam modificationTestInterval. Will use the default value of \"4\" seconds diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties b/java/org/apache/jasper/resources/LocalStrings_es.properties index ec1799209..45ea654c0 100644 --- a/java/org/apache/jasper/resources/LocalStrings_es.properties +++ b/java/org/apache/jasper/resources/LocalStrings_es.properties @@ -153,7 +153,6 @@ jsp.warning.xpoweredBy=Aviso: valor incorrecto para el initParam xpoweredBy. Se jsp.warning.enablePooling=Aviso: valor incorrecto para el initParam enablePooling. Se usará el valor por defecto de \"true\" jsp.warning.invalidTagPoolSize=Aviso: valor incorrecto para el parámetro init llamado tagPoolSize. Se usará la medida por defecto de {0} jsp.warning.mappedFile=Aviso: valor incorrecto para el initParam mappedFile. Se usará el valor por defecto de \"false\" -jsp.warning.sendErrToClient=Aviso: valor incorrecto para el initParam sendErrToClient. Se usará el valor por defecto de \"false\" jsp.warning.classDebugInfo=Aviso: valor incorrecto para el initParam classdebuginfo. Se usará el valor por defecto de \"false\" jsp.warning.checkInterval=Aviso: valor incorrecto para el initParam checkInterval. Se usará el valor por defecto de \"300\" segundos jsp.warning.development=Aviso: valor incorrecto para el initParam development. Se usará el valor por defecto de \"true\" diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties b/java/org/apache/jasper/resources/LocalStrings_fr.properties index bd57d4c3c..28c68e8b4 100644 --- a/java/org/apache/jasper/resources/LocalStrings_fr.properties +++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties @@ -122,7 +122,6 @@ jsp.error.setproperty.arrayVal=setProperty: on ne peut renseigner les array prop jsp.warning.keepgen=Attention: Valeur incorrecte pour le initParam keepgenerated. Utilisation de la valeur par défaut \"false\" jsp.warning.enablePooling=Attention: Valeur incorrecte pour le initParam enablePooling. Utilisation de la valeur par défaut \"true\" jsp.warning.mappedFile=Attention: Valeur incorrecte pour le initParam mappedFile. Utilisation de la valeur par défaut \"false\" -jsp.warning.sendErrToClient=Attention: Valeur incorrecte pour le initParam sendErrToClient. Utilisation de la valeur par défaut \"false\" jsp.warning.classDebugInfo=Attention: Valeur incorrecte pour le initParam classdebuginfo. Utilisation de la valeur par défaut \"false\" jsp.warning.checkInterval=Attention: Valeur incorrecte pour le initParam checkInterval. Utilisation de la valeur par défaut \"300\" secondes jsp.warning.development=Attention: Valeur incorrecte pour le initParam development. Utilisation de la valeur par défaut \"true\" diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties b/java/org/apache/jasper/resources/LocalStrings_ja.properties index 72ce6cd59..cfe536c00 100644 --- a/java/org/apache/jasper/resources/LocalStrings_ja.properties +++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties @@ -152,7 +152,6 @@ jsp.warning.xpoweredBy=\u8b66\u544a: Invalid value for the initParam xpoweredBy\ jsp.warning.enablePooling=\u8b66\u544a: initParam enablePooling\u304c\u7121\u52b9\u306a\u5024\u3067\u3059\u3002\"true\"\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059 jsp.warning.invalidTagPoolSize=\u8b66\u544a: tagPoolSize\u306e\u521d\u671f\u30d1\u30e9\u30e1\u30fc\u30bf\u304c\u7121\u52b9\u306a\u5024\u3067\u3059\u3002{0}\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u30b5\u30a4\u30ba\u3092\u4f7f\u7528\u3057\u307e\u3059 jsp.warning.mappedFile=\u8b66\u544a: initParam mappedFile\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u5024 \"false\" \u3092\u4f7f\u7528\u3057\u307e\u3059 -jsp.warning.sendErrToClient=\u8b66\u544a: initParam sendErrToClient\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u5024 \"false\" \u3092\u4f7f\u7528\u3057\u307e\u3059 jsp.warning.classDebugInfo=\u8b66\u544a: initParam classDebugInfo\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u5024 \"false\"\u3092\u4f7f\u7528\u3057\u307e\u3059 jsp.warning.checkInterval=\u8b66\u544a: initParam checkInterval\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\"300\"\u79d2\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059 jsp.warning.development=\u8b66\u544a: initParam development\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\"true\"\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059 diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml index 46133d207..a94802fe6 100644 --- a/webapps/docs/jasper-howto.xml +++ b/webapps/docs/jasper-howto.xml @@ -85,15 +85,10 @@ for use on a production Tomcat server.

in your global $CATALINA_BASE/conf/web.xml.

-

The Java compiler from Eclipse JDT in included as the default compiler. It is an -advanced Java compiler which will load all dependencies from the Tomcat class loader, -which will help tremendously when compiling on large installations with tens of JARs. -On fast servers, this will allow sub-second recompilation cycles for even large JSP -pages.

+

The Java compiler from Eclipse JDT in included as the default compiler. It is +an advanced Java compiler which will load all dependencies from the Tomcat class +loader, which will help tremendously when compiling on large installations with +tens of JARs. On fast servers, this will allow sub-second recompilation cycles +for even large JSP pages.

-

Apache Ant, which was used in previous Tomcat releases, can be used instead instead of -the new compiler by simply removing the lib/jasper-jdt.jar file, -and placing the ant.jar file from the latest Ant distribution in the -lib folder. If you do this, you also need to use the "javac" +

Apache Ant, which was used in previous Tomcat releases, can be used instead +of the new compiler by simply removing the lib/jasper-jdt.jar file, +and placing the ant.jar file from the latest Ant distribution in +the lib folder. If you do this, you also need to use the "javac" argument to catalina.sh.

-

The main JSP optimization which can be done is precompilation of JSPs. However, -this might not be possible (for example, when using the jsp-property-group feature) -or practical, in which case the configuration of the Jasper servlet becomes critical.

+

The main JSP optimization which can be done is precompilation of JSPs. +However, this might not be possible (for example, when using the +jsp-property-group feature) or practical, in which case the configuration of the +Jasper servlet becomes critical.

-

When using Jasper 2 in a production Tomcat server you should consider -making the following changes from the default configuration. +

When using Jasper 2 in a production Tomcat server you should consider making +the following changes from the default configuration.

-- 2.11.0