Author: markt
Date: Fri Nov 22 11:45:00 2013
New Revision: 1544499
URL: http://svn.apache.org/r1544499
Log:
Add command line support for TLD and JSP document validation to JspC
Modified:
tomcat/trunk/java/org/apache/jasper/JspC.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=1544499&r1=1544498&r2=1544499&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Fri Nov 22 11:45:00 2013
@@ -133,6 +133,8 @@ public class JspC extends Task implement
protected static final String SWITCH_ENCODING = "-javaEncoding";
protected static final String SWITCH_SMAP = "-smap";
protected static final String SWITCH_DUMP_SMAP = "-dumpsmap";
+ protected static final String SWITCH_VALIDATE_TLD = "-validateTld";
+ protected static final String SWITCH_VALIDATE_DOC = "-validateDoc";
protected static final String SHOW_SUCCESS ="-s";
protected static final String LIST_ERRORS = "-l";
protected static final int INC_WEBXML = 10;
@@ -164,6 +166,7 @@ public class JspC extends Task implement
protected boolean trimSpaces = false;
protected boolean genStringAsCharArray = false;
protected boolean validateXml;
+ protected boolean validateJspDoc;
protected boolean xpoweredBy;
protected boolean mappedFile = false;
protected boolean poolingEnabled = true;
@@ -370,6 +373,10 @@ public class JspC extends Task implement
smapSuppressed = false;
} else if (tok.equals(SWITCH_DUMP_SMAP)) {
smapDumped = true;
+ } else if (tok.equals(SWITCH_VALIDATE_TLD)) {
+ setValidateXml(true);
+ } else if (tok.equals(SWITCH_VALIDATE_DOC)) {
+ setValidateJspDoc(true);
} else {
if (tok.startsWith("-")) {
throw new JasperException("Unrecognized option: " + tok +
@@ -857,6 +864,14 @@ public class JspC extends Task implement
return validateXml;
}
+ public void setValidateJspDoc( boolean b ) {
+ this.validateJspDoc = b;
+ }
+
+ public boolean isValidateJspDoc() {
+ return validateJspDoc;
+ }
+
public void setListErrors( boolean b ) {
listErrors = b;
}
@@ -1434,6 +1449,11 @@ public class JspC extends Task implement
URL resourceBase = new
File(uriRoot).getCanonicalFile().toURI().toURL();
context = new JspCServletContext(log, resourceBase, classLoader);
+ if (isValidateJspDoc()) {
+ context.setAttribute(Constants.XML_VALIDATION_DOC_ATTR,
+ Boolean.TRUE);
+ }
+
TldScanner scanner = new TldScanner(context, true, validateXml);
scanner.setClassLoader(classLoader);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
