[arch-commits] Commit in tomcat7/trunk (8 files)
Guillaume Alaux
guillaume at archlinux.org
Thu Jan 10 09:03:51 UTC 2013
Date: Thursday, January 10, 2013 @ 04:03:51
Author: guillaume
Revision: 174996
Added systemd tmp file FS#33163 and re-enabled eclipse-ecj FS#33151
Added:
tomcat7/trunk/conf.d_tomcat7
(from rev 174936, tomcat7/trunk/tomcat7.conf.d)
tomcat7/trunk/rc.d_tomcat7
(from rev 174936, tomcat7/trunk/tomcat7)
tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf
tomcat7/trunk/systemd_tomcat7.service
(from rev 174936, tomcat7/trunk/systemd.tomcat7.service)
Modified:
tomcat7/trunk/PKGBUILD
Deleted:
tomcat7/trunk/systemd.tomcat7.service
tomcat7/trunk/tomcat7
tomcat7/trunk/tomcat7.conf.d
---------------------------------+
PKGBUILD | 39 +++++++++++--------
conf.d_tomcat7 | 19 +++++++++
rc.d_tomcat7 | 77 ++++++++++++++++++++++++++++++++++++++
systemd.tomcat7.service | 35 -----------------
systemd_tmpfiles.d_tomcat7.conf | 3 +
systemd_tomcat7.service | 35 +++++++++++++++++
tomcat7 | 77 --------------------------------------
tomcat7.conf.d | 19 ---------
8 files changed, 158 insertions(+), 146 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-01-10 09:00:32 UTC (rev 174995)
+++ PKGBUILD 2013-01-10 09:03:51 UTC (rev 174996)
@@ -2,24 +2,26 @@
pkgbase=tomcat7
pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
pkgver=7.0.34
-pkgrel=2
+pkgrel=3
arch=('any')
url='http://tomcat.apache.org/'
license=('APACHE')
-makedepends=('java-environment' 'apache-ant>=1.8' 'java-commons-daemon')
+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
- systemd.tomcat7.service)
+ conf.d_tomcat7
+ rc.d_tomcat7
+ systemd.tomcat7.service
+ systemd.tomcat7.tmpfiles.d
+ tomcat7.install)
sha256sums=('c05b85928ff870244a061700166ee781e66bad68f4a7867ba22c48beeec19fc0'
'4335136f0bee44aebfd7b4394c7fdfcc9d174a93ee4b1cf8d1f90ea164038e85'
'a9a2d50244e5206e471af4cdf36fd8444e85d382d9f70ca776d72985c152b788'
'7de8be5e501f0c697b6983f92e250702bb653fb8873a78bd04e15dce63670c01'
- '8ae4e12ccdd1a7be04fae1cf68b0c170a5ee7559f8dffca5f9ecf05c20b66c8e'
- '082227bd58187199503ac3222e3fcaa818eae0916d34c38dbcfa7f8fb7e5e6ce')
+ 'a64609f621ec1838a5476d9c5a7860800fed5644940fbb32b40828d14d17485f'
+ '2cd2542b42660942eba36c8875d37966e79bcd6220a8f63fde93c11942c894a4'
+ '8ae4e12ccdd1a7be04fae1cf68b0c170a5ee7559f8dffca5f9ecf05c20b66c8e')
_servletver=3.0
_jspver=2.2
@@ -32,13 +34,14 @@
ant deploy \
-Dbase.path=${srcdir}/DOWN_LIBS \
-Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
+ -Djdt.jar=/usr/share/java/eclipse-ecj.jar \
-Dno.build.dbcp=true
}
#TODO add test "ant test"
package_java-servlet3.0-tomcat() {
- pkgdesc="Servlet 3.0 java library implementation by Apache Tomcat"
+ pkgdesc='Servlet 3.0 java library implementation by Apache Tomcat'
depends=('java-environment>=5')
cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib"
@@ -51,7 +54,7 @@
}
package_java-jsp2.2-tomcat() {
- pkgdesc="JSP 2.2 java library implementation by Apache Tomcat"
+ pkgdesc='JSP 2.2 java library implementation by Apache Tomcat'
depends=('java-environment>=5')
cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib"
@@ -65,8 +68,8 @@
}
package_tomcat7() {
- pkgdesc="Servlet-3.0/JSP-2.2 Container"
- depends=('java-runtime>=6' 'java-jsvc'
+ pkgdesc='Servlet-3.0/JSP-2.2 Container'
+ depends=('java-runtime>=6' 'java-jsvc' 'eclipse-ecj'
"java-servlet3.0-tomcat=${pkgver}" "java-jsp2.2-tomcat=${pkgver}")
optdepends=('tomcat-native: to allow optimal performance in production environments')
backup=(etc/tomcat7/catalina.policy
@@ -87,7 +90,10 @@
rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
cp -r bin ${pkgdir}/usr/share/${pkgname}
+ # eclipse-ecj is packaged on its own
+ rm lib/eclipse-ecj.jar
install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
+ 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
@@ -129,9 +135,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_tomcat7 ${pkgdir}/etc/conf.d/${pkgname}
+ install -Dm755 ${srcdir}/rc.d_tomcat7 ${pkgdir}/etc/rc.d/${pkgname}
+
+ install -Dm644 ${srcdir}/systemd_tomcat7.service \
${pkgdir}/usr/lib/systemd/system/${pkgname}.service
+ install -Dm644 ${srcdir}/systemd_tmpfiles.d_tomcat7.conf \
+ ${pkgdir}/lib/tmpfiles.d/${pkgname}.conf
}
Copied: tomcat7/trunk/conf.d_tomcat7 (from rev 174936, tomcat7/trunk/tomcat7.conf.d)
===================================================================
--- conf.d_tomcat7 (rev 0)
+++ conf.d_tomcat7 2013-01-10 09:03:51 UTC (rev 174996)
@@ -0,0 +1,19 @@
+# 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
+# (compulsory to enable tomcat to start at boot)
+TOMCAT_JAVA_HOME=/usr/lib/jvm/java-7-openjdk
+
+# Tomcat home directory
+CATALINA_HOME=/usr/share/tomcat7
+
+# 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/tomcat7
+
+# Tomcat additional commandline options
+CATALINA_OPTS=
Copied: tomcat7/trunk/rc.d_tomcat7 (from rev 174936, tomcat7/trunk/tomcat7)
===================================================================
--- rc.d_tomcat7 (rev 0)
+++ rc.d_tomcat7 2013-01-10 09:03:51 UTC (rev 174996)
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+daemon_name=tomcat7
+
+. /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/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/${daemon_name}.pid \
+ -errfile /var/log/tomcat7/catalina.err \
+ -outfile /var/log/tomcat7/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.tomcat7.service
===================================================================
--- systemd.tomcat7.service 2013-01-10 09:00:32 UTC (rev 174995)
+++ systemd.tomcat7.service 2013-01-10 09:03:51 UTC (rev 174996)
@@ -1,35 +0,0 @@
-[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
-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} \
- -Dcatalina.base=${CATALINA_BASE} \
- -Djava.io.tmpdir=/var/tmp/tomcat7/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/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
-
Added: systemd_tmpfiles.d_tomcat7.conf
===================================================================
--- systemd_tmpfiles.d_tomcat7.conf (rev 0)
+++ systemd_tmpfiles.d_tomcat7.conf 2013-01-10 09:03:51 UTC (rev 174996)
@@ -0,0 +1,3 @@
+d /var/tmp/tomcat7
+d /var/tmp/tomcat7/temp 0775 tomcat tomcat
+d /var/tmp/tomcat7/work 0775 tomcat tomcat
Copied: tomcat7/trunk/systemd_tomcat7.service (from rev 174936, tomcat7/trunk/systemd.tomcat7.service)
===================================================================
--- systemd_tomcat7.service (rev 0)
+++ systemd_tomcat7.service 2013-01-10 09:03:51 UTC (rev 174996)
@@ -0,0 +1,35 @@
+[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
+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} \
+ -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
+
Deleted: tomcat7
===================================================================
--- tomcat7 2013-01-10 09:00:32 UTC (rev 174995)
+++ tomcat7 2013-01-10 09:03:51 UTC (rev 174996)
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-daemon_name=tomcat7
-
-. /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/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/${daemon_name}.pid \
- -errfile /var/log/tomcat7/catalina.err \
- -outfile /var/log/tomcat7/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: tomcat7.conf.d
===================================================================
--- tomcat7.conf.d 2013-01-10 09:00:32 UTC (rev 174995)
+++ tomcat7.conf.d 2013-01-10 09:03:51 UTC (rev 174996)
@@ -1,19 +0,0 @@
-# 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
-# (compulsory to enable tomcat to start at boot)
-TOMCAT_JAVA_HOME=/usr/lib/jvm/java-7-openjdk
-
-# Tomcat home directory
-CATALINA_HOME=/usr/share/tomcat7
-
-# 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/tomcat7
-
-# Tomcat additional commandline options
-CATALINA_OPTS=
More information about the arch-commits
mailing list