Author: markt Date: Fri Nov 22 15:56:25 2013 New Revision: 1544589 URL: http://svn.apache.org/r1544589 Log: Better name
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java tomcat/trunk/test/org/apache/jasper/TestJspC.java Modified: tomcat/trunk/java/org/apache/jasper/JspC.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1544589&r1=1544588&r2=1544589&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/JspC.java (original) +++ tomcat/trunk/java/org/apache/jasper/JspC.java Fri Nov 22 15:56:25 2013 @@ -165,7 +165,7 @@ public class JspC extends Task implement protected ClassLoader loader = null; protected boolean trimSpaces = false; protected boolean genStringAsCharArray = false; - protected boolean validateXml; + protected boolean validateTld; protected boolean validateJspDoc; protected boolean xpoweredBy; protected boolean mappedFile = false; @@ -374,7 +374,7 @@ public class JspC extends Task implement } else if (tok.equals(SWITCH_DUMP_SMAP)) { smapDumped = true; } else if (tok.equals(SWITCH_VALIDATE_TLD)) { - setValidateXml(true); + setValidateTld(true); } else if (tok.equals(SWITCH_VALIDATE_DOC)) { setValidateJspDoc(true); } else { @@ -856,12 +856,12 @@ public class JspC extends Task implement } } - public void setValidateXml( boolean b ) { - this.validateXml = b; + public void setValidateTld( boolean b ) { + this.validateTld = b; } - public boolean isValidateXml() { - return validateXml; + public boolean isValidateTld() { + return validateTld; } public void setValidateJspDoc( boolean b ) { @@ -1454,7 +1454,7 @@ public class JspC extends Task implement Boolean.TRUE); } - TldScanner scanner = new TldScanner(context, true, validateXml); + TldScanner scanner = new TldScanner(context, true, validateTld); scanner.setClassLoader(classLoader); try { Modified: tomcat/trunk/test/org/apache/jasper/TestJspC.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/TestJspC.java?rev=1544589&r1=1544588&r2=1544589&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/jasper/TestJspC.java (original) +++ tomcat/trunk/test/org/apache/jasper/TestJspC.java Fri Nov 22 15:56:25 2013 @@ -101,7 +101,7 @@ public class TestJspC { webappOut.mkdirs(); jspc.setUriroot(appDir.toString()); jspc.setOutputDir(webappOut.toString()); - jspc.setValidateXml(false); + jspc.setValidateTld(false); jspc.setWebXml(new File(webappOut, "generated_web.xml").toString()); jspc.execute(); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org