JSP 2.2 - Add support for the new jsp-property-group elements to the web.xml parsing

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

diff --git a/java/org/apache/catalina/deploy/JspPropertyGroup.java b/java/org/apache/catalina/deploy/JspPropertyGroup.java
index a208488..27fb0ae 100644 (file)
--- a/java/org/apache/catalina/deploy/JspPropertyGroup.java
+++ b/java/org/apache/catalina/deploy/JspPropertyGroup.java
@@ -81,4 +81,26 @@ public class JspPropertyGroup {
     }
     public String getUrlPattern() { return this.urlPattern; }
     
+    private String defaultContentType = null;
+    public void setDefaultContentType(String defaultContentType) {
+        this.defaultContentType = defaultContentType;
+    }
+    public String getDefaultContentType() { return this.defaultContentType; }
+    
+    private Integer buffer = null;
+    public void setBuffer(String buffer) {
+        this.buffer = Integer.valueOf(buffer);
+    }
+    public Integer getBuffer() { return this.buffer; }
+    
+    private Boolean errorOnUndeclaredNamespace = null;
+    public void setErrorOnUndeclaredNamespace(
+            String errorOnUndeclaredNamespace) {
+        this.errorOnUndeclaredNamespace =
+            Boolean.valueOf(errorOnUndeclaredNamespace);
+    }
+    public Boolean getErrorOnUndeclaredNamespace() {
+        return this.errorOnUndeclaredNamespace;
+    }
+    
 }

diff --git a/java/org/apache/catalina/startup/WebRuleSet.java b/java/org/apache/catalina/startup/WebRuleSet.java
index eab868c..07a3b6e 100644 (file)
--- a/java/org/apache/catalina/startup/WebRuleSet.java
+++ b/java/org/apache/catalina/startup/WebRuleSet.java
@@ -284,6 +284,12 @@ public class WebRuleSet extends RuleSetBase {
                                "setTrimWhitespace", 0);
         digester.addCallMethod(fullPrefix + "/jsp-config/jsp-property-group/url-pattern",
                                "setUrlPattern", 0);
+        digester.addCallMethod(fullPrefix + "/jsp-config/jsp-property-group/default-content-type",
+                               "setDefaultContentType", 0);
+        digester.addCallMethod(fullPrefix + "/jsp-config/jsp-property-group/buffer",
+                               "setBuffer", 0);
+        digester.addCallMethod(fullPrefix + "/jsp-config/jsp-property-group/error-on-undeclared-namespace",
+                               "setErrorOnUndeclaredNamespace", 0);
 
         digester.addRule(fullPrefix + "/login-config",
                          loginConfig);