[arch-commits] Commit in tomcat7/trunk (PKGBUILD tomcat7 tomcat7.conf.d)

[Guillaume Alaux]

    Date: Sunday, August 21, 2011 @ 17:08:54
  Author: guillaume
Revision: 136030

upgpkg: tomcat7 7.0.20-2

Fixed start at boot and pid number retrieval

Modified:
  tomcat7/trunk/PKGBUILD
  tomcat7/trunk/tomcat7
  tomcat7/trunk/tomcat7.conf.d

----------------+
 PKGBUILD       |   11 +++++------
 tomcat7        |    8 ++------
 tomcat7.conf.d |    4 ++++
 3 files changed, 11 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-21 20:28:55 UTC (rev 136029)
+++ PKGBUILD	2011-08-21 21:08:54 UTC (rev 136030)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
 pkgname=tomcat7
 pkgver=7.0.20
-pkgrel=1
+pkgrel=2
 pkgdesc="Servlet-3.0/JSP-2.2 Container"
 arch=('any')
 url='http://tomcat.apache.org/'
@@ -23,10 +23,9 @@
         tomcat7
         tomcat7.install)
 
-noextract=(dbcp-${pkgver}.jar)
 md5sums=('bb13b2910cc71c29e571ea062ad6ab3a'
-         '13eb5570b4d7dcbbe8b8372575c010c9'
-         '70eabcf5bbfa0978e738d95c64abb7a7'
+         '0fa46eae1746d6cd564905bfb0072776'
+         '361a41c02930a4e43245ab7379a617e9'
          '1be39071bd27781c352b2d73b765e29d')
 
 build() {
@@ -74,7 +73,7 @@
   ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
 
   # Arch scripts
-  install -Dm644 ${srcdir}/tomcat7.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/tomcat7 ${pkgdir}/etc/rc.d/${pkgname}
+  install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
+  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
 }
 

Modified: tomcat7
===================================================================
--- tomcat7	2011-08-21 20:28:55 UTC (rev 136029)
+++ tomcat7	2011-08-21 21:08:54 UTC (rev 136030)
@@ -6,15 +6,11 @@
 . /etc/rc.d/functions
 . /etc/conf.d/${daemon_name}
 
-get_pid() {
-	pidof -o %PPID ${daemon_name}
-}
-
 case "$1" in
   start)
     stat_busy "Starting ${daemon_name} daemon"
 
-    PID=$(get_pid)
+    PID=$(get_pid 'jsvc.exec')
     if [ -z "$PID" ]; then
       [ -f /var/run/${daemon_name}.pid ] && rm -f /var/run/${daemon_name}.pid
       # RUN
@@ -24,6 +20,7 @@
         -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 \
@@ -46,7 +43,6 @@
 
   stop)
     stat_busy "Stopping ${daemon_name} daemon"
-    PID=$(get_pid)
     # STOP
     /usr/bin/jsvc \
       -pidfile /var/run/${daemon_name}.pid \

Modified: tomcat7.conf.d
===================================================================
--- tomcat7.conf.d	2011-08-21 20:28:55 UTC (rev 136029)
+++ tomcat7.conf.d	2011-08-21 21:08:54 UTC (rev 136030)
@@ -1,3 +1,7 @@
+# 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-6-openjdk
+
 # Tomcat home directory
 CATALINA_HOME=/usr/share/tomcat7