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

[Paul Mattal]

    Date: Saturday, March 6, 2010 @ 18:22:57
  Author: paul
Revision: 71421

implemented TOMCAT_JAVA_HOME in /etc/conf.d/tomcat, closing FS#15417

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

---------------+
 PKGBUILD      |   10 +++++-----
 tomcat        |    4 ++--
 tomcat.conf.d |    6 ++++--
 3 files changed, 11 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-06 23:18:01 UTC (rev 71420)
+++ PKGBUILD	2010-03-06 23:22:57 UTC (rev 71421)
@@ -3,21 +3,21 @@
 
 pkgname=tomcat
 pkgver=5.5.28
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc="Servlet container for Java Servlet and JavaServer Pages"
 url="http://tomcat.apache.org/"
 license=('APACHE')
 depends=('java-environment')
-makedepends=('java-environment')
+makedepends=('openjdk6')
 backup=('opt/tomcat/conf/server.xml' 'opt/tomcat/conf/tomcat-users.xml' 'etc/conf.d/tomcat')
 install=tomcat.install
 source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
 	'tomcat'
 	'tomcat.conf.d')
 md5sums=('ffe786075c2cdd9c1fde7640bce79d35'
-         'a9617b3c9b0227b1323e1a4f7468516a'
-         '4da263803378b208144183c9f7df66a7')
+         '20e6a8e89a148e2b0ac81ca03ceea6b1'
+         '368322d8a51ce20cc5dbdb505706a16a')
 
 build() {
   unset LDFLAGS
@@ -38,7 +38,7 @@
   mkdir -p ${pkgdir}/opt/tomcat
   cp -R * ${pkgdir}/opt/tomcat
   install -D -m755 ${srcdir}/tomcat ${pkgdir}/etc/rc.d/tomcat
-  install -D -m755 ${srcdir}/tomcat.conf.d ${pkgdir}/etc/conf.d/tomcat
+  install -D -m644 ${srcdir}/tomcat.conf.d ${pkgdir}/etc/conf.d/tomcat
   chgrp -R 66 ${pkgdir}/opt/tomcat/conf ${pkgdir}/opt/tomcat/work
   chmod 0660 ${pkgdir}/opt/tomcat/conf/{*.xml,*.policy,*.properties,/Catalina/localhost/*.xml}
   chmod 775 ${pkgdir}/opt/tomcat/conf ${pkgdir}/opt/tomcat/work

Modified: tomcat
===================================================================
--- tomcat	2010-03-06 23:18:01 UTC (rev 71420)
+++ tomcat	2010-03-06 23:22:57 UTC (rev 71421)
@@ -10,7 +10,7 @@
     stat_busy "Starting Tomcat"
     /opt/tomcat/bin/jsvc \
       -user tomcat \
-      -home /usr/lib/jvm/java-6-openjdk \
+      -home $TOMCAT_JAVA_HOME \
       -Dcatalina.home=/opt/tomcat \
       -Dcatalina.base=/opt/tomcat \
       -Djava.io.tmpdir=/opt/tomcat/temp \
@@ -18,7 +18,7 @@
       -pidfile /var/run/tomcat.pid \
       -errfile /opt/tomcat/logs/catalina.log \
       $CATALINA_OPTS \
-      -cp /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/opt/tomcat/bin/commons-daemon.jar:/opt/tomcat/bin/bootstrap.jar \
+      -cp $TOMCAT_JAVA_HOME/lib/tools.jar:/opt/tomcat/bin/commons-daemon.jar:/opt/tomcat/bin/bootstrap.jar \
       org.apache.catalina.startup.Bootstrap
 
     if [ $? -gt 0 ]; then

Modified: tomcat.conf.d
===================================================================
--- tomcat.conf.d	2010-03-06 23:18:01 UTC (rev 71420)
+++ tomcat.conf.d	2010-03-06 23:22:57 UTC (rev 71421)
@@ -1,3 +1,5 @@
-# Arguments for catalina
+# The JAVA_HOME of the JVM for Tomcat to use
+TOMCAT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
 
-#CATALINA_OPTS=
+# Tomcat additional commandline options
+CATALINA_OPTS=