[arch-commits] Commit in tomcat7/trunk (3 files)
Guillaume Alaux
guillaume at archlinux.org
Sun Aug 19 14:16:08 UTC 2012
Date: Sunday, August 19, 2012 @ 10:16:07
Author: guillaume
Revision: 165437
upgpkg: tomcat7 7.0.29-1
Upstream release + added systemd service file
Added:
tomcat7/trunk/systemd.tomcat7.service
Modified:
tomcat7/trunk/PKGBUILD
tomcat7/trunk/tomcat7.conf.d
-------------------------+
PKGBUILD | 34 +++++++++++++++++++++++-----------
systemd.tomcat7.service | 31 +++++++++++++++++++++++++++++++
tomcat7.conf.d | 5 ++++-
3 files changed, 58 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-08-19 10:42:24 UTC (rev 165436)
+++ PKGBUILD 2012-08-19 14:16:07 UTC (rev 165437)
@@ -1,24 +1,25 @@
# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
pkgbase=tomcat7
pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.27
+pkgver=7.0.29
pkgrel=1
arch=('any')
url='http://tomcat.apache.org/'
license=('APACHE')
-# Does not build with JDK7. Same issue as with cassandra:
-# https://issues.apache.org/jira/browse/CASSANDRA-3275
-#makedepends=('java-environment>=6' 'apache-ant>=1.8' 'java-commons-daemon' 'eclipse-ecj')
-makedepends=('java-environment=6' 'apache-ant>=1.8' 'java-commons-daemon' 'eclipse-ecj')
+makedepends=('java-environment' 'apache-ant>=1.8' 'java-commons-daemon' 'eclipse-ecj')
source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
+ http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
tomcat7.conf.d
tomcat7
- tomcat7.install)
+ tomcat7.install
+ systemd.tomcat7.service)
-md5sums=('a7fa41d09ccc1dc324c35fdebebd2afe'
- 'eea5573b0acd985bb8b630a20719db76'
+md5sums=('16b9f637e5ca623cf87a2a1514c8978e'
+ '307076fa3827e19fa9b03f3ef7cf1f3f'
+ 'f200548b6636bd5894b109474904952a'
'361a41c02930a4e43245ab7379a617e9'
- '6c5b4ed6d71b227f305b751c349fa31b')
+ '6c5b4ed6d71b227f305b751c349fa31b'
+ '579ecebdbfcd9358d55e6425ae16bdeb')
_servletver=3.0
_jspver=2.2
@@ -27,10 +28,12 @@
cd "${srcdir}/apache-tomcat-${pkgver}-src"
. /etc/profile.d/apache-ant.sh
+
ant deploy \
-Dbase.path=${srcdir}/DOWN_LIBS \
-Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
- -Djdt.jar=/usr/share/java/eclipse-ecj.jar
+ -Djdt.jar=/usr/share/java/eclipse-ecj.jar \
+ -Dno.build.dbcp=true
}
#TODO add test "ant test"
@@ -88,7 +91,7 @@
# eclipse-ecj is packaged on its own
rm lib/eclipse-ecj.jar
install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
- ln -s /usr/share/java/eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/eclipse-ecj.jar
+ ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/eclipse-ecj.jar
# Provided by previous packages
rm ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
@@ -100,6 +103,12 @@
ln -s /usr/share/java/jsp${_jspver}-tomcat/${j}-${_jspver}.jar \
${pkgdir}/usr/share/java/${pkgname}/${j}.jar
done
+
+ install -m644 "${srcdir}/apache-tomcat-${pkgver}/lib/tomcat-dbcp.jar" \
+ ${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp-${pkgver}.jar
+ ln -s tomcat-dbcp-${pkgver}.jar \
+ ${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp.jar
+
ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
# 66=tomcat / 19=log
@@ -126,4 +135,7 @@
# 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 \
+ ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
}
+
Added: systemd.tomcat7.service
===================================================================
--- systemd.tomcat7.service (rev 0)
+++ systemd.tomcat7.service 2012-08-19 14:16:07 UTC (rev 165437)
@@ -0,0 +1,31 @@
+[Unit]
+Description=Tomcat 7 servlet container
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/tomcat7.pid
+Environment=CATALINA_PID=/var/run/tomcat7.pid
+EnvironmentFile=/etc/conf.d/tomcat7
+
+ExecStart=/usr/bin/jsvc \
+ -Dcatalina.home=${CATALINA_HOME} \
+ -Dcatalina.base=${CATALINA_BASE} \
+ -Djava.io.tmpdir=/var/tmp/tomcat7/temp \
+ -cp /usr/share/java/commons-daemon.jar:/usr/share/java/eclipse-ecj.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar \
+ -user tomcat \
+ -java-home ${TOMCAT_JAVA_HOME} \
+ -wait 10 \
+ -pidfile /var/run/tomcat7.pid \
+ -errfile /var/log/tomcat7/catalina.err \
+ -outfile /var/log/tomcat7/catalina.out \
+ $CATALINA_OPTS \
+ org.apache.catalina.startup.Bootstrap
+
+ExecStop=/usr/bin/jsvc \
+ -pidfile /var/run/tomcat7.pid \
+ -stop \
+ org.apache.catalina.startup.Bootstrap
+
+[Install]
+WantedBy=multi-user.target
Modified: tomcat7.conf.d
===================================================================
--- tomcat7.conf.d 2012-08-19 10:42:24 UTC (rev 165436)
+++ tomcat7.conf.d 2012-08-19 14:16:07 UTC (rev 165437)
@@ -1,3 +1,6 @@
+# Configuration file for Tomcat 7
+# 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
# (compulsory to enable tomcat to start at boot)
TOMCAT_JAVA_HOME=/usr/lib/jvm/java-7-openjdk
@@ -9,7 +12,7 @@
# 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=${CATALINA_HOME}
+CATALINA_BASE=/usr/share/tomcat7
# Tomcat additional commandline options
CATALINA_OPTS=
More information about the arch-commits
mailing list