- Fix cut & paste error.

- Fix validation for the two new page directives.
- I will next add support for the two new jsp-property-group elements.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@447527 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/compiler/PageInfo.java b/java/org/apache/jasper/compiler/PageInfo.java
index 801099e..3d78db1 100644 (file)
--- a/java/org/apache/jasper/compiler/PageInfo.java
+++ b/java/org/apache/jasper/compiler/PageInfo.java
@@ -657,7 +657,7 @@ class PageInfo {
                 err.jspError(n, "jsp.error.tag.invalid.trimdirectivewhitespaces");
         }
 
-        deferredSyntaxAllowedAsLiteralValue = value;
+        trimDirectiveWhitespacesValue = value;
     }
 
     public void setELIgnored(boolean s) {

diff --git a/java/org/apache/jasper/compiler/Validator.java b/java/org/apache/jasper/compiler/Validator.java
index 00e1f76..54095a6 100644 (file)
--- a/java/org/apache/jasper/compiler/Validator.java
+++ b/java/org/apache/jasper/compiler/Validator.java
@@ -65,19 +65,22 @@ class Validator {
         private ErrorDispatcher err;
 
         private static final JspUtil.ValidAttribute[] pageDirectiveAttrs = {
-                new JspUtil.ValidAttribute("language"),
-                new JspUtil.ValidAttribute("extends"),
-                new JspUtil.ValidAttribute("import"),
-                new JspUtil.ValidAttribute("session"),
-                new JspUtil.ValidAttribute("buffer"),
-                new JspUtil.ValidAttribute("autoFlush"),
-                new JspUtil.ValidAttribute("isThreadSafe"),
-                new JspUtil.ValidAttribute("info"),
-                new JspUtil.ValidAttribute("errorPage"),
-                new JspUtil.ValidAttribute("isErrorPage"),
-                new JspUtil.ValidAttribute("contentType"),
-                new JspUtil.ValidAttribute("pageEncoding"),
-                new JspUtil.ValidAttribute("isELIgnored") };
+            new JspUtil.ValidAttribute("language"),
+            new JspUtil.ValidAttribute("extends"),
+            new JspUtil.ValidAttribute("import"),
+            new JspUtil.ValidAttribute("session"),
+            new JspUtil.ValidAttribute("buffer"),
+            new JspUtil.ValidAttribute("autoFlush"),
+            new JspUtil.ValidAttribute("isThreadSafe"),
+            new JspUtil.ValidAttribute("info"),
+            new JspUtil.ValidAttribute("errorPage"),
+            new JspUtil.ValidAttribute("isErrorPage"),
+            new JspUtil.ValidAttribute("contentType"),
+            new JspUtil.ValidAttribute("pageEncoding"),
+            new JspUtil.ValidAttribute("isELIgnored"),
+            new JspUtil.ValidAttribute("deferredSyntaxAllowedAsLiteral"),
+            new JspUtil.ValidAttribute("trimDirectiveWhitespaces")
+        };
 
         private boolean pageEncodingSeen = false;