Date: Thursday, January 10, 2013 @ 06:15:49 Author: guillaume Revision: 174999
Added systemd tmpfile FS#33163 and cleaned sources files Added: tomcat6/trunk/conf.d_tomcat6 (from rev 174998, tomcat6/trunk/tomcat6.conf.d) tomcat6/trunk/rc.d_tomcat6 (from rev 174998, tomcat6/trunk/tomcat6) tomcat6/trunk/systemd_tomcat6.service (from rev 174998, tomcat6/trunk/systemd.tomcat6.service) Modified: tomcat6/trunk/PKGBUILD Deleted: tomcat6/trunk/systemd.tomcat6.service tomcat6/trunk/tomcat6 tomcat6/trunk/tomcat6.conf.d -------------------------+ PKGBUILD | 31 ++++++++++-------- conf.d_tomcat6 | 19 +++++++++++ rc.d_tomcat6 | 77 ++++++++++++++++++++++++++++++++++++++++++++++ systemd.tomcat6.service | 34 -------------------- systemd_tomcat6.service | 34 ++++++++++++++++++++ tomcat6 | 77 ---------------------------------------------- tomcat6.conf.d | 19 ----------- 7 files changed, 148 insertions(+), 143 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-01-10 09:44:00 UTC (rev 174998) +++ PKGBUILD 2013-01-10 11:15:49 UTC (rev 174999) @@ -2,24 +2,26 @@ pkgbase=tomcat6 pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6') pkgver=6.0.36 -pkgrel=2 +pkgrel=3 arch=('any') url='http://tomcat.apache.org/' license=('APACHE') makedepends=('java-environment>=5' 'apache-ant>=1.6' 'java-commons-daemon') source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz - tomcat6.conf.d - tomcat6 - tomcat6.install - systemd.tomcat6.service) + conf.d_tomcat6 + rc.d_tomcat6 + systemd_tomcat6.service + systemd_tmpfiles.d_tomcat6.conf + tomcat6.install) sha256sums=('8da5b897ff28f688a5c7fe5abaa95e0ae0de9562283cec3c2643faaa13a6932c' 'bc1be532d48a239a6945b028bf8f253087d3405f6522229226c484bf8ae4d45e' '13289d05abec4acc1fdd5ed0405271f1a18a90ef88cdcf87778e639edaf056ce' 'f7b205a30c29e836daa7aa7d2fe7462ff5695d3706856a1e460241c746e67834' - '9c97bbbee0724107d9045d8e2c4d110e5d52815979116e502e2921bb100be4f2' - 'c6323e28e800d557b40f3b66b918897662003efdc080f0c012686238641b8599') + 'c6323e28e800d557b40f3b66b918897662003efdc080f0c012686238641b8599' + '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80' + '9c97bbbee0724107d9045d8e2c4d110e5d52815979116e502e2921bb100be4f2') _servletver=2.5 _jspver=2.1 @@ -39,7 +41,7 @@ #TODO add test "ant test" package_java-servlet2.5-tomcat() { - pkgdesc="Servlet 2.5 java library implementation by Apache Tomcat" + pkgdesc='Servlet 2.5 java library implementation by Apache Tomcat' depends=('java-environment>=5') cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib" @@ -52,7 +54,7 @@ } package_java-jsp2.1-tomcat() { - pkgdesc="JSP 2.1 java library implementation by Apache Tomcat" + pkgdesc='JSP 2.1 java library implementation by Apache Tomcat' depends=('java-environment>=5') cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib" @@ -66,7 +68,7 @@ } package_tomcat6() { - pkgdesc="Servlet-2.5/JSP-2.1 Container" + pkgdesc='Servlet-2.5/JSP-2.1 Container' depends=('java-runtime>=5' 'java-jsvc' "java-servlet2.5-tomcat=${pkgver}" "java-jsp2.1-tomcat=${pkgver}") optdepends=('tomcat-native: to allow optimal performance in production environments') @@ -130,9 +132,12 @@ ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work # Arch scripts - install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname} - install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname} - install -Dm644 ${srcdir}/systemd.${pkgname}.service \ + install -Dm644 ${srcdir}/conf.d_tomcat6 ${pkgdir}/etc/conf.d/${pkgname} + install -Dm755 ${srcdir}/rc.d_tomcat6 ${pkgdir}/etc/rc.d/${pkgname} + + install -Dm644 ${srcdir}/systemd_tomcat6.service \ ${pkgdir}/usr/lib/systemd/system/${pkgname}.service + install -Dm644 ${srcdir}/systemd_tmpfiles.d_tomcat6.conf \ + ${pkgdir}/lib/tmpfiles.d/${pkgname}.conf } Copied: tomcat6/trunk/conf.d_tomcat6 (from rev 174998, tomcat6/trunk/tomcat6.conf.d) =================================================================== --- conf.d_tomcat6 (rev 0) +++ conf.d_tomcat6 2013-01-10 11:15:49 UTC (rev 174999) @@ -0,0 +1,19 @@ +# Configuration file for Tomcat 6 when started with 'initscripts' +# This file is NOT used when tomcat is started with systemd +# Have a look at /usr/share/tomcat6/bin/catalina.sh for a complete list of environment variables + +# The JAVA_HOME of the JVM for Tomcat to use +# (compulsory to enable tomcat to start at boot) +TOMCAT_JAVA_HOME=/usr/lib/jvm/java-7-openjdk + +# Tomcat home directory +CATALINA_HOME=/usr/share/tomcat6 + +# In many circumstances, it is desirable to have a single copy of a Tomcat +# binary distribution shared among multiple users on the same server. To make +# this possible, you can set the $CATALINA_BASE environment variable to the +# directory that contains the files for your 'personal' Tomcat instance. +CATALINA_BASE=/usr/share/tomcat6 + +# Tomcat additional commandline options +CATALINA_OPTS= Copied: tomcat6/trunk/rc.d_tomcat6 (from rev 174998, tomcat6/trunk/tomcat6) =================================================================== --- rc.d_tomcat6 (rev 0) +++ rc.d_tomcat6 2013-01-10 11:15:49 UTC (rev 174999) @@ -0,0 +1,77 @@ +#!/bin/bash + +daemon_name=tomcat6 + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/${daemon_name} + +case "$1" in + start) + stat_busy "Starting ${daemon_name} daemon" + + PID=$(get_pid 'jsvc.exec') + if [ -z "$PID" ]; then + [ -f /var/run/${daemon_name}.pid ] && rm -f /var/run/${daemon_name}.pid + # RUN + /usr/bin/jsvc \ + -Dcatalina.home=${CATALINA_HOME} \ + -Dcatalina.base=${CATALINA_BASE} \ + -Djava.io.tmpdir=/var/tmp/tomcat6/temp \ + -cp /usr/share/java/commons-daemon.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar \ + -user tomcat \ + -java-home ${TOMCAT_JAVA_HOME} \ + -wait 10 \ + -pidfile /var/run/${daemon_name}.pid \ + -errfile /var/log/tomcat6/catalina.err \ + -outfile /var/log/tomcat6/catalina.out \ + ${CATALINA_OPTS} \ + org.apache.catalina.startup.Bootstrap + + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + add_daemon ${daemon_name} + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping ${daemon_name} daemon" + # STOP + /usr/bin/jsvc \ + -pidfile /var/run/${daemon_name}.pid \ + -stop \ + org.apache.catalina.startup.Bootstrap + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/${daemon_name}.pid &> /dev/null + rm_daemon ${daemon_name} + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking ${daemon_name} status"; + ck_status ${daemon_name} + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" +esac + +exit 0 Deleted: systemd.tomcat6.service =================================================================== --- systemd.tomcat6.service 2013-01-10 09:44:00 UTC (rev 174998) +++ systemd.tomcat6.service 2013-01-10 11:15:49 UTC (rev 174999) @@ -1,34 +0,0 @@ -[Unit] -Description=Tomcat 6 servlet container -After=syslog.target network.target - -[Service] -Type=forking -PIDFile=/var/run/tomcat6.pid -Environment=CATALINA_PID=/var/run/tomcat6.pid -Environment=TOMCAT_JAVA_HOME=/usr/lib/jvm/java-7-openjdk -Environment=CATALINA_HOME=/usr/share/tomcat6 -Environment=CATALINA_BASE=/usr/share/tomcat6 -Environment=CATALINA_OPTS= - -ExecStart=/usr/bin/jsvc \ - -Dcatalina.home=${CATALINA_HOME} \ - -Dcatalina.base=${CATALINA_BASE} \ - -Djava.io.tmpdir=/var/tmp/tomcat6/temp \ - -cp /usr/share/java/commons-daemon.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar \ - -user tomcat \ - -java-home ${TOMCAT_JAVA_HOME} \ - -wait 10 \ - -pidfile /var/run/tomcat6.pid \ - -errfile /var/log/tomcat6/catalina.err \ - -outfile /var/log/tomcat6/catalina.out \ - $CATALINA_OPTS \ - org.apache.catalina.startup.Bootstrap - -ExecStop=/usr/bin/jsvc \ - -pidfile /var/run/tomcat6.pid \ - -stop \ - org.apache.catalina.startup.Bootstrap - -[Install] -WantedBy=multi-user.target Copied: tomcat6/trunk/systemd_tomcat6.service (from rev 174998, tomcat6/trunk/systemd.tomcat6.service) =================================================================== --- systemd_tomcat6.service (rev 0) +++ systemd_tomcat6.service 2013-01-10 11:15:49 UTC (rev 174999) @@ -0,0 +1,34 @@ +[Unit] +Description=Tomcat 6 servlet container +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/var/run/tomcat6.pid +Environment=CATALINA_PID=/var/run/tomcat6.pid +Environment=TOMCAT_JAVA_HOME=/usr/lib/jvm/java-7-openjdk +Environment=CATALINA_HOME=/usr/share/tomcat6 +Environment=CATALINA_BASE=/usr/share/tomcat6 +Environment=CATALINA_OPTS= + +ExecStart=/usr/bin/jsvc \ + -Dcatalina.home=${CATALINA_HOME} \ + -Dcatalina.base=${CATALINA_BASE} \ + -Djava.io.tmpdir=/var/tmp/tomcat6/temp \ + -cp /usr/share/java/commons-daemon.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar \ + -user tomcat \ + -java-home ${TOMCAT_JAVA_HOME} \ + -wait 10 \ + -pidfile /var/run/tomcat6.pid \ + -errfile /var/log/tomcat6/catalina.err \ + -outfile /var/log/tomcat6/catalina.out \ + $CATALINA_OPTS \ + org.apache.catalina.startup.Bootstrap + +ExecStop=/usr/bin/jsvc \ + -pidfile /var/run/tomcat6.pid \ + -stop \ + org.apache.catalina.startup.Bootstrap + +[Install] +WantedBy=multi-user.target Deleted: tomcat6 =================================================================== --- tomcat6 2013-01-10 09:44:00 UTC (rev 174998) +++ tomcat6 2013-01-10 11:15:49 UTC (rev 174999) @@ -1,77 +0,0 @@ -#!/bin/bash - -daemon_name=tomcat6 - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/${daemon_name} - -case "$1" in - start) - stat_busy "Starting ${daemon_name} daemon" - - PID=$(get_pid 'jsvc.exec') - if [ -z "$PID" ]; then - [ -f /var/run/${daemon_name}.pid ] && rm -f /var/run/${daemon_name}.pid - # RUN - /usr/bin/jsvc \ - -Dcatalina.home=${CATALINA_HOME} \ - -Dcatalina.base=${CATALINA_BASE} \ - -Djava.io.tmpdir=/var/tmp/tomcat6/temp \ - -cp /usr/share/java/commons-daemon.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar \ - -user tomcat \ - -java-home ${TOMCAT_JAVA_HOME} \ - -wait 10 \ - -pidfile /var/run/${daemon_name}.pid \ - -errfile /var/log/tomcat6/catalina.err \ - -outfile /var/log/tomcat6/catalina.out \ - ${CATALINA_OPTS} \ - org.apache.catalina.startup.Bootstrap - - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - add_daemon ${daemon_name} - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping ${daemon_name} daemon" - # STOP - /usr/bin/jsvc \ - -pidfile /var/run/${daemon_name}.pid \ - -stop \ - org.apache.catalina.startup.Bootstrap - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/${daemon_name}.pid &> /dev/null - rm_daemon ${daemon_name} - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking ${daemon_name} status"; - ck_status ${daemon_name} - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 Deleted: tomcat6.conf.d =================================================================== --- tomcat6.conf.d 2013-01-10 09:44:00 UTC (rev 174998) +++ tomcat6.conf.d 2013-01-10 11:15:49 UTC (rev 174999) @@ -1,19 +0,0 @@ -# Configuration file for Tomcat 6 when started with 'initscripts' -# This file is NOT used when tomcat is started with systemd -# Have a look at /usr/share/tomcat6/bin/catalina.sh for a complete list of environment variables - -# The JAVA_HOME of the JVM for Tomcat to use -# (compulsory to enable tomcat to start at boot) -TOMCAT_JAVA_HOME=/usr/lib/jvm/java-7-openjdk - -# Tomcat home directory -CATALINA_HOME=/usr/share/tomcat6 - -# In many circumstances, it is desirable to have a single copy of a Tomcat -# binary distribution shared among multiple users on the same server. To make -# this possible, you can set the $CATALINA_BASE environment variable to the -# directory that contains the files for your 'personal' Tomcat instance. -CATALINA_BASE=/usr/share/tomcat6 - -# Tomcat additional commandline options -CATALINA_OPTS=