You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2004/08/22 17:52:03 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler JspDocumentParser.java Validator.java
markt 2004/08/22 08:52:03
Modified: jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch JspDocumentParser.java
Validator.java
Log:
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
No revision
No revision
1.4.2.6 +8 -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.4.2.5
retrieving revision 1.4.2.6
diff -u -r1.4.2.5 -r1.4.2.6
--- JspDocumentParser.java 22 Aug 2004 12:35:58 -0000 1.4.2.5
+++ JspDocumentParser.java 22 Aug 2004 15:52:03 -0000 1.4.2.6
@@ -85,6 +85,8 @@
private static final String XMLNS = "xmlns:";
private static final String XMLNS_JSP = "xmlns:jsp";
private static final String JSP_VERSION = "version";
+ private static final String XMLNS_XSI = "xmlns:xsi";
+ private static final String XSI_SCHEMA_LOCATION = "xsi:schemaLocation";
private static final String URN_JSPTLD = "urn:jsptld:";
private static final String LEXICAL_HANDLER_PROPERTY
= "http://xml.org/sax/properties/lexical-handler";
@@ -432,7 +434,9 @@
for (int i=0; i<len; i++) {
String qName = attrs.getQName(i);
if (!qName.startsWith(XMLNS_JSP)
- && !qName.startsWith(JSP_VERSION)) {
+ && !qName.startsWith(JSP_VERSION)
+ && !qName.startsWith(XMLNS_XSI)
+ && !qName.startsWith(XSI_SCHEMA_LOCATION)) {
// get the prefix
String prefix = null;
1.11.2.5 +4 -3 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.11.2.4
retrieving revision 1.11.2.5
diff -u -r1.11.2.4 -r1.11.2.5
--- Validator.java 22 Aug 2004 12:35:58 -0000 1.11.2.4
+++ Validator.java 22 Aug 2004 15:52:03 -0000 1.11.2.5
@@ -255,6 +255,7 @@
private ErrorDispatcher err;
private static final JspUtil.ValidAttribute[] jspRootAttrs = {
+ new JspUtil.ValidAttribute("xsi:schemaLocation"),
new JspUtil.ValidAttribute("version", true) };
private static final JspUtil.ValidAttribute[] includeDirectiveAttrs = {
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
RE: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler JspDocumentParser.java Validator.java
Posted by Mark Thomas <ma...@apache.org>.
Sorry, finger trouble on my part. The log should have been:
Fix bug 13956. XSI Namespace Declaration should not be interpreted as a tag
library declaration
> -----Original Message-----
> From: markt@apache.org [mailto:markt@apache.org]
> Sent: Sunday, August 22, 2004 4:52 PM
> To: jakarta-tomcat-jasper-cvs@apache.org
> Subject: cvs commit:
> jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/comp
> iler JspDocumentParser.java Validator.java
>
> markt 2004/08/22 08:52:03
>
> Modified: jasper2/src/share/org/apache/jasper/compiler Tag:
> tomcat_4_branch JspDocumentParser.java
> Validator.java
> Log:
> CVS:
> ----------------------------------------------------------------------
> CVS: PR:
> CVS: If this change addresses a PR in the problem report tracking
> CVS: database, then enter the PR number(s) here.
> CVS: Obtained from:
> CVS: If this change has been taken from another system,
> such as NCSA,
> CVS: then name the system in this line, otherwise delete it.
> CVS: Submitted by:
> CVS: If this code has been contributed to Apache by
> someone else; i.e.,
> CVS: they sent us a patch or a new module, then include
> their name/email
> CVS: address here. If this is your work then delete this line.
> CVS: Reviewed by:
> CVS: If we are doing pre-commit code reviews and someone else has
> CVS: reviewed your changes, include their name(s) here.
> CVS: If you have not had it reviewed then delete this line.
>
> Revision Changes Path
> No revision
> No revision
> 1.4.2.6 +8 -4
> jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/comp
iler/JspDocumentParser.java
>
> Index: JspDocumentParser.java
> ===================================================================
> RCS file:
> /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/j
asper/compiler/JspDocumentParser.java,v
> retrieving revision 1.4.2.5
> retrieving revision 1.4.2.6
> diff -u -r1.4.2.5 -r1.4.2.6
> --- JspDocumentParser.java 22 Aug 2004 12:35:58 -0000 1.4.2.5
> +++ JspDocumentParser.java 22 Aug 2004 15:52:03 -0000 1.4.2.6
> @@ -85,6 +85,8 @@
> private static final String XMLNS = "xmlns:";
> private static final String XMLNS_JSP = "xmlns:jsp";
> private static final String JSP_VERSION = "version";
> + private static final String XMLNS_XSI = "xmlns:xsi";
> + private static final String XSI_SCHEMA_LOCATION =
> "xsi:schemaLocation";
> private static final String URN_JSPTLD = "urn:jsptld:";
> private static final String LEXICAL_HANDLER_PROPERTY
> = "http://xml.org/sax/properties/lexical-handler";
> @@ -432,7 +434,9 @@
> for (int i=0; i<len; i++) {
> String qName = attrs.getQName(i);
> if (!qName.startsWith(XMLNS_JSP)
> - && !qName.startsWith(JSP_VERSION)) {
> + && !qName.startsWith(JSP_VERSION)
> + && !qName.startsWith(XMLNS_XSI)
> + &&
> !qName.startsWith(XSI_SCHEMA_LOCATION)) {
>
> // get the prefix
> String prefix = null;
>
>
>
> 1.11.2.5 +4 -3
> jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/comp
iler/Validator.java
>
> Index: Validator.java
> ===================================================================
> RCS file:
> /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/j
asper/compiler/Validator.java,v
> retrieving revision 1.11.2.4
> retrieving revision 1.11.2.5
> diff -u -r1.11.2.4 -r1.11.2.5
> --- Validator.java 22 Aug 2004 12:35:58 -0000 1.11.2.4
> +++ Validator.java 22 Aug 2004 15:52:03 -0000 1.11.2.5
> @@ -255,6 +255,7 @@
> private ErrorDispatcher err;
>
> private static final JspUtil.ValidAttribute[]
> jspRootAttrs = {
> + new JspUtil.ValidAttribute("xsi:schemaLocation"),
> new JspUtil.ValidAttribute("version", true) };
>
> private static final JspUtil.ValidAttribute[]
> includeDirectiveAttrs = {
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org