5:18 p.m.
Author: remy.maucherat(a)jboss.com
Date: 2009-06-06 18:18:10 -0400 (Sat, 06 Jun 2009)
New Revision: 1087
Modified:
trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
Log:
- Redo in a more Jasper friendly way.
Modified: trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
===================================================================
--- trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java 2009-06-06 12:03:23 UTC
(rev 1086)
+++ trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java 2009-06-06 22:18:10 UTC
(rev 1087)
@@ -28,90 +28,90 @@
public class JspPropertyGroup implements Serializable {
protected ArrayList<String> urlPatterns = new ArrayList<String>();
- protected boolean elIgnored = false;
+ protected String elIgnored = null;
protected String pageEncoding = null;
- protected boolean scriptingInvalid = false;
- protected boolean isXml = false;
+ protected String scriptingInvalid = null;
+ protected String isXml = 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 deferredSyntaxAllowedAsLiteral = null;
+ protected String trimDirectiveWhitespaces = null;
protected String defaultContentType = null;
protected String buffer = null;
- protected boolean errorOnUndeclaredNamespace = false;
+ protected String errorOnUndeclaredNamespace = null;
- public String[] getUrlPatterns() {
- return urlPatterns.toArray(new String[0]);
- }
public void addUrlPattern(String urlPattern) {
urlPatterns.add(urlPattern);
}
- public boolean isElIgnored() {
- return elIgnored;
- }
- public void setElIgnored(boolean elIgnored) {
- this.elIgnored = elIgnored;
- }
public String getPageEncoding() {
return pageEncoding;
}
public void setPageEncoding(String pageEncoding) {
this.pageEncoding = pageEncoding;
}
- public boolean isScriptingInvalid() {
+ public void addIncludePrelude(String includePrelude) {
+ includePreludes.add(includePrelude);
+ }
+ public void addIncludeCoda(String includeCoda) {
+ includeCodas.add(includeCoda);
+ }
+ public String getDefaultContentType() {
+ return defaultContentType;
+ }
+ public void setDefaultContentType(String defaultContentType) {
+ this.defaultContentType = defaultContentType;
+ }
+ public String getBuffer() {
+ return buffer;
+ }
+ public void setBuffer(String buffer) {
+ this.buffer = buffer;
+ }
+ public String getElIgnored() {
+ return elIgnored;
+ }
+ public void setElIgnored(String elIgnored) {
+ this.elIgnored = elIgnored;
+ }
+ public String getScriptingInvalid() {
return scriptingInvalid;
}
- public void setScriptingInvalid(boolean scriptingInvalid) {
+ public void setScriptingInvalid(String scriptingInvalid) {
this.scriptingInvalid = scriptingInvalid;
}
- public boolean isXml() {
+ public String getIsXml() {
return isXml;
}
- public void setXml(boolean isXml) {
+ public void setIsXml(String isXml) {
this.isXml = isXml;
}
- public String[] getIncludePreludes() {
- return includePreludes.toArray(new String[0]);
- }
- public void addIncludePrelude(String includePrelude) {
- includePreludes.add(includePrelude);
- }
- public String[] getIncludeCodas() {
- return includeCodas.toArray(new String[0]);
- }
- public void addIncludeCoda(String includeCoda) {
- includeCodas.add(includeCoda);
- }
- public boolean isDeferredSyntaxAllowedAsLiteral() {
+ public String getDeferredSyntaxAllowedAsLiteral() {
return deferredSyntaxAllowedAsLiteral;
}
public void setDeferredSyntaxAllowedAsLiteral(
- boolean deferredSyntaxAllowedAsLiteral) {
+ String deferredSyntaxAllowedAsLiteral) {
this.deferredSyntaxAllowedAsLiteral = deferredSyntaxAllowedAsLiteral;
}
- public boolean isTrimDirectiveWhitespaces() {
+ public String getTrimDirectiveWhitespaces() {
return trimDirectiveWhitespaces;
}
- public void setTrimDirectiveWhitespaces(boolean trimDirectiveWhitespaces) {
+ public void setTrimDirectiveWhitespaces(String trimDirectiveWhitespaces) {
this.trimDirectiveWhitespaces = trimDirectiveWhitespaces;
}
- public String getDefaultContentType() {
- return defaultContentType;
+ public String getErrorOnUndeclaredNamespace() {
+ return errorOnUndeclaredNamespace;
}
- public void setDefaultContentType(String defaultContentType) {
- this.defaultContentType = defaultContentType;
+ public void setErrorOnUndeclaredNamespace(String errorOnUndeclaredNamespace) {
+ this.errorOnUndeclaredNamespace = errorOnUndeclaredNamespace;
}
- public String getBuffer() {
- return buffer;
+ public ArrayList<String> getUrlPatterns() {
+ return urlPatterns;
}
- public void setBuffer(String buffer) {
- this.buffer = buffer;
+ public ArrayList<String> getIncludePreludes() {
+ return includePreludes;
}
- public boolean isErrorOnUndeclaredNamespace() {
- return errorOnUndeclaredNamespace;
+ public ArrayList<String> getIncludeCodas() {
+ return includeCodas;
}
- public void setErrorOnUndeclaredNamespace(boolean errorOnUndeclaredNamespace) {
- this.errorOnUndeclaredNamespace = errorOnUndeclaredNamespace;
- }
}