cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_ja.properties
kinman 02/05/06 13:54:39
Modified:jasper/src/share/org/apache/jasper/compiler
SetPropertyGenerator.java
jasper/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_ja.properties
Log:
- Fixed 7124. Thanks [EMAIL PROTECTED] for the patch.
Revision ChangesPath
1.5 +4 -4
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SetPropertyGenerator.java
Index: SetPropertyGenerator.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SetPropertyGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SetPropertyGenerator.java 2 Apr 2002 16:10:39 - 1.4
+++ SetPropertyGenerator.java 6 May 2002 20:54:39 - 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SetPropertyGenerator.java,v
1.4 2002/04/02 16:10:39 glenn Exp $
- * $Revision: 1.4 $
- * $Date: 2002/04/02 16:10:39 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SetPropertyGenerator.java,v
1.5 2002/05/06 20:54:39 kinman Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/05/06 20:54:39 $
*
*
*
@@ -103,7 +103,7 @@
if (property.equals(*)) {
if (value != null) {
- String m =
Constants.getString(jsp.error.setproperty.invalidSyantx);
+ String m =
Constants.getString(jsp.error.setproperty.invalidSyntax);
throw new CompileException(start, m);
}
1.26 +2 -2
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- messages.properties 22 Mar 2002 03:35:27 - 1.25
+++ messages.properties 6 May 2002 20:54:39 - 1.26
@@ -1,4 +1,4 @@
-# $Id: messages.properties,v 1.25 2002/03/22 03:35:27 larryi Exp $
+# $Id: messages.properties,v 1.26 2002/05/06 20:54:39 kinman Exp $
#
# Default localized string information
# Localized this the Default Locale as is en_US
@@ -106,7 +106,7 @@
jsp.error.setproperty.beanNotFound=setProperty: Bean {0} not found
jsp.error.getproperty.beanNotFound=getProperty: Bean {0} not found
jsp.error.setproperty.ClassNotFound=setProperty: Class {0} not found
-jsp.error.setproperty.invalidSyantax=setProperty: can't have non-null value when
property=*
+jsp.error.setproperty.invalidSyntax=setProperty: can't have non-null value when
property=*
jsp.error.setproperty.beanInfoNotFound=setproperty: beanInfo for bean {0} not found
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
1.11 +2 -2
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages_es.properties
Index: messages_es.properties
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages_es.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- messages_es.properties3 Dec 2001 15:47:39 - 1.10
+++ messages_es.properties6 May 2002 20:54:39 - 1.11
@@ -1,4 +1,4 @@
-# $Id: messages_es.properties,v 1.10 2001/12/03 15:47:39 larryi Exp $
+# $Id: messages_es.properties,v 1.11 2002/05/06 20:54:39 kinman Exp $
#
# Default localized string information
# Localized para Locale es_ES
@@ -91,7 +91,7 @@
jsp.error.setproperty.beanNotFound=setProperty: Bean {0} no encontrado
jsp.error.getproperty.beanNotFound=getProperty: Bean {0} no encontrado
jsp.error.setproperty.ClassNotFound=setProperty: clase {0} no encontrada
-jsp.error.setproperty.invalidSyantax=setProperty: No puede haber unvalo no nulo
cuando se ha especificado property=*
+jsp.error.setproperty.invalidSyntax=setProperty: No puede haber unvalo no nulo
cuando se ha especificado property=*
jsp.error.setproperty.beanInfoNotFound=setproperty: beanInfo para bean {0} no
encontrado
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
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_ja.properties
larryi 01/12/03 07:47:39
Modified:jasper/src/share/org/apache/jasper
EmbededServletOptions.java JspC.java Options.java
jasper/src/share/org/apache/jasper/compiler Compiler.java
JavaCompiler.java JikesJavaCompiler.java
SunJavaCompiler.java
jasper/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_ja.properties
Log:
For the few who need it, add a classdebuginfo init parameter to enable
compiling the class file with debugging information.
Revision ChangesPath
1.7 +24 -3
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java
Index: EmbededServletOptions.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EmbededServletOptions.java2001/02/04 01:03:28 1.6
+++ EmbededServletOptions.java2001/12/03 15:47:39 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java,v
1.6 2001/02/04 01:03:28 glenn Exp $
- * $Revision: 1.6 $
- * $Date: 2001/02/04 01:03:28 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java,v
1.7 2001/12/03 15:47:39 larryi Exp $
+ * $Revision: 1.7 $
+ * $Date: 2001/12/03 15:47:39 $
*
*
*
@@ -106,6 +106,11 @@
public boolean sendErrorToClient = false;
/**
+ * Do we want to include debugging information in the class file?
+ */
+public boolean classDebugInfo = false;
+
+/**
* I want to see my generated servlets. Which directory are they
* in?
*/
@@ -173,6 +178,13 @@
}
/**
+ * Should class files be compiled with debug information?
+ */
+public boolean getClassDebugInfo() {
+return classDebugInfo;
+}
+
+/**
* Class ID for use in the plugin tag when the browser is IE.
*/
public String getIeClassId() {
@@ -257,6 +269,15 @@
else if (senderr.equalsIgnoreCase(false))
this.sendErrorToClient = false;
else Constants.message (jsp.warning.sendErrToClient, Logger.WARNING);
+}
+
+String debugInfo = config.getInitParameter(classdebuginfo);
+if (debugInfo != null) {
+if (debugInfo.equalsIgnoreCase(true))
+this.classDebugInfo = true;
+else if (debugInfo.equalsIgnoreCase(false))
+this.classDebugInfo = false;
+else Constants.message (jsp.warning.classDebugInfo, Logger.WARNING);
}
String ieClassId = config.getInitParameter(ieClassId);
1.13 +8 -3 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JspC.java 2001/09/18 00:16:34 1.12
+++ JspC.java 2001/12/03 15:47:39 1.13
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java,v 1.12
2001/09/18 00:16:34 craigmcc Exp $
- * $Revision: 1.12 $
- * $Date: 2001/09/18 00:16:34 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java,v 1.13
2001/12/03 15:47:39 larryi Exp $
+ * $Revision: 1.13 $
+ * $Date: 2001/12/03 15:47:39 $
*
*
*
@@ -181,6 +181,11 @@
return true;
}
+public boolean getClassDebugInfo() {
+// compile with debug info
+return false;
+}
+
public String getIeClassId() {
return ieClassId;
}
1.7 +8 -3
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java
Index: Options.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Options.java 2001/02/04 01:04:11 1.6
+++ Options.java 2001/12/03 15:47:39 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java,v 1.6
2001/02/04 01:04:11 glenn Exp $
- * $Revision: 1.6 $
- * $Date: 2001/02/04 01:04:11 $
+
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_ja.properties
larryi 01/11/30 14:17:40
Modified:jasper/src/share/org/apache/jasper Tag: tomcat_40_branch
EmbededServletOptions.java JspC.java Options.java
jasper/src/share/org/apache/jasper/compiler Tag:
tomcat_40_branch Compiler.java JavaCompiler.java
JikesJavaCompiler.java SunJavaCompiler.java
jasper/src/share/org/apache/jasper/resources Tag:
tomcat_40_branch messages.properties
messages_es.properties messages_ja.properties
Log:
For the few who need it, add a classdebuginfo init parameter to enable
compiling the class file with debugging information.
Revision ChangesPath
No revision
No revision
1.6.2.1 +24 -3
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java
Index: EmbededServletOptions.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- EmbededServletOptions.java2001/02/04 01:03:28 1.6
+++ EmbededServletOptions.java2001/11/30 22:17:39 1.6.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java,v
1.6 2001/02/04 01:03:28 glenn Exp $
- * $Revision: 1.6 $
- * $Date: 2001/02/04 01:03:28 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java,v
1.6.2.1 2001/11/30 22:17:39 larryi Exp $
+ * $Revision: 1.6.2.1 $
+ * $Date: 2001/11/30 22:17:39 $
*
*
*
@@ -106,6 +106,11 @@
public boolean sendErrorToClient = false;
/**
+ * Do we want to include debugging information in the class file?
+ */
+public boolean classDebugInfo = false;
+
+/**
* I want to see my generated servlets. Which directory are they
* in?
*/
@@ -173,6 +178,13 @@
}
/**
+ * Should class files be compiled with debug information?
+ */
+public boolean getClassDebugInfo() {
+return classDebugInfo;
+}
+
+/**
* Class ID for use in the plugin tag when the browser is IE.
*/
public String getIeClassId() {
@@ -257,6 +269,15 @@
else if (senderr.equalsIgnoreCase(false))
this.sendErrorToClient = false;
else Constants.message (jsp.warning.sendErrToClient, Logger.WARNING);
+}
+
+String debugInfo = config.getInitParameter(classdebuginfo);
+if (debugInfo != null) {
+if (debugInfo.equalsIgnoreCase(true))
+this.classDebugInfo = true;
+else if (debugInfo.equalsIgnoreCase(false))
+this.classDebugInfo = false;
+else Constants.message (jsp.warning.classDebugInfo, Logger.WARNING);
}
String ieClassId = config.getInitParameter(ieClassId);
1.12.2.1 +8 -3 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- JspC.java 2001/09/18 00:16:34 1.12
+++ JspC.java 2001/11/30 22:17:39 1.12.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java,v 1.12
2001/09/18 00:16:34 craigmcc Exp $
- * $Revision: 1.12 $
- * $Date: 2001/09/18 00:16:34 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java,v 1.12.2.1
2001/11/30 22:17:39 larryi Exp $
+ * $Revision: 1.12.2.1 $
+ * $Date: 2001/11/30 22:17:39 $
*
*
*
@@ -181,6 +181,11 @@
return true;
}
+public boolean getClassDebugInfo() {
+// compile with debug info
+return false;
+}
+
public String getIeClassId() {
return ieClassId;
}
1.6.2.1 +8 -3
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java
Index: Options.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- Options.java 2001/02/04 01:04:11 1.6
+++ Options.java 2001/11/30 22:17:39 1.6.2.1
@@ -1,7 +1,7 @@
/*
RE: cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_ja.properties
Remy,
Since for now SAS will be using Tomcat 3.3.x and 4.0.x in our IDE,
I added the classdebuginfo init parameter so it will be supported
by both. I have the same changes for 4.0 HEAD, but haven't tested
them yet. Since its time to go home, I'll commit them on Monday.
Thankfully the messages_ja.properties already had the new warning
string, so I didn't have worry about that one. :)
Cheers,
Larry
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Sent: Friday, November 30, 2001 5:18 PM
To: [EMAIL PROTECTED]
Subject: cvs commit:
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources
messages.properties messages_es.properties messages_ja.properties
larryi 01/11/30 14:17:40
Modified:jasper/src/share/org/apache/jasper Tag:
tomcat_40_branch
EmbededServletOptions.java JspC.java
Options.java
jasper/src/share/org/apache/jasper/compiler Tag:
tomcat_40_branch Compiler.java
JavaCompiler.java
JikesJavaCompiler.java SunJavaCompiler.java
jasper/src/share/org/apache/jasper/resources Tag:
tomcat_40_branch messages.properties
messages_es.properties messages_ja.properties
Log:
For the few who need it, add a classdebuginfo init
parameter to enable
compiling the class file with debugging information.
Revision ChangesPath
No revision
No revision
1.6.2.1 +24 -3
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededS
ervletOptions.java
Index: EmbededServletOptions.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jaspe
r/EmbededServletOptions.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- EmbededServletOptions.java 2001/02/04 01:03:28 1.6
+++ EmbededServletOptions.java 2001/11/30 22:17:39 1.6.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jaspe
r/EmbededServletOptions.java,v 1.6 2001/02/04 01:03:28 glenn Exp $
- * $Revision: 1.6 $
- * $Date: 2001/02/04 01:03:28 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jaspe
r/EmbededServletOptions.java,v 1.6.2.1 2001/11/30 22:17:39
larryi Exp $
+ * $Revision: 1.6.2.1 $
+ * $Date: 2001/11/30 22:17:39 $
*
*
*
@@ -106,6 +106,11 @@
public boolean sendErrorToClient = false;
/**
+ * Do we want to include debugging information in the
class file?
+ */
+public boolean classDebugInfo = false;
+
+/**
* I want to see my generated servlets. Which
directory are they
* in?
*/
@@ -173,6 +178,13 @@
}
/**
+ * Should class files be compiled with debug information?
+ */
+public boolean getClassDebugInfo() {
+return classDebugInfo;
+}
+
+/**
* Class ID for use in the plugin tag when the browser is IE.
*/
public String getIeClassId() {
@@ -257,6 +269,15 @@
else if (senderr.equalsIgnoreCase(false))
this.sendErrorToClient = false;
else Constants.message
(jsp.warning.sendErrToClient, Logger.WARNING);
+}
+
+String debugInfo =
config.getInitParameter(classdebuginfo);
+if (debugInfo != null) {
+if (debugInfo.equalsIgnoreCase(true))
+this.classDebugInfo = true;
+else if (debugInfo.equalsIgnoreCase(false))
+this.classDebugInfo = false;
+else Constants.message
(jsp.warning.classDebugInfo, Logger.WARNING);
}
String ieClassId = config.getInitParameter(ieClassId);
1.12.2.1 +8 -3
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jaspe
r/JspC.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- JspC.java 2001/09/18 00:16:34 1.12
+++ JspC.java 2001/11/30 22:17:39 1.12.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jaspe
r/JspC.java,v 1.12 2001/09/18 00:16:34 craigmcc Exp $
- * $Revision: 1.12 $
- * $Date: 2001/09/18 00:16:34 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jaspe
r/JspC.java,v 1.12.2.1 2001/11/30 22:17:39 larryi Exp $
+ * $Revision: 1.12.2.1 $
+ * $Date: 2001
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_ja.properties
kinman 01/11/20 17:57:19
Modified:jasper/src/share/org/apache/jasper/compiler Parser.java
jasper/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_ja.properties
Log:
PR: 4940
-- Issue error if reserved taglib prefixes are used in taglib directives.
Revision ChangesPath
1.17 +13 -1
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Parser.java 2001/10/19 01:42:36 1.16
+++ Parser.java 2001/11/21 01:57:19 1.17
@@ -187,6 +187,10 @@
new JspUtil.ValidAttribute (prefix, true)
};
+ private static final String[] reservedPrefixes = {
+ jsp, jspx, java, javax, servlet, sun, sunw
+ };
+
public boolean accept(ParseEventListener listener, JspReader reader,
Parser parser) throws JasperException
{
@@ -224,9 +228,17 @@
else if (match.equals(include))
JspUtil.checkAttributes (Include directive, attrs,
includeDvalidAttrs, start);
- else if (match.equals(taglib))
+ else if (match.equals(taglib)) {
JspUtil.checkAttributes (Taglib directive, attrs,
tagDvalidAttrs, start);
+ String prefix = attrs.getValue(prefix);
+ for (int i = 0; i reservedPrefixes.length; i++) {
+ if (prefix.equals(reservedPrefixes[i]))
+ throw new ParseException(reader.mark(),
+ Constants.getString(jsp.error.taglib.reserved.prefix,
+ new Object[] { prefix }));
+ }
+ }
// Match close.
reader.skipSpaces();
1.22 +2 -1
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- messages.properties 2001/10/03 21:48:30 1.21
+++ messages.properties 2001/11/21 01:57:19 1.22
@@ -1,4 +1,4 @@
-# $Id: messages.properties,v 1.21 2001/10/03 21:48:30 kinman Exp $
+# $Id: messages.properties,v 1.22 2001/11/21 01:57:19 kinman Exp $
#
# Default localized string information
# Localized this the Default Locale as is en_US
@@ -236,6 +236,7 @@
jspx.error.templateDataNotInJspCdata=Validation Error: Element lt;{0}gt; cannot
have template data. Template data must be encapsulated within a lt;jsp:textgt;
element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error: {1}
#Error while processing taglib jar file {0}: {1}
jsp.error.taglib.jarFileException=
+jsp.error.taglib.reserved.prefix=The taglib prefix {0} is reserved
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
1.9 +2 -1
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages_es.properties
Index: messages_es.properties
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages_es.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- messages_es.properties2001/09/07 17:57:46 1.8
+++ messages_es.properties2001/11/21 01:57:19 1.9
@@ -1,4 +1,4 @@
-# $Id: messages_es.properties,v 1.8 2001/09/07 17:57:46 craigmcc Exp $
+# $Id: messages_es.properties,v 1.9 2001/11/21 01:57:19 kinman Exp $
#
# Default localized string information
# Localized para Locale es_ES
@@ -194,6 +194,7 @@
jsp.error.library.invalid=
jsp.warning.tlvclass.is.null=No se puedee cargar la clase TagLibraryValidator
llamada {0}: {1}
jsp.error.taglibraryvalidator.invalidpage=
+jsp.error.taglib.reserved.prefix=
jsp.parser.sax.propertynotsupported=
jsp.parser.sax.propertynotrecognized=
jsp.parser.sax.featurenotsupported=
1.5 +2 -1
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages_ja.properties
Index:
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources messages.properties messages_es.properties messages_ja.properties
kinman 01/11/20 18:09:55
Modified:jasper/src/share/org/apache/jasper/compiler Tag:
tomcat_40_branch Parser.java
jasper/src/share/org/apache/jasper/resources Tag:
tomcat_40_branch messages.properties
messages_es.properties messages_ja.properties
Log:
PR: 4940
-- Issue error if reserved taglib prefixes are used in taglib directives.
Revision ChangesPath
No revision
No revision
1.13.2.3 +14 -2
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -r1.13.2.2 -r1.13.2.3
--- Parser.java 2001/10/03 19:26:47 1.13.2.2
+++ Parser.java 2001/11/21 02:09:55 1.13.2.3
@@ -187,6 +187,10 @@
new JspUtil.ValidAttribute (prefix, true)
};
+ private static final String[] reservedPrefixes = {
+ jsp, jspx, java, javax, servlet, sun, sunw
+ };
+
public boolean accept(ParseEventListener listener, JspReader reader,
Parser parser) throws JasperException
{
@@ -224,10 +228,18 @@
else if (match.equals(include))
JspUtil.checkAttributes (Include directive, attrs,
includeDvalidAttrs, start);
- else if (match.equals(taglib))
+ else if (match.equals(taglib)) {
JspUtil.checkAttributes (Taglib directive, attrs,
tagDvalidAttrs, start);
-
+ String prefix = attrs.getValue(prefix);
+ for (int i = 0; i reservedPrefixes.length; i++) {
+ if (prefix.equals(reservedPrefixes[i]))
+ throw new ParseException(reader.mark(),
+ Constants.getString(jsp.error.taglib.reserved.prefix,
+ new Object[] { prefix }));
+ }
+ }
+
// Match close.
reader.skipSpaces();
if (!reader.matches(close))
No revision
No revision
1.20.2.2 +2 -1
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -r1.20.2.1 -r1.20.2.2
--- messages.properties 2001/10/03 22:00:34 1.20.2.1
+++ messages.properties 2001/11/21 02:09:55 1.20.2.2
@@ -1,4 +1,4 @@
-# $Id: messages.properties,v 1.20.2.1 2001/10/03 22:00:34 kinman Exp $
+# $Id: messages.properties,v 1.20.2.2 2001/11/21 02:09:55 kinman Exp $
#
# Default localized string information
# Localized this the Default Locale as is en_US
@@ -236,6 +236,7 @@
jspx.error.templateDataNotInJspCdata=Validation Error: Element lt;{0}gt; cannot
have template data. Template data must be encapsulated within a lt;jsp:textgt;
element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error: {1}
#Error while processing taglib jar file {0}: {1}
jsp.error.taglib.jarFileException=
+jsp.error.taglib.reserved.prefix=The taglib prefix {0} is reserved
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
1.8.2.1 +2 -1
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages_es.properties
Index: messages_es.properties
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages_es.properties,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- messages_es.properties2001/09/07 17:57:46 1.8
+++ messages_es.properties2001/11/21 02:09:55 1.8.2.1
@@ -1,4 +1,4 @@
-# $Id: messages_es.properties,v 1.8 2001/09/07 17:57:46 craigmcc Exp $
+# $Id: messages_es.properties,v 1.8.2.1 2001/11/21 02:09:55 kinman Exp $
#
# Default localized string information
# Localized para Locale es_ES
@@ -194,6 +194,7 @@
jsp.error.library.invalid=
jsp.warning.tlvclass.is.null=No se puedee cargar la clase TagLibraryValidator
llamada {0}: {1}
