incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1400544 - in /incubator/ooo/trunk: ext_sources/7e4e73c21f031d5a4c93c128baf7fd75-apache-tomcat-5.5.35-src.tar.gz main/external_deps.lst main/tomcat/makefile.mk main/tomcat/tomcat.patch
Date Sun, 21 Oct 2012 01:03:32 GMT
Author: pfg
Date: Sun Oct 21 01:03:31 2012
New Revision: 1400544

URL: http://svn.apache.org/viewvc?rev=1400544&view=rev
Log:
Update Apache Tomcat to 5.5.36 (final) version,

Removed:
    incubator/ooo/trunk/ext_sources/7e4e73c21f031d5a4c93c128baf7fd75-apache-tomcat-5.5.35-src.tar.gz
Modified:
    incubator/ooo/trunk/main/external_deps.lst
    incubator/ooo/trunk/main/tomcat/makefile.mk
    incubator/ooo/trunk/main/tomcat/tomcat.patch

Modified: incubator/ooo/trunk/main/external_deps.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/external_deps.lst?rev=1400544&r1=1400543&r2=1400544&view=diff
==============================================================================
--- incubator/ooo/trunk/main/external_deps.lst (original)
+++ incubator/ooo/trunk/main/external_deps.lst Sun Oct 21 01:03:31 2012
@@ -199,10 +199,9 @@ if (SYSTEM_LIBXSLT != YES)
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SOLAR_JAVA == TRUE)
-    MD5 = 7e4e73c21f031d5a4c93c128baf7fd75
-    name = apache-tomcat-5.5.35-src.tar.gz
-    # This seems to be the original host, but the MD5 sum does not match.
-    # URL1 = http://<mirror>/tomcat/tomcat-5/v5.5.35/bin/apache-tomcat-5.5.35.tar.gz
+    MD5 = 63574e3ada44f473892a61a2da433a59
+    name = apache-tomcat-5.5.36-src.tar.gz
+    # URL1 = http://www.alliedquotes.com/mirrors/apache/tomcat/tomcat-5/v5.5.36/src/apache-tomcat-5.5.36-src.tar.gz
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SOLAR_JAVA == TRUE)

Modified: incubator/ooo/trunk/main/tomcat/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/tomcat/makefile.mk?rev=1400544&r1=1400543&r2=1400544&view=diff
==============================================================================
--- incubator/ooo/trunk/main/tomcat/makefile.mk (original)
+++ incubator/ooo/trunk/main/tomcat/makefile.mk Sun Oct 21 01:03:31 2012
@@ -34,10 +34,10 @@ TARGET=servlet
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=apache-tomcat-5.5.35-src
-TARFILE_MD5=7e4e73c21f031d5a4c93c128baf7fd75
+TARFILE_NAME=apache-tomcat-5.5.36-src
+TARFILE_MD5=63574e3ada44f473892a61a2da433a59
 
-TARFILE_ROOTDIR=apache-tomcat-5.5.35-src
+TARFILE_ROOTDIR=apache-tomcat-5.5.36-src
 
 ADDITIONAL_FILES = servletapi/build.xml
 #CONVERTFILES=build$/build.xml

Modified: incubator/ooo/trunk/main/tomcat/tomcat.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/tomcat/tomcat.patch?rev=1400544&r1=1400543&r2=1400544&view=diff
==============================================================================
--- incubator/ooo/trunk/main/tomcat/tomcat.patch (original)
+++ incubator/ooo/trunk/main/tomcat/tomcat.patch Sun Oct 21 01:03:31 2012
@@ -1,5 +1,5 @@
---- misc/apache-tomcat-5.5.35-src/servletapi/build.xml	Thu Jun 19 16:03:59 2008
-+++ misc/build/apache-tomcat-5.5.35-src/servletapi/build.xml	Thu Jun 19 15:56:18 2008
+--- misc/apache-tomcat-5.5.36-src/servletapi/build.xml	Thu Jun 19 16:03:59 2008
++++ misc/build/apache-tomcat-5.5.36-src/servletapi/build.xml	Thu Jun 19 15:56:18 2008
 @@ -1,1 +1,21 @@
 -dummy
 +<project name="jsr154 in Apache OpenOffice" default="debuild" basedir=".">



Mime
View raw message