Author: markt
Date: Tue Jul 4 20:47:13 2017
New Revision: 1800816
URL: http://svn.apache.org/viewvc?rev=1800816&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=53031
Add support for the fork option when compiling JSPs with the Jasper Ant task
and javac.
Modified:
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1800816&r1=1800815&r2=1800816&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Tue Jul 4 20:47:13 2017
@@ -206,6 +206,11 @@ public class JspC extends Task implement
protected boolean failOnError = true;
/**
+ * Should a separate process be forked to perform the compilation?
+ */
+ private boolean fork = false;
+
+ /**
* The file extensions to be handled as JSP files.
* Default list is .jsp and .jspx.
*/
@@ -792,7 +797,11 @@ public class JspC extends Task implement
*/
@Override
public boolean getFork() {
- return false;
+ return fork;
+ }
+
+ public void setFork(boolean fork) {
+ this.fork = fork;
}
/**
@@ -1433,6 +1442,7 @@ public class JspC extends Task implement
String msg = Localizer.getMessage("jspc.compilation.result",
Integer.toString(errorCount), Long.toString(time));
if (failOnError && errorCount > 0) {
+ System.out.println("Error Count: " + errorCount);
throw new BuildException(msg);
} else {
log.info(msg);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1800816&r1=1800815&r2=1800816&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jul 4 20:47:13 2017
@@ -57,6 +57,14 @@
</add>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <add>
+ <bug>53031</bug>: Add support for the <code>fork</code> option when
+ compiling JSPs with the Jasper Ant task and javac. (markt)
+ </add>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<add>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
