svn commit: r447527 - in /tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler: PageInfo.java Validator.java

[remm]

Author: remm
Date: Mon Sep 18 12:59:59 2006
New Revision: 447527

URL: http://svn.apache.org/viewvc?view=rev&rev=447527
Log:
- 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.

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/PageInfo.java
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/PageInfo.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/PageInfo.java?view=diff&rev=447527&r1=447526&r2=447527
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/PageInfo.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/PageInfo.java Mon Sep 
18 12:59:59 2006
@@ -657,7 +657,7 @@
                 err.jspError(n, 
"jsp.error.tag.invalid.trimdirectivewhitespaces");
         }
 
-        deferredSyntaxAllowedAsLiteralValue = value;
+        trimDirectiveWhitespacesValue = value;
     }
 
     public void setELIgnored(boolean s) {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java?view=diff&rev=447527&r1=447526&r2=447527
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java Mon Sep 
18 12:59:59 2006
@@ -65,19 +65,22 @@
         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;
 



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