cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
yoavs 2004/11/19 06:37:48
Modified:webapps/docs Tag: TOMCAT_5_0 changelog.xml
jasper2/src/share/org/apache/jasper Tag: TOMCAT_5_0
JspC.java
jasper2/src/share/org/apache/jasper/resources Tag:
TOMCAT_5_0 messages.properties
messages_es.properties messages_fr.properties
messages_ja.properties
Log:
Undoing my fix allowing for customizable extensions, after tomcat-dev
discussion.
Revision ChangesPath
No revision
No revision
1.70.2.76 +0 -3 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.70.2.75
retrieving revision 1.70.2.76
diff -u -r1.70.2.75 -r1.70.2.76
--- changelog.xml 18 Nov 2004 22:22:02 - 1.70.2.75
+++ changelog.xml 19 Nov 2004 14:37:47 - 1.70.2.76
@@ -87,9 +87,6 @@
Exposed compilerSourceVM and compilerTargetVM options to JspC.
(yoavs)
/update
update
-bug32257/bug: Added ability to customize JSP file extensions in
JspC. (yoavs)
- /update
- update
Updated JspC usage messages to include recently added configurable
parameters. (yoavs)
/update
/changelog
No revision
No revision
1.80.2.5 +1 -4
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.80.2.4
retrieving revision 1.80.2.5
diff -u -r1.80.2.4 -r1.80.2.5
--- JspC.java 18 Nov 2004 14:38:16 - 1.80.2.4
+++ JspC.java 19 Nov 2004 14:37:47 - 1.80.2.5
@@ -114,7 +114,6 @@
private static final String SWITCH_DIE = -die;
private static final String SWITCH_POOLING = -poolingEnabled;
private static final String SWITCH_ENCODING = -javaEncoding;
-private static final String SWITCH_ADD_EXTENSION = -addExtension;
private static final String SHOW_SUCCESS =-s;
private static final String LIST_ERRORS = -l;
@@ -293,8 +292,6 @@
setCompilerSourceVM(nextArg());
} else if (tok.equals(SWITCH_TARGET)) {
setCompilerTargetVM(nextArg());
-} else if (tok.equals(SWITCH_ADD_EXTENSION)) {
-addExtension(nextArg());
} else {
if (tok.startsWith(-)) {
throw new JasperException(Unrecognized option: + tok +
@@ -566,7 +563,7 @@
*
* @param extension The extension to add, e.g. myjsp
*/
-public void addExtension(final String extension) {
+protected void addExtension(final String extension) {
if(extension != null) {
if(extensions == null) {
extensions = new Vector();
No revision
No revision
1.146.2.2 +1 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/Attic/messages.properties
Index: messages.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/Attic/messages.properties,v
retrieving revision 1.146.2.1
retrieving revision 1.146.2.2
diff -u -r1.146.2.1 -r1.146.2.2
--- messages.properties 18 Nov 2004 14:38:16 - 1.146.2.1
+++ messages.properties 19 Nov 2004 14:37:47 - 1.146.2.2
@@ -230,7 +230,6 @@
\-javaEncoding enc Set the encoding charset for Java classes (default
UTF-8)\n\
\-source version Set the -source argument to the compiler (default
1.4)\n\
\-target version Set the -target argument to the compiler (default
1.4)\n\
-\-addExtension ext Add a file extension for JSP processing, e.g
myjsp\n\
jspc.webxml.header=?xml version=1.0 encoding=ISO-8859-1?\n\
\n\
1.50.2.2 +1 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/Attic/messages_es.properties
Index: messages_es.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/Attic/messages_es.properties,v
retrieving revision 1.50.2.1
retrieving revision 1.50.2.2
diff -u -r1.50.2.1 -r1.50.2.2
--- messages_es.properties18 Nov 2004 14:38:16 - 1.50.2.1
+++ messages_es.properties19 Nov 2004 14:37:48 - 1.50.2.2
@@ -231,7 +231,6 @@
\-javaEncoding enc Set the encoding
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
yoavs 2004/11/18 06:38:17
Modified:webapps/docs Tag: TOMCAT_5_0 changelog.xml
jasper2/src/share/org/apache/jasper Tag: TOMCAT_5_0
JspC.java
jasper2/src/share/org/apache/jasper/resources Tag:
TOMCAT_5_0 messages.properties
messages_es.properties messages_fr.properties
messages_ja.properties
Log:
Bugzilla 32257: add configurable file name extensions to JspC. Also updated
JspC usage messages.
Revision ChangesPath
No revision
No revision
1.70.2.73 +6 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.70.2.72
retrieving revision 1.70.2.73
diff -u -r1.70.2.72 -r1.70.2.73
--- changelog.xml 17 Nov 2004 20:06:35 - 1.70.2.72
+++ changelog.xml 18 Nov 2004 14:38:14 - 1.70.2.73
@@ -81,6 +81,12 @@
update
Exposed compilerSourceVM and compilerTargetVM options to JspC.
(yoavs)
/update
+ update
+bug32257/bug: Added ability to customize JSP file extensions in
JspC. (yoavs)
+ /update
+ update
+Updated JspC usage messages to include recently added configurable
parameters. (yoavs)
+ /update
/changelog
/subsection
No revision
No revision
1.80.2.4 +46 -6
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.80.2.3
retrieving revision 1.80.2.4
diff -u -r1.80.2.3 -r1.80.2.4
--- JspC.java 22 Oct 2004 16:51:23 - 1.80.2.3
+++ JspC.java 18 Nov 2004 14:38:16 - 1.80.2.4
@@ -32,6 +32,7 @@
import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.Enumeration;
+import java.util.List;
import java.util.Stack;
import java.util.StringTokenizer;
import java.util.Vector;
@@ -80,6 +81,7 @@
* @author Danno Ferrin
* @author Pierre Delisle
* @author Costin Manolache
+ * @author Yoav Shapira
*/
public class JspC implements Options {
@@ -112,6 +114,8 @@
private static final String SWITCH_DIE = -die;
private static final String SWITCH_POOLING = -poolingEnabled;
private static final String SWITCH_ENCODING = -javaEncoding;
+private static final String SWITCH_ADD_EXTENSION = -addExtension;
+
private static final String SHOW_SUCCESS =-s;
private static final String LIST_ERRORS = -l;
private static final int NO_WEBXML = 0;
@@ -150,7 +154,13 @@
private String compilerSourceVM = 1.3;
private boolean classDebugInfo = true;
-private Vector extensions;
+
+/**
+ * The file extensions to be handled as JSP files.
+ * Default list is .jsp and .jspx.
+ */
+private List extensions;
+
private Vector pages = new Vector();
private boolean errorOnUseBeanInvalidClassAttribute = true;
@@ -283,6 +293,8 @@
setCompilerSourceVM(nextArg());
} else if (tok.equals(SWITCH_TARGET)) {
setCompilerTargetVM(nextArg());
+} else if (tok.equals(SWITCH_ADD_EXTENSION)) {
+addExtension(nextArg());
} else {
if (tok.startsWith(-)) {
throw new JasperException(Unrecognized option: + tok +
@@ -538,6 +550,32 @@
classPath=s;
}
+/**
+ * Returns the list of file extensions
+ * that are treated as JSP files.
+ *
+ * @return The list of extensions
+ */
+public List getExtensions() {
+return extensions;
+}
+
+/**
+ * Adds the given file extension to the
+ * list of extensions handled as JSP files.
+ *
+ * @param extension The extension to add, e.g. myjsp
+ */
+public void addExtension(final String extension) {
+if(extension != null) {
+if(extensions == null) {
+extensions = new Vector();
+}
+
+extensions.add(extension);
+}
+}
+
/**
* Base dir for the webapp. Used to generate class names and resolve
* includes
@@ -852,11 +890,13 @@
public void scanFiles( File base ) throws JasperException {
Stack dirs = new Stack();
dirs.push(base);
-if (extensions == null) {
-extensions = new Vector();
-
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
luehe 2004/05/25 14:28:40
Modified:jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
Include javac errors whose line numbers cannot be mapped to JSP page in error
message that is returned to client.
For instance, a missing closing brace in a scriptlet causes havoc with the
try-catch-finally block that that JSP compiler puts around all generated code, and the
resulting javac error line numbers fall outside the scope of the begin and end java
line numbers of the scriptlet (and therefore cannot be mapped back to the JSP line
number of the scriptlet).
(This used to return the misleading error message about failure to find javac
compiler.)
Revision ChangesPath
1.146 +2 -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.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- messages.properties 21 May 2004 00:22:06 - 1.145
+++ messages.properties 25 May 2004 21:28:40 - 1.146
@@ -291,7 +291,7 @@
jsp.error.invalid.javaEncoding=Invalid java encodings. Tried {0} and then {1}. Both
failed.
jsp.error.needAlternateJavaEncoding=Default java encoding {0} is invalid on your
java platform. An alternate can be specified via the 'javaEncoding' parameter of
JspServlet.
#Error when compiling, used for jsp line number error messages
-jsp.error.single.line.number=\n\nAn error occurred at line: {0} in the jsp file:
{1}\n\n
+jsp.error.single.line.number=An error occurred at line: {0} in the jsp file: {1}
jsp.error.multiple.line.number=\n\nAn error occurred between lines: {0} and {1} in
the jsp file: {2}\n\n
jsp.error.corresponding.servlet=Generated servlet error:\n
jsp.error.empty.body.not.allowed=Empty body not allowed for {0}
1.50 +2 -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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- messages_es.properties21 May 2004 00:22:06 - 1.49
+++ messages_es.properties25 May 2004 21:28:40 - 1.50
@@ -292,7 +292,7 @@
jsp.error.invalid.javaEncoding=Codificaciones java incorrectas. Intenté {0} y luego
{1}. Ambas fallaron.
jsp.error.needAlternateJavaEncoding=La codificación java por defecto {0} es
incorrecta en tu plataforma java. Se puede especificar una alternativa vía parámetro
'javaEncoding' de JspServlet.
#Error when compiling, used for jsp line number error messages
-jsp.error.single.line.number=\n\nHa tenido lugar un error en la línea: {0} en el
archivo jsp: {1}\n\n
+jsp.error.single.line.number=Ha tenido lugar un error en la línea: {0} en el
archivo jsp: {1}
jsp.error.multiple.line.number=\n\nHa tenido lugar un error entre las líneas: {0} y
{1} en el archivo jsp: {2}\n\n
jsp.error.corresponding.servlet=Error de servlet generado:\n
jsp.error.empty.body.not.allowed=Cuerpo vacío no permitido para {0}
1.33 +2 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties
Index: messages_fr.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- messages_fr.properties10 Mar 2004 21:16:31 - 1.32
+++ messages_fr.properties25 May 2004 21:28:40 - 1.33
@@ -243,7 +243,7 @@
jsp.error.invalid.javaEncoding=Encodage java incorrect. Essai de {0} puis de {1}.
Les deux ont échoué.
jsp.error.needAlternateJavaEncoding=L''encodage java par défaut {0} est incorrect
sur votre environnement java. Une alternative peut être indiquée via le paramêtre
'javaEncoding' de la JspServlet.
#Erreur lors de la compilation, utilisé pour la ligne jsp des messages d''erreur
-jsp.error.single.line.number=\n\nUne erreur s''est produite à la ligne: {0} dans le
fichier jsp: {1}\n\n
+jsp.error.single.line.number=Une erreur s''est produite à la ligne: {0} dans le
fichier jsp: {1}
jsp.error.multiple.line.number=\n\nUne erreur s''est produite entre les lignes: {0}
et {1} dans le fichier jsp: {2}\n\n
jsp.error.corresponding.servlet=Erreur de servlet générée:\n
jsp.error.empty.body.not.allowed=Un
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
markt 2004/03/10 13:16:32
Modified:jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
- Fix 14359. Remove last traces of largefile option.
Revision ChangesPath
1.142 +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.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- messages.properties 26 Feb 2004 00:19:01 - 1.141
+++ messages.properties 10 Mar 2004 21:16:31 - 1.142
@@ -140,7 +140,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.xpoweredBy=Warning: Invalid value for the initParam xpoweredBy. Will
use the default value of \false\
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}
1.48 +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.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- messages_es.properties18 Feb 2004 21:22:21 - 1.47
+++ messages_es.properties10 Mar 2004 21:16:31 - 1.48
@@ -138,7 +138,6 @@
jsp.error.setproperty.paramOrValue=setProperty: O param o value pueden estar
presentes
jsp.error.setproperty.arrayVal=setProperty: No puede escribir en la propiedad de
array {0} a través de una valor de cadena literal
jsp.warning.keepgen=Aviso: valor incorrecto para el initParam keepgen. Se usará el
valor por defecto de \false\
-jsp.warning.largeFile=Aviso: valor incorrecto para el initParam largeFile. Se usará
el valor por defecto de \true\
jsp.warning.xpoweredBy=Aviso: valor incorrecto para el initParam xpoweredBy. Se
usará el valor por defecto de \false\
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}
1.32 +1 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties
Index: messages_fr.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- messages_fr.properties18 Feb 2004 21:22:21 - 1.31
+++ messages_fr.properties10 Mar 2004 21:16:31 - 1.32
@@ -105,7 +105,6 @@
jsp.error.setproperty.paramOrValue=setProperty: param ou value doit être présent
jsp.error.setproperty.arrayVal=setProperty: on ne peut renseigner les array
property {0} au travers d''une valeur chaîne constante (string constant value)
jsp.warning.keepgen=Attention: Valeur incorrecte pour le initParam keepgenerated.
Utilisation de la valeur par défaut \false\
-jsp.warning.largeFile=Attention: Valeur incorrecte pour le initParam largeFile.
Utilisation de la valeur par défaut \true\
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\
1.51 +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.50
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
kinman 2004/02/18 13:22:22
Modified:jasper2/src/share/org/apache/jasper
EmbeddedServletOptions.java JspC.java Options.java
jasper2/src/share/org/apache/jasper/compiler Generator.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
- Add some intellignece to the compiler for generating code for useBean action.
Generate direct instantiation (use new) when possible, use bean.instantiate
when bean name is specified, and for the case of invalid bean class, either
issue a translation time error (instead of javac error), or generate codes
to throw InstantiationException at runtime, depending on a new compiler
switch, errorOnUseBeanInvalidClassAttribute(defaulted to true). ;_)
Revision ChangesPath
1.9 +26 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java
Index: EmbeddedServletOptions.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- EmbeddedServletOptions.java 19 Dec 2003 18:15:51 - 1.8
+++ EmbeddedServletOptions.java 18 Feb 2004 21:22:21 - 1.9
@@ -158,6 +158,8 @@
*/
private boolean genStringAsCharArray = false;
+private boolean errorOnUseBeanInvalidClassAttribute = true;
+
/**
* I want to see my generated servlets. Which directory are they
* in?
@@ -334,6 +336,13 @@
return compiler;
}
+public boolean getErrorOnUseBeanInvalidClassAttribute() {
+return errorOnUseBeanInvalidClassAttribute;
+}
+
+public void setErrorOnUseBeanInvalidClassAttribute(boolean b) {
+errorOnUseBeanInvalidClassAttribute = b;
+}
public TldLocationsCache getTldLocationsCache() {
return tldLocationsCache;
@@ -535,6 +544,20 @@
} else {
if (log.isWarnEnabled()) {
log.warn(Localizer.getMessage(jsp.warning.genchararray));
+}
+}
+}
+
+String errBeanClass =
+ config.getInitParameter(errorOnUseBeanInvalidClassAttribute);
+if (errBeanClass != null) {
+if (errBeanClass.equalsIgnoreCase(true)) {
+errorOnUseBeanInvalidClassAttribute = true;
+} else if (errBeanClass.equalsIgnoreCase(false)) {
+errorOnUseBeanInvalidClassAttribute = false;
+} else {
+if (log.isWarnEnabled()) {
+log.warn(Localizer.getMessage(jsp.warning.errBean));
}
}
}
1.65 +12 -3
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.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- JspC.java 21 Jan 2004 15:45:31 - 1.64
+++ JspC.java 18 Feb 2004 21:22:21 - 1.65
@@ -186,6 +186,7 @@
private boolean classDebugInfo = true;
private Vector extensions;
private Vector pages = new Vector();
+private boolean errorOnUseBeanInvalidClassAttribute = true;
/**
* The java file encoding. Default
@@ -342,6 +343,14 @@
public boolean isXpoweredBy() {
return xpoweredBy;
+}
+
+public boolean getErrorOnUseBeanInvalidClassAttribute() {
+return errorOnUseBeanInvalidClassAttribute;
+}
+
+public void setErrorOnUseBeanInvalidClassAttribute(boolean b) {
+errorOnUseBeanInvalidClassAttribute = b;
}
public int getTagPoolSize() {
1.22 +10 -3
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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Options.java 5 Feb 2004 23:02:18 - 1.21
+++ Options.java 18 Feb 2004 21:22:21 - 1.22
@@ -77,6 +77,13 @@
public interface Options {
/**
+ * Returns true if Jasper issues a compilation error instead of a runtime
+ * Instantiation error if the class attribute specified in useBean action
+ * is invalid.
+ */
+public boolean getErrorOnUseBeanInvalidClassAttribute();
+
+/**
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
kinman 2003/12/04 11:37:58
Modified:jasper2/src/share/org/apache/jasper/compiler Parser.java
TagFileProcessor.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
- Rewrite error checking when processing tag files to conform with the
lastest JSP spec. Check that names declared in any of the following
in a translation unit is unique.
* name attribute in attribute directive
* name-given attribute in variable directive
* alias attribute in variable directive
* dynamic-attributes attribute in tag directive
except that dynamic-attributes attribute of the tag directive can be declared
more than once with the same value.
Also check that name-from-attribute attributes of variable directives are
unique, and that they refer to attribte directives declared in the same
translation unit, with the correct attribute values.
Revision ChangesPath
1.85 +4 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- Parser.java 29 Oct 2003 21:53:43 - 1.84
+++ Parser.java 4 Dec 2003 19:37:58 - 1.85
@@ -1942,6 +1942,7 @@
reader.setSingleFile(true);
reader.skipUntil();
while (reader.hasMoreInput()) {
+start = reader.mark();
if (reader.matches(%--)) {
parseComment(parent);
} else if (reader.matches(%@)) {
1.53 +114 -93
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java
Index: TagFileProcessor.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- TagFileProcessor.java 2 Sep 2003 21:39:59 - 1.52
+++ TagFileProcessor.java 4 Dec 2003 19:37:58 - 1.53
@@ -68,6 +68,7 @@
import java.net.URLClassLoader;
import java.util.Iterator;
import java.util.Vector;
+import java.util.HashMap;
import javax.servlet.jsp.tagext.TagAttributeInfo;
import javax.servlet.jsp.tagext.TagExtraInfo;
@@ -145,6 +146,19 @@
private Vector attributeVector;
private Vector variableVector;
+private static final String ATTR_NAME =
+the name attribute of the attribute directive;
+private static final String VAR_NAME_GIVEN =
+the name-given attribute of the variable directive;
+private static final String VAR_NAME_FROM =
+the name-from-attribute attribute of the variable directive;
+private static final String VAR_ALIAS =
+the alias attribute of the variable directive;
+private static final String TAG_DYNAMIC =
+the dynamic-attributes attribute of the tag directive;
+private HashMap nameTable = new HashMap();
+private HashMap nameFromTable = new HashMap();
+
public TagFileDirectiveVisitor(Compiler compiler,
TagLibraryInfo tagLibInfo,
String name,
@@ -171,6 +185,9 @@
bodycontent);
}
dynamicAttrsMapName = n.getAttributeValue(dynamic-attributes);
+if (dynamicAttrsMapName != null) {
+checkUniqueName(dynamicAttrsMapName, TAG_DYNAMIC, n);
+}
smallIcon = n.getAttributeValue(small-icon);
largeIcon = n.getAttributeValue(large-icon);
description = n.getAttributeValue(description);
@@ -210,9 +227,11 @@
type = java.lang.String;
}
-attributeVector.addElement(
+TagAttributeInfo tagAttributeInfo =
new TagAttributeInfo(attrName, required, type, rtexprvalue,
- fragment));
+ fragment);
+attributeVector.addElement(tagAttributeInfo);
+checkUniqueName(attrName, ATTR_NAME, n, tagAttributeInfo);
}
public void visit(Node.VariableDirective n) throws JasperException {
@@ -265,6 +284,12 @@
* denotes the name of the variable that is being aliased
*/
nameGiven = alias;
+
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
kinman 2003/08/11 14:11:08
Modified:jasper2/src/share/org/apache/jasper/compiler
ErrorDispatcher.java JspDocumentParser.java
Parser.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
- Allow a taglib to be defined more than once in taglib directives, even in
statically included files.
- Remove need for keeping a Stack for prefix bookkeeping.
Revision ChangesPath
1.12 +24 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java
Index: ErrorDispatcher.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ErrorDispatcher.java 5 Feb 2003 23:39:20 - 1.11
+++ ErrorDispatcher.java 11 Aug 2003 21:11:07 - 1.12
@@ -244,7 +244,28 @@
* @param errCode Error code
* @param arg1 First argument for parametric replacement
* @param arg2 Second argument for parametric replacement
+ * @param arg3 Third argument for parametric replacement
*/
+
+public void jspError(Mark where, String errCode, String arg1, String arg2,
+ String arg3)
+throws JasperException {
+dispatch(where, errCode, new Object[] {arg1, arg2, arg3}, null);
+}
+
+/*
+ * Dispatches the given JSP parse error to the configured error handler.
+ *
+ * The given error code is localized. If it is not found in the
+ * resource bundle for localized error messages, it is used as the error
+ * message.
+ *
+ * @param n Node that caused the error
+ * @param errCode Error code
+ * @param arg1 First argument for parametric replacement
+ * @param arg2 Second argument for parametric replacement
+ */
+
public void jspError(Node n, String errCode, String arg1, String arg2)
throws JasperException {
dispatch(n.getStart(), errCode, new Object[] {arg1, arg2}, null);
1.64 +5 -10
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java
Index: JspDocumentParser.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- JspDocumentParser.java9 Aug 2003 14:55:46 - 1.63
+++ JspDocumentParser.java11 Aug 2003 21:11:07 - 1.64
@@ -109,7 +109,6 @@
private boolean isTagFile;
private boolean directivesOnly;
private boolean isTop;
-private LinkedList prefixMapLinkedList;
/*
* Constructor
@@ -128,7 +127,6 @@
this.isTagFile = isTagFile;
this.directivesOnly = directivesOnly;
this.isTop = true;
-this.prefixMapLinkedList = new LinkedList();;
}
/*
@@ -560,9 +558,8 @@
if (taglibInfo != null) {
pageInfo.addTaglib(uri, taglibInfo);
pageInfo.pushPrefixMapping(prefix, uri);
-prefixMapLinkedList.addLast(new Boolean(true));
} else {
-prefixMapLinkedList.addLast(new Boolean(false));
+pageInfo.pushPrefixMapping(prefix, null);
}
}
@@ -570,9 +567,7 @@
* Receives notification of the end of a Namespace mapping.
*/
public void endPrefixMapping(String prefix) throws SAXException {
-if (((Boolean) prefixMapLinkedList.removeFirst()).booleanValue()) {
-pageInfo.popPrefixMapping(prefix);
-}
+pageInfo.popPrefixMapping(prefix);
}
1.79 +8 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- Parser.java 9 Aug 2003 19:18:22 - 1.78
+++ Parser.java 11 Aug 2003 21:11:07 - 1.79
@@ -451,6 +451,11 @@
String prefix = attrs.getValue(prefix);
if (prefix != null) {
if (uri != null) {
+ String uriPrev = pageInfo.getURI(prefix);
+ if (uriPrev != null !uriPrev.equals(uri)) {
+ err.jspError(reader.mark(), jsp.error.prefix.refined,
+ prefix, uri,
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
kinman 2003/08/14 14:16:52
Modified:jasper2/src/share/org/apache/jasper/compiler
ErrorDispatcher.java Generator.java PageInfo.java
Validator.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
- Add attibutes doctype-root-element, doctype-system and doctype-public
to jsp:output for outputing a DOCTYPE declartion in xml documents, per
latest spec change.
Revision ChangesPath
1.13 +24 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java
Index: ErrorDispatcher.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ErrorDispatcher.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ErrorDispatcher.java 11 Aug 2003 21:11:07 - 1.12
+++ ErrorDispatcher.java 14 Aug 2003 21:16:52 - 1.13
@@ -240,7 +240,7 @@
* resource bundle for localized error messages, it is used as the error
* message.
*
- * @param n Node that caused the error
+ * @param where Error location
* @param errCode Error code
* @param arg1 First argument for parametric replacement
* @param arg2 Second argument for parametric replacement
@@ -269,6 +269,26 @@
public void jspError(Node n, String errCode, String arg1, String arg2)
throws JasperException {
dispatch(n.getStart(), errCode, new Object[] {arg1, arg2}, null);
+}
+
+/*
+ * Dispatches the given JSP parse error to the configured error handler.
+ *
+ * The given error code is localized. If it is not found in the
+ * resource bundle for localized error messages, it is used as the error
+ * message.
+ *
+ * @param n Node that caused the error
+ * @param errCode Error code
+ * @param arg1 First argument for parametric replacement
+ * @param arg2 Second argument for parametric replacement
+ * @param arg3 Third argument for parametric replacement
+ */
+
+public void jspError(Node n, String errCode, String arg1, String arg2,
+ String arg3)
+ throws JasperException {
+ dispatch(n.getStart(), errCode, new Object[] {arg1, arg2, arg3}, null);
}
/*
1.195 +40 -11
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- Generator.java9 Aug 2003 19:19:37 - 1.194
+++ Generator.java14 Aug 2003 21:16:52 - 1.195
@@ -594,14 +594,18 @@
}
/**
- * Generates an XML declaration, under the following conditions:
- *
- * - 'omit-xml-declaration' attribute of jsp:output action is set to
- * no or false
- * - JSP document without a jsp:root
+ * Generates an XML Prolog, which includes an XML declaration and
+ * an XML doctype declaration.
*/
-private void generateXmlDeclaration(Node.Nodes page) {
+private void generateXmlProlog(Node.Nodes page) {
+ /*
+ * An XML declaration is generated under the following conditions:
+ *
+ * - 'omit-xml-declaration' attribute of jsp:output action is set to
+ * no or false
+ * - JSP document without a jsp:root
+ */
String omitXmlDecl = pageInfo.getOmitXmlDecl();
if ((omitXmlDecl != null !JspUtil.booleanValue(omitXmlDecl))
|| (omitXmlDecl == null page.getRoot().isXmlSyntax()
@@ -611,6 +615,31 @@
out.printil(out.write(\?xml version=\\\1.0\\\ encoding=\\\ +
charSet + \\\?\\n\););
}
+
+ /*
+ * Output a DOCTYPE declaration if the doctype-root-element appears.
+ * If doctype-public appears:
+ * !DOCTYPE name PUBLIC doctypePublic doctypeSystem
+ * else
+ * !DOCTYPE name SYSTEM doctypeSystem
+ */
+
+ String doctypeName = pageInfo.getDoctypeName();
+ if (doctypeName != null) {
+ String doctypePublic = pageInfo.getDoctypePublic();
+ String doctypeSystem = pageInfo.getDoctypeSystem();
+ out.printin(out.write(\!DOCTYPE );
+ out.print(doctypeName);
+ if (doctypePublic == null) {
+ out.print( SYSTEM \\\);
+ } else {
+ out.print( PUBLIC \\\);
+
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
kinman 2003/08/14 17:06:10
Modified:jasper2/src/share/org/apache/jasper/compiler
JspDocumentParser.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
- Spec has been changed to allow for include-prelude and include-coda in
jsp-config.
Revision ChangesPath
1.65 +35 -17
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java
Index: JspDocumentParser.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- JspDocumentParser.java11 Aug 2003 21:11:07 - 1.64
+++ JspDocumentParser.java15 Aug 2003 00:06:09 - 1.65
@@ -149,18 +149,6 @@
inStream,
isTagFile,
directivesOnly);
-
- // It's an error to have a prelude or a coda associated with
- // a JSP document
- if (!jspDocParser.pageInfo.getIncludePrelude().isEmpty()) {
- String file = (String) jspDocParser.pageInfo.getIncludePrelude().get(0);
- jspDocParser.err.jspError(jsp.error.prelude.xml, path, file);
- }
- if (!jspDocParser.pageInfo.getIncludeCoda().isEmpty()) {
- String file = (String) jspDocParser.pageInfo.getIncludeCoda().get(0);
- jspDocParser.err.jspError(jsp.error.coda.xml, path, file);
- }
-
Node.Nodes pageNodes = null;
try {
@@ -171,8 +159,10 @@
dummyRoot.setJspConfigPageEncoding(jspConfigPageEnc);
dummyRoot.setIsEncodingSpecifiedInProlog(isEncodingSpecifiedInProlog);
jspDocParser.current = dummyRoot;
-
- if (parent != null) {
+ if (parent == null) {
+ jspDocParser.addInclude(dummyRoot,
+ jspDocParser.pageInfo.getIncludePrelude());
+ } else {
jspDocParser.isTop = false;
}
@@ -192,6 +182,11 @@
// Parse the input
saxParser.parse(jspDocParser.inputSource, jspDocParser);
+ if (parent == null) {
+ jspDocParser.addInclude(dummyRoot,
+ jspDocParser.pageInfo.getIncludeCoda());
+ }
+
// Create Node.Nodes from dummy root
pageNodes = new Node.Nodes(dummyRoot);
@@ -202,6 +197,29 @@
}
return pageNodes;
+}
+
+/*
+ * Processes the given list of included files.
+ *
+ * This is used to implement the include-prelude and include-coda
+ * subelements of the jsp-config element in web.xml
+ */
+private void addInclude(Node parent, List files) throws SAXException {
+ if (files != null) {
+ Iterator iter = files.iterator();
+ while (iter.hasNext()) {
+ String file = (String) iter.next();
+ AttributesImpl attrs = new AttributesImpl();
+ attrs.addAttribute(, file, file, CDATA, file);
+
+ // Create a dummy Include directive node
+ Node includeDir = new Node.IncludeDirective(attrs,
+null, // XXX
+parent);
+ processIncludeDirective(file, includeDir);
+ }
+ }
}
/*
1.131 +1 -3
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.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- messages.properties 14 Aug 2003 21:16:52 - 1.130
+++ messages.properties 15 Aug 2003 00:06:09 - 1.131
@@ -388,8 +388,6 @@
jsp.error.variable.either.name=Either name-given or name-from-attribute attribute
must be specified in a variable directive
jsp.error.variable.both.name=Cannot specified both name-given or
name-from-attribute attributes in a variable directive
jsp.error.variable.alias=Both or none of the name-from-attribute and alias
attributes can be specified in a variable directive
-jsp.error.prelude.xml=The JSP document {0} has a prelude ({1}) associated with it
-jsp.error.coda.xml=The JSP document {0} has a coda ({1}) associated with it
jsp.error.attribute.null_name=Null attribute name
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
luehe 2003/07/21 14:52:51
Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
JspDocumentParser.java PageInfo.java Validator.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
Forgive duplicate attribute values on static include
Revision ChangesPath
1.191 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- Generator.java21 Jul 2003 05:34:55 - 1.190
+++ Generator.java21 Jul 2003 21:52:51 - 1.191
@@ -539,7 +539,7 @@
if (pageInfo.isSession())
out.printil(HttpSession session = null;);
- if (pageInfo.isIsErrorPage()) {
+ if (pageInfo.isErrorPage()) {
out.printil(Throwable exception =
org.apache.jasper.runtime.JspRuntimeLibrary.getThrowable(request););
}
1.61 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java
Index: JspDocumentParser.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- JspDocumentParser.java21 Jul 2003 20:44:20 - 1.60
+++ JspDocumentParser.java21 Jul 2003 21:52:51 - 1.61
@@ -557,7 +557,7 @@
*/
public void startPrefixMapping(String prefix, String uri)
throws SAXException {
- // XXX
+ // XXX
}
/*
1.31 +257 -84
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java
Index: PageInfo.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- PageInfo.java 21 Jul 2003 20:44:20 - 1.30
+++ PageInfo.java 21 Jul 2003 21:52:51 - 1.31
@@ -63,6 +63,7 @@
import java.util.*;
import org.apache.jasper.Constants;
+import org.apache.jasper.JasperException;
import javax.servlet.jsp.tagext.TagLibraryInfo;
/**
@@ -83,17 +84,24 @@
private String language = java;
private String xtends = Constants.JSP_SERVLET_BASE;
private String contentType = null;
-private boolean session = true;
+private String session;
+private boolean isSession = true;
+private String bufferValue;
private int buffer = 8*1024; // XXX confirm
-private boolean autoFlush = true;
-private boolean threadSafe = true;
+private String autoFlush;
+private boolean isAutoFlush = true;
+private String isThreadSafeValue;
+private boolean isThreadSafe = true;
+private String isErrorPageValue;
private boolean isErrorPage = false;
private String errorPage = null;
+private String info;
private int maxTagNesting = 0;
private boolean scriptless = false;
private boolean scriptingInvalid = false;
-private boolean elIgnored = false;
+private String isELIgnoredValue;
+private boolean isELIgnored = false;
private boolean elIgnoredSpecified = false;
private String omitXmlDecl = null;
@@ -170,78 +178,6 @@
return beanRepository;
}
-public String getLanguage() {
- return language;
-}
-
-public void setLanguage(String language) {
- this.language = language;
-}
-
-public String getExtends() {
- return xtends;
-}
-
-public void setExtends(String xtends) {
- this.xtends = xtends;
-}
-
-public String getContentType() {
- return contentType;
-}
-
-public void setContentType(String contentType) {
- this.contentType = contentType;
-}
-
-public String getErrorPage() {
- return errorPage;
-}
-
-public void setErrorPage(String errorPage) {
- this.errorPage = errorPage;
-}
-
-public int getBuffer() {
- return buffer;
-}
-
-public void setBuffer(int buffer) {
- this.buffer = buffer;
-}
-
-public boolean isSession() {
- return session;
-}
-
-public void setSession(boolean session) {
- this.session = session;
-}
-
-public
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
kinman 2003/02/27 16:12:42
Modified:jasper2/src/share/org/apache/jasper/compiler Parser.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
- Fix 17387: Bad error message for illegal content in jsp:text
Revision ChangesPath
1.66 +6 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- Parser.java 26 Feb 2003 17:58:07 - 1.65
+++ Parser.java 28 Feb 2003 00:12:41 - 1.66
@@ -1501,9 +1501,11 @@
new Node.TemplateText( ttext.toString(), start, parent );
-if( !reader.matchesETagWithoutLessThan( jsp:text ) ) {
+ if (! reader.hasMoreInput()) {
err.jspError( start, jsp.error.unterminated,
lt;jsp:textgt; );
+ } else if( !reader.matchesETagWithoutLessThan( jsp:text ) ) {
+err.jspError( start, jsp.error.jsptext.badcontent);
}
}
}
1.102 +2 -1
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.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- messages.properties 26 Feb 2003 17:10:48 - 1.101
+++ messages.properties 28 Feb 2003 00:12:41 - 1.102
@@ -370,3 +370,4 @@
jsp.error.prelude.xml=The JSP document {0} has a prelude ({1}) associated with it
jsp.error.coda.xml=The JSP document {0} has a coda ({1}) associated with it
jsp.error.attribute.null_name=Null attribute name
+jsp.error.jsptext.badcontent=\'lt;\', when appears in the body of
lt;jsp:textgt;, must be encapsulated within a CDATA
1.36 +2 -1
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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- messages_es.properties24 Feb 2003 23:44:00 - 1.35
+++ messages_es.properties28 Feb 2003 00:12:41 - 1.36
@@ -265,3 +265,4 @@
jsp.error.variable.alias=
jsp.error.prelude.xml=
jsp.error.coda.xml=
+jsp.error.jsptext.badcontent=
1.20 +2 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties
Index: messages_fr.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- messages_fr.properties24 Feb 2003 23:44:00 - 1.19
+++ messages_fr.properties28 Feb 2003 00:12:41 - 1.20
@@ -303,4 +303,5 @@
jsp.error.variable.alias=
jsp.error.prelude.xml=
jsp.error.coda.xml=
+jsp.error.jsptext.badcontent=
1.36 +2 -1
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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- messages_ja.properties24 Feb 2003 23:44:00 - 1.35
+++ messages_ja.properties28 Feb 2003 00:12:41 - 1.36
@@ -296,4 +296,5 @@
jsp.error.variable.alias=
jsp.error.prelude.xml=
jsp.error.coda.xml=
+jsp.error.jsptext.badcontent=
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
luehe 2003/02/24 15:44:00
Modified:jasper2/src/share/org/apache/jasper/compiler
JspDocumentParser.java Parser.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
Renamed jsp.error.unable.loadclass to jsp.error.loadclass.taghandler, and added name
of tag handler class to error string
Revision ChangesPath
1.44 +7 -7
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java
Index: JspDocumentParser.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- JspDocumentParser.java24 Feb 2003 23:23:39 - 1.43
+++ JspDocumentParser.java24 Feb 2003 23:43:59 - 1.44
@@ -657,13 +657,13 @@
}
Class tagHandlerClass = null;
if (tagFileInfo == null) {
+ String handlerClassName = tagInfo.getTagClassName();
try {
- tagHandlerClass
- = ctxt.getClassLoader().loadClass(tagInfo.getTagClassName());
+ tagHandlerClass = ctxt.getClassLoader().loadClass(handlerClassName);
} catch (Exception e) {
throw new SAXException(
- Localizer.getMessage(jsp.error.unable.loadclass,
- localName, prefix));
+ Localizer.getMessage(jsp.error.loadclass.taghandler,
+ handlerClassName, qName));
}
} else {
tagInfo = tagFileInfo.getTagInfo();
1.63 +7 -7
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Parser.java 23 Feb 2003 20:57:05 - 1.62
+++ Parser.java 24 Feb 2003 23:43:59 - 1.63
@@ -1328,12 +1328,12 @@
if (tagFileInfo == null) {
// Must be a classic tag, load it here.
// tag files will be loaded later, in TagFileProcessor
+ String handlerClassName = tagInfo.getTagClassName();
try {
- tagHandlerClass
- = ctxt.getClassLoader().loadClass(tagInfo.getTagClassName());
+ tagHandlerClass = ctxt.getClassLoader().loadClass(handlerClassName);
} catch (Exception e) {
- err.jspError(start, jsp.error.unable.loadclass, shortTagName,
- prefix);
+ err.jspError(start, jsp.error.loadclass.taghandler,
+ handlerClassName, tagName);
}
} else {
tagInfo = tagFileInfo.getTagInfo();
1.99 +2 -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.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- messages.properties 24 Feb 2003 23:23:39 - 1.98
+++ messages.properties 24 Feb 2003 23:43:59 - 1.99
@@ -72,7 +72,7 @@
jsp.error.action.isnottagfile={0} action can be used in tag files only
jsp.error.unterminated=Unterminated {0} tag
jsp.error.usebean.notinsamefile=useBean tag must begin and end in the same physical
file
-jsp.error.unable.loadclass=Unable to load class {0}
+jsp.error.loadclass.taghandler=Unable to load tag handler class \{0}\ for tag
\{1}\
jsp.error.unable.compile=Unable to compile class for JSP
jsp.error.unable.load=Unable to load class for JSP
jsp.error.unable.rename=Unable to rename class file {0} to {1}
1.35 +2 -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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- messages_es.properties24 Feb 2003 19:39:39 - 1.34
+++ messages_es.properties24 Feb 2003 23:44:00 - 1.35
@@ -54,7 +54,7 @@
jsp.error.unknownException= ! Error no caturado ¡ Deberias considerar el poner una
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
kinman 2003/01/31 18:41:13
Modified:jasper2/src/share/org/apache/jasper/compiler
JspDocumentParser.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
- It is now illegal to have preludes and cods assoicated with a JSP document.
Revision ChangesPath
1.36 +14 -29
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java
Index: JspDocumentParser.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- JspDocumentParser.java22 Jan 2003 20:08:24 - 1.35
+++ JspDocumentParser.java1 Feb 2003 02:41:13 - 1.36
@@ -150,6 +150,17 @@
JspDocumentParser handler = new JspDocumentParser(pc, path, inStream,
isTagFile,
directivesOnly);
+ // It's an error to have a prelude or a coda associated with
+ // a JSP document
+ if (!handler.pageInfo.getIncludePrelude().isEmpty()) {
+ String file = (String) handler.pageInfo.getIncludePrelude().get(0);
+ handler.err.jspError(jsp.error.prelude.xml, path, file);
+ }
+ if (!handler.pageInfo.getIncludeCoda().isEmpty()) {
+ String file = (String) handler.pageInfo.getIncludeCoda().get(0);
+ handler.err.jspError(jsp.error.coda.xml, path, file);
+ }
+
Node.Nodes pageNodes = null;
Node.JspRoot jspRoot = null;
@@ -160,8 +171,6 @@
rootAttrs.addAttribute(, , version, CDATA, 2.0);
jspRoot = new Node.JspRoot(rootAttrs, null, null);
handler.current = jspRoot;
- handler.addInclude(jspRoot,
-handler.pageInfo.getIncludePrelude());
} else {
handler.isTop = false;
handler.current = parent;
@@ -184,7 +193,6 @@
saxParser.parse(handler.inputSource, handler);
if (parent == null) {
- handler.addInclude(jspRoot, handler.pageInfo.getIncludeCoda());
// Create Node.Nodes from dummy (top-level) jsp:root
pageNodes = new Node.Nodes(jspRoot);
} else {
@@ -729,29 +737,6 @@
}
}
}
-}
-
-/*
- * Processes the given list of included files.
- *
- * This is used to implement the include-prelude and include-coda
- * subelements of the jsp-config element in web.xml
- */
-private void addInclude(Node parent, List files) throws SAXException {
-if (files != null) {
-Iterator iter = files.iterator();
-while (iter.hasNext()) {
-String file = (String) iter.next();
-AttributesImpl attrs = new AttributesImpl();
-attrs.addAttribute(, file, file, CDATA, file);
-
-// Create a dummy Include directive node
-Node includeDir = new Node.IncludeDirective(attrs,
- null, // XXX
- parent);
-processIncludeDirective(file, includeDir);
-}
-}
}
/*
1.86 +8 -6
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.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- messages.properties 28 Jan 2003 00:13:38 - 1.85
+++ messages.properties 1 Feb 2003 02:41:13 - 1.86
@@ -354,8 +354,10 @@
jsp.error.tagfile.illegalPath=Illegal tag file path: {0}, must start with
\/WEB-INF/tags\ or \/META-INF/tags\
jsp.error.plugin.wrongRootElement=Name of root element in {0} different from {1}
jsp.error.attribute.invalidPrefix=The attribute prefix {0} does not correspond to
any imported tag library
-jsp.error.nested.jspattribute=a jsp:attribute standard action cannot be nested
within another jsp:attribute standard action
-jsp.error.nested.jspbody=a jsp:body standard action cannot be nested within another
jsp:body or jsp:attribute standard action
-jsp.error.variable.either.name=either name-given or name-from-attribute attribute
must be specified in a variable directive
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
kinman 2003/01/13 15:50:48
Modified:jasper2/src/share/org/apache/jasper/compiler Parser.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
- Fix 15851, 16027, and 1600: output appropiate message when a jsp:attribute
or jsp:body is nested in another jsp:attribute or jsp:body.
Revision ChangesPath
1.56 +14 -9
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- Parser.java 11 Jan 2003 00:51:36 - 1.55
+++ Parser.java 13 Jan 2003 23:50:48 - 1.56
@@ -1568,10 +1568,6 @@
err.jspError( reader.mark(), jsp.error.not.in.template,
Expression language );
} else if (reader.matches(jsp:)) {
-if ((parent instanceof Node.NamedAttribute)
-reader.matches(attribute)) {
-err.jspError(reader.mark(), jsp.error.nested.jspattribute);
-}
err.jspError( reader.mark(), jsp.error.not.in.template,
Standard actions );
} else if (parseCustomTag(parent)) {
@@ -1651,6 +1647,16 @@
return;
}
+// Check for nested jsp:body or jsp:attribute
+if (tag.equals(jsp:body) || tag.equals(jsp:attribute)) {
+if (reader.matches(jsp:attribute)) {
+err.jspError(reader.mark(),
jsp.error.nested.jspattribute);
+}
+else if (reader.matches(jsp:body)) {
+err.jspError(reader.mark(), jsp.error.nested.jspbody);
+}
+}
+
if( bodyType.equalsIgnoreCase( TagInfo.BODY_CONTENT_JSP ) ) {
parseElements( parent );
}
@@ -1696,8 +1702,7 @@
reader.skipSpaces();
}
parseBody(namedAttributeNode, jsp:attribute,
- getAttributeBodyType(parent,
-attrs.getValue(name)));
+ TagInfo.BODY_CONTENT_JSP);
if (namedAttributeNode.isTrim()) {
Node.Nodes subElems = namedAttributeNode.getBody();
if (subElems != null) {
1.79 +2 -1
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.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- messages.properties 11 Jan 2003 00:11:06 - 1.78
+++ messages.properties 13 Jan 2003 23:50:48 - 1.79
@@ -351,3 +351,4 @@
jsp.error.plugin.wrongRootElement=Name of root element in {0} different from {1}
jsp.error.attribute.invalidPrefix=The attribute prefix {0} does not correspond to
any imported tag library
jsp.error.nested.jspattribute=a jsp:attribute standard action cannot be nested
within another jsp:attribute standard action
+jsp.error.nested.jspbody=a jsp:body standard action cannot be nested within another
jsp:body or jsp:attribute standard action
1.28 +2 -1
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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- messages_es.properties11 Jan 2003 00:11:06 - 1.27
+++ messages_es.properties13 Jan 2003 23:50:48 - 1.28
@@ -259,3 +259,4 @@
jsp.error.xml.invalidHighSurrogate=
jsp.error.attributes.not.allowed=
jsp.error.nested.jspattribute=
+jsp.error.nested.jspbody=
1.11 +2 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties
Index: messages_fr.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- messages_fr.properties11 Jan
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
kinman 2003/01/10 16:11:06
Modified:jasper2/src/share/org/apache/jasper/compiler Node.java
Parser.java TagPluginManager.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
- Fix 15851: nested jsp:attribute should be disallowed.
Revision ChangesPath
1.52 +11 -8
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java
Index: Node.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Node.java 8 Jan 2003 18:42:43 - 1.51
+++ Node.java 11 Jan 2003 00:11:06 - 1.52
@@ -1333,11 +1333,14 @@
}
childInfo = new ChildInfo();
name = this.getAttributeValue(name);
- localName = name;
- int index = name.indexOf(':');
- if (index != -1) {
- prefix = name.substring(0, index);
- localName = name.substring(index+1);
+if (name != null) {
+// Mandatary attribute name will be checked in Validator
+ localName = name;
+ int index = name.indexOf(':');
+ if (index != -1) {
+ prefix = name.substring(0, index);
+ localName = name.substring(index+1);
+}
}
}
1.54 +7 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Parser.java 9 Jan 2003 23:54:40 - 1.53
+++ Parser.java 11 Jan 2003 00:11:06 - 1.54
@@ -1568,6 +1568,10 @@
err.jspError( reader.mark(), jsp.error.not.in.template,
Expression language );
} else if (reader.matches(jsp:)) {
+if ((parent instanceof Node.NamedAttribute)
+reader.matches(attribute)) {
+err.jspError(reader.mark(), jsp.error.nested.jspattribute);
+}
err.jspError( reader.mark(), jsp.error.not.in.template,
Standard actions );
} else if (parseCustomTag(parent)) {
1.10 +5 -8
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagPluginManager.java
Index: TagPluginManager.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagPluginManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TagPluginManager.java 1 Jan 2003 12:25:58 - 1.9
+++ TagPluginManager.java 11 Jan 2003 00:11:06 - 1.10
@@ -99,12 +99,9 @@
page.visit(new Node.Visitor() {
public void visit(Node.CustomTag n)
-throws JasperException {
+throws JasperException {
invokePlugin(n);
-Node.Nodes body = n.getBody();
-if (body != null) {
-body.visit(this);
-}
+visitBody(n);
}
});
1.78 +2 -1
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.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- messages.properties 9 Jan 2003 23:54:40 - 1.77
+++ messages.properties 11 Jan 2003 00:11:06 - 1.78
@@ -350,3 +350,4 @@
jsp.error.tagfile.illegalPath=Illegal tag file path: {0}, must start with
\/WEB-INF/tags\ or \/META-INF/tags\
jsp.error.plugin.wrongRootElement=Name of root element in {0} different from {1}
jsp.error.attribute.invalidPrefix=The attribute prefix {0} does not correspond to
any imported tag library
+jsp.error.nested.jspattribute=a jsp:attribute standard action cannot be nested
within another jsp:attribute standard action
1.27 +2 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties
Index: messages_es.properties
===
RCS file:
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
luehe 2002/12/12 14:30:30
Modified:jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
Added error message for jsp.error.plugin.badtype error code
Revision ChangesPath
1.69 +2 -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.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- messages.properties 12 Dec 2002 17:44:38 - 1.68
+++ messages.properties 12 Dec 2002 22:30:30 - 1.69
@@ -107,8 +107,8 @@
jsp.error.closeindividualparam=param tag needs to be closed with \/\
jsp.error.closeparams=param tag needs to be closed with /params
jsp.error.plugin.notype=type not declared in jsp:plugin
+jsp.error.plugin.badtype=Illegal value for 'type' attribute in jsp:plugin: must be
'bean' or 'applet'
jsp.error.plugin.nocode=code not declared in jsp:plugin
-jsp.error.plugin.notclosed=jsp:plugin not closed
jsp.error.ise_on_clear=Illegal to clear() when buffer size == 0
jsp.error.setproperty.beanNotFound=setProperty: Bean {0} not found
jsp.error.getproperty.beanNotFound=getProperty: Bean {0} not found
1.26 +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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- messages_es.properties9 Dec 2002 23:27:03 - 1.25
+++ messages_es.properties12 Dec 2002 22:30:30 - 1.26
@@ -86,7 +86,6 @@
jsp.error.closeparams=el tag param necesita ser cerrado con /params
jsp.error.plugin.notype=tipo no declarado en jsp:plugin
jsp.error.plugin.nocode=codigo no declarado en jsp:plugin
-jsp.error.plugin.notclosed=jsp:plugin no cerrado
jsp.error.ise_on_clear=Es ilegal usar clear() cuando el tamaño del buffer es 0
jsp.error.setproperty.beanNotFound=setProperty: Bean {0} no encontrado
jsp.error.getproperty.beanNotFound=getProperty: Bean {0} no encontrado
1.9 +1 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties
Index: messages_fr.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- messages_fr.properties9 Dec 2002 23:27:03 - 1.8
+++ messages_fr.properties12 Dec 2002 22:30:30 - 1.9
@@ -107,7 +107,6 @@
jsp.error.closeparams=Le tag param tag doit être fermé avec /params
jsp.error.plugin.notype=type non déclaré dans jsp:plugin
jsp.error.plugin.nocode=code non déclaré dans jsp:plugin
-jsp.error.plugin.notclosed=jsp:plugin non fermé
jsp.error.ise_on_clear=Il est interdit d''utiliser clear() quand la taille de
tampon== 0
jsp.error.setproperty.beanNotFound=setProperty: le Bean {0} est introuvable
jsp.error.getproperty.beanNotFound=getProperty: le Bean {0} est introuvable
1.26 +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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- messages_ja.properties9 Dec 2002 23:27:03 - 1.25
+++ messages_ja.properties12 Dec 2002 22:30:30 - 1.26
@@ -98,7 +98,6 @@
jsp.error.closeparams=param\u30bf\u30b0\u306f/params\u3067\u9589\u3058\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
jsp.error.plugin.notype=jsp:plugin\u3067type\u5c5e\u6027\u304c\u5ba3\u8a00\u3055\u308c\u3066\u3044\u307e\u305b\u3093
jsp.error.plugin.nocode=jsp:plugin\u3067code\u5c5e\u6027\u304c\u5ba3\u8a00\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-jsp.error.plugin.notclosed=jsp:plugin\u304c\u9589\u3058\u3066\u3044\u307e\u305b\u3093
jsp.error.ise_on_clear=\u30d0\u30c3\u30d5\u30a1\u30b5\u30a4\u30ba\u304c0\u306e\u6642\u306bclear()\u3092\u5b9f\u884c\u3057\u3066\u3082\u7121\u52b9\u3067\u3059
jsp.error.setproperty.beanNotFound=setProperty: Bean {0}
\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
luehe 2002/12/09 15:27:04
Modified:jasper2/src/share/org/apache/jasper/compiler Validator.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
Fixed Bugtraq 4790760: A translation-time error is not generated if
the 'name' attribute of jsp:param is an expression
Revision ChangesPath
1.57 +12 -5
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java
Index: Validator.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- Validator.java9 Dec 2002 22:26:10 - 1.56
+++ Validator.java9 Dec 2002 23:27:03 - 1.57
@@ -476,6 +476,13 @@
public void visit(Node.ParamAction n) throws JasperException {
JspUtil.checkAttributes(Param action, n,
paramActionAttrs, err);
+ // make sure the value of the 'name' attribute is not a
+ // request-time expression
+ if (isExpression(n, n.getAttributes().getValue(name))) {
+ err.jspError(n,
+ jsp.error.attribute.standard.non_rt_with_expr,
+ name, jsp:param);
+ }
n.setValue(getJspAttribute(value, null, null,
n.getAttributeValue(value),
java.lang.String.class, null,
@@ -739,7 +746,7 @@
// Make sure its value does not contain any.
if (isExpression(n, attrs.getValue(i))) {
err.jspError(n,
- jsp.error.attribute.non_rt_with_expr,
+ jsp.error.attribute.custom.non_rt_with_expr,
tldAttrs[j].getName());
}
jspAttrs[i]
@@ -976,7 +983,7 @@
* Checks to see if the given attribute value represents a runtime or
* EL expression.
*/
- private boolean isExpression(Node.CustomTag n, String value) {
+ private boolean isExpression(Node n, String value) {
if ((n.isXmlSyntax() value.startsWith(%=))
|| (!n.isXmlSyntax() value.startsWith(%=))
|| (value.indexOf(${) != -1 !pageInfo.isELIgnored()))
1.66 +3 -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.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- messages.properties 9 Dec 2002 22:17:32 - 1.65
+++ messages.properties 9 Dec 2002 23:27:03 - 1.66
@@ -297,7 +297,8 @@
jsp.error.page.config_pagedir_encoding_conflict=Page-encoding specified in
jsp-property-group ({0}) is different from that specified in page directive ({1})
jsp.error.page.prolog_pagedir_encoding_conflict=Page-encoding specified in XML
prolog ({0}) is different from that specified in page directive ({1})
jsp.error.page.prolog_config_encoding_conflict=Page-encoding specified in XML
prolog ({0}) is different from that specified in jsp-property-group ({1})
-jsp.error.attribute.non_rt_with_expr=According to TLD, attribute {0} does not
accept any expressions
+jsp.error.attribute.custom.non_rt_with_expr=According to TLD, attribute {0} does
not accept any expressions
+jsp.error.attribute.standard.non_rt_with_expr=The {0} attribute of the {1} standard
action does not accept any expressions
jsp.error.scripting.variable.missing_name=Unable to determine scripting variable
name from attribute {0}
jasper.error.emptybodycontent.nonempty=According to TLD, tag {0} must be empty, but
is not
jsp.error.tagfile.var_name_given_equals_attr_name=In tag file {0}, the name-given
attribute ({1}) of a variable directive equals the name attribute of an attribute
directive
1.25 +2 -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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- messages_es.properties2 Dec 2002 11:21:00 - 1.24
+++
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
jfclere 2002/12/02 03:21:01
Modified:jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
The -o option is not supported -dd seems to be the one to use.
Revision ChangesPath
1.62 +2 -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.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- messages.properties 23 Nov 2002 00:04:58 - 1.61
+++ messages.properties 2 Dec 2002 11:21:00 - 1.62
@@ -156,7 +156,7 @@
jsp.error.bad_attribute=Attribute {0} invalid for tag {1} according to TLD
jsp.error.tld_not_found=Could not locate TLD {0}
jsp.error.webxml_not_found=Could not locate web.xml
-jsp.cmd_line.usage=Usage: jsptoservlet [-o path/to/outputDirectory]
[-keepgenerated] \
+jsp.cmd_line.usage=Usage: jsptoservlet [-dd path/to/outputDirectory]
[-keepgenerated] \
.jsp files
jsp.message.cp_is=Classpath {0} is: {1}
jsp.error.unable.to_load_taghandler_class=Unable to load tag handler class {0}
because of {1}
1.24 +2 -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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- messages_es.properties8 Nov 2002 19:42:56 - 1.23
+++ messages_es.properties2 Dec 2002 11:21:00 - 1.24
@@ -128,7 +128,7 @@
jsp.error.bad_attribute=atributo {0} no es valido de acuerdo con el TLD especificado
jsp.error.tld_not_found=No puedo localizar el TLD {0}
jsp.error.webxml_not_found=No puedo localizar web.xml
-jsp.cmd_line.usage=Uso: jsptoservlet [-o ruta/a/DirectorioSalida]
[-keepgenerated] Archivos .jsp
+jsp.cmd_line.usage=Uso: jsptoservlet [-dd ruta/a/DirectorioSalida]
[-keepgenerated] Archivos .jsp
jsp.message.cp_is=classpath {0} es: {1}
jsp.error.unable.to_load_taghandler_class=No se puede cargar clase manejadora {0}
del tag acausa de {1}
jsp.error.unable.to_find_method=No se puede encontrar el metodo de escritura para
el atributo: {0}
1.6 +2 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties
Index: messages_fr.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- messages_fr.properties23 Nov 2002 00:04:58 - 1.5
+++ messages_fr.properties2 Dec 2002 11:21:00 - 1.6
@@ -153,7 +153,7 @@
jsp.error.bad_attribute=L''attribut {0} est incorrect pour le tag {1} d''après la
TLD indiquée
sjsp.error.tld_not_found=Impossible de localiser la TLD {0}
jsp.error.webxml_not_found=Impossible de localiser le fichier web.xml
-jsp.cmd_line.usage=Usage: jsptoservlet [-o path/to/outputDirectory]
[-keepgenerated] \
+jsp.cmd_line.usage=Usage: jsptoservlet [-dd path/to/outputDirectory]
[-keepgenerated] \
.jsp files
jsp.message.cp_is=Le Classpath {0} est: {1}
jsp.error.unable.to_load_taghandler_class=Impossible de charger la classe
gestionnaire de tag {0} car {1}
1.24 +2 -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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- messages_ja.properties8 Nov 2002 19:42:56 - 1.23
+++ messages_ja.properties2 Dec 2002 11:21:00 - 1.24
@@ -139,7 +139,7 @@
jsp.error.bad_attribute=\u6307\u5b9a\u3055\u308c\u305fTLD\u306b\u3088\u308b\u3068\u3001\u5c5e\u6027
{0} \u306f\u7121\u52b9\u3067\u3059
jsp.error.tld_not_found=TLD {0} \u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
jsp.error.webxml_not_found=web.xml\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
-jsp.cmd_line.usage=\u4f7f\u7528\u6cd5: jsptoservlet [-o
\u51fa\u529b\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u30d1\u30b9] [-keepgenerated]
.jsp\u30d5\u30a1\u30a4\u30eb\u7fa4
+jsp.cmd_line.usage=\u4f7f\u7528\u6cd5: jsptoservlet [-dd
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
luehe 2002/11/08 11:42:56
Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
JspDocumentParser.java Node.java Parser.java
Validator.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
Made enumeration of ValidationMessage[] returned by TLV's validate()
method more robust by also considering the case where a
ValidationMessage element might be null.
Revision ChangesPath
1.123 +5 -57
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- Generator.java7 Nov 2002 19:09:03 - 1.122
+++ Generator.java8 Nov 2002 19:42:55 - 1.123
-1766,65 +1766,13
}
public void visit(Node.JspBody n) throws JasperException {
-Node.JspAttribute value = n.getValue();
if (isSimpleTagHandler) {
out.printin(simpleTagHandlerVar);
out.print(.setJspBody();
-
- if (value != null) {
- out.print(attributeValue(value, false, JspFragment.class,
-null ));
- } else {
- generateJspFragment(n, simpleTagHandlerVar);
- }
+ generateJspFragment(n, simpleTagHandlerVar);
out.println(););
} else {
-Node parent = n.getParent();
-if( (parent instanceof Node.CustomTag) (value != null) ) {
-Node.CustomTag customTag = (Node.CustomTag)parent;
-
-// Classic tag handler invoked with jsp:body value=...
-// Generate a tag body that evaluates the given
-// fragment.
-
-// First, generate a Map with all the AT_BEGIN and
-// NESTED variables so the body can access them.
-VariableInfo[] varInfos = customTag.getVariableInfos();
-TagVariableInfo[] tagVarInfos =
-customTag.getTagVariableInfos();
-
-String var = JspUtil.nextTemporaryVariableName();
-out.printil( java.util.HashMap + var +
- = new java.util.HashMap(); );
-
- for (int i = 0; i varInfos.length; i++) {
- if ((varInfos[i].getScope() == VariableInfo.AT_BEGIN)
- || (varInfos[i].getScope() == VariableInfo.NESTED)) {
- out.printil( var + .put( \ +
- varInfos[i].getVarName() + \, +
- varInfos[i].getVarName() + ); );
- }
- }
-
- for (int i = 0; i tagVarInfos.length; i++) {
- if ((tagVarInfos[i].getScope() == VariableInfo.AT_BEGIN)
- || (tagVarInfos[i].getScope() == VariableInfo.NESTED))
{
- out.printin( var + .put( \ );
- String name = tagVarInfos[i].getNameGiven();
- if( name == null ) {
- name = customTag.getTagData().getAttributeString(
-tagVarInfos[i].getNameFromAttribute());
- }
- out.println( name + \, + name + ); );
- }
- }
-
-out.printil(( +
-attributeValue(value, false, JspFragment.class,
-null ) + ).invoke( out, + var + ); );
- } else {
-visitBody(n);
- }
+ visitBody(n);
}
}
1.27 +4 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java
Index: JspDocumentParser.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- JspDocumentParser.java8 Nov 2002 03:03:01 - 1.26
+++ JspDocumentParser.java8 Nov 2002 19:42:55 - 1.27
-274,7 +274,7
} else if
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_fr.properties messages_ja.properties
luehe 2002/11/07 14:19:13
Modified:jasper2/src/share/org/apache/jasper/compiler PageInfo.java
ParserController.java Validator.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
Report translation-time error if different page character encodings
are detected in two or more of the following: the XML prolog of a JSP
page, the pageEncoding attribute of the page directive of the JSP
page, and in a JSP configuration element (whose URL pattern matches
the page).
Revision ChangesPath
1.15 +8 -19
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java
Index: PageInfo.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- PageInfo.java 6 Nov 2002 20:14:19 - 1.14
+++ PageInfo.java 7 Nov 2002 22:19:13 - 1.15
-94,10 +94,7
* (declaration).
* Only meaningful for XML documents.
*/
-private String xmlEncoding = null;
-
-// Indicates whether page has XML declaration with encoding attribute
-private boolean hasEncodingProlog = false;
+private String xmlPrologEncoding = null;
private int maxTagNesting = 0;
private boolean scriptless = false;
-235,22 +232,14
return pageEncoding;
}
-public void setXmlEncoding(String xmlEncoding) {
- this.xmlEncoding = xmlEncoding;
+public void setXmlPrologEncoding(String xmlPrologEncoding) {
+ this.xmlPrologEncoding = xmlPrologEncoding;
}
-public String getXmlEncoding() {
- return xmlEncoding;
+public String getXmlPrologEncoding() {
+ return xmlPrologEncoding;
}
-public void setHasEncodingProlog(boolean hasEncodingProlog) {
- this.hasEncodingProlog = hasEncodingProlog;
-}
-
-public boolean hasEncodingProlog() {
- return hasEncodingProlog;
-}
-
public int getMaxTagNesting() {
return maxTagNesting;
}
1.26 +10 -6
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ParserController.java
Index: ParserController.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ParserController.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ParserController.java 7 Nov 2002 00:50:52 - 1.25
+++ ParserController.java 7 Nov 2002 22:19:13 - 1.26
-192,9 +192,6
if (isTopFile) {
pageInfo.setIsXml(isXml);
- if (isXml) {
- pageInfo.setXmlEncoding(encoding);
- }
isTopFile = false;
} else {
compiler.getPageInfo().addDependant(absFileName);
-274,12 +271,19
ctxt, err);
sourceEnc = (String) ret[0];
boolean isEncodingSetInProlog = ((Boolean) ret[1]).booleanValue();
- if (isTopFile) {
- pageInfo.setHasEncodingProlog(isEncodingSetInProlog);
- }
if (isEncodingSetInProlog) {
// Prolog present only in XML syntax
isXml = true;
+ if (isTopFile) {
+ String jspConfigPageEnc = pageInfo.getPageEncoding();
+ if (jspConfigPageEnc != null
+ !jspConfigPageEnc.equals(sourceEnc)) {
+ err.jspError(
+ jsp.error.page.prolog_config_encoding_conflict,
+ sourceEnc, jspConfigPageEnc);
+ }
+ pageInfo.setXmlPrologEncoding(sourceEnc);
+ }
} else if (sourceEnc.equals(UTF-8)) {
/*
* We don't know if we're dealing with an XML document
1.52 +29 -12
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java
Index: Validator.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Validator.java7 Nov 2002 18:34:19 - 1.51
+++ Validator.java7 Nov 2002 22:19:13 - 1.52
-255,17 +255,34
if (pageEncodingSeen)
err.jspError(n, jsp.error.page.multiple.pageencoding);
