Author: remy.maucherat(a)jboss.com
Date: 2009-01-06 11:27:33 -0500 (Tue, 06 Jan 2009)
New Revision: 894
Modified:
trunk/java/org/apache/jasper/compiler/JDTCompiler.java
trunk/webapps/docs/changelog.xml
Log:
- JDK options for the JDT compiler.
Modified: trunk/java/org/apache/jasper/compiler/JDTCompiler.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/JDTCompiler.java 2009-01-02 16:35:04 UTC (rev
893)
+++ trunk/java/org/apache/jasper/compiler/JDTCompiler.java 2009-01-06 16:27:33 UTC (rev
894)
@@ -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: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2009-01-02 16:35:04 UTC (rev 893)
+++ trunk/webapps/docs/changelog.xml 2009-01-06 16:27:33 UTC (rev 894)
@@ -110,7 +110,7 @@
EL security manager fixes. (markt)
</fix>
<fix>
- <bug>36923</bug>: If EL is diabled, handle as template text. (markt)
+ <bug>36923</bug>: If EL is disabled, handle as template text.
(markt)
</fix>
<fix>
<bug>46462</bug>: Compatibility with ASF projects which use JSP.
(markt)
@@ -118,6 +118,9 @@
<fix>
<bug>46381</bug>: Coerce EL to String rather than Object when
concatenating. (markt)
</fix>
+ <fix>
+ <bug>37515</bug>: Add options for 1.6 and 1.7 source and target to
JDT compiler. (markt)
+ </fix>
</changelog>
</subsection>
</section>
Show replies by date