Fixed bug #112530 so users should now be able to set a custom CLASSPATH in /etc/conf.d/tomcat-5. Also changed tomcat to use xml-apis from xml-commons instead of xerces because the jar in xerces is a packed one.

Package-Manager: portage-2.0.53

5 files changed, 101 insertions, 22 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 6906b219fd49..5590d0e1832b 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,15 @@
 # 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.43 2005/11/14 20:17:58 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.44 2005/12/06 21:43:43 betelgeuse Exp $
+
+*tomcat-5.0.28-r11 (06 Dec 2005)
+
+  06 Dec 2005; Petteri Räty <betelgeuse@gentoo.org>
+  +files/5.0.28/setclasspath.patch, -tomcat-5.0.28-r8.ebuild,
+  +tomcat-5.0.28-r11.ebuild:
+  Fixed bug #112530 so users should now be able to set a custom CLASSPATH in
+  /etc/conf.d/tomcat-5. Also changed tomcat to use xml-apis from xml-commons
+  instead of xerces because the jar in xerces is a packed one.
 
 *tomcat-5.0.28-r10 (14 Nov 2005)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 6edfcf4c3e31..8447beeac24e 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b9fb7b69288d59034b282159b4e45124 ChangeLog 18860
+MD5 05a057faa0c915872d9abeff2a21c0fb ChangeLog 19256
 MD5 cbb635ed31e3b7ddabe1db851a8b471e files/5.0.27/gentoo.diff 463
 MD5 c19b85e130d0e0a565eebc406d699965 files/5.0.27/jikes.diff 510
 MD5 bf74c2bd8c21359ada1793cddfa95f37 files/5.0.27/tomcat.conf 2660
@@ -13,23 +13,24 @@ MD5 987ddee3c5a93ccaa4311c85f5dfceb3 files/5.0.28/gentoo.diff 541
 MD5 98a29b32de00d97f156dc31dfe3cf472 files/5.0.28/jikes.diff 584
 MD5 4a887877fb26ce5a6a1d58c66578bd7f files/5.0.28/log4j.properties 401
 MD5 0990cfa870b64034e742297c6be3634b files/5.0.28/scripts.patch 823
+MD5 e27a41dfeb80703ec4a3433942541b7d files/5.0.28/setclasspath.patch 652
 MD5 a4df0ce5b57f2bcaa707ff3b5858bee4 files/5.0.28/tomcat.conf 2707
 MD5 a279252c639b232107c83c6cb981c261 files/5.0.28/tomcat.conf-r1 2837
 MD5 286d3dcf80a376b72913412cec25e496 files/5.0.28/tomcat.env 34
 MD5 c84cd76463e0c773cc3c58f9d6ea7e92 files/5.0.28/tomcat.init 766
 MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r6 75
 MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r10 78
-MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r8 78
+MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r11 78
 MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r9 78
 MD5 f994107ba9a296c7de72d951eb9ddb29 metadata.xml 454
 MD5 e35c5aa21003d0e3f61bfc44a59104fd tomcat-5.0.27-r6.ebuild 3886
 MD5 0834be3df6afbfaf96e457c19b6a2055 tomcat-5.0.28-r10.ebuild 11061
-MD5 dea4438dfc3c1b5bbd13eb05e6d2210f tomcat-5.0.28-r8.ebuild 9958
+MD5 a6a24d616de2452c5c77f0cf199a6dbe tomcat-5.0.28-r11.ebuild 11095
 MD5 a5e32b74350e806a25b4cd56a9fdd6d4 tomcat-5.0.28-r9.ebuild 10001
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDePEEQiJ/wx066S4RAm9GAJ0aKrN+j0vQXGcF8obcx7ziWCydMgCghP2V
-FzrSoo0NBdJFBAe6yU1PBDI=
-=Hgg3
+iD8DBQFDlgYdQiJ/wx066S4RAvxMAJ9E7k6j+d5aiawpWl+S7BGaoAxeIwCggmXR
+4xk/ZEcdp3RJOsuF6HYSzHI=
+=2xP+
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/files/5.0.28/setclasspath.patch b/www-servers/tomcat/files/5.0.28/setclasspath.patch
new file mode 100644
index 000000000000..105417c71aca
--- /dev/null
+++ b/www-servers/tomcat/files/5.0.28/setclasspath.patch
@@ -0,0 +1,12 @@
+diff -ur jakarta-tomcat-5.0.28-src.old/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh jakarta-tomcat-5.0.28-src/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh
+--- jakarta-tomcat-5.0.28-src.old/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh	2005-12-06 22:12:03.288738608 +0200
++++ jakarta-tomcat-5.0.28-src/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh	2005-12-06 22:13:15.632740648 +0200
+@@ -40,7 +40,7 @@
+ JAVA_ENDORSED_DIRS="$BASEDIR"/common/endorsed
+ 
+ # Set standard CLASSPATH
+-CLASSPATH="$JAVA_HOME"/lib/tools.jar
++CLASSPATH="${CLASSPATH}":"$JAVA_HOME"/lib/tools.jar
+ 
+ # OSX hack to CLASSPATH
+ JIKESPATH=
diff --git a/www-servers/tomcat/files/digest-tomcat-5.0.28-r8 b/www-servers/tomcat/files/digest-tomcat-5.0.28-r11
index 38ec5031aa8e..38ec5031aa8e 100644
--- a/www-servers/tomcat/files/digest-tomcat-5.0.28-r8
+++ b/www-servers/tomcat/files/digest-tomcat-5.0.28-r11
diff --git a/www-servers/tomcat/tomcat-5.0.28-r8.ebuild b/www-servers/tomcat/tomcat-5.0.28-r11.ebuild
index d5ac1e6ccb58..98d9e845b8c8 100644
--- a/www-servers/tomcat/tomcat-5.0.28-r8.ebuild
+++ b/www-servers/tomcat/tomcat-5.0.28-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r8.ebuild,v 1.1 2005/10/15 11:40:42 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r11.ebuild,v 1.1 2005/12/06 21:43:43 betelgeuse Exp $
 
 inherit eutils java-pkg
 
@@ -35,6 +35,7 @@ RDEPEND=">=virtual/jdk-1.4
 	=dev-java/struts-1.1-r4
 	dev-java/sun-jaf-bin
 	>=dev-java/xerces-2.6.2-r1
+	dev-java/xml-commons
 	jikes? ( dev-java/jikes )"
 DEPEND=">=virtual/jdk-1.4
 	${RDEPEND}
@@ -52,10 +53,18 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${PV}/build.xml-01.patch
-	epatch ${FILESDIR}/${PV}/build.xml-02.patch
-	epatch ${FILESDIR}/${PV}/gentoo.diff
-	epatch ${FILESDIR}/${PV}/scripts.patch
+	local PATCHES="
+		build.xml-01.patch
+		build.xml-02.patch
+		gentoo.diff
+		scripts.patch
+		setclasspath.patch
+	"
+
+	for patch in ${PATCHES}; do
+		epatch "${FILESDIR}/${PV}/${patch}"
+	done
+
 	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
 
 	# avoid packed jars :-)
@@ -68,7 +77,7 @@ src_unpack() {
 	java-pkg_jar-from commons-daemon
 
 	mkdir ../common/endorsed && cd ../common/endorsed
-	java-pkg_jar-from xerces-2 xml-apis.jar
+	java-pkg_jar-from xml-commons xml-apis.jar
 	java-pkg_jar-from xerces-2 xercesImpl.jar
 
 	mkdir ../lib && cd ../lib
@@ -109,12 +118,12 @@ src_compile(){
 	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
 	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
 	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
-	antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)"
+	antflags="${antflags} -Djaxen.jar=$(java-pkg_getjars jaxen)"
 	antflags="${antflags} -Djmx.jar=$(java-pkg_getjar sun-jmx jmxri.jar)"
 	antflags="${antflags} -Djmx-tools.jar=$(java-pkg_getjar sun-jmx jmxtools.jar)"
 	antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
 	antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
-	antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
+	antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xml-commons xml-apis.jar)"
 	antflags="${antflags} -Dstruts.home=/usr/share/struts-1.1/"
 
 	ant ${antflags} || die "compile failed"
@@ -143,7 +152,12 @@ src_install() {
 	keepdir /var/log/${TOMCAT_NAME}/default
 	keepdir /var/tmp/${TOMCAT_NAME}/default
 	keepdir /var/run/${TOMCAT_NAME}/default
-	dodir   /var/lib/${TOMCAT_NAME}/default
+
+	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/default/
+	dodir   ${CATALINA_BASE}
+	keepdir ${CATALINA_BASE}/shared/lib
+	keepdir ${CATALINA_BASE}/shared/classes
+
 	dodir   /etc/${TOMCAT_NAME}/default
 	fperms  440 /etc/${TOMCAT_NAME}/default
 
@@ -193,7 +207,7 @@ src_install() {
 	chmod -R 750 conf/*
 	chown -R tomcat:tomcat webapps/* conf/*
 	cp -pR conf/* ${D}/etc/${TOMCAT_NAME}/default || die "failed to copy conf"
-	cp -R bin common server shared ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
+	cp -R bin common server ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
 
 	keepdir               ${WEBAPPS_DIR}
 	set_webapps_perms     ${D}/${WEBAPPS_DIR}
@@ -202,14 +216,14 @@ src_install() {
 	if use examples; then
 		cp -p ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
 		cp -pr webapps/{tomcat-docs,jsp-examples,servlets-examples,ROOT,webdav} \
-			${D}/var/lib/${TOMCAT_NAME}/default/webapps
+			${D}${CATALINA_BASE}/webapps
 	fi
 
 	# symlink the directories to make CATALINA_BASE possible
-	dosym /etc/${TOMCAT_NAME}/default /var/lib/${TOMCAT_NAME}/default/conf
-	dosym /var/log/${TOMCAT_NAME}/default /var/lib/${TOMCAT_NAME}/default/logs
-	dosym /var/tmp/${TOMCAT_NAME}/default /var/lib/${TOMCAT_NAME}/default/temp
-	dosym /var/run/${TOMCAT_NAME}/default /var/lib/${TOMCAT_NAME}/default/work
+	dosym /etc/${TOMCAT_NAME}/default ${CATALINA_BASE}/conf
+	dosym /var/log/${TOMCAT_NAME}/default ${CATALINA_BASE}/logs
+	dosym /var/tmp/${TOMCAT_NAME}/default ${CATALINA_BASE}/temp
+	dosym /var/run/${TOMCAT_NAME}/default ${CATALINA_BASE}/work
 
 	cp ${FILESDIR}/${PV}/log4j.properties ${D}/etc/${TOMCAT_NAME}/
 	chown tomcat:tomcat ${D}/etc/${TOMCAT_NAME}/log4j.properties
@@ -271,6 +285,11 @@ pkg_postinst() {
 	einfo "This is needed to deploy WAR files from the manager webapp."
 	einfo "See bug 99704. If you are upgrading tomcat you need to manually"
 	einfo "change the permissions."
+
+	einfo ""
+	einfo "Run emerge --config =${PF}"
+	einfo "to configure Tomcat if you need to for example"
+	einfo "change the home directory of the Tomcat user."
 }
 
 #helpers
@@ -278,3 +297,41 @@ set_webapps_perms() {
 	chown  tomcat:tomcat ${1} || die "Failed to change owner off ${1}."
 	chmod  750           ${1} || die "Failed to change permissions off ${1}."
 }
+
+pkg_config() {
+	# Better suggestions are welcome
+	local currentdir="$(getent passwd tomcat | gawk -F':' '{ print $6 }')"
+
+	einfo "The default home directory for Tomcat is /dev/null."
+	einfo "You need to change it if your applications needs it to"
+	einfo "be an actual directory. Current home directory:"
+	einfo "${currentdir}"
+	einfo ""
+	einfo "Do you want to change it [yes/no]?"
+
+	local answer
+	read answer
+
+	if [[ "${answer}" == "yes" ]]; then
+		einfo ""
+		einfo "Suggestions:"
+		einfo "${WEBAPPS_DIR}"
+		einfo ""
+		einfo "If you want to suggest a directory, file a bug to"
+		einfo "http://bugs.gentoo.org"
+		einfo ""
+		einfo "Enter home directory:"
+
+		local homedir
+		read homedir
+
+		einfo ""
+		einfo "Setting home directory to: ${homedir}"
+
+		/usr/sbin/usermod -d"${homedir}" tomcat
+
+		einfo "You can run emerge --config =${PF}"
+		einfo "again to change to homedir"
+		einfo "at any time."
+	fi
+}