[arch-commits] Commit in tomcat6/trunk (4 files)

[Guillaume Alaux]

    Date: Thursday, May 23, 2013 @ 22:56:18
  Author: guillaume
Revision: 186287

Removed rc.d script & Al for next release

Modified:
  tomcat6/trunk/PKGBUILD
  tomcat6/trunk/tomcat6.install
Deleted:
  tomcat6/trunk/conf.d_tomcat6
  tomcat6/trunk/rc.d_tomcat6

-----------------+
 PKGBUILD        |   11 -------
 conf.d_tomcat6  |   19 -------------
 rc.d_tomcat6    |   76 ------------------------------------------------------
 tomcat6.install |    2 -
 4 files changed, 1 insertion(+), 107 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-23 20:40:14 UTC (rev 186286)
+++ PKGBUILD	2013-05-23 20:56:18 UTC (rev 186287)
@@ -9,8 +9,6 @@
 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)
@@ -18,8 +16,6 @@
 sha256sums=('665d72f375a9bf9ec5b8f9300c0af620948ff14d35b4c57c4297030ff6c1f281'
             '3e91abc752bf2b6ca19df9c8644bccdd92ba837397a8c1a745d72f58d5301b00'
             '13289d05abec4acc1fdd5ed0405271f1a18a90ef88cdcf87778e639edaf056ce'
-            'ab5c4a6e342962cbde2b0bc62674be4db416113097835336e863a42d261534cf'
-            '8eab99cff8baa3e75d656c2f221f8b146e822d7e6962527d07a2f20cb8ccb404'
             '07b9ff0686134b3256cda8b5253b91ba23f54b547640729e2382c3c12067ea80'
             '9c97bbbee0724107d9045d8e2c4d110e5d52815979116e502e2921bb100be4f2')
 
@@ -78,8 +74,7 @@
           etc/tomcat6/logging.properties
           etc/tomcat6/server.xml
           etc/tomcat6/tomcat-users.xml
-          etc/tomcat6/web.xml
-          etc/conf.d/tomcat6)
+          etc/tomcat6/web.xml)
   install=tomcat6.install
 
   cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build"
@@ -131,10 +126,6 @@
   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 \

Deleted: conf.d_tomcat6
===================================================================
--- conf.d_tomcat6	2013-05-23 20:40:14 UTC (rev 186286)
+++ conf.d_tomcat6	2013-05-23 20:56:18 UTC (rev 186287)
@@ -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=

Deleted: rc.d_tomcat6
===================================================================
--- rc.d_tomcat6	2013-05-23 20:40:14 UTC (rev 186286)
+++ rc.d_tomcat6	2013-05-23 20:56:18 UTC (rev 186287)
@@ -1,76 +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} \
-        -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

Modified: tomcat6.install
===================================================================
--- tomcat6.install	2013-05-23 20:40:14 UTC (rev 186286)
+++ tomcat6.install	2013-05-23 20:56:18 UTC (rev 186287)
@@ -8,8 +8,6 @@
     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
 }