[arch-commits] Commit in tomcat6/repos/extra-any (12 files)

Guillaume Alaux guillaume at nymeria.archlinux.org
Mon May 6 15:21:18 EDT 2013


    Date: Monday, May 6, 2013 @ 21:21:18
  Author: guillaume
Revision: 184358

archrelease: copy trunk to extra-any

Added:
  tomcat6/repos/extra-any/PKGBUILD
    (from rev 184357, tomcat6/trunk/PKGBUILD)
  tomcat6/repos/extra-any/conf.d_tomcat6
    (from rev 184357, tomcat6/trunk/conf.d_tomcat6)
  tomcat6/repos/extra-any/rc.d_tomcat6
    (from rev 184357, tomcat6/trunk/rc.d_tomcat6)
  tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf
    (from rev 184357, tomcat6/trunk/systemd_tmpfiles.d_tomcat6.conf)
  tomcat6/repos/extra-any/systemd_tomcat6.service
    (from rev 184357, tomcat6/trunk/systemd_tomcat6.service)
  tomcat6/repos/extra-any/tomcat6.install
    (from rev 184357, tomcat6/trunk/tomcat6.install)
Deleted:
  tomcat6/repos/extra-any/PKGBUILD
  tomcat6/repos/extra-any/conf.d_tomcat6
  tomcat6/repos/extra-any/rc.d_tomcat6
  tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf
  tomcat6/repos/extra-any/systemd_tomcat6.service
  tomcat6/repos/extra-any/tomcat6.install

---------------------------------+
 PKGBUILD                        |  286 +++++++++++++++++++-------------------
 conf.d_tomcat6                  |   38 ++---
 rc.d_tomcat6                    |  153 ++++++++++----------
 systemd_tmpfiles.d_tomcat6.conf |    6 
 systemd_tomcat6.service         |   67 ++++----
 tomcat6.install                 |   54 +++----
 6 files changed, 301 insertions(+), 303 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-06 19:21:01 UTC (rev 184357)
+++ PKGBUILD	2013-05-06 19:21:18 UTC (rev 184358)
@@ -1,143 +0,0 @@
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
-pkgbase=tomcat6
-pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
-pkgver=6.0.36
-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
-        conf.d_tomcat6
-        rc.d_tomcat6
-        systemd_tomcat6.service
-        systemd_tmpfiles.d_tomcat6.conf
-        tomcat6.install)
-
-sha256sums=('8da5b897ff28f688a5c7fe5abaa95e0ae0de9562283cec3c2643faaa13a6932c'
-            'bc1be532d48a239a6945b028bf8f253087d3405f6522229226c484bf8ae4d45e'
-            '13289d05abec4acc1fdd5ed0405271f1a18a90ef88cdcf87778e639edaf056ce'
-            'f7b205a30c29e836daa7aa7d2fe7462ff5695d3706856a1e460241c746e67834'
-            'c6323e28e800d557b40f3b66b918897662003efdc080f0c012686238641b8599'
-            '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
-            '9c97bbbee0724107d9045d8e2c4d110e5d52815979116e502e2921bb100be4f2')
-
-_servletver=2.5
-_jspver=2.1
-
-#FIXME ant target 'download' should not be called
-build() {
-  cd "${srcdir}/apache-tomcat-${pkgver}-src"
-
-  . /etc/profile.d/apache-ant.sh
-
-  ant download deploy\
-    -Dbase.path=${srcdir}/DOWN_LIBS \
-    -Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
-    -Dno.build.dbcp=true
-}
-
-#TODO add test "ant test"
-
-package_java-servlet2.5-tomcat() {
-  pkgdesc='Servlet 2.5 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.1-tomcat() {
-  pkgdesc='JSP 2.1 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_tomcat6() {
-  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')
-  backup=(etc/tomcat6/catalina.policy
-          etc/tomcat6/catalina.properties
-          etc/tomcat6/context.xml
-          etc/tomcat6/logging.properties
-          etc/tomcat6/server.xml
-          etc/tomcat6/tomcat-users.xml
-          etc/tomcat6/web.xml
-          etc/conf.d/tomcat6)
-  install=tomcat6.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}
-
-  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-
-  # 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_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/repos/extra-any/PKGBUILD (from rev 184357, tomcat6/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-05-06 19:21:18 UTC (rev 184358)
@@ -0,0 +1,143 @@
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+pkgbase=tomcat6
+pkgname=('java-servlet2.5-tomcat' 'java-jsp2.1-tomcat' 'tomcat6')
+pkgver=6.0.37
+pkgrel=1
+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
+        conf.d_tomcat6
+        rc.d_tomcat6
+        systemd_tomcat6.service
+        systemd_tmpfiles.d_tomcat6.conf
+        tomcat6.install)
+
+sha256sums=('665d72f375a9bf9ec5b8f9300c0af620948ff14d35b4c57c4297030ff6c1f281'
+            '3e91abc752bf2b6ca19df9c8644bccdd92ba837397a8c1a745d72f58d5301b00'
+            '13289d05abec4acc1fdd5ed0405271f1a18a90ef88cdcf87778e639edaf056ce'
+            'ab5c4a6e342962cbde2b0bc62674be4db416113097835336e863a42d261534cf'
+            '8eab99cff8baa3e75d656c2f221f8b146e822d7e6962527d07a2f20cb8ccb404'
+            '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
+            '9c97bbbee0724107d9045d8e2c4d110e5d52815979116e502e2921bb100be4f2')
+
+_servletver=2.5
+_jspver=2.1
+
+#FIXME ant target 'download' should not be called
+build() {
+  cd "${srcdir}/apache-tomcat-${pkgver}-src"
+
+  . /etc/profile.d/apache-ant.sh
+
+  ant clean download deploy\
+    -Dbase.path=${srcdir}/DOWN_LIBS \
+    -Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
+    -Dno.build.dbcp=true
+}
+
+#TODO add test "ant test"
+
+package_java-servlet2.5-tomcat() {
+  pkgdesc='Servlet 2.5 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.1-tomcat() {
+  pkgdesc='JSP 2.1 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_tomcat6() {
+  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')
+  backup=(etc/tomcat6/catalina.policy
+          etc/tomcat6/catalina.properties
+          etc/tomcat6/context.xml
+          etc/tomcat6/logging.properties
+          etc/tomcat6/server.xml
+          etc/tomcat6/tomcat-users.xml
+          etc/tomcat6/web.xml
+          etc/conf.d/tomcat6)
+  install=tomcat6.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}
+
+  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
+
+  # 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_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
+}
+

Deleted: conf.d_tomcat6
===================================================================
--- conf.d_tomcat6	2013-05-06 19:21:01 UTC (rev 184357)
+++ conf.d_tomcat6	2013-05-06 19:21:18 UTC (rev 184358)
@@ -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=

Copied: tomcat6/repos/extra-any/conf.d_tomcat6 (from rev 184357, tomcat6/trunk/conf.d_tomcat6)
===================================================================
--- conf.d_tomcat6	                        (rev 0)
+++ conf.d_tomcat6	2013-05-06 19:21:18 UTC (rev 184358)
@@ -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=

Deleted: rc.d_tomcat6
===================================================================
--- rc.d_tomcat6	2013-05-06 19:21:01 UTC (rev 184357)
+++ rc.d_tomcat6	2013-05-06 19:21:18 UTC (rev 184358)
@@ -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

Copied: tomcat6/repos/extra-any/rc.d_tomcat6 (from rev 184357, tomcat6/trunk/rc.d_tomcat6)
===================================================================
--- rc.d_tomcat6	                        (rev 0)
+++ rc.d_tomcat6	2013-05-06 19:21:18 UTC (rev 184358)
@@ -0,0 +1,76 @@
+#!/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} \
+        -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_tmpfiles.d_tomcat6.conf
===================================================================
--- systemd_tmpfiles.d_tomcat6.conf	2013-05-06 19:21:01 UTC (rev 184357)
+++ systemd_tmpfiles.d_tomcat6.conf	2013-05-06 19:21:18 UTC (rev 184358)
@@ -1,3 +0,0 @@
-d   /var/tmp/tomcat6
-d   /var/tmp/tomcat6/temp   0775    tomcat  tomcat
-d   /var/tmp/tomcat6/work   0775    tomcat  tomcat

Copied: tomcat6/repos/extra-any/systemd_tmpfiles.d_tomcat6.conf (from rev 184357, tomcat6/trunk/systemd_tmpfiles.d_tomcat6.conf)
===================================================================
--- systemd_tmpfiles.d_tomcat6.conf	                        (rev 0)
+++ systemd_tmpfiles.d_tomcat6.conf	2013-05-06 19:21:18 UTC (rev 184358)
@@ -0,0 +1,3 @@
+d   /var/tmp/tomcat6
+d   /var/tmp/tomcat6/temp   0775    tomcat  tomcat
+d   /var/tmp/tomcat6/work   0775    tomcat  tomcat

Deleted: systemd_tomcat6.service
===================================================================
--- systemd_tomcat6.service	2013-05-06 19:21:01 UTC (rev 184357)
+++ systemd_tomcat6.service	2013-05-06 19:21:18 UTC (rev 184358)
@@ -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/repos/extra-any/systemd_tomcat6.service (from rev 184357, tomcat6/trunk/systemd_tomcat6.service)
===================================================================
--- systemd_tomcat6.service	                        (rev 0)
+++ systemd_tomcat6.service	2013-05-06 19:21:18 UTC (rev 184358)
@@ -0,0 +1,33 @@
+[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} \
+            -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.install
===================================================================
--- tomcat6.install	2013-05-06 19:21:01 UTC (rev 184357)
+++ tomcat6.install	2013-05-06 19:21:18 UTC (rev 184358)
@@ -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/tomcat6 -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: tomcat6/repos/extra-any/tomcat6.install (from rev 184357, tomcat6/trunk/tomcat6.install)
===================================================================
--- tomcat6.install	                        (rev 0)
+++ tomcat6.install	2013-05-06 19:21:18 UTC (rev 184358)
@@ -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/tomcat6 -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