Author: markt
Date: Wed Jan 14 16:30:43 2009
New Revision: 734582
URL: http://svn.apache.org/viewvc?rev=734582&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37515
Add options for 1.6 and 1.7 source and target to JDT compiler
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=734582&r1=734581&r2=734582&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 16:30:43 2009
@@ -169,12 +169,6 @@
markt - Second commit removes e.printStackTrace. URLs not used to
locate files. TCK passes.
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37515
- Add options for 1.6 and 1.7 source and target to JDT compiler
- http://svn.apache.org/viewvc?rev=731773&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Provide deployment feedback - ie when deployment succeeds but startup fails,
it should return FAIL
http://svn.apache.org/viewvc?rev=731644&view=rev
+1: fhanik, funkman
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?rev=734582&r1=734581&r2=734582&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Wed
Jan 14 16:30:43 2009
@@ -300,6 +300,12 @@
} else if(opt.equals("1.5")) {
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_5);
+ } else if(opt.equals("1.6")) {
+ settings.put(CompilerOptions.OPTION_Source,
+ CompilerOptions.VERSION_1_6);
+ } else if(opt.equals("1.7")) {
+ settings.put(CompilerOptions.OPTION_Source,
+ CompilerOptions.VERSION_1_7);
} else {
log.warn("Unknown source VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_Source,
@@ -331,6 +337,16 @@
CompilerOptions.VERSION_1_5);
settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_1_5);
+ } else if(opt.equals("1.6")) {
+ settings.put(CompilerOptions.OPTION_TargetPlatform,
+ CompilerOptions.VERSION_1_6);
+ settings.put(CompilerOptions.OPTION_Compliance,
+ CompilerOptions.VERSION_1_6);
+ } else if(opt.equals("1.7")) {
+ settings.put(CompilerOptions.OPTION_TargetPlatform,
+ CompilerOptions.VERSION_1_7);
+ settings.put(CompilerOptions.OPTION_Compliance,
+ CompilerOptions.VERSION_1_7);
} else {
log.warn("Unknown target VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_TargetPlatform,
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=734582&r1=734581&r2=734582&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 14 16:30:43 2009
@@ -303,6 +303,10 @@
<subsection name="Jasper">
<changelog>
<fix>
+ <bug>37515</bug>: Support 1.6 and 1.7 as source and target for
+ compilation. (markt)
+ </fix>
+ <fix>
ClassCastException in EL ExpressionBuilder. (rjung)
</fix>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
