Author: markt
Date: Tue Sep 30 13:28:33 2014
New Revision: 1628440
URL: http://svn.apache.org/r1628440
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43001
Enable the JspC Ant task to set the JspC option mappedFile.
Motivation: A really simple fix. The mappedFile option has different default
(false) in JspC vs. EmbeddedServletOptions, and there was no way to configure
it in an Ant task.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1623392,1624247
Merged /tomcat/tc7.0.x/trunk:r1624249
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1628440&r1=1628439&r2=1628440&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Sep 30 13:28:33 2014
@@ -57,17 +57,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43001
- Enable the JspC Ant task to set the JspC option mappedFile.
-
- Motivation: A really simple fix. The mappedFile option has different
- default (false) in JspC vs. EmbeddedServletOptions, and there was no way
- to configure it in an Ant task.
-
- http://svn.apache.org/r1624249
- +1: kkolinko, remm, markt
- -1:
-
* Update documented minimum Ant version to use at build time to be 1.8.0
Motivation: Align documentation with code.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java?rev=1628440&r1=1628439&r2=1628440&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java Tue Sep 30 13:28:33
2014
@@ -477,6 +477,10 @@ public class JspC extends Task implement
return mappedFile;
}
+ public void setMappedFile(boolean b) {
+ mappedFile = b;
+ }
+
/**
* @deprecated Removed in Tomcat 7
*/
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1628440&r1=1628439&r2=1628440&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Sep 30 13:28:33 2014
@@ -78,6 +78,10 @@
<subsection name="Jasper">
<changelog>
<fix>
+ <bug>43001</bug>: Enable the JspC Ant task to set the JspC option
+ <code>mappedFile</code>. (kkolinko)
+ </fix>
+ <fix>
<bug>56334</bug>: Fix a regression in EL parsing when quoted string
follows a whitespace. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
