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
commit53bc2763fbb2fc9ddff1ddd0df29f1d2ed9d7c19 (patch)
tree8d0c989679c7ef3abad41629324a2082ef46bfab /www-servers/tomcat
parentsmall fix to one of the themes (diff)
downloadgentoo-2-53bc2763fbb2fc9ddff1ddd0df29f1d2ed9d7c19.tar.gz
gentoo-2-53bc2763fbb2fc9ddff1ddd0df29f1d2ed9d7c19.tar.bz2
gentoo-2-53bc2763fbb2fc9ddff1ddd0df29f1d2ed9d7c19.zip
added log4j to classpath in catalina.sh, fixes #84206. thanks to Santiago Gala <sgala@apache.org> for the report and the fix.
(Portage version: 2.0.51.19)
Diffstat (limited to 'www-servers/tomcat')
-rw-r--r--www-servers/tomcat/ChangeLog7
-rw-r--r--www-servers/tomcat/files/5.0.28/scripts.patch2
2 files changed, 7 insertions, 2 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/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"