Package: tomcat6 Severity: minor Version: 6.0.18-2 Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu ubuntu-patch jaunty
Tomcat6 Java libraries are located in /usr/share/tomcat6/lib ($CATALINA_HOME/lib) but also linked to in /var/lib/tomcat6/lib ($CATALINA_BASE/lib). Tomcat 6 completely ignores $CATALINA_BASE/lib (see /usr/share/doc/tomcat6-common/RUNNING.txt.gz for details) so this directory is useless. It is confusing because the user tends to think he can add libraries there as well. In the same vein, tomcat6-instance-create also creates a "lib" subdirectory in private tomcat6 instances... which is also ignored. Proposed patch disables both useless directories. It's taken from Ubuntu's recent 6.0.18-0ubuntu6. Regards, -- Thierry Carrez
diff -u tomcat6-6.0.18/debian/tomcat6-instance-create tomcat6-6.0.18/debian/tomcat6-instance-create --- tomcat6-6.0.18/debian/tomcat6-instance-create +++ tomcat6-6.0.18/debian/tomcat6-instance-create @@ -114,10 +114,6 @@ mkdir ${TARGET}/conf mkdir ${TARGET}/logs -mkdir ${TARGET}/lib -for jar in /usr/share/tomcat6/lib/*; do - ln -s $jar ${TARGET}/lib/`basename $jar` -done mkdir ${TARGET}/webapps mkdir ${TARGET}/work mkdir ${TARGET}/temp diff -u tomcat6-6.0.18/debian/tomcat6.links tomcat6-6.0.18/debian/tomcat6.links --- tomcat6-6.0.18/debian/tomcat6.links +++ tomcat6-6.0.18/debian/tomcat6.links @@ -4,14 +3,0 @@ -/usr/share/tomcat6/lib/annotations-api.jar /var/lib/tomcat6/lib/annotations-api.jar -/usr/share/tomcat6/lib/catalina-ant.jar /var/lib/tomcat6/lib/catalina-ant.jar -/usr/share/tomcat6/lib/catalina-ha.jar /var/lib/tomcat6/lib/catalina-ha.jar -/usr/share/tomcat6/lib/catalina.jar /var/lib/tomcat6/lib/catalina.jar -/usr/share/tomcat6/lib/catalina-tribes.jar /var/lib/tomcat6/lib/catalina-tribes.jar -/usr/share/tomcat6/lib/commons-dbcp.jar /var/lib/tomcat6/lib/commons-dbcp.jar -/usr/share/tomcat6/lib/commons-pool.jar /var/lib/tomcat6/lib/commons-pool.jar -/usr/share/tomcat6/lib/el-api.jar /var/lib/tomcat6/lib/el-api.jar -/usr/share/tomcat6/lib/jasper-el.jar /var/lib/tomcat6/lib/jasper-el.jar -/usr/share/tomcat6/lib/jasper.jar /var/lib/tomcat6/lib/jasper.jar -/usr/share/tomcat6/lib/jasper-jdt.jar /var/lib/tomcat6/lib/jasper-jdt.jar -/usr/share/tomcat6/lib/jsp-api.jar /var/lib/tomcat6/lib/jsp-api.jar -/usr/share/tomcat6/lib/servlet-api.jar /var/lib/tomcat6/lib/servlet-api.jar -/usr/share/tomcat6/lib/tomcat-coyote.jar /var/lib/tomcat6/lib/tomcat-coyote.jar