[jbossweb-commits] JBossWeb SVN: r1103 - in trunk/java/org/apache/catalina: startup and 1 other directory.

Author: remy.maucherat(a)jboss.com Date: 2009-06-11 07:10:55 -0400 (Thu, 11 Jun 2009) New Revision: 1103 Modified: trunk/java/org/apache/catalina/deploy/jsp/TagAttributeInfo.java trunk/java/org/apache/catalina/deploy/jsp/TagVariableInfo.java trunk/java/org/apache/catalina/startup/TldRuleSet.java Log: - Booleans don't actually work, so replace with Strings. Modified: trunk/java/org/apache/catalina/deploy/jsp/TagAttributeInfo.java =================================================================== --- trunk/java/org/apache/catalina/deploy/jsp/TagAttributeInfo.java 2009-06-11 10:26:21 UTC (rev 1102) +++ trunk/java/org/apache/catalina/deploy/jsp/TagAttributeInfo.java 2009-06-11 11:10:55 UTC (rev 1103) @@ -20,18 +20,18 @@ public class TagAttributeInfo { protected String name; protected String type; - protected boolean reqTime = false; - protected boolean required = false; + protected String reqTime; + protected String required; /* * private fields for JSP 2.0 */ - protected boolean fragment = false; + protected String fragment; /* * private fields for JSP 2.1 */ protected String description; - protected boolean deferredValue = false; - protected boolean deferredMethod = false; + protected String deferredValue; + protected String deferredMethod; protected String expectedTypeName; protected String methodSignature; @@ -47,52 +47,53 @@ public void setType(String type) { this.type = type; } - public boolean isReqTime() { + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + public String getExpectedTypeName() { + return expectedTypeName; + } + public void setExpectedTypeName(String expectedTypeName) { + this.expectedTypeName = expectedTypeName; + } + public String getMethodSignature() { + return methodSignature; + } + public void setMethodSignature(String methodSignature) { + this.methodSignature = methodSignature; + } + public String getReqTime() { return reqTime; } - public void setReqTime(boolean reqTime) { + public void setReqTime(String reqTime) { this.reqTime = reqTime; } - public boolean isRequired() { + public String getRequired() { return required; } - public void setRequired(boolean required) { + public void setRequired(String required) { this.required = required; } - public boolean isFragment() { + public String getFragment() { return fragment; } - public void setFragment(boolean fragment) { + public void setFragment(String fragment) { this.fragment = fragment; } - public String getDescription() { - return description; - } - public void setDescription(String description) { - this.description = description; - } - public boolean isDeferredValue() { + public String getDeferredValue() { return deferredValue; } - public void setDeferredValue(boolean deferredValue) { + public void setDeferredValue(String deferredValue) { this.deferredValue = deferredValue; } - public boolean isDeferredMethod() { + public String getDeferredMethod() { return deferredMethod; } - public void setDeferredMethod(boolean deferredMethod) { + public void setDeferredMethod(String deferredMethod) { this.deferredMethod = deferredMethod; } - public String getExpectedTypeName() { - return expectedTypeName; - } - public void setExpectedTypeName(String expectedTypeName) { - this.expectedTypeName = expectedTypeName; - } - public String getMethodSignature() { - return methodSignature; - } - public void setMethodSignature(String methodSignature) { - this.methodSignature = methodSignature; - } + } Modified: trunk/java/org/apache/catalina/deploy/jsp/TagVariableInfo.java =================================================================== --- trunk/java/org/apache/catalina/deploy/jsp/TagVariableInfo.java 2009-06-11 10:26:21 UTC (rev 1102) +++ trunk/java/org/apache/catalina/deploy/jsp/TagVariableInfo.java 2009-06-11 11:10:55 UTC (rev 1103) @@ -25,7 +25,7 @@ protected String nameGiven; // <name-given> protected String nameFromAttribute; // <name-from-attribute> protected String className; // <class> - protected boolean declare = true; // <declare> + protected String declare; // <declare> protected String scope; // <scope> public String getNameGiven() { @@ -46,17 +46,17 @@ public void setClassName(String className) { this.className = className; } - public boolean isDeclare() { - return declare; - } - public void setDeclare(boolean declare) { - this.declare = declare; - } public String getScope() { return scope; } public void setScope(String scope) { this.scope = scope; } + public String getDeclare() { + return declare; + } + public void setDeclare(String declare) { + this.declare = declare; + } } Modified: trunk/java/org/apache/catalina/startup/TldRuleSet.java =================================================================== --- trunk/java/org/apache/catalina/startup/TldRuleSet.java 2009-06-11 10:26:21 UTC (rev 1102) +++ trunk/java/org/apache/catalina/startup/TldRuleSet.java 2009-06-11 11:10:55 UTC (rev 1103) @@ -196,8 +196,6 @@ "setFragment", 0); digester.addCallMethod(prefix + "taglib/tag/attribute/description", "setDescription", 0); - digester.addCallMethod(prefix + "taglib/tag/attribute/required", - "setRequired", 0); digester.addCallMethod(prefix + "taglib/tag/attribute/deferred-value", "setDeferredValue", 0); digester.addCallMethod(prefix + "taglib/tag/attribute/deferred-value/type",