Author: kkolinko Date: Fri Apr 4 16:34:31 2014 New Revision: 1584800 URL: http://svn.apache.org/r1584800 Log: Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=56283 Add Java 8 support to Jasper's default configuration
Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/build.properties.default tomcat/tc6.0.x/trunk/eclipse.classpath 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/res/maven/jasper.pom 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=1584800&r1=1584799&r2=1584800&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Apr 4 16:34:31 2014 @@ -49,24 +49,6 @@ PATCHES PROPOSED TO BACKPORT: remm: no need to add i18n for something that will not happen -1: -* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=56283 - Add Java 8 support to Jasper's default configuration - http://people.apache.org/~markt/patches/2014-03-19-Jasper-Java8-tc6-v1.patch - http://people.apache.org/~markt/patches/2014-03-23-Jasper-Java8-tc6-part2-v1.patch - +1: markt, remm - +1: kkolinko: - - See r1557990. There are noTldJars lists in TldConfig, TldLocationsCache - that have to be updated. Maybe add support for "ecj-*.jar" pattern - there? (If not, then just add "4.3.2" and "P20140317-1600" versions). - - - Technically CompilerOptions.VERSION_1_8 is a String constant "1.8", - so it will be inlined at compile time. At runtime Jasper will be - compatible with any earlier versions of ecj 4.3.x. - Thus I am OK with this change. - markt: Additional patch added - kkolinko: Thank you. Changing the vote to +1. - -1: - PATCHES/ISSUES THAT ARE STALLED: Modified: tomcat/tc6.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1584800&r1=1584799&r2=1584800&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/build.properties.default (original) +++ tomcat/tc6.0.x/trunk/build.properties.default Fri Apr 4 16:34:31 2014 @@ -106,8 +106,8 @@ wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j # - noTldJars in o.a.j.compiler.TldLocationsCache # - res/maven/jasper.pom # - eclipse.classpath -jdt.version=4.3.1 -jdt.release=R-4.3.1-201309111000 +jdt.version=P20140317-1600 +jdt.release=P20140317-1600 jdt.home=${base.path}/ecj-${jdt.version} jdt.jar=${jdt.home}/ecj-${jdt.version}.jar # The download will be moved to the archive area eventually. We are taking care of that in advance. Modified: tomcat/tc6.0.x/trunk/eclipse.classpath URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/eclipse.classpath?rev=1584800&r1=1584799&r2=1584800&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/eclipse.classpath (original) +++ tomcat/tc6.0.x/trunk/eclipse.classpath Fri Apr 4 16:34:31 2014 @@ -20,7 +20,7 @@ <classpathentry kind="src" path="test"/> <classpathentry kind="src" path="webapps/examples/WEB-INF/classes"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.3.1/ecj-4.3.1.jar"/> + <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-P20140317-1600/ecj-P20140317-1600.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/> <classpathentry kind="output" path=".settings/output"/> 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=1584800&r1=1584799&r2=1584800&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 Fri Apr 4 16:34:31 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=1584800&r1=1584799&r2=1584800&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 Fri Apr 4 16:34:31 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, + 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, + CompilerOptions.VERSION_1_8); + settings.put(CompilerOptions.OPTION_Compliance, + 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=1584800&r1=1584799&r2=1584800&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 Fri Apr 4 16:34:31 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/res/maven/jasper.pom URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/jasper.pom?rev=1584800&r1=1584799&r2=1584800&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/res/maven/jasper.pom (original) +++ tomcat/tc6.0.x/trunk/res/maven/jasper.pom Fri Apr 4 16:34:31 2014 @@ -63,7 +63,7 @@ <dependency> <groupId>org.eclipse.jdt.core.compiler</groupId> <artifactId>ecj</artifactId> - <version>4.3.1</version> + <version>P20140317-1600</version> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> 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=1584800&r1=1584799&r2=1584800&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Apr 4 16:34:31 2014 @@ -116,6 +116,12 @@ <bug>56265</bug>: Do not escape values of dynamic tag attributes containing EL expressions. (kkolinko) </fix> + <update> + <bug>56283</bug>: Update to the Eclipse JDT Compiler P20140317-1600 + which adds support for Java 8 syntax to JSPs. Add support for value + "1.8" for the <code>compilerSourceVM</code> and + <code>compilerTargetVM</code> options. (markt) + </update> </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