tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1327293 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default eclipse.classpath java/org/apache/catalina/startup/TldConfig.java java/org/apache/jasper/compiler/TldLocationsCache.java res/maven/jasper.pom webapps/docs/changelog.xml
Date Tue, 17 Apr 2012 21:38:23 GMT
Author: kkolinko
Date: Tue Apr 17 21:38:22 2012
New Revision: 1327293

URL: http://svn.apache.org/viewvc?rev=1327293&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52805
Update to Eclipse JDT Compiler 3.7.2.

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/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=1327293&r1=1327292&r2=1327293&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 17 21:38:22 2012
@@ -139,12 +139,6 @@ PATCHES PROPOSED TO BACKPORT:
   Add WebSocket support to Tomcat 6
   +1: fhanik
 
-* Update to Eclipse JDT Compiler 3.7.2.
-  https://issues.apache.org/bugzilla/show_bug.cgi?id=52805
-  Patch: https://issues.apache.org/bugzilla/attachment.cgi?id=28478
-  +1: kkolinko, markt, fhanik
-  -1:
-
 * Update Apache Commons Daemon to 1.0.10.
   Update the native component of the Tomcat APR/native connector to
   1.1.23 and take advantage of the simplified distribution.

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1327293&r1=1327292&r2=1327293&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Tue Apr 17 21:38:22 2012
@@ -107,8 +107,8 @@ wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j
 # - noTldJars in o.a.j.compiler.TldLocationsCache
 # - res/maven/jasper.pom
 # - eclipse.classpath
-jdt.version=3.7
-jdt.release=R-3.7-201106131736
+jdt.version=3.7.2
+jdt.release=R-3.7.2-201202080800
 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=1327293&r1=1327292&r2=1327293&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/eclipse.classpath (original)
+++ tomcat/tc6.0.x/trunk/eclipse.classpath Tue Apr 17 21:38:22 2012
@@ -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/ecj-3.7.jar"/>
+	<classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-3.7.2/ecj-3.7.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=1327293&r1=1327292&r2=1327293&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 Tue Apr 17 21:38:22
2012
@@ -87,6 +87,8 @@ public final class TldConfig  implements
         noTldJars.add("jasper.jar");
         noTldJars.add("jasper-el.jar");
         noTldJars.add("ecj-3.7.jar");
+        noTldJars.add("ecj-3.7.1.jar");
+        noTldJars.add("ecj-3.7.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/TldLocationsCache.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java?rev=1327293&r1=1327292&r2=1327293&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 Tue Apr 17
21:38:22 2012
@@ -129,6 +129,8 @@ public class TldLocationsCache {
         noTldJars.add("jasper.jar");
         noTldJars.add("jasper-el.jar");
         noTldJars.add("ecj-3.7.jar");
+        noTldJars.add("ecj-3.7.1.jar");
+        noTldJars.add("ecj-3.7.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=1327293&r1=1327292&r2=1327293&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/jasper.pom (original)
+++ tomcat/tc6.0.x/trunk/res/maven/jasper.pom Tue Apr 17 21:38:22 2012
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>org.eclipse.jdt.core.compiler</groupId>
       <artifactId>ecj</artifactId>
-      <version>3.7</version>
+      <version>3.7.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=1327293&r1=1327292&r2=1327293&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 17 21:38:22 2012
@@ -44,16 +44,6 @@
  General, Catalina, Coyote, Jasper, Cluster, Webapps, Other
 -->
 <section name="Tomcat 6.0.36 (jfclere)" rtext="">
-  <subsection name="General">
-    <changelog>
-      <update>
-        Update Apache Commons Daemon to 1.0.8. (mturk)
-      </update>
-      <update>
-        Update Apache Commons Pool to 1.5.7. (kkolinko)
-      </update>
-    </changelog>
-  </subsection>
   <subsection name="Catalina">
     <changelog>
       <fix>
@@ -128,7 +118,7 @@
   <subsection name="Coyote">
     <changelog>
       <update>
-        <bug>51477</bug>Support all SSL protocol combinations in the APR/native
+        <bug>51477</bug>: Support all SSL protocol combinations in the APR/native
         connector. This only works when using the native library version 1.1.21
         or later. (rjung)
       </update>
@@ -178,11 +168,17 @@
         wagon-ssh. (jfclere)
       </fix>
       <fix>
-        Update Commons Daemon to 1.0.9 to resolve <bug>52548</bug> which meant
-        that services created with service.bat did not set the
+        Update Apache Commons Daemon to 1.0.9 to resolve <bug>52548</bug>
+        which meant that services created with service.bat did not set the
         <code>catalina.home</code> and <code>catalina.base</code>
system
         properties. (markt)
       </fix>
+      <update>
+        Update Apache Commons Pool to 1.5.7. (kkolinko)
+      </update>
+      <update>
+        <bug>52805</bug>: Update to Eclipse JDT Compiler 3.7.2. (kkolinko)
+      </update>
     </changelog>
   </subsection>
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message