Author: jfclere
Date: Mon Apr 29 09:19:27 2013
New Revision: 1476932
URL: http://svn.apache.org/r1476932
Log:
commit accepted patch for BZ 54615.
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=1476932&r1=1476931&r2=1476932&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Apr 29 09:19:27 2013
@@ -31,12 +31,6 @@ PATCHES ACCEPTED TO BACKPORT:
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54615
- Update to Eclipse JDT Compiler 4.2.2
- http://people.apache.org/~kkolinko/patches/2013-03-26_tc6_eclipse422.patch
- +1: kkolinko, rjung, markt
- -1:
-
PATCHES/ISSUES THAT ARE STALLED
* Backport JSP unloading patch (BZ48358).
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1476932&r1=1476931&r2=1476932&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Mon Apr 29 09:19:27 2013
@@ -107,14 +107,14 @@ wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j
# - noTldJars in o.a.j.compiler.TldLocationsCache
# - res/maven/jasper.pom
# - eclipse.classpath
-jdt.version=3.7.2
-jdt.release=R-3.7.2-201202080800
+jdt.version=4.2.2
+jdt.release=R-4.2.2-201302041200
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.
# Note older JARs were called ecj.jar. Newer JARs are called
ecj-${jdt.version}.jar
-jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
-jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# ----- Tomcat native library -----
tomcat-native.version=1.1.27
Modified: tomcat/tc6.0.x/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/eclipse.classpath?rev=1476932&r1=1476931&r2=1476932&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/eclipse.classpath (original)
+++ tomcat/tc6.0.x/trunk/eclipse.classpath Mon Apr 29 09:19:27 2013
@@ -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"/>
- <classpathentry kind="var"
path="TOMCAT_LIBS_BASE/ecj-3.7.2/ecj-3.7.2.jar"/>
+ <classpathentry kind="var"
path="TOMCAT_LIBS_BASE/ecj-4.2.2/ecj-4.2.2.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<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=1476932&r1=1476931&r2=1476932&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 Mon
Apr 29 09:19:27 2013
@@ -89,6 +89,8 @@ public final class TldConfig implements
noTldJars.add("ecj-3.7.jar");
noTldJars.add("ecj-3.7.1.jar");
noTldJars.add("ecj-3.7.2.jar");
+ noTldJars.add("ecj-4.2.1.jar");
+ noTldJars.add("ecj-4.2.2.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=1476932&r1=1476931&r2=1476932&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 Mon
Apr 29 09:19:27 2013
@@ -147,6 +147,10 @@ public class JDTCompiler extends org.apa
}
return result;
}
+
+ public boolean ignoreOptionalProblems() {
+ return false;
+ }
}
final INameEnvironment env = new INameEnvironment() {
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=1476932&r1=1476931&r2=1476932&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
Mon Apr 29 09:19:27 2013
@@ -131,6 +131,8 @@ public class TldLocationsCache {
noTldJars.add("ecj-3.7.jar");
noTldJars.add("ecj-3.7.1.jar");
noTldJars.add("ecj-3.7.2.jar");
+ noTldJars.add("ecj-4.2.1.jar");
+ noTldJars.add("ecj-4.2.2.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=1476932&r1=1476931&r2=1476932&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/jasper.pom (original)
+++ tomcat/tc6.0.x/trunk/res/maven/jasper.pom Mon Apr 29 09:19:27 2013
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
- <version>3.7.2</version>
+ <version>4.2.2</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=1476932&r1=1476931&r2=1476932&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Apr 29 09:19:27 2013
@@ -120,6 +120,13 @@
</update>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>54615</bug>: Tomcat 6 doesn't build against ecj 4.x (kkolinko)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Cluster">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
