summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Brinkmann <luckyduck@gentoo.org>2005-03-06 13:36:38 +0000
committerJan Brinkmann <luckyduck@gentoo.org>2005-03-06 13:36:38 +0000
commit8148e97b1a78b40888cd82d6a1a3ad6ffb7f79b1 (patch)
tree4fe27e46ebf7ffc7fea89d15c263529fccdc43b7 /www-servers
parentsmall fix to one of the themes (diff)
downloadhistorical-8148e97b1a78b40888cd82d6a1a3ad6ffb7f79b1.tar.gz
historical-8148e97b1a78b40888cd82d6a1a3ad6ffb7f79b1.tar.bz2
historical-8148e97b1a78b40888cd82d6a1a3ad6ffb7f79b1.zip
added log4j to classpath in catalina.sh, fixes #84206. thanks to Santiago Gala <sgala@apache.org> for the report and the fix.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/tomcat/ChangeLog7
-rw-r--r--www-servers/tomcat/Manifest4
-rw-r--r--www-servers/tomcat/files/5.0.28/scripts.patch2
3 files changed, 9 insertions, 4 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 9efcd2e2e867..9f1ce6f39901 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for www-servers/tomcat
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.16 2005/02/13 19:52:06 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.17 2005/03/06 13:36:38 luckyduck Exp $
+
+ 06 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+ files/5.0.28/scripts.patch:
+ added log4j to classpath in catalina.sh, fixes #84206. thanks to Santiago Gala
+ <sgala@apache.org> for the report and the fix.
13 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
files/5.0.28/build.xml-02.patch, files/5.0.28/gentoo.diff,
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 112d8ae52ac6..2f2a4415d2cb 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,7 +2,7 @@ MD5 b1b082a9d71411ae91913bd9afe99c9f tomcat-5.0.27-r4.ebuild 3716
MD5 021a5a634771a57a24b83d563a40e165 tomcat-5.0.28.ebuild 9672
MD5 b8bdcdd27b76556b90401621fc29996c tomcat-4.1.30-r5.ebuild 3614
MD5 257ce52cfc15f63798cb7b13ee761cb4 tomcat-3.3.2-r2.ebuild 3217
-MD5 b1c21f5d6e28fee276fe3c85a54dd2ec ChangeLog 13420
+MD5 6c02367ac6669e8108d3ca3fb90f37ff ChangeLog 13633
MD5 c11ce937193406815ff7a2b306784fd8 metadata.xml 555
MD5 71d59fd713a960e63c1b894ca5893a1b files/digest-tomcat-4.1.30-r5 74
MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r4 75
@@ -20,7 +20,7 @@ MD5 38c130772e7d43dcdff78b3d94f96efd files/5.0.27/tomcat.env 27
MD5 bf74c2bd8c21359ada1793cddfa95f37 files/5.0.27/tomcat.conf 2660
MD5 d6b2ebda71fd769327f49bcb51f92db2 files/5.0.27/tomcat.init 636
MD5 c19b85e130d0e0a565eebc406d699965 files/5.0.27/jikes.diff 510
-MD5 4ba810f86c7774a9270d1b00f188bb3c files/5.0.28/scripts.patch 800
+MD5 0990cfa870b64034e742297c6be3634b files/5.0.28/scripts.patch 823
MD5 987ddee3c5a93ccaa4311c85f5dfceb3 files/5.0.28/gentoo.diff 541
MD5 286d3dcf80a376b72913412cec25e496 files/5.0.28/tomcat.env 34
MD5 6eaf54e60fd0b74ae37ec1dbd8540598 files/5.0.28/build.xml-01.patch 623
diff --git a/www-servers/tomcat/files/5.0.28/scripts.patch b/www-servers/tomcat/files/5.0.28/scripts.patch
index a72f3b827ed8..9ec832192c75 100644
--- a/www-servers/tomcat/files/5.0.28/scripts.patch
+++ b/www-servers/tomcat/files/5.0.28/scripts.patch
@@ -6,7 +6,7 @@ diff -uprN ../jakarta-tomcat-5.0.28-src.orig/jakarta-tomcat-catalina/catalina/sr
CLASSPATH="$CLASSPATH":"$JSSE_HOME"/lib/jcert.jar:"$JSSE_HOME"/lib/jnet.jar:"$JSSE_HOME"/lib/jsse.jar
fi
-CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar
-+CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:`java-config -p commons-logging`
++CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:`java-config -p commons-logging`:`java-config -p log4j`
if [ -z "$CATALINA_BASE" ] ; then
CATALINA_BASE="$CATALINA_HOME"