Author: violetagg Date: Sat Dec 14 08:30:57 2013 New Revision: 1550900 URL: http://svn.apache.org/r1550900 Log: In addition to r1542550 where TagLibraryInfoImpl.createVariable(...) method is removed. According to web-jsptaglibrary schema, variableType->declare is 'true' by default. Adjust default value for 'declare' in o.a.t.util.descriptor.tld.TldRuleSet.Variable to the one expected by the schema.
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java tomcat/trunk/test/webapp/WEB-INF/bugs.tld Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java?rev=1550900&r1=1550899&r2=1550900&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java Sat Dec 14 08:30:57 2013 @@ -301,7 +301,7 @@ public class TldRuleSet extends RuleSetB private String nameGiven; private String nameFromAttribute; private String className = "java.lang.String"; - private boolean declare; + private boolean declare = true; private int scope = VariableInfo.NESTED; public void setNameGiven(String nameGiven) { Modified: tomcat/trunk/test/webapp/WEB-INF/bugs.tld URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/bugs.tld?rev=1550900&r1=1550899&r2=1550900&view=diff ============================================================================== --- tomcat/trunk/test/webapp/WEB-INF/bugs.tld (original) +++ tomcat/trunk/test/webapp/WEB-INF/bugs.tld Sat Dec 14 08:30:57 2013 @@ -63,7 +63,7 @@ <variable> <name-from-attribute>beanName</name-from-attribute> <variable-class>org.apache.jasper.compiler.TestGenerator.Bean</variable-class> - <declare>true</declare> + <!--declare>true</declare--> <scope>AT_END</scope> </variable> </tag> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org