cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Validator.java

[kinman]

kinman      02/04/24 17:36:46

  Modified:    jasper2/src/share/org/apache/jasper/compiler Validator.java
  Log:
  - Fixed 5903: version attribute in jsp:root is mandatory.
  
  Revision  Changes    Path
  1.5       +12 -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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Validator.java    19 Apr 2002 20:35:01 -0000      1.4
  +++ Validator.java    25 Apr 2002 00:36:46 -0000      1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
 1.4 2002/04/19 20:35:01 kinman Exp $
  - * $Revision: 1.4 $
  - * $Date: 2002/04/19 20:35:01 $
  + * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
 1.5 2002/04/25 00:36:46 kinman Exp $
  + * $Revision: 1.5 $
  + * $Date: 2002/04/25 00:36:46 $
    *
    * ====================================================================
    * 
  @@ -265,6 +265,9 @@
        private PageInfo pageInfo;
        private ErrorDispatcher err;
   
  +     private static final JspUtil.ValidAttribute[] jspRootAttrs = {
  +         new JspUtil.ValidAttribute("version", true) };
  +
        private static final JspUtil.ValidAttribute[] includeDirectiveAttrs = {
            new JspUtil.ValidAttribute("file", true) };
   
  @@ -321,6 +324,12 @@
        ValidateVisitor(Compiler compiler) {
            this.pageInfo = compiler.getPageInfo();
            this.err = compiler.getErrorDispatcher();
  +     }
  +
  +     public void visit(Node.JspRoot n) throws JasperException {
  +         JspUtil.checkAttributes("Jsp:root", n.getAttributes(),
  +                                 jspRootAttrs, n.getStart(), err);
  +         visitBody(n);
        }
   
        public void visit(Node.IncludeDirective n) throws JasperException {
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>