summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/tomcat/ChangeLog8
-rw-r--r--www-servers/tomcat/files/digest-tomcat-6.0.9_alpha3
-rw-r--r--www-servers/tomcat/tomcat-6.0.9_alpha.ebuild165
3 files changed, 175 insertions, 1 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 0890c0288399..a219b052dc5f 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-servers/tomcat
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.113 2007/01/31 10:31:50 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.114 2007/02/02 21:37:53 wltjr Exp $
+
+*tomcat-6.0.9_alpha (02 Feb 2007)
+
+ 02 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+ +tomcat-6.0.9_alpha.ebuild:
+ -m Bumped package to latest alpha
31 Jan 2007; Vlastimil Babka <caster@gentoo.org>
tomcat-6.0.7_beta-r6.ebuild, tomcat-6.0.8_alpha-r3.ebuild:
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.9_alpha b/www-servers/tomcat/files/digest-tomcat-6.0.9_alpha
new file mode 100644
index 000000000000..ac34a58141dd
--- /dev/null
+++ b/www-servers/tomcat/files/digest-tomcat-6.0.9_alpha
@@ -0,0 +1,3 @@
+MD5 f22e59e244270d8aef6e96d5026e8e1b apache-tomcat-6.0.9-src.tar.gz 3218164
+RMD160 c35c6441a358926a8bef4bc855b275ad2445f842 apache-tomcat-6.0.9-src.tar.gz 3218164
+SHA256 ce3a2a6976ecf0059245debcb2c69c9b3947baf1ecc383fa80c27e55f2ee5647 apache-tomcat-6.0.9-src.tar.gz 3218164
diff --git a/www-servers/tomcat/tomcat-6.0.9_alpha.ebuild b/www-servers/tomcat/tomcat-6.0.9_alpha.ebuild
new file mode 100644
index 000000000000..e4d7b76b87f6
--- /dev/null
+++ b/www-servers/tomcat/tomcat-6.0.9_alpha.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.9_alpha.ebuild,v 1.1 2007/02/02 21:37:53 wltjr Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Apache Servlet-2.5/JSP-2.1 Container"
+
+MY_P="apache-${P/_alpha/}-src"
+SLOT="6"
+#SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
+SRC_URI="http://people.apache.org/~remm/tomcat-6/v6.0.9/src/apache-tomcat-6.0.9-src.tar.gz"
+HOMEPAGE="http://tomcat.apache.org/"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+LICENSE="Apache-2.0"
+
+IUSE="doc examples source test"
+
+RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 )
+ =dev-java/eclipse-ecj-3.2*
+ >=dev-java/commons-daemon-1.0.1
+ >=dev-java/commons-dbcp-1.2.1
+ >=dev-java/commons-logging-1.1
+ >=dev-java/commons-pool-1.2
+ ~dev-java/tomcat-servlet-api-${PV}"
+
+DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
+ ${RDEPEND}
+ test? ( dev-java/junit )"
+
+S=${WORKDIR}/${MY_P}
+
+TOMCAT_NAME="${PN}-${SLOT}"
+TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
+WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
+
+pkg_setup() {
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+
+ WANT_ANT_TASKS="ant-trax"
+}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}/${SLOT}/build-xml.patch"
+
+# cd "${S}/bin"
+# java-pkg_jar-from commons-daemon
+}
+
+src_compile(){
+ # Prevent out of memory/heap space errors
+ # Not sure if this is happening for others
+
+ # Old way
+# java-pkg_force-compiler ecj-3.2
+
+ # New way if others get out of heap space
+# ANT_OPTS=-XX:MaxPermSize=128m
+
+ local antflags="build-jasper-jdt deploy -Dbase.path=${T}"
+ antflags="${antflags} -Dcompile.debug=false"
+ if ! use doc; then
+ antflags="${antflags} -Dnobuild.docs=true"
+ fi
+ antflags="${antflags} -Dant.jar=$(java-pkg_getjar ant-core ant.jar)"
+ antflags="${antflags} -Dcommons-daemon.jar=$(java-pkg_getjar commons-daemon commons-daemon.jar)"
+ antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.2 ecj.jar)"
+ antflags="${antflags} -Djsp-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 jsp-api.jar)"
+ antflags="${antflags} -Dservlet-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 servlet-api.jar)"
+ eant ${antflags}
+}
+
+src_install() {
+ local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
+
+ # init.d, conf.d
+ newinitd ${FILESDIR}/${SLOT}/tomcat.init ${TOMCAT_NAME}
+ newconfd ${FILESDIR}/${SLOT}/tomcat.conf ${TOMCAT_NAME}
+
+ # create dir structure
+ diropts -m755 -o tomcat -g tomcat
+ dodir /etc/${TOMCAT_NAME}
+ fperms 750 /etc/${TOMCAT_NAME}
+ dodir /usr/share/${TOMCAT_NAME}
+ keepdir /var/log/${TOMCAT_NAME}/
+ keepdir /var/tmp/${TOMCAT_NAME}/
+ keepdir /var/run/${TOMCAT_NAME}/
+ dodir ${CATALINA_BASE}
+ diropts -m0755
+
+ cd "${S}"
+ # we don't need dos scripts
+ rm -f bin/*.bat
+ chmod 755 bin/*.sh
+
+ # fix context's since upstream is slackin
+ sed -i -e 's:}/server/:}/:' ${S}/webapps/host-manager/host-manager.xml
+ sed -i -e 's:}/server/:}/:' ${S}/webapps/manager/manager.xml
+
+ # copy the manager's context to the right position
+ mkdir -p conf/Catalina/localhost
+ cp ${S}/webapps/host-manager/host-manager.xml conf/Catalina/localhost
+ cp ${S}/webapps/manager/manager.xml conf/Catalina/localhost
+
+ # 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.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 output/build/bin output/build/lib ${D}/usr/share/${TOMCAT_NAME} \
+ || die "failed to copy"
+
+ cp ${T}/tomcat6-deps/jdt/jasper-jdt.jar ${D}/usr/share/${TOMCAT_NAME}/lib \
+ || die "failed to copy"
+
+ keepdir ${WEBAPPS_DIR}
+ chown tomcat:tomcat ${D}/${WEBAPPS_DIR} || die "Failed to change owner off ${1}."
+ chmod 750 ${D}/${WEBAPPS_DIR} || die "Failed to change permissions off ${1}."
+
+ cd "${D}/usr/share/${TOMCAT_NAME}/lib"
+ java-pkg_jar-from tomcat-servlet-api-2.5
+
+ cd "${S}"
+
+ # Copy over webapps, some controlled by use flags
+ cp -p RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
+ cp -pr webapps/ROOT ${D}${CATALINA_BASE}/webapps
+
+ mkdir ${D}${TOMCAT_HOME}/webapps
+ chown tomcat:tomcat ${D}${TOMCAT_HOME}/webapps
+ cp -pr webapps/host-manager ${D}${TOMCAT_HOME}/webapps
+ cp -pr webapps/manager ${D}${TOMCAT_HOME}/webapps
+
+ if use doc; then
+ cp -pr output/build/webapps/docs ${D}${CATALINA_BASE}/webapps
+ fi
+ if use examples; then
+ cp -pr output/build/webapps/examples ${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}/{RELEASE-NOTES,RUNNING.txt}
+ fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
+}
+
+pkg_postinst() {
+ elog
+ elog " This ebuild implements a FHS compliant layout for tomcat"
+ elog " Please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
+ elog " for more information."
+ elog
+ elog " Please report any bugs to http://bugs.gentoo.org/"
+ elog
+}