9:12 a.m.
Author: remy.maucherat(a)jboss.com
Date: 2009-06-02 10:12:44 -0400 (Tue, 02 Jun 2009)
New Revision: 1073
Modified:
trunk/java/org/apache/catalina/core/StandardContext.java
trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
trunk/java/org/apache/catalina/startup/WebRuleSet.java
Log:
- Fix some jsp-property-group fields.
Modified: trunk/java/org/apache/catalina/core/StandardContext.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardContext.java 2009-05-28 15:28:37 UTC (rev
1072)
+++ trunk/java/org/apache/catalina/core/StandardContext.java 2009-06-02 14:12:44 UTC (rev
1073)
@@ -2284,8 +2284,12 @@
*/
public void addJspPropertyGroup(JspPropertyGroup propertyGroup) {
// Add any JSP mapping specified, as it needs to be mapped to the JSP Servlet
- addJspMapping(propertyGroup.getUrlPattern());
- jspPropertyGroups.put(propertyGroup.getUrlPattern(), propertyGroup);
+ String[] urlPatterns = propertyGroup.getUrlPatterns();
+ for (int i = 0; i < urlPatterns.length; i++) {
+ addJspMapping(urlPatterns[i]);
+ // Split off the groups to individual mappings
+ jspPropertyGroups.put(urlPatterns[i], propertyGroup);
+ }
}
Modified: trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
===================================================================
--- trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java 2009-05-28 15:28:37 UTC
(rev 1072)
+++ trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java 2009-06-02 14:12:44 UTC
(rev 1073)
@@ -23,27 +23,28 @@
package org.apache.catalina.deploy;
import java.io.Serializable;
+import java.util.ArrayList;
public class JspPropertyGroup implements Serializable {
- protected String urlPattern = null;
+ protected ArrayList<String> urlPatterns = new ArrayList<String>();
protected boolean elIgnored = false;
protected String pageEncoding = null;
protected boolean scriptingInvalid = false;
protected boolean isXml = false;
- protected String includePrelude = null;
- protected String includeCoda = null;
+ protected ArrayList<String> includePreludes = new ArrayList<String>();
+ protected ArrayList<String> includeCodas = new ArrayList<String>();
protected boolean deferredSyntaxAllowedAsLiteral = false;
protected boolean trimDirectiveWhitespaces = false;
protected String defaultContentType = null;
protected String buffer = null;
protected boolean errorOnUndeclaredNamespace = false;
- public String getUrlPattern() {
- return urlPattern;
+ public String[] getUrlPatterns() {
+ return urlPatterns.toArray(new String[0]);
}
- public void setUrlPattern(String urlPattern) {
- this.urlPattern = urlPattern;
+ public void addUrlPattern(String urlPattern) {
+ urlPatterns.add(urlPattern);
}
public boolean isElIgnored() {
return elIgnored;
@@ -69,17 +70,17 @@
public void setXml(boolean isXml) {
this.isXml = isXml;
}
- public String getIncludePrelude() {
- return includePrelude;
+ public String[] getIncludePreludes() {
+ return includePreludes.toArray(new String[0]);
}
- public void setIncludePrelude(String includePrelude) {
- this.includePrelude = includePrelude;
+ public void addIncludePrelude(String includePrelude) {
+ includePreludes.add(includePrelude);
}
- public String getIncludeCoda() {
- return includeCoda;
+ public String[] getIncludeCodas() {
+ return includeCodas.toArray(new String[0]);
}
- public void setIncludeCoda(String includeCoda) {
- this.includeCoda = includeCoda;
+ public void addIncludeCoda(String includeCoda) {
+ includeCodas.add(includeCoda);
}
public boolean isDeferredSyntaxAllowedAsLiteral() {
return deferredSyntaxAllowedAsLiteral;
Modified: trunk/java/org/apache/catalina/startup/WebRuleSet.java
===================================================================
--- trunk/java/org/apache/catalina/startup/WebRuleSet.java 2009-05-28 15:28:37 UTC (rev
1072)
+++ trunk/java/org/apache/catalina/startup/WebRuleSet.java 2009-06-02 14:12:44 UTC (rev
1073)
@@ -250,7 +250,7 @@
"addJspPropertyGroup",
"org.apache.catalina.deploy.JspPropertyGroup");
digester.addCallMethod(prefix + elementName +
"/jsp-config/jsp-property-group/url-pattern",
- "setUrlPattern", 0);
+ "addUrlPattern", 0);
digester.addCallMethod(prefix + elementName +
"/jsp-config/jsp-property-group/el-ignored",
"setElIgnored", 0);
digester.addCallMethod(prefix + elementName +
"/jsp-config/jsp-property-group/page-encoding",
@@ -260,9 +260,9 @@
digester.addCallMethod(prefix + elementName +
"/jsp-config/jsp-property-group/is-xml",
"setIsXml", 0);
digester.addCallMethod(prefix + elementName +
"/jsp-config/jsp-property-group/include-prelude",
- "setIncludePrelude", 0);
+ "addIncludePrelude", 0);
digester.addCallMethod(prefix + elementName +
"/jsp-config/jsp-property-group/include-coda",
- "setIncludeCoda", 0);
+ "addIncludeCoda", 0);
digester.addCallMethod(prefix + elementName +
"/jsp-config/jsp-property-group/deferred-syntax-allowed-as-literal",
"setDeferredSyntaxAllowedAsLiteral", 0);
digester.addCallMethod(prefix + elementName +
"/jsp-config/jsp-property-group/trim-directive-whitespaces",