[arch-commits] Commit in tomcat7/repos/extra-any (12 files)
Guillaume Alaux
guillaume at archlinux.org
Thu Jan 17 08:42:57 UTC 2013
Date: Thursday, January 17, 2013 @ 03:42:56
Author: guillaume
Revision: 175360
archrelease: copy trunk to extra-any
Added:
tomcat7/repos/extra-any/PKGBUILD
(from rev 175359, tomcat7/trunk/PKGBUILD)
tomcat7/repos/extra-any/conf.d_tomcat7
(from rev 175359, tomcat7/trunk/conf.d_tomcat7)
tomcat7/repos/extra-any/rc.d_tomcat7
(from rev 175359, tomcat7/trunk/rc.d_tomcat7)
tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 175359, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 175359, tomcat7/trunk/systemd_tomcat7.service)
tomcat7/repos/extra-any/tomcat7.install
(from rev 175359, tomcat7/trunk/tomcat7.install)
Deleted:
tomcat7/repos/extra-any/PKGBUILD
tomcat7/repos/extra-any/conf.d_tomcat7
tomcat7/repos/extra-any/rc.d_tomcat7
tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
tomcat7/repos/extra-any/systemd_tomcat7.service
tomcat7/repos/extra-any/tomcat7.install
---------------------------------+
PKGBUILD | 292 +++++++++++++++++++-------------------
conf.d_tomcat7 | 38 ++--
rc.d_tomcat7 | 154 ++++++++++----------
systemd_tmpfiles.d_tomcat7.conf | 6
systemd_tomcat7.service | 70 ++++-----
tomcat7.install | 54 +++----
6 files changed, 307 insertions(+), 307 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-01-17 08:41:55 UTC (rev 175359)
+++ PKGBUILD 2013-01-17 08:42:56 UTC (rev 175360)
@@ -1,146 +0,0 @@
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
-pkgbase=tomcat7
-pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.34
-pkgrel=3
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-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
- conf.d_tomcat7
- rc.d_tomcat7
- systemd_tomcat7.service
- systemd_tmpfiles.d_tomcat7.conf
- tomcat7.install)
-
-sha256sums=('c05b85928ff870244a061700166ee781e66bad68f4a7867ba22c48beeec19fc0'
- '4335136f0bee44aebfd7b4394c7fdfcc9d174a93ee4b1cf8d1f90ea164038e85'
- 'a9a2d50244e5206e471af4cdf36fd8444e85d382d9f70ca776d72985c152b788'
- '7de8be5e501f0c697b6983f92e250702bb653fb8873a78bd04e15dce63670c01'
- 'a64609f621ec1838a5476d9c5a7860800fed5644940fbb32b40828d14d17485f'
- '871d2ba81cc8a52da00873e4ecf03ecd5dd2ef23626c2ee825ed06eeee54b72b'
- '8ae4e12ccdd1a7be04fae1cf68b0c170a5ee7559f8dffca5f9ecf05c20b66c8e')
-
-_servletver=3.0
-_jspver=2.2
-
-build() {
- 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 \
- -Dno.build.dbcp=true
-}
-
-#TODO add test "ant test"
-
-package_java-servlet3.0-tomcat() {
- pkgdesc='Servlet 3.0 java library implementation by Apache Tomcat'
- depends=('java-environment>=5')
-
- cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib"
-
- install -dm755 ${pkgdir}/usr/share/java/servlet${_servletver}-tomcat
- install -m644 servlet-api.jar \
- ${pkgdir}/usr/share/java/servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar
- ln -s servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar \
- ${pkgdir}/usr/share/java/servlet-api.jar
-}
-
-package_java-jsp2.2-tomcat() {
- pkgdesc='JSP 2.2 java library implementation by Apache Tomcat'
- depends=('java-environment>=5')
-
- cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib"
-
- install -dm755 ${pkgdir}/usr/share/java/jsp${_jspver}-tomcat
- for j in el-api jsp-api; do
- install -m644 ${j}.jar \
- ${pkgdir}/usr/share/java/jsp${_jspver}-tomcat/${j}-${_jspver}.jar
- ln -s jsp${_jspver}-tomcat/${j}-${_jspver}.jar ${pkgdir}/usr/share/java/${j}.jar
- done
-}
-
-package_tomcat7() {
- 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
- etc/tomcat7/catalina.properties
- etc/tomcat7/context.xml
- etc/tomcat7/logging.properties
- etc/tomcat7/server.xml
- etc/tomcat7/tomcat-users.xml
- etc/tomcat7/web.xml
- etc/conf.d/tomcat7)
- install=tomcat7.install
-
- cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build"
-
- # Tomcat general files
- install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
- # commons-daemon and tomcat-natives are packaged on their own
- 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
- ln -s /usr/share/java/servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar \
- ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
-
- for j in el-api jsp-api; do
- rm ${pkgdir}/usr/share/java/${pkgname}/${j}.jar
- 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
- install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
- ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
- touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
- chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
- install -dm775 ${pkgdir}/etc/${pkgname}
- install -g 66 -m640 conf/* ${pkgdir}/etc/${pkgname}
- install -d -g66 -m775 ${pkgdir}/etc/${pkgname}/Catalina
- ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
- install -dm775 ${pkgdir}/var/lib/${pkgname}
- cp -r webapps ${pkgdir}/var/lib/${pkgname}
- chown -R 66:66 ${pkgdir}/var/lib/${pkgname}
- ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
- install -dm1777 ${pkgdir}/var/tmp
- install -dm755 -o 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
- ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
- ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
- # Arch scripts
- 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/repos/extra-any/PKGBUILD (from rev 175359, tomcat7/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-01-17 08:42:56 UTC (rev 175360)
@@ -0,0 +1,146 @@
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+pkgbase=tomcat7
+pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
+pkgver=7.0.35
+pkgrel=1
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+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
+ conf.d_tomcat7
+ rc.d_tomcat7
+ systemd_tomcat7.service
+ systemd_tmpfiles.d_tomcat7.conf
+ tomcat7.install)
+
+sha256sums=('3eefa08c8600839f32555e9a306fe8f1232c05c846839ab6901e81e5a11fccac'
+ '5bb3825d1b5785b77761c9dde32776e56fa7a7362aab019a2578d00ffae2b0c1'
+ 'a9a2d50244e5206e471af4cdf36fd8444e85d382d9f70ca776d72985c152b788'
+ '7de8be5e501f0c697b6983f92e250702bb653fb8873a78bd04e15dce63670c01'
+ 'a64609f621ec1838a5476d9c5a7860800fed5644940fbb32b40828d14d17485f'
+ '871d2ba81cc8a52da00873e4ecf03ecd5dd2ef23626c2ee825ed06eeee54b72b'
+ '8ae4e12ccdd1a7be04fae1cf68b0c170a5ee7559f8dffca5f9ecf05c20b66c8e')
+
+_servletver=3.0
+_jspver=2.2
+
+build() {
+ 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 \
+ -Dno.build.dbcp=true
+}
+
+#TODO add test "ant test"
+
+package_java-servlet3.0-tomcat() {
+ pkgdesc='Servlet 3.0 java library implementation by Apache Tomcat'
+ depends=('java-environment>=5')
+
+ cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib"
+
+ install -dm755 ${pkgdir}/usr/share/java/servlet${_servletver}-tomcat
+ install -m644 servlet-api.jar \
+ ${pkgdir}/usr/share/java/servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar
+ ln -s servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar \
+ ${pkgdir}/usr/share/java/servlet-api.jar
+}
+
+package_java-jsp2.2-tomcat() {
+ pkgdesc='JSP 2.2 java library implementation by Apache Tomcat'
+ depends=('java-environment>=5')
+
+ cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build/lib"
+
+ install -dm755 ${pkgdir}/usr/share/java/jsp${_jspver}-tomcat
+ for j in el-api jsp-api; do
+ install -m644 ${j}.jar \
+ ${pkgdir}/usr/share/java/jsp${_jspver}-tomcat/${j}-${_jspver}.jar
+ ln -s jsp${_jspver}-tomcat/${j}-${_jspver}.jar ${pkgdir}/usr/share/java/${j}.jar
+ done
+}
+
+package_tomcat7() {
+ 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
+ etc/tomcat7/catalina.properties
+ etc/tomcat7/context.xml
+ etc/tomcat7/logging.properties
+ etc/tomcat7/server.xml
+ etc/tomcat7/tomcat-users.xml
+ etc/tomcat7/web.xml
+ etc/conf.d/tomcat7)
+ install=tomcat7.install
+
+ cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build"
+
+ # Tomcat general files
+ install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
+ # commons-daemon and tomcat-natives are packaged on their own
+ 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
+ ln -s /usr/share/java/servlet${_servletver}-tomcat/servlet-api-${_servletver}.jar \
+ ${pkgdir}/usr/share/java/${pkgname}/servlet-api.jar
+
+ for j in el-api jsp-api; do
+ rm ${pkgdir}/usr/share/java/${pkgname}/${j}.jar
+ 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
+ install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
+ ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
+ touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
+ chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
+
+ install -dm775 ${pkgdir}/etc/${pkgname}
+ install -g 66 -m640 conf/* ${pkgdir}/etc/${pkgname}
+ install -d -g66 -m775 ${pkgdir}/etc/${pkgname}/Catalina
+ ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
+
+ install -dm775 ${pkgdir}/var/lib/${pkgname}
+ cp -r webapps ${pkgdir}/var/lib/${pkgname}
+ chown -R 66:66 ${pkgdir}/var/lib/${pkgname}
+ ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
+
+ install -dm1777 ${pkgdir}/var/tmp
+ install -dm755 -o 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
+ ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
+ ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
+
+ # Arch scripts
+ 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
+}
+
Deleted: conf.d_tomcat7
===================================================================
--- conf.d_tomcat7 2013-01-17 08:41:55 UTC (rev 175359)
+++ conf.d_tomcat7 2013-01-17 08:42:56 UTC (rev 175360)
@@ -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=
Copied: tomcat7/repos/extra-any/conf.d_tomcat7 (from rev 175359, tomcat7/trunk/conf.d_tomcat7)
===================================================================
--- conf.d_tomcat7 (rev 0)
+++ conf.d_tomcat7 2013-01-17 08:42:56 UTC (rev 175360)
@@ -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=
Deleted: rc.d_tomcat7
===================================================================
--- rc.d_tomcat7 2013-01-17 08:41:55 UTC (rev 175359)
+++ rc.d_tomcat7 2013-01-17 08:42:56 UTC (rev 175360)
@@ -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
Copied: tomcat7/repos/extra-any/rc.d_tomcat7 (from rev 175359, tomcat7/trunk/rc.d_tomcat7)
===================================================================
--- rc.d_tomcat7 (rev 0)
+++ rc.d_tomcat7 2013-01-17 08:42:56 UTC (rev 175360)
@@ -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_tmpfiles.d_tomcat7.conf
===================================================================
--- systemd_tmpfiles.d_tomcat7.conf 2013-01-17 08:41:55 UTC (rev 175359)
+++ systemd_tmpfiles.d_tomcat7.conf 2013-01-17 08:42:56 UTC (rev 175360)
@@ -1,3 +0,0 @@
-d /var/tmp/tomcat7
-d /var/tmp/tomcat7/temp 0775 tomcat tomcat
-d /var/tmp/tomcat7/work 0775 tomcat tomcat
Copied: tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf (from rev 175359, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
===================================================================
--- systemd_tmpfiles.d_tomcat7.conf (rev 0)
+++ systemd_tmpfiles.d_tomcat7.conf 2013-01-17 08:42:56 UTC (rev 175360)
@@ -0,0 +1,3 @@
+d /var/tmp/tomcat7
+d /var/tmp/tomcat7/temp 0775 tomcat tomcat
+d /var/tmp/tomcat7/work 0775 tomcat tomcat
Deleted: systemd_tomcat7.service
===================================================================
--- systemd_tomcat7.service 2013-01-17 08:41:55 UTC (rev 175359)
+++ systemd_tomcat7.service 2013-01-17 08:42:56 UTC (rev 175360)
@@ -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:/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
-
Copied: tomcat7/repos/extra-any/systemd_tomcat7.service (from rev 175359, tomcat7/trunk/systemd_tomcat7.service)
===================================================================
--- systemd_tomcat7.service (rev 0)
+++ systemd_tomcat7.service 2013-01-17 08:42:56 UTC (rev 175360)
@@ -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.install
===================================================================
--- tomcat7.install 2013-01-17 08:41:55 UTC (rev 175359)
+++ tomcat7.install 2013-01-17 08:42:56 UTC (rev 175360)
@@ -1,27 +0,0 @@
-post_install() {
- getent group tomcat >/dev/null 2>&1 || groupadd -g 66 tomcat
- getent passwd tomcat >/dev/null 2>&1 || useradd -u 66 -g tomcat -d /usr/share/tomcat7 -s /bin/false tomcat
-
- if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then
- echo ">>> It appears that your current kernel has linux security"
- echo ">>> capabilities built as a module. Tomcat requires this"
- echo ">>> functionality to operate."
- echo ">>>"
- echo ">>> To activate the module, please load it now (modprobe capability)."
- echo ">>> Also, you should add it to your MODULES array in rc.conf, so"
- echo ">>> it will be activated automatically at boot-up."
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- if getent passwd tomcat >/dev/null 2>&1; then
- userdel tomcat
- fi
- if getent group tomcat >/dev/null 2>&1; then
- groupdel tomcat
- fi
-}
Copied: tomcat7/repos/extra-any/tomcat7.install (from rev 175359, tomcat7/trunk/tomcat7.install)
===================================================================
--- tomcat7.install (rev 0)
+++ tomcat7.install 2013-01-17 08:42:56 UTC (rev 175360)
@@ -0,0 +1,27 @@
+post_install() {
+ getent group tomcat >/dev/null 2>&1 || groupadd -g 66 tomcat
+ getent passwd tomcat >/dev/null 2>&1 || useradd -u 66 -g tomcat -d /usr/share/tomcat7 -s /bin/false tomcat
+
+ if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then
+ echo ">>> It appears that your current kernel has linux security"
+ echo ">>> capabilities built as a module. Tomcat requires this"
+ echo ">>> functionality to operate."
+ echo ">>>"
+ echo ">>> To activate the module, please load it now (modprobe capability)."
+ echo ">>> Also, you should add it to your MODULES array in rc.conf, so"
+ echo ">>> it will be activated automatically at boot-up."
+ fi
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ if getent passwd tomcat >/dev/null 2>&1; then
+ userdel tomcat
+ fi
+ if getent group tomcat >/dev/null 2>&1; then
+ groupdel tomcat
+ fi
+}
More information about the arch-commits
mailing list