diff options
author | Petteri Räty <betelgeuse@gentoo.org> | 2005-03-09 17:01:40 +0000 |
---|---|---|
committer | Petteri Räty <betelgeuse@gentoo.org> | 2005-03-09 17:01:40 +0000 |
commit | ac7f1c6157ded6b1c28363a6daf296232874d44d (patch) | |
tree | 08c060ee1f1e96b9111e29b28ed26b394dd6b40b /www-servers | |
parent | Modified kernel ebuilds. (diff) | |
download | betelgeuse-ac7f1c6157ded6b1c28363a6daf296232874d44d.tar.gz betelgeuse-ac7f1c6157ded6b1c28363a6daf296232874d44d.tar.bz2 betelgeuse-ac7f1c6157ded6b1c28363a6daf296232874d44d.zip |
removed tomcat
svn path=/; revision=3
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/tomcat/Manifest | 3 | ||||
-rw-r--r-- | www-servers/tomcat/files/5.5.4/build.xml-01.patch | 19 | ||||
-rw-r--r-- | www-servers/tomcat/files/5.5.4/build.xml-02.patch | 29 | ||||
-rw-r--r-- | www-servers/tomcat/files/5.5.4/gentoo.diff | 13 | ||||
-rw-r--r-- | www-servers/tomcat/files/5.5.4/jikes.diff | 13 | ||||
-rw-r--r-- | www-servers/tomcat/files/5.5.4/tomcat.conf | 79 | ||||
-rw-r--r-- | www-servers/tomcat/files/5.5.4/tomcat.init | 22 | ||||
-rw-r--r-- | www-servers/tomcat/files/digest-tomcat-5.0.28 | 1 | ||||
-rw-r--r-- | www-servers/tomcat/files/digest-tomcat-5.5.4 | 1 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-5.5.4.ebuild | 192 |
10 files changed, 0 insertions, 372 deletions
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest deleted file mode 100644 index def06b9..0000000 --- a/www-servers/tomcat/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -MD5 8e0fbdb0a41ef1fbd39a116ebe92136f tomcat-5.5.4.ebuild 6851 -MD5 683e898e909b3d90ca630696086b4c4c files/digest-tomcat-5.0.28 76 -MD5 77a8faaf643482f6febf6d616411cd45 files/digest-tomcat-5.5.4 77 diff --git a/www-servers/tomcat/files/5.5.4/build.xml-01.patch b/www-servers/tomcat/files/5.5.4/build.xml-01.patch deleted file mode 100644 index 1caa16c..0000000 --- a/www-servers/tomcat/files/5.5.4/build.xml-01.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- build.xml 2004-10-05 22:19:36.837810480 +1000 -+++ build.xml 2004-10-05 22:19:51.448589304 +1000 -@@ -77,14 +77,14 @@ - - <target name="checkout.depends" - description="Update or checkout dependent sources from CVS"> -- -+<!-- - <cvs cvsroot="${cvsroot}" quiet="true" - command="checkout -P jakarta-commons/LICENSE" - dest="${basedir}" compression="true" /> - <cvs cvsroot="${cvsroot}" quiet="true" - command="checkout -P ${commons-daemon.project}" - dest="${basedir}" compression="true" /> -- -+--> - </target> - - <!-- *************** UTILITY TARGETS *************** --> diff --git a/www-servers/tomcat/files/5.5.4/build.xml-02.patch b/www-servers/tomcat/files/5.5.4/build.xml-02.patch deleted file mode 100644 index 6eaf757..0000000 --- a/www-servers/tomcat/files/5.5.4/build.xml-02.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- jakarta-tomcat-5/build.xml 2004-10-05 23:21:44.091181840 +1000 -+++ jakarta-tomcat-5/build.xml 2004-10-05 23:22:26.574723360 +1000 -@@ -1545,8 +1545,7 @@ - <!-- That is ugly XXX needs a review --> - <copy file="LICENSE" tofile="../LICENSE"/> - <copy file="LICENSE" tofile="${base.path}/LICENSE"/> -- -- <!-- Downdown any sub package or tools needed. --> -+<!-- - <antcall target="downloadgz"> - <param name="sourcefile" value="${commons-beanutils.loc}"/> - <param name="destfile" value="${commons-beanutils.jar}"/> -@@ -1593,7 +1592,6 @@ - </antcall> - - <antcall target="downloadgz"> -- <!-- xerces2 brings 2 files, test for one of them --> - <param name="sourcefile" value="${xerces.loc}"/> - <param name="destfile" value="${xml-apis.jar}"/> - </antcall> -@@ -1655,7 +1653,7 @@ - <param name="sourcefile" value="${saxpath.loc}"/> - <param name="destfile" value="${saxpath.jar}"/> - </antcall> -- -+--> - <!-- Build the dependencies that are not yet released --> - <antcall target="build-depends"/> - diff --git a/www-servers/tomcat/files/5.5.4/gentoo.diff b/www-servers/tomcat/files/5.5.4/gentoo.diff deleted file mode 100644 index 78e61fe..0000000 --- a/www-servers/tomcat/files/5.5.4/gentoo.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- jakarta-tomcat-catalina/catalina/src/bin/catalina.sh 2004-05-19 02:25:07.000000000 -0400 -+++ jakarta-tomcat-catalina/catalina/src/bin/catalina.sh 2004-05-19 02:23:20.128089696 -0400 -@@ -38,6 +38,10 @@ - # $Id: gentoo.diff,v 1.1 2004/10/09 09:59:14 axxo Exp $ - # ----------------------------------------------------------------------------- - -+# source the appropriate files right away -+source /etc/profile -+source /etc/conf.d/tomcat5 -+ - # OS specific support. $var _must_ be set to either true or false. - cygwin=false - os400=false diff --git a/www-servers/tomcat/files/5.5.4/jikes.diff b/www-servers/tomcat/files/5.5.4/jikes.diff deleted file mode 100644 index 60f56ec..0000000 --- a/www-servers/tomcat/files/5.5.4/jikes.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- jakarta-tomcat-catalina/catalina/src/conf/web.xml 2004-06-18 03:10:14.000000000 +0200 -+++ jakarta-tomcat-catalina/catalina/src/conf/web.xml 2004-07-28 18:51:39.192165664 +0200 -@@ -186,6 +186,10 @@ - <servlet> - <servlet-name>jsp</servlet-name> - <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class> -+ <init-param> -+ <param-name>compiler</param-name> -+ <param-value>jikes</param-value> -+ </init-param> - <init-param> - <param-name>fork</param-name> - <param-value>false</param-value> diff --git a/www-servers/tomcat/files/5.5.4/tomcat.conf b/www-servers/tomcat/files/5.5.4/tomcat.conf deleted file mode 100644 index c4b1a8d..0000000 --- a/www-servers/tomcat/files/5.5.4/tomcat.conf +++ /dev/null @@ -1,79 +0,0 @@ -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.0.28/tomcat.conf,v 1.1 2004/10/09 09:59:14 axxo Exp $ - -# JVM Runtime -# Using the default setting, it will determine your JVM from the system-vm -# set using java-config. -# See java-config(1) manual page for assistance in determining this value. -# -# You can override this value with whatever path you wish. -# Example: JAVA_HOME=/opt/sun-jdk-1.4.2.05 - -#JAVA_HOME=`java-config -O` - -# (Optional) Java runtime options used when the "start", "stop", or "run" -# commands are executed. -# JAVA_OPTS="" - -# The profile you would like to load -PROFILE=default - -# Where your web applications are located -CATALINA_HOME=/usr/share/tomcat5 -CATALINA_BASE=/var/lib/tomcat5/$PROFILE - -# Tomcat's User -CATALINA_USER=tomcat - -# Tomcat Console Log Location -CATALINA_OUT=/var/log/tomcat5/$PROFILE/catalina.log - -# Location of the Tomcat JARs and classes -#CATALINA_LIBDIR=/usr/share/tomcat5/lib - -# The CLASSPATH for Tomcat to use, plus any others you need. -#CLASSPATH=${CLASSPATH}:${CATALINA_LIBDIR} - -# (Optional) Directory path location of temporary directory the JVM should -# use (java.io.tmpdir). Defaults to $CATALINA_BASE/temp. -# CATALINA_TMPDIR="/your/path/here" - -# TOMCAT STARTUP/SHUTDOWN -# debug Start Catalina in a debugger -# debug -security Debug Catalina with a security manager -# embedded Start Catalina in embedded mode -# jpda start Start Catalina under JPDA debugger -# start Start Catalina in a separate window -# start -security Start in a separate window with security manager -# stop Stop Catalina" -# -# NOTE: -security requires JSSE (see below) -# NOTE: jpda requires JPDA (see below) -TOMCAT_START="start" -TOMCAT_STOP="stop" - -# (Optional) Java runtime options used when the "start", "stop", or "run" -# commands are executed. -# CATALINA_OPTS="" - -# Java Platform Debugger Architecture (JPDA) -# http://java.sun.com/products/jpda/ -# Included with Java SDK 1.3 and later. No need to specify location. -# -# JPDA_TRANSPORT (Optional) JPDA transport used when the "jpda start" -# command is executed. The default is "dt_socket". -# -# JPDA_ADDRESS (Optional) Java runtime options used when the "jpda start" -# command is executed. The default is 8000. -# -# JPDA_TRANSPORT="dt_socket" -# JPDA_ADDRESS="8000" - -# Java Secure Socket Extension (JSSE) -# http://java.sun.com/products/jsse/ -# Included with Java SDK 1.4 and later. -# -# JSSE_HOME (Optional) May point at your Java Secure Sockets Extension -# (JSSE) installation, whose JAR files will be added to the -# system class path used to start Tomcat. -# -# JSSE_HOME="/opt/sun-jdk-1.4.1.02/jre/lib/" diff --git a/www-servers/tomcat/files/5.5.4/tomcat.init b/www-servers/tomcat/files/5.5.4/tomcat.init deleted file mode 100644 index fc99eec..0000000 --- a/www-servers/tomcat/files/5.5.4/tomcat.init +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.0.28/tomcat.init,v 1.1 2004/10/09 09:59:14 axxo Exp $ - -depend() { - use dns logger mysql postgresql net -} - -start() { - ebegin "Starting Tomcat" - start-stop-daemon --start --quiet --chuid tomcat:tomcat --exec ${CATALINA_HOME}/bin/catalina.sh -- ${TOMCAT_START} - sleep 5 - eend $? -} - -stop() { - ebegin "Stopping Tomcat" - start-stop-daemon --start --quiet --chuid tomcat:tomcat --exec ${CATALINA_HOME}/bin/catalina.sh -- ${TOMCAT_STOP} - sleep 5 - eend $? -} diff --git a/www-servers/tomcat/files/digest-tomcat-5.0.28 b/www-servers/tomcat/files/digest-tomcat-5.0.28 deleted file mode 100644 index 9482a45..0000000 --- a/www-servers/tomcat/files/digest-tomcat-5.0.28 +++ /dev/null @@ -1 +0,0 @@ -MD5 2f1e94dde7b99dbef476caef85ed5319 jakarta-tomcat-5.0.28-src.tar.gz 38722 diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.4 b/www-servers/tomcat/files/digest-tomcat-5.5.4 deleted file mode 100644 index afa7dc0..0000000 --- a/www-servers/tomcat/files/digest-tomcat-5.5.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 2fdfb34df8f670af2669d02fb6103a45 jakarta-tomcat-5.5.4-src.tar.gz 3742364 diff --git a/www-servers/tomcat/tomcat-5.5.4.ebuild b/www-servers/tomcat/tomcat-5.5.4.ebuild deleted file mode 100644 index d17fe59..0000000 --- a/www-servers/tomcat/tomcat-5.5.4.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -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" -LICENSE="Apache-2.0" -#These are arrenged to the same order as in jakarta-tomcat-5/build.properties.default -DEPEND=" - >=dev-java/ant-1.5 - >=virtual/jdk-1.5 - >=dev-java/commons-beanutils-1.4.0 - >=dev-java/commons-launcher-0.9 - >=dev-java/commons-daemon-1.0 - >=dev-java/commons-digester-1.4 - >=dev-java/commons-el-1.0 - >=dev-java/commons-logging-1.0.1 - >=dev-java/commons-modeler-1.1 - >=dev-java/xerces-2.6.2-r1 - jikes? ( dev-java/jikes )" - -# >=dev-util/eclipse-sdk-3.0.0 - -# >=dev-java/commons-collections-3.1 -# >=dev-java/regexp-1.3 -# >=dev-java/log4j-1.2.8 -# >=dev-java/commons-dbcp-1.2.1 -# >=dev-java/commons-httpclient-2.0 -# >=dev-java/commons-pool-1.2 -# >=dev-java/commons-fileupload-1.0 -# >=dev-java/junit-3.8.1 -# dev-java/jmx -# =dev-java/struts-1.1-r2 -# >=dev-java/saxpath-1.0 -# >=dev-java/jaxen-1.0 -# jikes? ( dev-java/jikes )" - -RDEPEND=">=virtual/jdk-1.5 - jikes? ( dev-java/jikes )" -IUSE="doc jikes junit" -S=${WORKDIR}/jakarta-${P}-src - -TOMCAT_HOME="/opt/${PN}${SLOT}" -TOMCAT_NAME="${PN}${SLOT}" - -src_unpack() { - unpack ${A} - cd ${S} - - # update the build.xml to remove downloading - epatch ${FILESDIR}/${PV}/build.xml-01.patch - epatch ${FILESDIR}/${PV}/build.xml-02.patch - - epatch ${FILESDIR}/${PV}/gentoo.diff - use jikes && epatch ${FILESDIR}/${PV}/jikes.diff - -} - -src_compile(){ - local antflags="-Dbase.path=${T}" - use jikes && antflags="${antflags} -Dbuild.compiler=jikes" - - einfo `java-pkg_getjar commons-beanutils` - - antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils)" - antflags="${antflags} -Dcommons-launcher.jar=$(java-pkg_getjar commons-launcher)" - antflags="${antflags} -Dcommons-daemon.jar=$(java-pkg_getjar commons-daemon)" - antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjar commons-digester)" - antflags="${antflags} -Dcommons-el.jar=$(java-pkg_getjar commons-el)" - antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging)" - antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)" - antflags="${antflags} -Dcommons-modeler.jar=$(java-pkg_getjar commons-modeler)" - antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" - - -# antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjar commons-collections)" -# antflags="${antflags} -Dregexp.jar=$(java-pkg_getjar regexp)" -# antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)" -# antflags="${antflags} -Dlog4j.jar=$(java-pkg_getjar log4j)" -# antflags="${antflags} -Dcommons-dbcp.jar=$(java-pkg_getjar commons-dbcp)" -# antflags="${antflags} -Dcommons-httpclient.jar=$(java-pkg_getjar commons-httpclient)" -# antflags="${antflags} -Dcommons-pool.jar=$(java-pkg_getjar commons-pool)" -# antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjar commons-fileupload)" -# antflags="${antflags} -Djunit.jar=$(java-pkg_getjar junit)" -# antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts struts.jar)" - -# antflags="${antflags} -Djmx.jar=$(java-pkg_getjar jmx jmxri.jar)" -# antflags="${antflags} -Djmx-tools.jar=$(java-pkg_getjar jmx jmxtools.jar)" - - # This is used to reference the tld files in /usr/share/struts/lib -# antflags="${antflags} -Dstruts.home=/usr/share/struts" -# antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts struts.jar)" - -# antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)" -# antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)" - - - use doc && antflags="${antflags} javadoc" - - ant ${antflags} || die "compile failed" -} -src_install() { - cd ${S}/jakarta-tomcat-5/build - - # INIT SCRIPTS AND ENV - insinto /etc/init.d - insopts -m0750 - newins ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME} - - insinto /etc/conf.d - insopts -m0644 - newins ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME} - use jikes && sed -e "\cCATALINA_OPTScaCATALINA_OPTS=\"-Dbuild.compiler.emacs=true\"" -i ${D}/etc/conf.d/${TOMCAT_NAME} - - diropts -m750 - dodir ${TOMCAT_HOME} /var/log/${TOMCAT_NAME} /etc/${TOMCAT_NAME} - keepdir /var/log/${TOMCAT_NAME} - - mv conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to move conf" - mv bin common server shared temp work ${D}${TOMCAT_HOME} || die "failed to move" - keepdir ${TOMCAT_HOME}/{work,temp} - - if ! use doc; then - rm -rf webapps/{tomcat-docs,jsp-examples,servlets-examples} - fi - - mv webapps ${D}${TOMCAT_HOME} - - dosym /etc/${TOMCAT_NAME} ${TOMCAT_HOME}/conf - dosym /var/log/${TOMCAT_NAME} ${TOMCAT_HOME}/logs - - fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml -} - - -pkg_preinst() { - enewgroup tomcat - enewuser tomcat -1 -1 /dev/null tomcat - - chown -R tomcat:tomcat ${D}/opt/${TOMCAT_NAME} - chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME} - chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME} -} - -pkg_postinst() { - #due to previous ebuild bloopers, make sure everything is correct - use doc && chown -R root:root /usr/share/doc/${PF} - chown root:root /etc/init.d/${TOMCAT_NAME} - chown root:root /etc/conf.d/${TOMCAT_NAME} - - chown -R tomcat:tomcat /opt/${TOMCAT_NAME} - chown -R tomcat:tomcat /etc/${TOMCAT_NAME} - chown -R tomcat:tomcat /var/log/${TOMCAT_NAME} - - chmod 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}" - einfo " 4. Logs: /var/log/${TOMCAT_NAME}/" - 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. " - ewarn " A version number has been appended so that tomcat 3, 4 and 5" - ewarn " can be installed side by side" - einfo " " - einfo " NETWORK CONFIGURATION:" - einfo " By default, Tomcat runs on port 8080. You can change this" - einfo " value by editing /etc/${TOMCAT_NAME}/server.xml." - einfo " " - einfo " To test Tomcat while it's running, point your web browser to:" - einfo " http://localhost:8080/" - ! use doc && einfo " You do not have the doc USE flag set, examples have NOT been installed." - einfo " " - einfo " " - einfo " BUGS:" - einfo " Please file any bugs at http://bugs.gentoo.org/ or else it" - einfo " may not get seen. Thank you." - einfo " " -} |