geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r687787 [1/3] - in /geronimo/server/branches/2.1/repository/org/apache/tomcat: ./ catalina/6.0.18-G678601/ jasper-el/6.0.18-G678601/ jasper/6.0.18-G678601/
Date Thu, 21 Aug 2008 15:49:38 GMT
Author: dwoods
Date: Thu Aug 21 08:49:36 2008
New Revision: 687787

URL: http://svn.apache.org/viewvc?rev=687787&view=rev
Log:
GERONIMO-4245 revert ELParser back to 6.0.16 level to fix JSP/JSTL TCK failures

Added:
    geronimo/server/branches/2.1/repository/org/apache/tomcat/ELParser-6.0.18.patch
    geronimo/server/branches/2.1/repository/org/apache/tomcat/catalina/6.0.18-G678601/catalina-6.0.18-G678601.jar
    geronimo/server/branches/2.1/repository/org/apache/tomcat/catalina/6.0.18-G678601/catalina-6.0.18-G678601.jar.md5
    geronimo/server/branches/2.1/repository/org/apache/tomcat/catalina/6.0.18-G678601/catalina-6.0.18-G678601.jar.sha1
    geronimo/server/branches/2.1/repository/org/apache/tomcat/jasper-el/6.0.18-G678601/jasper-el-6.0.18-G678601.jar.sha1
    geronimo/server/branches/2.1/repository/org/apache/tomcat/jasper/6.0.18-G678601/jasper-6.0.18-G678601.jar.sha1
Removed:
    geronimo/server/branches/2.1/repository/org/apache/tomcat/ELParser-6.0.19-r685708.patch
Modified:
    geronimo/server/branches/2.1/repository/org/apache/tomcat/6.0.18-G678601.README.TXT
    geronimo/server/branches/2.1/repository/org/apache/tomcat/jasper-el/6.0.18-G678601/jasper-el-6.0.18-G678601.jar
    geronimo/server/branches/2.1/repository/org/apache/tomcat/jasper-el/6.0.18-G678601/jasper-el-6.0.18-G678601.jar.md5
    geronimo/server/branches/2.1/repository/org/apache/tomcat/jasper/6.0.18-G678601/jasper-6.0.18-G678601.jar
    geronimo/server/branches/2.1/repository/org/apache/tomcat/jasper/6.0.18-G678601/jasper-6.0.18-G678601.jar.md5

Modified: geronimo/server/branches/2.1/repository/org/apache/tomcat/6.0.18-G678601.README.TXT
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/tomcat/6.0.18-G678601.README.TXT?rev=687787&r1=687786&r2=687787&view=diff
==============================================================================
--- geronimo/server/branches/2.1/repository/org/apache/tomcat/6.0.18-G678601.README.TXT (original)
+++ geronimo/server/branches/2.1/repository/org/apache/tomcat/6.0.18-G678601.README.TXT Thu
Aug 21 08:49:36 2008
@@ -36,10 +36,10 @@
   java/org/apache/catalina/deploy/Injectable.java
   java/org/apache/catalina/deploy/InjectionTarget.java
  
-Apply the ELParse patch from Tomcat 6.0.x (6.0.19) to fix Bug45511
+Revert the java/org/apache/el/parser/ELParser* files to the Tomcat 6.0.16 level to fix Bug45511
and 60 TCK failures in the JSP and JSTL buckets.
    https://issues.apache.org/bugzilla/show_bug.cgi?id=45511
 ------------------------------------------------------------------
-patch -p0 -u < ELParser-6.0.19-r685708.patch
+patch -p0 -u < ELParser-6.0.18.patch
 
 
 Build tomcat
@@ -57,10 +57,6 @@
   cp output/build/lib/catalina.jar <geronimo-root>/repository/org/apache/tomcat/catalina/6.0.18-G678601/catalina-6.0.18-G678601.jar
   cp output/build/lib/jasper.jar   <geronimo-root>/repository/org/apache/tomcat/jasper/6.0.18-G678601/jasper-6.0.18-G678601.jar
 
-Copy the patched jasper-el jar over (until 6.0.19 is released)
---------------------------------------------------------------
-  cp output/build/lib/jasper-el.jar   <geronimo-root>/repository/org/apache/tomcat/jasper-el/6.0.18-G678601/jasper-el-6.0.18-G678601.jar
-
 
 How the patch was created (tomcat_6_0_18-G678601.patch):
 --------------------------------------------------------
@@ -81,5 +77,3 @@
 Create the patch:
   svn diff > TOMCAT_6_0_18-G678601.patch
 
-Update the README, patch file(s) and patched jars in svn.
-



Mime
View raw message