[patch] 2014-04-04_56283_tc6_v2.patch

2014-04-04_56283_tc6_v2.patch (text/plain), 2.66 KB, created by Konstantin Kolinko on 2014-04-04 19:51:25 UTC

(hide)

Description: 2014-04-04_56283_tc6_v2.patch

Filename:

MIME Type:

Creator: Konstantin Kolinko

Created: 2014-04-04 19:51:25 UTC

Size: 2.66 KB

patch

obsolete

>Index: java/org/apache/catalina/startup/TldConfig.java >=================================================================== >--- java/org/apache/catalina/startup/TldConfig.java (revision 1584864) >+++ java/org/apache/catalina/startup/TldConfig.java (working copy) >@@ -94,6 +94,8 @@ > 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"); >Index: java/org/apache/jasper/compiler/JDTCompiler.java >=================================================================== >--- java/org/apache/jasper/compiler/JDTCompiler.java (revision 1584864) >+++ java/org/apache/jasper/compiler/JDTCompiler.java (working copy) >@@ -310,6 +310,9 @@ > } 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 @@ > 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, >Index: java/org/apache/jasper/compiler/TldLocationsCache.java >=================================================================== >--- java/org/apache/jasper/compiler/TldLocationsCache.java (revision 1584864) >+++ java/org/apache/jasper/compiler/TldLocationsCache.java (working copy) >@@ -134,6 +134,8 @@ > 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"); View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]