Date: Thursday, September 6, 2012 @ 15:58:31 Author: guillaume Revision: 166343
Upstream release - sources Modified: tomcat7/trunk/PKGBUILD tomcat7/trunk/systemd.tomcat7.service tomcat7/trunk/tomcat7.conf.d -------------------------+ PKGBUILD | 10 +++++----- systemd.tomcat7.service | 6 +++++- tomcat7.conf.d | 3 ++- 3 files changed, 12 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-09-06 19:14:11 UTC (rev 166342) +++ PKGBUILD 2012-09-06 19:58:31 UTC (rev 166343) @@ -1,7 +1,7 @@ # Maintainer: Guillaume ALAUX <[email protected]> pkgbase=tomcat7 pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7') -pkgver=7.0.29 +pkgver=7.0.30 pkgrel=1 arch=('any') url='http://tomcat.apache.org/' @@ -14,12 +14,12 @@ tomcat7.install systemd.tomcat7.service) -md5sums=('16b9f637e5ca623cf87a2a1514c8978e' - '307076fa3827e19fa9b03f3ef7cf1f3f' - 'f200548b6636bd5894b109474904952a' +md5sums=('18c61cc4a7b559ad34d34d6f4229ac28' + '48c19559f28aa6f189bcb0b2c2e563cb' + '5219c0d3a25f274ec956d3291b83b320' '361a41c02930a4e43245ab7379a617e9' '6c5b4ed6d71b227f305b751c349fa31b' - '579ecebdbfcd9358d55e6425ae16bdeb') + '1e2fba29b10f29541d0f5811ede9cb76') _servletver=3.0 _jspver=2.2 Modified: systemd.tomcat7.service =================================================================== --- systemd.tomcat7.service 2012-09-06 19:14:11 UTC (rev 166342) +++ systemd.tomcat7.service 2012-09-06 19:58:31 UTC (rev 166343) @@ -6,7 +6,10 @@ Type=forking PIDFile=/var/run/tomcat7.pid Environment=CATALINA_PID=/var/run/tomcat7.pid -EnvironmentFile=/etc/conf.d/tomcat7 +Environment=TOMCAT_JAVA_HOME=/usr/lib/jvm/java-7-openjdk +Environment=CATALINA_HOME=/usr/share/tomcat7 +Environment=CATALINA_BASE=/usr/share/tomcat7 +Environment=CATALINA_OPTS= ExecStart=/usr/bin/jsvc \ -Dcatalina.home=${CATALINA_HOME} \ @@ -29,3 +32,4 @@ [Install] WantedBy=multi-user.target + Modified: tomcat7.conf.d =================================================================== --- tomcat7.conf.d 2012-09-06 19:14:11 UTC (rev 166342) +++ tomcat7.conf.d 2012-09-06 19:58:31 UTC (rev 166343) @@ -1,4 +1,5 @@ -# Configuration file for Tomcat 7 +# Configuration file for Tomcat 7 when used with initscripts +# This file is NOT used when starting tomcat with systemd # Have a look at /usr/share/tomcat7/bin/catalina.sh for a complete list of environment variables # The JAVA_HOME of the JVM for Tomcat to use
