From b463835f856b49db3a6c6c4d2f06134e86dbf071 Mon Sep 17 00:00:00 2001 From: Jan Brinkmann Date: Tue, 17 May 2005 19:19:18 +0000 Subject: revision bump, indicate the changes (Portage version: 2.0.51.19) --- www-servers/tomcat/ChangeLog | 8 +- www-servers/tomcat/Manifest | 16 +- www-servers/tomcat/files/digest-tomcat-5.0.28-r3 | 1 - www-servers/tomcat/files/digest-tomcat-5.0.28-r4 | 1 + www-servers/tomcat/tomcat-5.0.28-r3.ebuild | 270 ----------------------- www-servers/tomcat/tomcat-5.0.28-r4.ebuild | 270 +++++++++++++++++++++++ 6 files changed, 281 insertions(+), 285 deletions(-) delete mode 100644 www-servers/tomcat/files/digest-tomcat-5.0.28-r3 create mode 100644 www-servers/tomcat/files/digest-tomcat-5.0.28-r4 delete mode 100644 www-servers/tomcat/tomcat-5.0.28-r3.ebuild create mode 100644 www-servers/tomcat/tomcat-5.0.28-r4.ebuild (limited to 'www-servers/tomcat') diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 02f7e9847045..0dfeff057389 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,12 @@ # 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.31 2005/05/17 19:16:23 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.32 2005/05/17 19:19:18 luckyduck Exp $ + +*tomcat-5.0.28-r4 (17 May 2005) + + 17 May 2005; Jan Brinkmann + -tomcat-5.0.28-r3.ebuild, +tomcat-5.0.28-r4.ebuild: + revision bump, indicate the changes 17 May 2005; Jan Brinkmann tomcat-5.0.28-r3.ebuild: permission changes diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 570f783052ac..e4e92ceb8810 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,12 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 824bf7b84d248475c413dcc92fb59d39 tomcat-5.0.28-r3.ebuild 9573 MD5 918871e43d382090d5e2ee937cad8271 tomcat-5.0.27-r6.ebuild 3931 -MD5 62832317516ca76ec8f3c4443500d2f2 ChangeLog 16372 +MD5 824bf7b84d248475c413dcc92fb59d39 tomcat-5.0.28-r4.ebuild 9573 +MD5 0703dd429a592ccf632c317b49080ca4 ChangeLog 16550 MD5 c11ce937193406815ff7a2b306784fd8 metadata.xml 555 MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r6 75 -MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r3 78 +MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r4 78 MD5 cbb635ed31e3b7ddabe1db851a8b471e files/5.0.27/gentoo.diff 463 MD5 38c130772e7d43dcdff78b3d94f96efd files/5.0.27/tomcat.env 27 MD5 bf74c2bd8c21359ada1793cddfa95f37 files/5.0.27/tomcat.conf 2660 @@ -20,10 +17,3 @@ MD5 d538c7caef4b5cecd6cc95ee1988bace files/5.0.28/tomcat.conf 2652 MD5 c0d89ffb4276e8a6d0cf08fcad6517f9 files/5.0.28/tomcat.init 701 MD5 744a9ce174144fc5689c1fabee527e55 files/5.0.28/build.xml-02.patch 3177 MD5 98a29b32de00d97f156dc31dfe3cf472 files/5.0.28/jikes.diff 584 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCikMh06ebR+OMO78RAkCpAJ96Ku7RddQ+F24ybtR5yQU0pdztrACeOoKr -m+kCAM+NO6qPz7GHSvximVI= -=EqMK ------END PGP SIGNATURE----- diff --git a/www-servers/tomcat/files/digest-tomcat-5.0.28-r3 b/www-servers/tomcat/files/digest-tomcat-5.0.28-r3 deleted file mode 100644 index 38ec5031aa8e..000000000000 --- a/www-servers/tomcat/files/digest-tomcat-5.0.28-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 8115f86558aef8a17543397e7f9d9469 jakarta-tomcat-5.0.28-src.tar.gz 3565766 diff --git a/www-servers/tomcat/files/digest-tomcat-5.0.28-r4 b/www-servers/tomcat/files/digest-tomcat-5.0.28-r4 new file mode 100644 index 000000000000..38ec5031aa8e --- /dev/null +++ b/www-servers/tomcat/files/digest-tomcat-5.0.28-r4 @@ -0,0 +1 @@ +MD5 8115f86558aef8a17543397e7f9d9469 jakarta-tomcat-5.0.28-src.tar.gz 3565766 diff --git a/www-servers/tomcat/tomcat-5.0.28-r3.ebuild b/www-servers/tomcat/tomcat-5.0.28-r3.ebuild deleted file mode 100644 index b5c543d8758e..000000000000 --- a/www-servers/tomcat/tomcat-5.0.28-r3.ebuild +++ /dev/null @@ -1,270 +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.0.28-r3.ebuild,v 1.3 2005/05/17 19:16:23 luckyduck Exp $ - -inherit eutils java-pkg - -DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container" - -SLOT="${PV/.*}" -SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/src/jakarta-${P}-src.tar.gz" -HOMEPAGE="http://jakarta.apache.org/tomcat" -KEYWORDS="~x86 ~amd64 -ppc64 ~sparc" -LICENSE="Apache-2.0" -DEPEND="sys-apps/sed - >=virtual/jdk-1.4 - dev-java/ant" -RDEPEND=">=virtual/jdk-1.4 - =dev-java/commons-beanutils-1.7* - >=dev-java/commons-collections-3.1 - >=dev-java/commons-daemon-1.0 - >=dev-java/commons-dbcp-1.2.1 - >=dev-java/commons-digester-1.5 - >=dev-java/commons-fileupload-1.0 - =dev-java/commons-httpclient-2* - >=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/jmx - >=dev-java/log4j-1.2.8 - =dev-java/jakarta-regexp-1.3* - >=dev-java/saxpath-1.0 - ~dev-java/servletapi-2.4 - =dev-java/struts-1.1* - dev-java/sun-jaf-bin - >=dev-java/xerces-2.6.2-r1 - jikes? ( dev-java/jikes )" -IUSE="doc examples jikes" - -S=${WORKDIR}/jakarta-${P}-src - -TOMCAT_HOME="/usr/share/${PN}-${SLOT}" -TOMCAT_NAME="${PN}-${SLOT}" - -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 - use jikes && epatch ${FILESDIR}/${PV}/jikes.diff - - # avoid packed jars :-) - mkdir -p ${S}/jakarta-tomcat-5/build/common - cd ${S}/jakarta-tomcat-5/build - - mkdir ./bin && cd ./bin - java-pkg_jar-from commons-logging commons-logging-api.jar - java-pkg_jar-from jmx jmxri.jar jmx.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 - java-pkg_jar-from jakarta-regexp-1.3 -} - -src_compile(){ - local antflags="-Dbase.path=${T}" - use jikes && antflags="${antflags} -Dbuild.compiler=jikes" - antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-bin)" - 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} -Dlog4j.jar=$(java-config -p log4j)" - antflags="${antflags} -Dregexp.jar=$(java-config -p jakarta-regexp-1.3)" - antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts 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 jmx jmxri.jar)" - antflags="${antflags} -Djmx-tools.jar=$(java-pkg_getjar 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} -Dstruts.home=/usr/share/struts" - - ant ${antflags} || die "compile failed" - -} -src_install() { - cd ${S}/jakarta-tomcat-5/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} - - if use jikes; then - sed -e "\cCATALINA_OPTScaCATALINA_OPTS=\"-Dbuild.compiler.emacs=true\"" \ - -i ${D}/etc/conf.d/${TOMCAT_NAME} - fi - - # create dir structure - diropts -m755 - dodir /usr/share/${TOMCAT_NAME} - - dodir /var/log/${TOMCAT_NAME}/default - chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME} - dodir /etc/${TOMCAT_NAME}/default/ - chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME} - dodir /var/tmp/${TOMCAT_NAME}/default - chown -R tomcat:tomcat ${D}/var/tmp/${TOMCAT_NAME} - dodir /var/run/${TOMCAT_NAME}/default - chown -R tomcat:tomcat ${D}/var/run/${TOMCAT_NAME} - dodir /var/lib/${TOMCAT_NAME}/default - chown -R tomcat:tomcat ${D}/var/lib/${TOMCAT_NAME} - - keepdir /var/log/${TOMCAT_NAME}/default - keepdir /etc/${TOMCAT_NAME}/default/ - keepdir /var/tmp/${TOMCAT_NAME}/default - keepdir /var/run/${TOMCAT_NAME}/default - - # 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}/jakarta-tomcat-catalina/webapps/admin/admin.xml \ - conf/Catalina/localhost - cp ${S}/jakarta-tomcat-catalina/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 $(ls *.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 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 - cp -pra conf/* ${D}/etc/${TOMCAT_NAME}/default || die "failed to copy conf" - cp -pra bin common server shared ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy" - - # if the useflag is set, copy over the examples - dodir /var/lib/${TOMCAT_NAME}/default/webapps - keepdir /var/lib/${TOMCAT_NAME}/default/webapps - 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 - 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 - - use doc && dodoc ${S}/jakarta-tomcat-5/{LICENSE,RELEASE-NOTES,RUNNING.txt} - fperms 640 /etc/${TOMCAT_NAME}/default/tomcat-users.xml -} - - -pkg_preinst() { - enewgroup tomcat - enewuser tomcat -1 -1 /dev/null tomcat -} - -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} - - chmod -R 750 /etc/${TOMCAT_NAME} - - einfo " " - einfo " NOTICE!" - einfo " FILE LOCATIONS:" - einfo " 1. Tomcat home directory: ${TOMCAT_HOME}" - einfo " Contains application data, configuration files." - einfo " 2. Runtime settings: /etc/conf.d/${TOMCAT_NAME}" - einfo " Contains CLASSPATH and JAVA_HOME settings." - einfo " 3. Configuration: /etc/${TOMCAT_NAME}/default" - einfo " 4. Logs: /var/log/${TOMCAT_NAME}/default" - einfo " " - einfo " " - einfo " STARTING AND STOPPING TOMCAT:" - einfo " /etc/init.d/${TOMCAT_NAME} start" - einfo " /etc/init.d/${TOMCAT_NAME} stop" - einfo " /etc/init.d/${TOMCAT_NAME} restart" - einfo " " - einfo " " - ewarn " If you are upgrading from older ebuild do NOT use" - ewarn " /etc/init.d/tomcat and /etc/conf.d/tomcat you probably" - ewarn " want to remove these. " - einfo " " - ewarn " This ebuild implements a new filesystem layout for tomcat" - ewarn " please read http://gentoo-wiki.com/Tomcat_Gentoo_ebuild for" - ewarn " more information!." - einfo " " - einfo " NETWORK CONFIGURATION:" - einfo " By default, Tomcat runs on port 8080. You can change this" - einfo " value by editing /etc/${TOMCAT_NAME}/default/server.xml." - einfo " " - einfo " To test Tomcat while it's running, point your web browser to:" - einfo " http://localhost:8080/" - if ! use examples; then - ewarn "" - ewarn "You do not have the examples USE flag set, examples have NOT been installed." - ewarn " " - fi - einfo " " - einfo " BUGS:" - einfo " Please file any bugs at http://bugs.gentoo.org/ or else it" - einfo " may not get seen. Thank you." - einfo " " -} diff --git a/www-servers/tomcat/tomcat-5.0.28-r4.ebuild b/www-servers/tomcat/tomcat-5.0.28-r4.ebuild new file mode 100644 index 000000000000..b262cf259e44 --- /dev/null +++ b/www-servers/tomcat/tomcat-5.0.28-r4.ebuild @@ -0,0 +1,270 @@ +# 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-r4.ebuild,v 1.1 2005/05/17 19:19:18 luckyduck Exp $ + +inherit eutils java-pkg + +DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container" + +SLOT="${PV/.*}" +SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/src/jakarta-${P}-src.tar.gz" +HOMEPAGE="http://jakarta.apache.org/tomcat" +KEYWORDS="~x86 ~amd64 -ppc64 ~sparc" +LICENSE="Apache-2.0" +DEPEND="sys-apps/sed + >=virtual/jdk-1.4 + dev-java/ant" +RDEPEND=">=virtual/jdk-1.4 + =dev-java/commons-beanutils-1.7* + >=dev-java/commons-collections-3.1 + >=dev-java/commons-daemon-1.0 + >=dev-java/commons-dbcp-1.2.1 + >=dev-java/commons-digester-1.5 + >=dev-java/commons-fileupload-1.0 + =dev-java/commons-httpclient-2* + >=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/jmx + >=dev-java/log4j-1.2.8 + =dev-java/jakarta-regexp-1.3* + >=dev-java/saxpath-1.0 + ~dev-java/servletapi-2.4 + =dev-java/struts-1.1* + dev-java/sun-jaf-bin + >=dev-java/xerces-2.6.2-r1 + jikes? ( dev-java/jikes )" +IUSE="doc examples jikes" + +S=${WORKDIR}/jakarta-${P}-src + +TOMCAT_HOME="/usr/share/${PN}-${SLOT}" +TOMCAT_NAME="${PN}-${SLOT}" + +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 + use jikes && epatch ${FILESDIR}/${PV}/jikes.diff + + # avoid packed jars :-) + mkdir -p ${S}/jakarta-tomcat-5/build/common + cd ${S}/jakarta-tomcat-5/build + + mkdir ./bin && cd ./bin + java-pkg_jar-from commons-logging commons-logging-api.jar + java-pkg_jar-from jmx jmxri.jar jmx.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 + java-pkg_jar-from jakarta-regexp-1.3 +} + +src_compile(){ + local antflags="-Dbase.path=${T}" + use jikes && antflags="${antflags} -Dbuild.compiler=jikes" + antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-bin)" + 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} -Dlog4j.jar=$(java-config -p log4j)" + antflags="${antflags} -Dregexp.jar=$(java-config -p jakarta-regexp-1.3)" + antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts 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 jmx jmxri.jar)" + antflags="${antflags} -Djmx-tools.jar=$(java-pkg_getjar 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} -Dstruts.home=/usr/share/struts" + + ant ${antflags} || die "compile failed" + +} +src_install() { + cd ${S}/jakarta-tomcat-5/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} + + if use jikes; then + sed -e "\cCATALINA_OPTScaCATALINA_OPTS=\"-Dbuild.compiler.emacs=true\"" \ + -i ${D}/etc/conf.d/${TOMCAT_NAME} + fi + + # create dir structure + diropts -m755 + dodir /usr/share/${TOMCAT_NAME} + + dodir /var/log/${TOMCAT_NAME}/default + chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME} + dodir /etc/${TOMCAT_NAME}/default/ + chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME} + dodir /var/tmp/${TOMCAT_NAME}/default + chown -R tomcat:tomcat ${D}/var/tmp/${TOMCAT_NAME} + dodir /var/run/${TOMCAT_NAME}/default + chown -R tomcat:tomcat ${D}/var/run/${TOMCAT_NAME} + dodir /var/lib/${TOMCAT_NAME}/default + chown -R tomcat:tomcat ${D}/var/lib/${TOMCAT_NAME} + + keepdir /var/log/${TOMCAT_NAME}/default + keepdir /etc/${TOMCAT_NAME}/default/ + keepdir /var/tmp/${TOMCAT_NAME}/default + keepdir /var/run/${TOMCAT_NAME}/default + + # 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}/jakarta-tomcat-catalina/webapps/admin/admin.xml \ + conf/Catalina/localhost + cp ${S}/jakarta-tomcat-catalina/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 $(ls *.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 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 + cp -pra conf/* ${D}/etc/${TOMCAT_NAME}/default || die "failed to copy conf" + cp -pra bin common server shared ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy" + + # if the useflag is set, copy over the examples + dodir /var/lib/${TOMCAT_NAME}/default/webapps + keepdir /var/lib/${TOMCAT_NAME}/default/webapps + 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 + 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 + + use doc && dodoc ${S}/jakarta-tomcat-5/{LICENSE,RELEASE-NOTES,RUNNING.txt} + fperms 640 /etc/${TOMCAT_NAME}/default/tomcat-users.xml +} + + +pkg_preinst() { + enewgroup tomcat + enewuser tomcat -1 -1 /dev/null tomcat +} + +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} + + chmod -R 750 /etc/${TOMCAT_NAME} + + einfo " " + einfo " NOTICE!" + einfo " FILE LOCATIONS:" + einfo " 1. Tomcat home directory: ${TOMCAT_HOME}" + einfo " Contains application data, configuration files." + einfo " 2. Runtime settings: /etc/conf.d/${TOMCAT_NAME}" + einfo " Contains CLASSPATH and JAVA_HOME settings." + einfo " 3. Configuration: /etc/${TOMCAT_NAME}/default" + einfo " 4. Logs: /var/log/${TOMCAT_NAME}/default" + einfo " " + einfo " " + einfo " STARTING AND STOPPING TOMCAT:" + einfo " /etc/init.d/${TOMCAT_NAME} start" + einfo " /etc/init.d/${TOMCAT_NAME} stop" + einfo " /etc/init.d/${TOMCAT_NAME} restart" + einfo " " + einfo " " + ewarn " If you are upgrading from older ebuild do NOT use" + ewarn " /etc/init.d/tomcat and /etc/conf.d/tomcat you probably" + ewarn " want to remove these. " + einfo " " + ewarn " This ebuild implements a new filesystem layout for tomcat" + ewarn " please read http://gentoo-wiki.com/Tomcat_Gentoo_ebuild for" + ewarn " more information!." + einfo " " + einfo " NETWORK CONFIGURATION:" + einfo " By default, Tomcat runs on port 8080. You can change this" + einfo " value by editing /etc/${TOMCAT_NAME}/default/server.xml." + einfo " " + einfo " To test Tomcat while it's running, point your web browser to:" + einfo " http://localhost:8080/" + if ! use examples; then + ewarn "" + ewarn "You do not have the examples USE flag set, examples have NOT been installed." + ewarn " " + fi + einfo " " + einfo " BUGS:" + einfo " Please file any bugs at http://bugs.gentoo.org/ or else it" + einfo " may not get seen. Thank you." + einfo " " +} -- cgit v1.2.3-65-gdbad