Author: markt
Date: Mon Dec 28 22:23:14 2009
New Revision: 894260
URL: http://svn.apache.org/viewvc?rev=894260&view=rev
Log:
JSP 2.2 - Add support for the new jsp-property-group elements to the web.xml
parsing
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java?rev=894260&r1=894259&r2=894260&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java Mon Dec
28 22:23:14 2009
@@ -81,4 +81,26 @@
}
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;
+ }
+
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=894260&r1=894259&r2=894260&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Mon Dec 28
22:23:14 2009
@@ -284,6 +284,12 @@
"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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
