Author: markt
Date: Wed Apr 9 15:41:28 2014
New Revision: 1585997
URL: http://svn.apache.org/r1585997
Log:
Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=56283
Add support for running Tomcat 6 with ecj-P20140317-1600.jar (as drop-in
replacement for ecj-4.3.1.jar).
Add support for value "1.8" for the compilerSourceVM and compilerTargetVM
options.
Note that ecj-P20140317-1600.jar can only be used when running with Java 6 or
later. The "1.8" options make sense only when running with Java 8 (or later).
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.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=1585997&r1=1585996&r2=1585997&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 9 15:41:28 2014
@@ -28,17 +28,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=56283
- Add support for running Tomcat 6 with ecj-P20140317-1600.jar (as drop-in
- replacement for ecj-4.3.1.jar). Add support for value "1.8" for the
- compilerSourceVM and compilerTargetVM options.
- Note that, per previous comments, ecj-P20140317-1600.jar can only be used
when
- running with Java 6 or later. The "1.8" options make sense only when running
- with Java 8 (or later).
- https://issues.apache.org/bugzilla/attachment.cgi?id=31476&action=diff
- +1: markt, schultz, kkolinko
- -1:
-
* Add a work around for validating XML documents (often TLDs) that use
just the file name to refer to refer to the JavaEE schema on which they
are based.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=1585997&r1=1585996&r2=1585997&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java Wed
Apr 9 15:41:28 2014
@@ -94,6 +94,8 @@ public final class TldConfig implements
noTldJars.add("ecj-4.2.1.jar");
noTldJars.add("ecj-4.2.2.jar");
noTldJars.add("ecj-4.3.1.jar");
+ noTldJars.add("ecj-4.3.2.jar");
+ noTldJars.add("ecj-P20140317-1600.jar");
noTldJars.add("jsp-api.jar");
noTldJars.add("servlet-api.jar");
noTldJars.add("tomcat-coyote.jar");
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=1585997&r1=1585996&r2=1585997&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
Apr 9 15:41:28 2014
@@ -310,6 +310,9 @@ public class JDTCompiler extends org.apa
} else if(opt.equals("1.7")) {
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_7);
+ } else if(opt.equals("1.8")) {
+ settings.put(CompilerOptions.OPTION_Source,
+ "1.8"); // CompilerOptions.VERSION_1_8
} else {
log.warn("Unknown source VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_Source,
@@ -351,6 +354,11 @@ public class JDTCompiler extends org.apa
CompilerOptions.VERSION_1_7);
settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_1_7);
+ } else if(opt.equals("1.8")) {
+ settings.put(CompilerOptions.OPTION_TargetPlatform,
+ "1.8"); // CompilerOptions.VERSION_1_8
+ settings.put(CompilerOptions.OPTION_Compliance,
+ "1.8"); // CompilerOptions.VERSION_1_8
} else {
log.warn("Unknown target VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_TargetPlatform,
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java?rev=1585997&r1=1585996&r2=1585997&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
Wed Apr 9 15:41:28 2014
@@ -134,6 +134,8 @@ public class TldLocationsCache {
noTldJars.add("ecj-4.2.1.jar");
noTldJars.add("ecj-4.2.2.jar");
noTldJars.add("ecj-4.3.1.jar");
+ noTldJars.add("ecj-4.3.2.jar");
+ noTldJars.add("ecj-P20140317-1600.jar");
noTldJars.add("jsp-api.jar");
noTldJars.add("servlet-api.jar");
noTldJars.add("tomcat-coyote.jar");
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=1585997&r1=1585996&r2=1585997&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Apr 9 15:41:28 2014
@@ -122,6 +122,14 @@
<bug>56265</bug>: Do not escape values of dynamic tag attributes
containing EL expressions. (kkolinko)
</fix>
+ <fix>
+ <bug>56283</bug>: Add support for running Tomcat 6 with
+ ecj-P20140317-1600.jar (as drop-in replacement for ecj-4.3.1.jar). Add
+ support for value "1.8" for the <code>compilerSourceVM</code> and
+ <code>compilerTargetVM</code> options. Note that ecj-P20140317-1600.jar
+ can only be used when running with Java 6 or later. The "1.8" options
+ make sense only when running with Java 8 (or later). (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
