public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgraded tomcat to 6.0.20

Browse Source 
svn path=/nixpkgs/trunk/; revision=16600
This commit is contained in:
Sander van der Burg 2009-08-06 17:15:38 +00:00
parent f33f18439f
commit d8e017cbb3
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/http/tomcat/6.0.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "apache-tomcat-6.0.18"; name = "apache-tomcat-6.0.20";
builder = ./builder-6.0.sh; builder = ./builder-6.0.sh;
src = fetchurl { src = fetchurl {
url = http://apache.mirrors.webazilla.nl/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18.tar.gz; url = http://apache.mirrors.webazilla.nl/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20.tar.gz;
md5 = "8354e156f097158f8d7b699078fd39c1"; sha256 = "0vh48rvbynawivqm3hs7453527g8qns9kcj7vmihjpf21mrc2hx4";
}; };
inherit jdk; inherit jdk;

9
pkgs/servers/http/tomcat/builder-6.0.sh
View File

@ -3,11 +3,4 @@ source $stdenv/setup
tar zxf $src tar zxf $src
mkdir $out mkdir $out
mv apache-tomcat*/* $out mv apache-tomcat-*/* $out
# Rename the context.xml to context.xml.default in order to allow a custom context.xml
mv $out/conf/context.xml $out/conf/context.xml.default
# Change all references from CATALINA_HOME to CATALINA_BASE and add support for shared libraries
sed -i -e 's|${catalina.home}|${catalina.base}|g' \
-e 's|shared.loader=|shared.loader=${catalina.base}/shared/lib/*.jar|' $out/conf/catalina.properties