From c49c5ef3b5052c664fe9f12a8cf07e0d2b79bd3d Mon Sep 17 00:00:00 2001 From: Joshua Nichols Date: Fri, 7 Jul 2006 20:09:00 +0000 Subject: Removed commons-logging.jar from init.d script, which can cause problems with logging. Only commons-logging-api.jar is needed. Package-Manager: portage-2.1.1_pre2-r2 --- www-servers/tomcat/Manifest | 30 +-- www-servers/tomcat/files/digest-tomcat-5.5.17 | 3 - www-servers/tomcat/tomcat-5.5.17.ebuild | 284 -------------------------- 3 files changed, 15 insertions(+), 302 deletions(-) delete mode 100644 www-servers/tomcat/files/digest-tomcat-5.5.17 delete mode 100644 www-servers/tomcat/tomcat-5.5.17.ebuild (limited to 'www-servers/tomcat') diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 5627192d9c08..2cd86a41f7c2 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -82,10 +82,10 @@ AUX 5.5.17/tomcat.env 36 RMD160 2d6488d26696ec0624b7774d3a31cb02afeaeea0 SHA1 1c MD5 f41b77c0652379c5cfbe0f04bf99b4c2 files/5.5.17/tomcat.env 36 RMD160 2d6488d26696ec0624b7774d3a31cb02afeaeea0 files/5.5.17/tomcat.env 36 SHA256 c2aa217a92fb637fb81a77c98cd769932923bbe65e72c25295993f7cf4982fef files/5.5.17/tomcat.env 36 -AUX 5.5.17/tomcat.init 2997 RMD160 4787ef0c876662dbd3170a1d78c55018d43ec000 SHA1 2df9e6ce30c111c32370d2245e8720cc2c589cbe SHA256 993b9589226743593c15e7b688f2d03cd817969e17c59a9a6e636742cb771f23 -MD5 c8102af8111a57cbf191709ddb19dd79 files/5.5.17/tomcat.init 2997 -RMD160 4787ef0c876662dbd3170a1d78c55018d43ec000 files/5.5.17/tomcat.init 2997 -SHA256 993b9589226743593c15e7b688f2d03cd817969e17c59a9a6e636742cb771f23 files/5.5.17/tomcat.init 2997 +AUX 5.5.17/tomcat.init 3008 RMD160 4b72a5f17e6b2fff1cc08d08537d67d3e819e8a6 SHA1 49aac0eec247cdad73e7191818d3189821eae831 SHA256 ee102562f053794e931a2d6ad1bd89e3b42255f1b2dc300fc010aa75ae182015 +MD5 d79479a87fa7e1c26e6952104b1765fc files/5.5.17/tomcat.init 3008 +RMD160 4b72a5f17e6b2fff1cc08d08537d67d3e819e8a6 files/5.5.17/tomcat.init 3008 +SHA256 ee102562f053794e931a2d6ad1bd89e3b42255f1b2dc300fc010aa75ae182015 files/5.5.17/tomcat.init 3008 AUX 5.5.17/tomcatbuild-xml.patch 5235 RMD160 b82aae53ac882e5914aea8dfc8f80283bee7f9b1 SHA1 7a97a4e3ab76228c3d6964355dd3b5a9b3bce33a SHA256 d5f621c8d3972a88a057db3c028baedf4affab4333c3f1c6117461d3dd0b6cec MD5 276495751102b4c1e19aa944043055e6 files/5.5.17/tomcatbuild-xml.patch 5235 RMD160 b82aae53ac882e5914aea8dfc8f80283bee7f9b1 files/5.5.17/tomcatbuild-xml.patch 5235 @@ -101,14 +101,14 @@ EBUILD tomcat-5.0.28-r12.ebuild 11138 RMD160 7e7a04d273cec10955f8db35da0b39d946a MD5 935b85f96588785ea578042c3984ef28 tomcat-5.0.28-r12.ebuild 11138 RMD160 7e7a04d273cec10955f8db35da0b39d946a3904a tomcat-5.0.28-r12.ebuild 11138 SHA256 0cbc5ef6348aa322b258bc63c5db3efbaad54ce9d8b8e487bff3599ca55d4cf1 tomcat-5.0.28-r12.ebuild 11138 -EBUILD tomcat-5.5.17.ebuild 9042 RMD160 fa88460b31af6c5a8d083af3d0029b2f3b503008 SHA1 7ff76a94a1414a6a864c5d930ce93233c9b8db06 SHA256 ade857101f5a8f20ad3619fd19d9ecd7d643c2443a621381839de2de4e5ee922 -MD5 e8553017d001f52e29f85845c2774ed8 tomcat-5.5.17.ebuild 9042 -RMD160 fa88460b31af6c5a8d083af3d0029b2f3b503008 tomcat-5.5.17.ebuild 9042 -SHA256 ade857101f5a8f20ad3619fd19d9ecd7d643c2443a621381839de2de4e5ee922 tomcat-5.5.17.ebuild 9042 -MISC ChangeLog 20684 RMD160 917687ef7ac512e9f476a131e59268b03a23bbe4 SHA1 7301bb2faa2edb1f204252f9ce058d97ac460e1d SHA256 1f7352e1e3a559bbdd73693a5a8f61c298b8aec67322d4240a1969dd0c7c0559 -MD5 c0d48c77c509a67cdea55e2a489c3ff8 ChangeLog 20684 -RMD160 917687ef7ac512e9f476a131e59268b03a23bbe4 ChangeLog 20684 -SHA256 1f7352e1e3a559bbdd73693a5a8f61c298b8aec67322d4240a1969dd0c7c0559 ChangeLog 20684 +EBUILD tomcat-5.5.17-r1.ebuild 9267 RMD160 4ed7990bff35afb5283be0c9b2b6fb300dc667ec SHA1 6f6da7789aec2610325dd63422f5ca030b24824d SHA256 8bd233c5b4174cc7445cefa7d49b9a1c3908eba31cd328ea86093d0d9737b6d4 +MD5 3bce7c8ee82cd3c2d30532d7bb5e5f25 tomcat-5.5.17-r1.ebuild 9267 +RMD160 4ed7990bff35afb5283be0c9b2b6fb300dc667ec tomcat-5.5.17-r1.ebuild 9267 +SHA256 8bd233c5b4174cc7445cefa7d49b9a1c3908eba31cd328ea86093d0d9737b6d4 tomcat-5.5.17-r1.ebuild 9267 +MISC ChangeLog 20978 RMD160 2b6f24030ec90e6713c6b1010d996b4cbb3e15ad SHA1 7bdcc7b0b4ca090badb4229845eed8bb3b4e6fef SHA256 bf763a33c3e82a0af094815441ab86a423f819f3b295c80976f4f509358a4d33 +MD5 a31d826ba8957c7f7635ca1341f86e3b ChangeLog 20978 +RMD160 2b6f24030ec90e6713c6b1010d996b4cbb3e15ad ChangeLog 20978 +SHA256 bf763a33c3e82a0af094815441ab86a423f819f3b295c80976f4f509358a4d33 ChangeLog 20978 MISC metadata.xml 454 RMD160 c40a7fbdb01b9716f9d163e051184ddfc386e880 SHA1 e2ad202de8a8a9c7f43dd30451310fdee4531ab6 SHA256 c8affe406c8353e5ba4a811a2ea2016dfa0626858ef3413dade2a266f78ee82c MD5 f994107ba9a296c7de72d951eb9ddb29 metadata.xml 454 RMD160 c40a7fbdb01b9716f9d163e051184ddfc386e880 metadata.xml 454 @@ -119,6 +119,6 @@ SHA256 8adce6bec0e657beb514e68dc8196cca8650ec0f2b5d1e421106ccc9fe954531 files/di MD5 d942ea8b8317ba352e744aed2d284d01 files/digest-tomcat-5.0.28-r12 280 RMD160 7283323e161ab5dd3a94549def34af040891e49a files/digest-tomcat-5.0.28-r12 280 SHA256 2c09d3ad89eb04ab24e5c95a9492d7f461e1935bdb076100010cd3d4f7cb8796 files/digest-tomcat-5.0.28-r12 280 -MD5 b8576467d4d99bc9c4862c31d5839d56 files/digest-tomcat-5.5.17 277 -RMD160 6a37c8c24770ea3fdb63334615303b56350f1cf9 files/digest-tomcat-5.5.17 277 -SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/digest-tomcat-5.5.17 277 +MD5 b8576467d4d99bc9c4862c31d5839d56 files/digest-tomcat-5.5.17-r1 277 +RMD160 6a37c8c24770ea3fdb63334615303b56350f1cf9 files/digest-tomcat-5.5.17-r1 277 +SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/digest-tomcat-5.5.17-r1 277 diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.17 b/www-servers/tomcat/files/digest-tomcat-5.5.17 deleted file mode 100644 index 51d603367aa1..000000000000 --- a/www-servers/tomcat/files/digest-tomcat-5.5.17 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 afedf090888029b19a1bebc471264105 apache-tomcat-5.5.17-src.tar.gz 4282022 -RMD160 004d87bc64b32eee42f9979d2fdbb36836b69015 apache-tomcat-5.5.17-src.tar.gz 4282022 -SHA256 295c9fa64d9aa81d5c836b694804d8d57fcfdbc76b9889a044852aa73f2c3ad8 apache-tomcat-5.5.17-src.tar.gz 4282022 diff --git a/www-servers/tomcat/tomcat-5.5.17.ebuild b/www-servers/tomcat/tomcat-5.5.17.ebuild deleted file mode 100644 index 3e39363ca518..000000000000 --- a/www-servers/tomcat/tomcat-5.5.17.ebuild +++ /dev/null @@ -1,284 +0,0 @@ -# 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.5.17.ebuild,v 1.1 2006/07/03 02:13:09 nichoj Exp $ - -inherit eutils java-pkg - -DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container" - -MY_P="apache-${P}-src" -SLOT="5.5" -SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz" -HOMEPAGE="http://jakarta.apache.org/tomcat" -KEYWORDS="~amd64 ~x86" -LICENSE="Apache-2.0" - -RDEPEND=">=virtual/jdk-1.4 - =dev-java/eclipse-ecj-3.1* - =dev-java/commons-beanutils-1.7* - >=dev-java/commons-collections-3.1 - >=dev-java/commons-daemon-1.0.1 - >=dev-java/commons-dbcp-1.2.1 - >=dev-java/commons-digester-1.7 - >=dev-java/commons-fileupload-1.0 - >=dev-java/commons-httpclient-2.0 - >=dev-java/commons-el-1.0 - >=dev-java/commons-launcher-0.9 - >=dev-java/commons-logging-1.0.4 - >=dev-java/commons-modeler-1.1 - >=dev-java/commons-pool-1.2 - ~dev-java/jaxen-1.0 - >=dev-java/junit-3.8.1 - =dev-java/mx4j-3* - >=dev-java/log4j-1.2.9 - >=dev-java/saxpath-1.0 - ~dev-java/servletapi-2.4 - =dev-java/struts-1.2* - =dev-java/gnu-jaf-1* - >=dev-java/xerces-2.7.1" -DEPEND=">=virtual/jdk-1.4 - ${RDEPEND} - sys-apps/sed - dev-java/ant" -IUSE="doc examples source test" - -S="${WORKDIR}/${MY_P}" - -TOMCAT_HOME="/usr/share/${PN}-${SLOT}" -TOMCAT_NAME="${PN}-${SLOT}" -WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps" - -pkg_setup() { - enewgroup tomcat - enewuser tomcat -1 -1 /dev/null tomcat -} - -src_unpack() { - unpack ${A} - cd ${S} - - local PATCHES=" - mainbuild-xml.patch - tomcatbuild-xml.patch - catalinabuild-xml.patch - jasperbuild-xml.patch - " - for patch in ${PATCHES}; do - epatch "${FILESDIR}/${PV}/${patch}" - done - - # avoid packed jars :-) - mkdir -p ${S}/build/build/common - cd ${S}/build/build - - mkdir ./bin && cd ./bin - java-pkg_jar-from commons-logging commons-logging-api.jar - java-pkg_jar-from mx4j-3.0 mx4j.jar jmx.jar - java-pkg_jar-from mx4j-3.0 mx4j-rjmx.jar jmx-remote.jar - 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 xerces-2 xercesImpl.jar - - mkdir ../lib && cd ../lib - java-pkg_jar-from ant-core - java-pkg_jar-from commons-collections - java-pkg_jar-from commons-dbcp - java-pkg_jar-from commons-el - java-pkg_jar-from commons-pool - java-pkg_jar-from servletapi-2.4 - - mkdir -p ../../server/lib && cd ../../server/lib - java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar - java-pkg_jar-from commons-digester - java-pkg_jar-from commons-fileupload - java-pkg_jar-from commons-modeler -} - -src_compile(){ - local antflags="-Dbase.path=${T}" - - antflags="${antflags} -Dactivation.jar=$(java-config -p gnu-jaf-1)" - antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)" - antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)" - antflags="${antflags} -Dcommons-digester.jar=$(java-config -p commons-digester)" - antflags="${antflags} -Dcommons-dbcp.jar=$(java-config -p commons-dbcp)" - antflags="${antflags} -Dcommons-el.jar=$(java-config -p commons-el)" - antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)" - antflags="${antflags} -Dcommons-pool.jar=$(java-config -p commons-pool)" - antflags="${antflags} -Dcommons-fileupload.jar=$(java-config -p commons-fileupload)" - antflags="${antflags} -Dcommons-launcher.jar=$(java-config -p commons-launcher)" - antflags="${antflags} -Dcommons-modeler.jar=$(java-config -p commons-modeler)" - antflags="${antflags} -Djunit.jar=$(java-config -p junit)" - antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.1 ecj.jar)" - antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)" - antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)" - 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} -Djmx.jar=$(java-pkg_getjar mx4j-3.0 mx4j.jar)" - antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-3.0 mx4j-rjmx.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} -Dstruts.home=/usr/share/struts" - antflags="${antflags} -Djasper.home=${S}/jasper" - - ant ${antflags} || die "compile failed" - -} -src_install() { - cd ${S}/build/build - - # init.d, env.d, conf.d - newinitd ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME} - newconfd ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME} - newenvd ${FILESDIR}/${PV}/${PN}.env 21${PN} - - # create dir structure - diropts -m755 -o tomcat -g tomcat - dodir /usr/share/${TOMCAT_NAME} - keepdir /var/log/${TOMCAT_NAME}/ - keepdir /var/tmp/${TOMCAT_NAME}/ - keepdir /var/run/${TOMCAT_NAME}/ - - local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/ - dodir ${CATALINA_BASE} - keepdir ${CATALINA_BASE}/shared/lib - keepdir ${CATALINA_BASE}/shared/classes - - dodir /etc/${TOMCAT_NAME} - fperms 750 /etc/${TOMCAT_NAME} - - diropts -m0755 - - # we don't need dos scripts - rm -f bin/*.bat - - # copy the manager and admin context's to the right position - mkdir -p conf/Catalina/localhost - cp ${S}/container/webapps/admin/admin.xml \ - conf/Catalina/localhost - cp ${S}/container/webapps/manager/manager.xml \ - conf/Catalina/localhost - - # make the jars available via java-config -p and jar-from, etc - base=$(pwd) - libdirs="common/lib server/lib" - for dir in ${libdirs} - do - cd ${dir} - - for jar in *.jar; - do - # replace the file with a symlink - if [ ! -L ${jar} ]; then - java-pkg_dojar ${jar} - rm -f ${jar} - ln -s ${DESTTREE}/share/${TOMCAT_NAME}/lib/${jar} ${jar} - fi - done - - cd ${base} - done - - # replace a packed struts.jar - cd server/webapps/admin/WEB-INF/lib - rm -f struts.jar - java-pkg_jar-from struts-1.2 struts.jar - cd ${base} - - # replace the default pw with a random one, see #92281 - local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) - sed -e s:SHUTDOWN:${randpw}: -i conf/{server,server-minimal}.xml - - # copy over the directories - chown -R tomcat:tomcat webapps/* conf/* - cp -pR conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to copy conf" - cp -R bin common server shared ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy" - - keepdir ${WEBAPPS_DIR} - set_webapps_perms ${D}/${WEBAPPS_DIR} - - # if the useflag is set, copy over the examples - 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}${CATALINA_BASE}/webapps - fi - - # symlink the directories to make CATALINA_BASE possible - dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf - dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs - dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp - dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work - - dodoc ${S}/build/{RELEASE-NOTES,RUNNING.txt} - fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml -} - -pkg_postinst() { - # due to previous ebuild bloopers, make sure everything is correct - chown root:root /etc/init.d/${TOMCAT_NAME} - chown root:root /etc/conf.d/${TOMCAT_NAME} - - einfo - ewarn " This ebuild implements a new filesystem layout for tomcat" - ewarn " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml" - ewarn " for more information!." - einfo - einfo " Please file any bugs at http://bugs.gentoo.org/ or else it" - einfo " may not get seen. Thank you." - einfo - -# This may be a comeback, so it's here for convienence -# 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 -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 -} -- cgit v1.2.3-65-gdbad