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 2004/03/10 22:33:10 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_ja.properties
markt 2004/03/10 13:33:10
Modified: jasper2/src/share/org/apache/jasper Tag: tomcat_4_branch
EmbededServletOptions.java JspC.java Options.java
jasper2/src/share/org/apache/jasper/resources Tag:
tomcat_4_branch messages.properties
messages_es.properties messages_ja.properties
Log:
- Fix 14359. Remove the last traces of the largefile option.
Revision Changes Path
No revision
No revision
1.8.2.5 +3 -28 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Attic/EmbededServletOptions.java
Index: EmbededServletOptions.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Attic/EmbededServletOptions.java,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -r1.8.2.4 -r1.8.2.5
--- EmbededServletOptions.java 5 Feb 2004 22:19:06 -0000 1.8.2.4
+++ EmbededServletOptions.java 10 Mar 2004 21:33:09 -0000 1.8.2.5
@@ -99,14 +99,6 @@
public boolean keepGenerated = true;
/**
- * Indicates if "large" files should be supported. What this essentially
- * means is that we generated code so that the HTML data in a JSP
- * file is stored separately as opposed to those constant string
- * data being used literally in the generated servlet.
- */
- public boolean largeFile = false;
-
- /**
* Determines whether tag handler pooling is enabled.
*/
public boolean poolingEnabled = true;
@@ -189,13 +181,6 @@
return keepGenerated;
}
- /**
- * Getter method to determine large file support.
- */
- public boolean getLargeFile() {
- return largeFile;
- }
-
public boolean isPoolingEnabled() {
return poolingEnabled;
}
@@ -318,16 +303,6 @@
else Constants.message ("jsp.warning.keepgen", Logger.WARNING);
}
-
- String largeFile = config.getInitParameter("largefile");
- if (largeFile != null) {
- if (largeFile.equalsIgnoreCase("true"))
- this.largeFile = true;
- else if (largeFile.equalsIgnoreCase("false"))
- this.largeFile = false;
- else Constants.message ("jsp.warning.largeFile", Logger.WARNING);
- }
-
String mapFile = config.getInitParameter("mappedfile");
if (mapFile != null) {
if (mapFile.equalsIgnoreCase("true"))
1.12.2.8 +3 -8 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java,v
retrieving revision 1.12.2.7
retrieving revision 1.12.2.8
diff -u -r1.12.2.7 -r1.12.2.8
--- JspC.java 5 Feb 2004 22:19:06 -0000 1.12.2.7
+++ JspC.java 10 Mar 2004 21:33:09 -0000 1.12.2.8
@@ -146,7 +146,6 @@
//public static final String SWITCH_XML_OUTPUT = "-xml";
- boolean largeFile = false;
boolean mappedFile = false;
int jspVerbosityLevel = Logger.INFORMATION;
@@ -203,10 +202,6 @@
return true;
}
- public boolean getLargeFile() {
- return largeFile;
- }
-
public boolean isPoolingEnabled() {
return true;
}
1.6.2.3 +3 -9 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java
Index: Options.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- Options.java 5 Feb 2004 22:19:06 -0000 1.6.2.2
+++ Options.java 10 Mar 2004 21:33:09 -0000 1.6.2.3
@@ -80,12 +80,6 @@
*/
public boolean getKeepGenerated();
-
- /**
- * Are we supporting large files?
- */
- public boolean getLargeFile();
-
/**
* Returns true if tag handler pooling is enabled, false otherwise.
*/
No revision
No revision
1.9.2.11 +1 -2 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.9.2.10
retrieving revision 1.9.2.11
diff -u -r1.9.2.10 -r1.9.2.11
--- messages.properties 7 Jan 2004 00:39:20 -0000 1.9.2.10
+++ messages.properties 10 Mar 2004 21:33:09 -0000 1.9.2.11
@@ -112,7 +112,6 @@
jsp.error.setproperty.paramOrValue=setProperty: either param or value can be present
jsp.error.setproperty.arrayVal=setProperty: can't set array property {0} through a string constant value
jsp.warning.keepgen=Warning: Invalid value for the initParam keepgenerated. Will use the default value of \"false\"
-jsp.warning.largeFile=Warning: Invalid value for the initParam largeFile. Will use the default value of \"true\"
jsp.warning.enablePooling=Warning: Invalid value for the initParam enablePooling. Will use the default value of \"true\"
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\"
1.3.2.4 +1 -2 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties
Index: messages_es.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- messages_es.properties 9 Oct 2002 21:59:08 -0000 1.3.2.3
+++ messages_es.properties 10 Mar 2004 21:33:09 -0000 1.3.2.4
@@ -96,7 +96,6 @@
jsp.error.setproperty.paramOrValue=setProperty: O param o value pueden estar presentes
jsp.error.setproperty.arrayVal=setProperty: No puede escribir a la propiedad de array {0} a traves de una valor de cadena literal
jsp.warning.keepgen=Aviso: valor incorrecto para el initParam keepgen. Se usara el valor por defecto de \"false\"
-jsp.warning.largeFile=Aviso: valor incorrecto para el initParam largeFile. se usara el valor por defecto de \"true\"
jsp.warning.enablePooling=Aviso: valor incorrecto para el initParam enablePooling. se usara el valor por defecto de \"true\"
jsp.warning.mappedFile=Aviso: valor incorrecto para the initParam mappedFile. se usara el valor por defecto de \"false\"
jsp.warning.sendErrToClient=Aviso: valor incorrecto para the initParam sendErrToClient. se usara el valor por defecto de \"false\"
1.2.2.4 +1 -2 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- messages_ja.properties 4 Mar 2003 17:20:27 -0000 1.2.2.3
+++ messages_ja.properties 10 Mar 2004 21:33:09 -0000 1.2.2.4
@@ -124,7 +124,6 @@
jsp.error.setproperty.paramOrValue=setProperty: param\u5c5e\u6027\u304bvalue\u5c5e\u6027\u306e\u3069\u3061\u3089\u304b\u4e00\u3064\u3060\u3051\u3092\u6307\u5b9a\u3067\u304d\u307e\u3059
jsp.error.setproperty.arrayVal=setProperty: \u5c5e\u6027\u914d\u5217 {0} \u3092\u6587\u5b57\u5217\u5b9a\u6570\u5024\u3067\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093
jsp.warning.keepgen=\u8b66\u544a: initParam keepgenerated\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002 \u30c7\u30d5\u30a9\u30eb\u30c8\u5024 \"false\" \u3092\u4f7f\u7528\u3057\u307e\u3059
-jsp.warning.largeFile=\u8b66\u544a: initParam largeFile\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u5024 \"true\" \u3092\u4f7f\u7528\u3057\u307e\u3059
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
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org