[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2020-11-23 Thread Maxime Gauduin via arch-commits
Date: Tuesday, November 24, 2020 @ 07:41:36
  Author: alucryd
Revision: 401776

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 401775, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 401775, tomcat7/trunk/tomcat7.install)
  tomcat7/repos/extra-any/tomcat7.service
(from rev 401775, tomcat7/trunk/tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.sysusers
(from rev 401775, tomcat7/trunk/tomcat7.sysusers)
  tomcat7/repos/extra-any/tomcat7.tmpfiles
(from rev 401775, tomcat7/trunk/tomcat7.tmpfiles)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/tomcat7.install
  tomcat7/repos/extra-any/tomcat7.service
  tomcat7/repos/extra-any/tomcat7.sysusers
  tomcat7/repos/extra-any/tomcat7.tmpfiles

--+
 PKGBUILD |  250 ++---
 tomcat7.install  |   32 +++---
 tomcat7.service  |   70 +++---
 tomcat7.sysusers |2 
 tomcat7.tmpfiles |   10 +-
 5 files changed, 182 insertions(+), 182 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2020-11-24 07:41:25 UTC (rev 401775)
+++ PKGBUILD2020-11-24 07:41:36 UTC (rev 401776)
@@ -1,125 +0,0 @@
-# Maintainer: Maxime Gauduin 
-# Contributor: Guillaume Alaux 
-
-pkgname=tomcat7
-pkgver=7.0.106
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=(any)
-url=https://tomcat.apache.org/
-license=(APACHE)
-depends=(
-  'java-runtime>=6'
-  java-jsvc
-  java-commons-daemon
-  eclipse-ecj
-)
-makedepends=(
-  ant
-  git
-  'java-environment=8'
-)
-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
-)
-install=tomcat7.install
-_tag=c5d9010a75e99a69f59ba11cc1116d039a113979
-source=(
-  git+https://github.com/apache/tomcat.git#tag=${_tag}
-  tomcat7.service
-  tomcat7.sysusers
-  tomcat7.tmpfiles
-)
-b2sums=('SKIP'
-
'e8931e1b6ef796617eaad93c3a32e996fe9887ae07ac0459fd5a13342704289c4ff77149d12f273254de72567f0334b77b4cd435e47c795567184ac21579d44d'
-
'a84b82434c1ca47fca30fd67a4af07260ee0b1f16450420317750587dd2ca54cc3e3c20e3475ffcee9e4302cce54fdd53f2d27cab25c80b42256f6816437c3a2'
-
'c014d435c9903e0b5d66c45ffcc2c3bbb46a087958e9281042031fd6a41595b9be6fc07fc9be388911d5b4832fa99c4d13b768ba526adbef9087b28d13347189')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-pkgver() {
-  cd tomcat
-
-  _pkgver=$(git describe --tags)
-
-  if [[ ${_pkgver} != 7.* ]]; then
-exit 1
-  fi
-
-  echo ${_pkgver}
-}
-
-prepare() {
-  cd tomcat
-
-  cp build.properties.default build.properties
-  sed "/^base\.path=/c\base\.path=${srcdir}" -i build.properties
-  sed "/^compile.debug=/c\compile.debug=false" -i build.properties
-  sed "/^trydownload.httpusecaches=/c\trydownload.httpusecaches=false" -i 
build.properties
-  sed "/^#java.7.home=/c\java.7.home=/usr/lib/jvm/java-8-openjdk" -i 
build.properties
-}
-
-build() {
-  cd tomcat
-
-  export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
-
-  ant
-}
-
-package() {
-  cd tomcat/output/build
-
-  # Tomcat general files
-  install -dm 755 "${pkgdir}"/usr/share/tomcat7/bin
-  install -m 755  bin/* -t "${pkgdir}"/usr/share/tomcat7/bin/
-  # commons-daemon is packaged on its own
-  rm "${pkgdir}"/usr/share/tomcat7/bin/{*.bat,commons-daemon*}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/tomcat7/bin/commons-daemon.jar
-
-  install -dm 755 "${pkgdir}"/usr/share/java/tomcat7
-  install -m 644 lib/* -t "${pkgdir}"/usr/share/java/tomcat7/
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/tomcat7/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/tomcat7/ecj.jar
-
-  ln -s /usr/share/java/tomcat7 "${pkgdir}"/usr/share/tomcat7/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm 775 -o ${_uid_tomcat} -g ${_gid_log} "${pkgdir}"/var/log/tomcat7
-  ln -s /var/log/tomcat7 "${pkgdir}"/usr/share/tomcat7/logs
-  touch "${pkgdir}"/var/log/tomcat7/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/tomcat7/catalina.{out,err}
-
-  install -dm 775 "${pkgdir}"/etc/tomcat7
-  install -m 640 -g ${_gid_tomcat} conf/* -t "${pkgdir}"/etc/tomcat7/
-
-  install -dm 775 -g ${_gid_tomcat} "${pkgdir}"/etc/tomcat7/Catalina
-  ln -s /etc/tomcat7 "${pkgdir}"/usr/share/tomcat7/conf
-
-  install -dm 775 "${pkgdir}"/var/lib/tomcat7
-  cp -dr --no-preserve=ownership webapps "${pkgdir}"/var/lib/tomcat7/
-  chown -R ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/tomcat7
-  chmod 775 "${pkgdir}"/var/lib/tomcat7/webapps
-  ln -s /var/lib/tomcat7/webapps "${pkgdir}"/usr/share/tomcat7/webapps
-
-  install 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2020-07-21 Thread Maxime Gauduin via arch-commits
Date: Tuesday, July 21, 2020 @ 09:59:29
  Author: alucryd
Revision: 392319

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 392318, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 392318, tomcat7/trunk/tomcat7.install)
  tomcat7/repos/extra-any/tomcat7.service
(from rev 392318, tomcat7/trunk/tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.sysusers
(from rev 392318, tomcat7/trunk/tomcat7.sysusers)
  tomcat7/repos/extra-any/tomcat7.tmpfiles
(from rev 392318, tomcat7/trunk/tomcat7.tmpfiles)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/tomcat7.install
  tomcat7/repos/extra-any/tomcat7.service
  tomcat7/repos/extra-any/tomcat7.sysusers
  tomcat7/repos/extra-any/tomcat7.tmpfiles

--+
 PKGBUILD |  186 ++---
 tomcat7.install  |   32 -
 tomcat7.service  |   70 +--
 tomcat7.sysusers |2 
 tomcat7.tmpfiles |   10 +-
 5 files changed, 150 insertions(+), 150 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2020-07-21 09:59:21 UTC (rev 392318)
+++ PKGBUILD2020-07-21 09:59:29 UTC (rev 392319)
@@ -1,93 +0,0 @@
-# Maintainer: Maxime Gauduin 
-# Contributor: Guillaume Alaux 
-
-pkgname=tomcat7
-pkgver=7.0.104
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=(any)
-url=https://tomcat.apache.org/
-license=(APACHE)
-depends=(
-  'java-runtime>=6'
-  java-jsvc
-  java-commons-daemon
-  eclipse-ecj
-)
-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
-)
-install=tomcat7.install
-source=(
-  
https://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz{,.asc}
-  tomcat7.service
-  tomcat7.sysusers
-  tomcat7.tmpfiles
-)
-validpgpkeys=(
-  DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 # Mark E D Thomas
-  713DA88BE50911535FE716F5208B0AB1D63011C7 # Violeta Georgieva Georgieva
-)
-
-sha256sums=('0cbc72a05f62978e0b78ce4acf1bb7aa720bfbbabc8a11e11930d73285aea73e'
-'SKIP'
-'51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd apache-tomcat-${pkgver}
-
-  # Tomcat general files
-  install -dm 755 "${pkgdir}"/usr/share/{,java/}tomcat7
-  cp -dr --no-preserve=ownership bin "${pkgdir}"/usr/share/tomcat7
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/tomcat7/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/tomcat7/bin/commons-daemon.jar
-
-  install -m 644 lib/* "${pkgdir}"/usr/share/java/tomcat7
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/tomcat7/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/tomcat7/ecj.jar
-
-  ln -s /usr/share/java/tomcat7 "${pkgdir}"/usr/share/tomcat7/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm 775 -o ${_uid_tomcat} -g ${_gid_log} "${pkgdir}"/var/log/tomcat7
-  ln -s /var/log/tomcat7 "${pkgdir}"/usr/share/tomcat7/logs
-  touch "${pkgdir}"/var/log/tomcat7/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/tomcat7/catalina.{out,err}
-
-  install -dm 775 "${pkgdir}"/etc/tomcat7
-  install -m 640 -g ${_gid_tomcat} conf/* "${pkgdir}"/etc/tomcat7
-  install -dm 775 -g ${_gid_tomcat} "${pkgdir}"/etc/tomcat7/Catalina
-  ln -s /etc/tomcat7 "${pkgdir}"/usr/share/tomcat7/conf
-
-  install -dm 775 "${pkgdir}"/var/lib/tomcat7
-  cp -r webapps "${pkgdir}"/var/lib/tomcat7
-  chown -R ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/tomcat7
-  chmod 775 "${pkgdir}"/var/lib/tomcat7/webapps
-  ln -s /var/lib/tomcat7/webapps "${pkgdir}"/usr/share/tomcat7/webapps
-
-  install -dm 1777 "${pkgdir}"/var/tmp
-  install -dm 775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${pkgdir}"/var/tmp/tomcat7/{temp,work}
-  ln -s /var/tmp/tomcat7/temp "${pkgdir}"/usr/share/tomcat7/temp
-  ln -s /var/tmp/tomcat7/work "${pkgdir}"/usr/share/tomcat7/work
-
-  install -Dm 644 ../tomcat7.service 
"${pkgdir}"/usr/lib/systemd/system/tomcat7.service
-  install -Dm 644 ../tomcat7.sysusers 
"${pkgdir}"/usr/lib/sysusers.d/tomcat7.conf
-  install -Dm 644 ../tomcat7.tmpfiles 
"${pkgdir}"/usr/lib/tmpfiles.d/tomcat7.conf
-}
-
-# vim: ts=2 sw=2 et:

Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 392318, 
tomcat7/trunk/PKGBUILD)

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2020-05-28 Thread Maxime Gauduin via arch-commits
Date: Thursday, May 28, 2020 @ 08:18:23
  Author: alucryd
Revision: 387752

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 387751, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 387751, tomcat7/trunk/tomcat7.install)
  tomcat7/repos/extra-any/tomcat7.service
(from rev 387751, tomcat7/trunk/tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.sysusers
(from rev 387751, tomcat7/trunk/tomcat7.sysusers)
  tomcat7/repos/extra-any/tomcat7.tmpfiles
(from rev 387751, tomcat7/trunk/tomcat7.tmpfiles)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/tomcat7.install
  tomcat7/repos/extra-any/tomcat7.service
  tomcat7/repos/extra-any/tomcat7.sysusers
  tomcat7/repos/extra-any/tomcat7.tmpfiles

--+
 PKGBUILD |  188 ++---
 tomcat7.install  |   32 -
 tomcat7.service  |   70 +--
 tomcat7.sysusers |2 
 tomcat7.tmpfiles |   10 +-
 5 files changed, 150 insertions(+), 152 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2020-05-28 08:18:12 UTC (rev 387751)
+++ PKGBUILD2020-05-28 08:18:23 UTC (rev 387752)
@@ -1,95 +0,0 @@
-# Maintainer: Maxime Gauduin 
-# Contributor: Guillaume Alaux 
-
-pkgname=tomcat7
-pkgver=7.0.100
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=(any)
-url=https://tomcat.apache.org/
-license=(APACHE)
-depends=(
-  'java-runtime>=6'
-  java-jsvc
-  java-commons-daemon
-  eclipse-ecj
-)
-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
-)
-install=tomcat7.install
-source=(
-  
https://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz{,.asc}
-  tomcat7.service
-  tomcat7.sysusers
-  tomcat7.tmpfiles
-)
-validpgpkeys=(
-  DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 # Mark E D Thomas
-  713DA88BE50911535FE716F5208B0AB1D63011C7 # Violeta Georgieva Georgieva
-)
-
-sha256sums=(
-  3b8057cb9fd50ace772a0f92b247029fc848ed611d5cff9cb6ab832ffbb65272
-  SKIP
-  51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce
-  4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708
-  bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6
-)
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd apache-tomcat-${pkgver}
-
-  # Tomcat general files
-  install -dm 755 "${pkgdir}"/usr/share/{,java/}tomcat7
-  cp -r bin "${pkgdir}"/usr/share/tomcat7
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/tomcat7/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/tomcat7/bin/commons-daemon.jar
-
-  install -m 644 lib/* "${pkgdir}"/usr/share/java/tomcat7
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/tomcat7/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/tomcat7/ecj.jar
-
-  ln -s /usr/share/java/tomcat7 "${pkgdir}"/usr/share/tomcat7/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm 775 -o ${_uid_tomcat} -g ${_gid_log} "${pkgdir}"/var/log/tomcat7
-  ln -s /var/log/tomcat7 "${pkgdir}"/usr/share/tomcat7/logs
-  touch "${pkgdir}"/var/log/tomcat7/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/tomcat7/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/tomcat7
-  install -g ${_gid_tomcat} -m 640 conf/* "${pkgdir}"/etc/tomcat7
-  install -d -g ${_gid_tomcat} -m 775 "${pkgdir}"/etc/tomcat7/Catalina
-  ln -s /etc/tomcat7 "${pkgdir}"/usr/share/tomcat7/conf
-
-  install -dm 775 "${pkgdir}"/var/lib/tomcat7
-  cp -r webapps "${pkgdir}"/var/lib/tomcat7
-  chown -R ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/tomcat7
-  chmod 775 "${pkgdir}"/var/lib/tomcat7/webapps
-  ln -s /var/lib/tomcat7/webapps "${pkgdir}"/usr/share/tomcat7/webapps
-
-  install -dm 1777 "${pkgdir}"/var/tmp
-  install -dm 775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${pkgdir}"/var/tmp/tomcat7/{temp,work}
-  ln -s /var/tmp/tomcat7/temp "${pkgdir}"/usr/share/tomcat7/temp
-  ln -s /var/tmp/tomcat7/work "${pkgdir}"/usr/share/tomcat7/work
-
-  install -Dm 644 ../tomcat7.service 
"${pkgdir}"/usr/lib/systemd/system/tomcat7.service
-  install -Dm 644 ../tomcat7.sysusers 
"${pkgdir}"/usr/lib/sysusers.d/tomcat7.conf
-  install -Dm 644 ../tomcat7.tmpfiles 
"${pkgdir}"/usr/lib/tmpfiles.d/tomcat7.conf
-}
-
-# vim: ts=2 sw=2 et:

Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 387751, 
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2020-02-16 Thread Maxime Gauduin via arch-commits
Date: Monday, February 17, 2020 @ 07:32:15
  Author: alucryd
Revision: 375726

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 375725, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 375725, tomcat7/trunk/tomcat7.install)
  tomcat7/repos/extra-any/tomcat7.service
(from rev 375725, tomcat7/trunk/tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.sysusers
(from rev 375725, tomcat7/trunk/tomcat7.sysusers)
  tomcat7/repos/extra-any/tomcat7.tmpfiles
(from rev 375725, tomcat7/trunk/tomcat7.tmpfiles)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  176 --
 systemd_sysusers.d_tomcat7.conf |1 
 systemd_tmpfiles.d_tomcat7.conf |5 -
 systemd_tomcat7.service |   35 ---
 tomcat7.install |   32 +++---
 tomcat7.service |   35 +++
 tomcat7.sysusers|1 
 tomcat7.tmpfiles|5 +
 8 files changed, 152 insertions(+), 138 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2020-02-17 07:32:07 UTC (rev 375725)
+++ PKGBUILD2020-02-17 07:32:15 UTC (rev 375726)
@@ -1,81 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.85
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz{,.asc}
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-validpgpkeys=('DCFD35E0BF8CA7344752DE8B6FB21E8933C60243'  # Mark E D Thomas
-  '713DA88BE50911535FE716F5208B0AB1D63011C7') # Violeta Georgieva 
Georgieva
-
-sha512sums=('ed4f9d85fafe21570af7e01e712ebfb878066f9fab99d344935e20cf1f18c3389e103d33feb6937b5382408f3d356dbd8e7668bc82d299841bc099a1f8f7'
-'SKIP'
-
'99b27236151847c59f5f50d5a0e5d0bf829c7311d921d456b69188aee610453640162740acc0889f0ca0025181f48a963cd9eeca974fa18694f86fd2a328547f'
-
'3e64dd5904df35cf7d3c32a6ccab1669eff95d738127fafd60c7c75bf5e7dfd6123f696dbe706efaf1ac18e6d8a311ce3c1a50f3c7fdc33d82da44d20c20109e'
-
'bf8a105c9aef6d52bd0a20909fcb21ccf953048eb5c72037ebe69ca47bea364f67eff9dc8d701313c0293fc81d74644726cd214bb8604c005e8fec162efcbb01')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2019-02-16 Thread Felix Yan via arch-commits
Date: Saturday, February 16, 2019 @ 17:46:58
  Author: felixonmars
Revision: 346373

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 346372, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 346372, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 346372, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 346372, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 346372, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  162 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   70 
 tomcat7.install |   32 +++
 5 files changed, 138 insertions(+), 138 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2019-02-16 17:46:29 UTC (rev 346372)
+++ PKGBUILD2019-02-16 17:46:58 UTC (rev 346373)
@@ -1,81 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.84
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz{,.asc}
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-validpgpkeys=('DCFD35E0BF8CA7344752DE8B6FB21E8933C60243'  # Mark E D Thomas
-  '713DA88BE50911535FE716F5208B0AB1D63011C7') # Violeta Georgieva 
Georgieva
-
-sha512sums=('8885117f1748322da56fa10eb9f5519bd4beb7b3b85ad1d6907224bef6adaf1f155ee981a8aa6b35516450b9d40cda5bad06fb825e19904afe3aef057aa13878'
-'SKIP'
-
'99b27236151847c59f5f50d5a0e5d0bf829c7311d921d456b69188aee610453640162740acc0889f0ca0025181f48a963cd9eeca974fa18694f86fd2a328547f'
-
'3e64dd5904df35cf7d3c32a6ccab1669eff95d738127fafd60c7c75bf5e7dfd6123f696dbe706efaf1ac18e6d8a311ce3c1a50f3c7fdc33d82da44d20c20109e'
-
'bf8a105c9aef6d52bd0a20909fcb21ccf953048eb5c72037ebe69ca47bea364f67eff9dc8d701313c0293fc81d74644726cd214bb8604c005e8fec162efcbb01')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2018-09-07 Thread Felix Yan via arch-commits
Date: Friday, September 7, 2018 @ 09:49:43
  Author: felixonmars
Revision: 333822

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 333821, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 333821, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 333821, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 333821, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 333821, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  162 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   70 
 tomcat7.install |   32 +++
 5 files changed, 138 insertions(+), 138 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2018-09-07 09:49:14 UTC (rev 333821)
+++ PKGBUILD2018-09-07 09:49:43 UTC (rev 333822)
@@ -1,81 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.82
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz{,.asc}
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-validpgpkeys=('DCFD35E0BF8CA7344752DE8B6FB21E8933C60243'  # Mark E D Thomas
-  '713DA88BE50911535FE716F5208B0AB1D63011C7') # Violeta Georgieva 
Georgieva
-
-sha256sums=('2f19ca3fd578b8d04e72a7fd20b43beddbcece2c49eb3472265465506261676d'
-'SKIP'
-'51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2017-10-04 Thread Guillaume Alaux
Date: Wednesday, October 4, 2017 @ 10:12:24
  Author: guillaume
Revision: 306715

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 306714, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 306714, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 306714, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 306714, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 306714, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  162 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   70 
 tomcat7.install |   32 +++
 5 files changed, 138 insertions(+), 138 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2017-10-04 10:11:36 UTC (rev 306714)
+++ PKGBUILD2017-10-04 10:12:24 UTC (rev 306715)
@@ -1,81 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.81
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz{,.asc}
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-validpgpkeys=('DCFD35E0BF8CA7344752DE8B6FB21E8933C60243'  # Mark E D Thomas
-  '713DA88BE50911535FE716F5208B0AB1D63011C7') # Violeta Georgieva 
Georgieva
-
-sha256sums=('389766c30106bb30f1ed8682c7959ec53cddae0ae9260958c666e21f151b9955'
-'SKIP'
-'51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2017-08-17 Thread Guillaume Alaux
Date: Thursday, August 17, 2017 @ 11:07:52
  Author: guillaume
Revision: 302341

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 302340, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 302340, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 302340, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 302340, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 302340, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  162 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   70 
 tomcat7.install |   32 +++
 5 files changed, 138 insertions(+), 138 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2017-08-17 11:07:07 UTC (rev 302340)
+++ PKGBUILD2017-08-17 11:07:52 UTC (rev 302341)
@@ -1,81 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.79
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz{,.asc}
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-validpgpkeys=('DCFD35E0BF8CA7344752DE8B6FB21E8933C60243'  # Mark E D Thomas
-  '713DA88BE50911535FE716F5208B0AB1D63011C7') # Violeta Georgieva 
Georgieva
-
-sha256sums=('6cd91a30de93daa65d35c7430cb2c6951070e9ca1f043b4d91b51c8ce4d351c3'
-'SKIP'
-'51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2017-08-11 Thread Guillaume Alaux
Date: Friday, August 11, 2017 @ 12:23:10
  Author: guillaume
Revision: 301919

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 301918, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 301918, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 301918, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 301918, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 301918, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  162 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   70 
 tomcat7.install |   32 +++
 5 files changed, 138 insertions(+), 138 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2017-08-11 12:22:04 UTC (rev 301918)
+++ PKGBUILD2017-08-11 12:23:10 UTC (rev 301919)
@@ -1,81 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.78
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz{,.asc}
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-validpgpkeys=('DCFD35E0BF8CA7344752DE8B6FB21E8933C60243'  # Mark E D Thomas
-  '713DA88BE50911535FE716F5208B0AB1D63011C7') # Violeta Georgieva 
Georgieva
-
-sha256sums=('7ac4caaf25281e83cba9711e823b23b587a960dc8fb09bf9f039bed9e62b11bf'
-'SKIP'
-'51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2017-06-06 Thread Guillaume Alaux
Date: Tuesday, June 6, 2017 @ 10:51:38
  Author: guillaume
Revision: 298033

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 298032, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 298032, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 298032, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 298032, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 298032, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  162 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   70 
 tomcat7.install |   32 +++
 5 files changed, 138 insertions(+), 138 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2017-06-06 10:51:00 UTC (rev 298032)
+++ PKGBUILD2017-06-06 10:51:38 UTC (rev 298033)
@@ -1,81 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.76
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz{,.asc}
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-validpgpkeys=('DCFD35E0BF8CA7344752DE8B6FB21E8933C60243'  # Mark E D Thomas
-  '713DA88BE50911535FE716F5208B0AB1D63011C7') # Violeta Georgieva 
Georgieva
-
-sha256sums=('63ccbb0ad37077a01e1fcd2b7cfd48d94007759194dcbcd2fbe10dee85bc46be'
-'SKIP'
-'51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2017-03-22 Thread Guillaume Alaux
Date: Wednesday, March 22, 2017 @ 20:22:35
  Author: guillaume
Revision: 291223

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 291222, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 291222, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 291222, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 291222, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 291222, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  161 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   70 
 tomcat7.install |   32 +++
 5 files changed, 138 insertions(+), 137 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2017-03-22 20:21:53 UTC (rev 291222)
+++ PKGBUILD2017-03-22 20:22:35 UTC (rev 291223)
@@ -1,80 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.75
-pkgrel=2
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz{,.asc}
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-validpgpkeys=('713DA88BE50911535FE716F5208B0AB1D63011C7') # Violeta Georgieva 
Georgieva
-
-sha256sums=('d19a2fbbc23e310296d1e978f8e8f977b54cd328ce10cd879b58a443bc6eaa70'
-'SKIP'
-'51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
- 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2017-02-05 Thread Guillaume Alaux
Date: Sunday, February 5, 2017 @ 10:41:08
  Author: guillaume
Revision: 288066

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 288065, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 288065, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 288065, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 288065, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 288065, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  160 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   70 
 tomcat7.install |   35 +++-
 5 files changed, 137 insertions(+), 140 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2017-02-05 10:36:12 UTC (rev 288065)
+++ PKGBUILD2017-02-05 10:41:08 UTC (rev 288066)
@@ -1,80 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.75
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz{,.asc}
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-validpgpkeys=('713DA88BE50911535FE716F5208B0AB1D63011C7') # Violeta Georgieva 
Georgieva
-
-sha256sums=('d19a2fbbc23e310296d1e978f8e8f977b54cd328ce10cd879b58a443bc6eaa70'
-'SKIP'
-'51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
- 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2017-01-28 Thread Guillaume Alaux
Date: Saturday, January 28, 2017 @ 09:25:17
  Author: guillaume
Revision: 287595

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 287594, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 287594, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 287594, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 287594, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 287594, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  160 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   70 
 tomcat7.install |   38 -
 5 files changed, 140 insertions(+), 140 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2017-01-28 09:24:15 UTC (rev 287594)
+++ PKGBUILD2017-01-28 09:25:17 UTC (rev 287595)
@@ -1,80 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.73
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz{,.asc}
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-validpgpkeys=('713DA88BE50911535FE716F5208B0AB1D63011C7') # Violeta Georgieva 
Georgieva
-
-sha256sums=('0e814d6ad7d5b90e29c79887137420d3bc413540f9faa60d98f11e6c8a8fea85'
-'SKIP'
-'51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
- 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2016-11-16 Thread Guillaume Alaux
Date: Wednesday, November 16, 2016 @ 12:43:16
  Author: guillaume
Revision: 280883

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 280882, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 280882, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 280882, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 280882, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 280882, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  158 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   70 
 tomcat7.install |   38 -
 5 files changed, 140 insertions(+), 138 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2016-11-16 12:42:05 UTC (rev 280882)
+++ PKGBUILD2016-11-16 12:43:16 UTC (rev 280883)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.72
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('779c7bba49a9ed3cafc47a87c8f331d2068f2545105fdd1c1076e0357ebda5db'
-'51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
- "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 "${srcdir}"/systemd_sysusers.d_${pkgname}.conf \
-   

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2016-09-20 Thread Guillaume Alaux
Date: Tuesday, September 20, 2016 @ 15:52:58
  Author: guillaume
Revision: 276772

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 276771, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 276771, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 276771, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 276771, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 276771, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  156 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   70 -
 tomcat7.install |   38 -
 5 files changed, 138 insertions(+), 138 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2016-09-20 15:52:14 UTC (rev 276771)
+++ PKGBUILD2016-09-20 15:52:58 UTC (rev 276772)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.70
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('13f33616a3352e4fce548e042adfdd824353d0b48a42e1606daace7916868c74'
-'51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
- "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 "${srcdir}"/systemd_sysusers.d_${pkgname}.conf \
-   

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2016-06-21 Thread Guillaume Alaux
Date: Tuesday, June 21, 2016 @ 20:18:03
  Author: guillaume
Revision: 270465

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 270464, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 270464, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 270464, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 270464, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 270464, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  156 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   70 -
 tomcat7.install |   38 -
 5 files changed, 138 insertions(+), 138 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2016-06-21 20:16:29 UTC (rev 270464)
+++ PKGBUILD2016-06-21 20:18:03 UTC (rev 270465)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.70
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('13f33616a3352e4fce548e042adfdd824353d0b48a42e1606daace7916868c74'
-'51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
- "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 "${srcdir}"/systemd_sysusers.d_${pkgname}.conf \
- 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2016-06-21 Thread Guillaume Alaux
Date: Tuesday, June 21, 2016 @ 20:16:29
  Author: guillaume
Revision: 270464

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 270463, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 270463, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 270463, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 270463, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 270463, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  156 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   70 -
 tomcat7.install |   38 -
 5 files changed, 138 insertions(+), 138 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2016-06-21 20:06:18 UTC (rev 270463)
+++ PKGBUILD2016-06-21 20:16:29 UTC (rev 270464)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.70
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('13f33616a3352e4fce548e042adfdd824353d0b48a42e1606daace7916868c74'
-'51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
- "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 "${srcdir}"/systemd_sysusers.d_${pkgname}.conf \
- 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2016-06-21 Thread Guillaume Alaux
Date: Tuesday, June 21, 2016 @ 20:06:18
  Author: guillaume
Revision: 270463

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 270462, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 270462, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 270462, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 270462, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 270462, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  156 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   70 -
 tomcat7.install |   38 -
 5 files changed, 138 insertions(+), 138 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2016-06-21 20:05:32 UTC (rev 270462)
+++ PKGBUILD2016-06-21 20:06:18 UTC (rev 270463)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.70
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('13f33616a3352e4fce548e042adfdd824353d0b48a42e1606daace7916868c74'
-'51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
- "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 "${srcdir}"/systemd_sysusers.d_${pkgname}.conf \
- 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2016-06-21 Thread Guillaume Alaux
Date: Tuesday, June 21, 2016 @ 20:05:32
  Author: guillaume
Revision: 270462

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 270461, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 270461, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 270461, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 270461, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 270461, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  156 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   70 -
 tomcat7.install |   38 -
 5 files changed, 138 insertions(+), 138 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2016-06-21 20:04:25 UTC (rev 270461)
+++ PKGBUILD2016-06-21 20:05:32 UTC (rev 270462)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.69
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('5202aab315355d001c41cfe81820e55d3dcd4b4da191054464c68182fa2a9c0f'
-'51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
- "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 "${srcdir}"/systemd_sysusers.d_${pkgname}.conf \
- 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2016-04-24 Thread Guillaume Alaux
Date: Sunday, April 24, 2016 @ 17:12:38
  Author: guillaume
Revision: 266115

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 266114, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 266114, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 266114, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 266114, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 266114, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  156 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   70 -
 tomcat7.install |   38 -
 5 files changed, 138 insertions(+), 138 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2016-04-24 15:11:55 UTC (rev 266114)
+++ PKGBUILD2016-04-24 15:12:38 UTC (rev 266115)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.68
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('2c1a02422f265607de733521e54f18613e9dd5efc2861914fe45a858227bb8e0'
-'51f599e519095ec146f5eba1a0d471117070f5b3089715bc9e392d537deb38ce'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
- "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 "${srcdir}"/systemd_sysusers.d_${pkgname}.conf \
- 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2016-02-18 Thread Guillaume Alaux
Date: Thursday, February 18, 2016 @ 09:54:24
  Author: guillaume
Revision: 259944

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 259943, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 259943, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 259943, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 259943, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 259943, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  156 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   68 
 tomcat7.install |   38 -
 5 files changed, 138 insertions(+), 136 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2016-02-18 08:53:47 UTC (rev 259943)
+++ PKGBUILD2016-02-18 08:54:24 UTC (rev 259944)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.67
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('cd6074f30e2cc98f55213fd396264a760f4a4c8a9b3d4842546578eab8f5220e'
-'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
- "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 "${srcdir}"/systemd_sysusers.d_${pkgname}.conf \
-

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2015-12-11 Thread Guillaume Alaux
Date: Friday, December 11, 2015 @ 13:55:14
  Author: guillaume
Revision: 255794

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 255793, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 255793, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 255793, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 255793, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 255793, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  156 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   66 
 tomcat7.install |   38 -
 5 files changed, 136 insertions(+), 136 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2015-12-11 12:54:26 UTC (rev 255793)
+++ PKGBUILD2015-12-11 12:55:14 UTC (rev 255794)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.65
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('ef0edb1f560702adc4096097ddfba038086d62da77d0b247d927fd326bc637e9'
-'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
- "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 "${srcdir}"/systemd_sysusers.d_${pkgname}.conf \
- 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2015-10-23 Thread Guillaume Alaux
Date: Friday, October 23, 2015 @ 13:08:55
  Author: guillaume
Revision: 249684

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 249683, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 249683, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 249683, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 249683, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 249683, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  156 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   66 
 tomcat7.install |   38 -
 5 files changed, 136 insertions(+), 136 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2015-10-23 11:08:15 UTC (rev 249683)
+++ PKGBUILD2015-10-23 11:08:55 UTC (rev 249684)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.64
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('76c729037f9fd6a0f44fa41c147c4c7291e68f74b79ec474c0bcef8a57661306'
-'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
- "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 "${srcdir}"/systemd_sysusers.d_${pkgname}.conf \
- 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2015-09-01 Thread Guillaume Alaux
Date: Tuesday, September 1, 2015 @ 22:16:04
  Author: guillaume
Revision: 245181

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 245180, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 245180, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 245180, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 245180, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 245180, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  156 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   66 
 tomcat7.install |   38 -
 5 files changed, 136 insertions(+), 136 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2015-09-01 20:14:59 UTC (rev 245180)
+++ PKGBUILD2015-09-01 20:16:04 UTC (rev 245181)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.63
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('b5d878a17de2421a078d8907583076b507e67dbf1567c6f4346d70c88473f8ad'
-'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}"
-
-  # Tomcat general files
-  install -dm755 "${pkgdir}"/usr/share/{,java/}${pkgname}
-  cp -r bin "${pkgdir}"/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
"${pkgdir}"/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
"${pkgdir}"/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* "${pkgdir}"/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm "${pkgdir}"/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar "${pkgdir}"/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} "${pkgdir}"/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
"${pkgdir}"/var/log/${pkgname}
-  ln -s /var/log/${pkgname} "${pkgdir}"/usr/share/${pkgname}/logs
-  touch "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} "${pkgdir}"/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 "${pkgdir}"/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* "${pkgdir}"/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} "${pkgdir}"/var/lib/${pkgname}
-  chmod 775 "${pkgdir}"/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps "${pkgdir}"/usr/share/${pkgname}/webapps
-
-  install -dm1777 "${pkgdir}"/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
"${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
-
-  install -Dm644 "${srcdir}"/systemd_${pkgname}.service \
- "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 "${srcdir}"/systemd_sysusers.d_${pkgname}.conf \
- 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2015-07-19 Thread Guillaume Alaux
Date: Sunday, July 19, 2015 @ 20:55:46
  Author: guillaume
Revision: 242371

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 242370, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 242370, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 242370, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 242370, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 242370, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  156 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   66 
 tomcat7.install |   38 -
 5 files changed, 136 insertions(+), 136 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2015-07-19 18:54:26 UTC (rev 242370)
+++ PKGBUILD2015-07-19 18:55:46 UTC (rev 242371)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.62
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('a787ea12e163e78ccebbb9662d7da78e707aef051d15af9ab5be20489adf1f6d'
-'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd ${srcdir}/apache-tomcat-${pkgver}
-
-  # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 ${pkgdir}/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
-  chmod 775 ${pkgdir}/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
${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
-
-  install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 ${srcdir}/systemd_sysusers.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
-  install -Dm644 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2015-05-18 Thread Guillaume Alaux
Date: Monday, May 18, 2015 @ 12:56:32
  Author: guillaume
Revision: 239520

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 239519, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 239519, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 239519, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 239519, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 239519, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  156 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   66 
 tomcat7.install |   38 -
 5 files changed, 136 insertions(+), 136 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2015-05-18 10:55:45 UTC (rev 239519)
+++ PKGBUILD2015-05-18 10:56:32 UTC (rev 239520)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.61
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('2528ad7434e44ab1198b5692d5f831ac605051129119fd81a00d4c75abe1c0e0'
-'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd ${srcdir}/apache-tomcat-${pkgver}
-
-  # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 ${pkgdir}/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
-  chmod 775 ${pkgdir}/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
${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
-
-  install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 ${srcdir}/systemd_sysusers.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
-  install -Dm644 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2015-04-13 Thread Guillaume Alaux
Date: Monday, April 13, 2015 @ 21:57:26
  Author: guillaume
Revision: 236393

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 236392, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 236392, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 236392, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 236392, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 236392, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  156 +++---
 systemd_sysusers.d_tomcat7.conf |2 
 systemd_tmpfiles.d_tomcat7.conf |   10 +-
 systemd_tomcat7.service |   66 
 tomcat7.install |   38 -
 5 files changed, 136 insertions(+), 136 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2015-04-13 19:57:09 UTC (rev 236392)
+++ PKGBUILD2015-04-13 19:57:26 UTC (rev 236393)
@@ -1,78 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.59
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_sysusers.d_${pkgname}.conf
-systemd_tmpfiles.d_${pkgname}.conf)
-
-sha256sums=('e0fe43d1fa17013bf7b3b2d3f71105d606a0582c153eb16fb210e7d5164941b0'
-'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
-'4c0e12c45b406d2e8f0081de3d60dbf34c31f4da36296cedce6af5d6e03c8708'
-'bc8ce84b3b2c938f55980cbe9bc1c2a5f371e23b34cf11c1b56d2c49836761d6')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd ${srcdir}/apache-tomcat-${pkgver}
-
-  # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 ${pkgdir}/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
-  chmod 775 ${pkgdir}/var/lib/${pkgname}/webapps
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
${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
-
-  install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 ${srcdir}/systemd_sysusers.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf
-  install -Dm644 

[arch-commits] Commit in tomcat7/repos/extra-any (9 files)

2015-02-09 Thread Guillaume Alaux
Date: Monday, February 9, 2015 @ 22:42:39
  Author: guillaume
Revision: 231205

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 231204, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_sysusers.d_tomcat7.conf
(from rev 231204, tomcat7/trunk/systemd_sysusers.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 231204, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 231204, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 231204, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  153 +++---
 systemd_sysusers.d_tomcat7.conf |1 
 systemd_tmpfiles.d_tomcat7.conf |8 +
 systemd_tomcat7.service |   66 
 tomcat7.install |   54 -
 5 files changed, 136 insertions(+), 146 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2015-02-09 21:40:11 UTC (rev 231204)
+++ PKGBUILD2015-02-09 21:42:39 UTC (rev 231205)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.57
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_tmpfiles.d_${pkgname}.conf
-${pkgname}.install)
-
-sha256sums=('1ce390049ed23143e3db0c94781c1e88a4d1b39ceb471c0af088a0c326d637cb'
-'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
-'4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
-'13df331dad3441f027c8b5964ba5bf420df3dc8faf0f96e071db981e8ea322f0')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd ${srcdir}/apache-tomcat-${pkgver}
-
-  # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 ${pkgdir}/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
${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
-
-  install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
-}

Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 231204, 
tomcat7/trunk/PKGBUILD)

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2014-11-14 Thread Guillaume Alaux
Date: Friday, November 14, 2014 @ 13:37:36
  Author: guillaume
Revision: 226231

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 226230, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 226230, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 226230, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 226230, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  150 +++---
 systemd_tmpfiles.d_tomcat7.conf |6 -
 systemd_tomcat7.service |   66 
 tomcat7.install |   70 -
 4 files changed, 146 insertions(+), 146 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2014-11-14 12:36:53 UTC (rev 226230)
+++ PKGBUILD2014-11-14 12:37:36 UTC (rev 226231)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.56
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_tmpfiles.d_${pkgname}.conf
-${pkgname}.install)
-
-sha256sums=('c0ca44be20bccebbb043ccd7ab5ea4d94060fdde6bb84812f3da363955dae5bb'
-'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
-'4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
-'13df331dad3441f027c8b5964ba5bf420df3dc8faf0f96e071db981e8ea322f0')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd ${srcdir}/apache-tomcat-${pkgver}
-
-  # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 ${pkgdir}/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
${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
-
-  install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
-}

Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 226230, 
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-11-14 12:37:36 UTC (rev 226231)
@@ -0,0 +1,75 @@
+# Maintainer: Guillaume 

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2014-10-15 Thread Guillaume Alaux
Date: Wednesday, October 15, 2014 @ 09:54:33
  Author: guillaume
Revision: 224372

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 224371, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 224371, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 224371, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 224371, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  150 +++---
 systemd_tmpfiles.d_tomcat7.conf |6 -
 systemd_tomcat7.service |   66 
 tomcat7.install |   70 -
 4 files changed, 146 insertions(+), 146 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2014-10-15 07:53:56 UTC (rev 224371)
+++ PKGBUILD2014-10-15 07:54:33 UTC (rev 224372)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.55
-pkgrel=2
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_tmpfiles.d_${pkgname}.conf
-${pkgname}.install)
-
-sha256sums=('c20934fda63bc7311e2d8e067d67f886890c8be72280425c5f6f8fdd7a376c15'
-'c6d4dbbaac417418397e395944f7b6aa38ac10e2fc33c7ee3520dba4cd23'
-'4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
-'13df331dad3441f027c8b5964ba5bf420df3dc8faf0f96e071db981e8ea322f0')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd ${srcdir}/apache-tomcat-${pkgver}
-
-  # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 ${pkgdir}/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
${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
-
-  install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
-}

Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 224371, 
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-10-15 07:54:33 UTC (rev 224372)
@@ -0,0 +1,75 @@
+# Maintainer: Guillaume 

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2014-09-08 Thread Guillaume Alaux
Date: Monday, September 8, 2014 @ 22:01:47
  Author: guillaume
Revision: 221203

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 221201, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 221201, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 221201, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 221201, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  150 +++---
 systemd_tmpfiles.d_tomcat7.conf |6 -
 systemd_tomcat7.service |   66 
 tomcat7.install |   70 -
 4 files changed, 146 insertions(+), 146 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2014-09-08 20:01:47 UTC (rev 221202)
+++ PKGBUILD2014-09-08 20:01:47 UTC (rev 221203)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.55
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_tmpfiles.d_${pkgname}.conf
-${pkgname}.install)
-
-sha256sums=('c20934fda63bc7311e2d8e067d67f886890c8be72280425c5f6f8fdd7a376c15'
-'7f2931a77b3da0dfce4886251c5bdfc186bf1ad60f6c01c3cafe0bab75034fb7'
-'4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
-'13df331dad3441f027c8b5964ba5bf420df3dc8faf0f96e071db981e8ea322f0')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd ${srcdir}/apache-tomcat-${pkgver}
-
-  # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 ${pkgdir}/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
${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
-
-  install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
-}

Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 221201, 
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-09-08 20:01:47 UTC (rev 221203)
@@ -0,0 +1,75 @@
+# Maintainer: Guillaume 

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2014-07-30 Thread Guillaume Alaux
Date: Wednesday, July 30, 2014 @ 13:36:10
  Author: guillaume
Revision: 218373

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 218372, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 218372, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 218372, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 218372, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  150 +++---
 systemd_tmpfiles.d_tomcat7.conf |6 -
 systemd_tomcat7.service |   66 
 tomcat7.install |   70 -
 4 files changed, 146 insertions(+), 146 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2014-07-30 11:35:47 UTC (rev 218372)
+++ PKGBUILD2014-07-30 11:36:10 UTC (rev 218373)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.54
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_tmpfiles.d_${pkgname}.conf
-${pkgname}.install)
-
-sha256sums=('f0316c128881c4df384771dc0da8f8e80d861385798e57d22fd4068f48ab8724'
-'7f2931a77b3da0dfce4886251c5bdfc186bf1ad60f6c01c3cafe0bab75034fb7'
-'4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
-'13df331dad3441f027c8b5964ba5bf420df3dc8faf0f96e071db981e8ea322f0')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd ${srcdir}/apache-tomcat-${pkgver}
-
-  # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 ${pkgdir}/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
${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
-
-  install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
-}

Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 218372, 
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-07-30 11:36:10 UTC (rev 218373)
@@ -0,0 +1,75 @@
+# Maintainer: Guillaume 

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2014-05-24 Thread Guillaume Alaux
Date: Saturday, May 24, 2014 @ 13:29:29
  Author: guillaume
Revision: 213543

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 213542, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 213542, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 213542, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 213542, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  150 +++---
 systemd_tmpfiles.d_tomcat7.conf |6 -
 systemd_tomcat7.service |   66 
 tomcat7.install |   70 -
 4 files changed, 146 insertions(+), 146 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2014-05-24 11:27:54 UTC (rev 213542)
+++ PKGBUILD2014-05-24 11:29:29 UTC (rev 213543)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.53
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=7' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_tmpfiles.d_${pkgname}.conf
-${pkgname}.install)
-
-sha256sums=('f5e79d70ca7962d11abfc753e47b68a11fdfb4a409e76e2b7bd0a945f80f87c9'
-'7f2931a77b3da0dfce4886251c5bdfc186bf1ad60f6c01c3cafe0bab75034fb7'
-'4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
-'13df331dad3441f027c8b5964ba5bf420df3dc8faf0f96e071db981e8ea322f0')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd ${srcdir}/apache-tomcat-${pkgver}
-
-  # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 ${pkgdir}/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
${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
-
-  install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
-}

Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 213542, 
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-05-24 11:29:29 UTC (rev 213543)
@@ -0,0 +1,75 @@
+# Maintainer: Guillaume ALAUX 

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2014-04-02 Thread Guillaume Alaux
Date: Wednesday, April 2, 2014 @ 23:45:37
  Author: guillaume
Revision: 209759

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 209758, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 209758, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 209758, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 209758, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  150 +++---
 systemd_tmpfiles.d_tomcat7.conf |6 -
 systemd_tomcat7.service |   66 
 tomcat7.install |   70 -
 4 files changed, 146 insertions(+), 146 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2014-04-02 21:45:03 UTC (rev 209758)
+++ PKGBUILD2014-04-02 21:45:37 UTC (rev 209759)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.52
-pkgrel=1
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=7' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_tmpfiles.d_${pkgname}.conf
-${pkgname}.install)
-
-sha256sums=('f5f3c2c8f9946bf24445d2da14b3c2b8dc848622ef07c3cda14f486435d27fb0'
-'7f2931a77b3da0dfce4886251c5bdfc186bf1ad60f6c01c3cafe0bab75034fb7'
-'4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
-'13df331dad3441f027c8b5964ba5bf420df3dc8faf0f96e071db981e8ea322f0')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd ${srcdir}/apache-tomcat-${pkgver}
-
-  # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 ${pkgdir}/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
${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
-
-  install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
-}

Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 209758, 
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-04-02 21:45:37 UTC (rev 209759)
@@ -0,0 +1,75 @@
+# Maintainer: Guillaume 

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2014-02-19 Thread Guillaume Alaux
Date: Wednesday, February 19, 2014 @ 16:20:32
  Author: guillaume
Revision: 206124

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 206123, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 206123, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 206123, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 206123, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  150 +++---
 systemd_tmpfiles.d_tomcat7.conf |6 -
 systemd_tomcat7.service |   66 
 tomcat7.install |   70 -
 4 files changed, 146 insertions(+), 146 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2014-02-19 15:19:54 UTC (rev 206123)
+++ PKGBUILD2014-02-19 15:20:32 UTC (rev 206124)
@@ -1,75 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.50
-pkgrel=2
-pkgdesc='Open source implementation of the Java Servlet 3.0 and JavaServer 
Pages 2.2 technologies'
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=7' 'java-jsvc' 'java-commons-daemon' 'eclipse-ecj')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/${pkgname}/catalina.policy
-etc/${pkgname}/catalina.properties
-etc/${pkgname}/context.xml
-etc/${pkgname}/logging.properties
-etc/${pkgname}/server.xml
-etc/${pkgname}/tomcat-users.xml
-etc/${pkgname}/web.xml)
-install=${pkgname}.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-systemd_${pkgname}.service
-systemd_tmpfiles.d_${pkgname}.conf
-${pkgname}.install)
-
-sha256sums=('7be7b2d9e6626c81f2aa3d39a7e5b0e52e025d773cd29c4a0cf9e71b0d4c11e9'
-'7f2931a77b3da0dfce4886251c5bdfc186bf1ad60f6c01c3cafe0bab75034fb7'
-'4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
-'13df331dad3441f027c8b5964ba5bf420df3dc8faf0f96e071db981e8ea322f0')
-
-_gid_log=19
-_gid_tomcat=71
-_uid_tomcat=71
-
-package() {
-  cd ${srcdir}/apache-tomcat-${pkgver}
-
-  # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm 
${pkgdir}/usr/share/${pkgname}/bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  ln -s /usr/share/java/commons-daemon.jar 
${pkgdir}/usr/share/${pkgname}/bin/commons-daemon.jar
-
-  install -m644 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  # eclipse-ecj is packaged on its own
-  rm ${pkgdir}/usr/share/java/${pkgname}/ecj-*.jar
-  ln -s ../eclipse-ecj.jar ${pkgdir}/usr/share/java/${pkgname}/ecj.jar
-
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
-  # We log through systemd but this would still be required for stock Tomcat 
logging
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_log} 
${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp ${_gid_log} ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm775 ${pkgdir}/etc/${pkgname}
-  install -g ${_gid_tomcat} -m640 conf/* ${pkgdir}/etc/${pkgname}
-  install -d -g ${_gid_tomcat} -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 ${_uid_tomcat}:${_gid_tomcat} ${pkgdir}/var/lib/${pkgname}
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm775 -o ${_uid_tomcat} -g ${_gid_tomcat} 
${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
-
-  install -Dm644 ${srcdir}/systemd_${pkgname}.service \
- ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
-  install -Dm644 ${srcdir}/systemd_tmpfiles.d_${pkgname}.conf \
- ${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf
-}

Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 206123, 
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-02-19 15:20:32 UTC (rev 206124)
@@ -0,0 +1,75 @@
+# Maintainer: Guillaume 

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2014-02-15 Thread Guillaume Alaux
Date: Saturday, February 15, 2014 @ 17:38:41
  Author: guillaume
Revision: 206024

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 206023, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 206023, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 206023, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 206023, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  212 +-
 systemd_tmpfiles.d_tomcat7.conf |6 -
 systemd_tomcat7.service |   67 +---
 tomcat7.install |   79 ++
 4 files changed, 146 insertions(+), 218 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2014-02-15 16:37:29 UTC (rev 206023)
+++ PKGBUILD2014-02-15 16:38:41 UTC (rev 206024)
@@ -1,137 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat7
-pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.50
-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
-systemd_tomcat7.service
-systemd_tmpfiles.d_tomcat7.conf
-tomcat7.install)
-
-sha256sums=('a668e1356b4fa3032ecf2b65bc9136cd2eed98547719b363df66eb27b5e20fd0'
-'7be7b2d9e6626c81f2aa3d39a7e5b0e52e025d773cd29c4a0cf9e71b0d4c11e9'
-'6b3d9711319165c331b827cba40cb788c0d1ea60fd181a56b8da4ca41e2d2930'
-'4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
-'4db469bcbcfb043c63ce3db0412997552861ea0f9c09d8825808570ed75aa27b')
-
-_servletver=3.0
-_jspver=2.2
-
-build() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src
-
-  . /etc/profile.d/apache-ant.sh
-
-  ant clean 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 \
--Djava.7.home=${JAVA_HOME}
-}
-
-#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)
-  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 

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2014-01-30 Thread Guillaume Alaux
Date: Thursday, January 30, 2014 @ 20:47:56
  Author: guillaume
Revision: 204892

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 204891, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 204891, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 204891, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 204891, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  273 +++---
 systemd_tmpfiles.d_tomcat7.conf |6 
 systemd_tomcat7.service |   68 -
 tomcat7.install |   88 ++--
 4 files changed, 218 insertions(+), 217 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2014-01-30 19:46:55 UTC (rev 204891)
+++ PKGBUILD2014-01-30 19:47:56 UTC (rev 204892)
@@ -1,136 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat7
-pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.47
-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
-systemd_tomcat7.service
-systemd_tmpfiles.d_tomcat7.conf
-tomcat7.install)
-
-sha256sums=('be7cad1c70b9db84e8b139a81312ecd80761f2e69edbd1d176d49e52f728bc99'
-'46dc31b08c120ffc2e38dccc119b9df02662a9fb297fa3fc6d90902c2f86057a'
-'6b3d9711319165c331b827cba40cb788c0d1ea60fd181a56b8da4ca41e2d2930'
-'4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
-'4db469bcbcfb043c63ce3db0412997552861ea0f9c09d8825808570ed75aa27b')
-
-_servletver=3.0
-_jspver=2.2
-
-build() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src
-
-  . /etc/profile.d/apache-ant.sh
-
-  ant clean 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)
-  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 \
-

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2013-10-30 Thread Guillaume Alaux
Date: Wednesday, October 30, 2013 @ 17:52:12
  Author: guillaume
Revision: 198594

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 198593, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 198593, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 198593, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 198593, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  273 ++
 systemd_tmpfiles.d_tomcat7.conf |6 
 systemd_tomcat7.service |   68 -
 tomcat7.install |   88 ++--
 4 files changed, 217 insertions(+), 218 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-10-30 16:51:05 UTC (rev 198593)
+++ PKGBUILD2013-10-30 16:52:12 UTC (rev 198594)
@@ -1,137 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat7
-pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.42
-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
-systemd_tomcat7.service
-systemd_tmpfiles.d_tomcat7.conf
-tomcat7.install)
-
-sha256sums=('5dbc2194b894de0b620752f18f5dc69901627f49b87d9dfb5951750bb9c20c72'
-'c163f762d7180fc259cc0d8d96e6e05a53b7ffb0120cb2086d6dfadd991c36df'
-'6b3d9711319165c331b827cba40cb788c0d1ea60fd181a56b8da4ca41e2d2930'
-'4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
-'4db469bcbcfb043c63ce3db0412997552861ea0f9c09d8825808570ed75aa27b')
-
-_servletver=3.0
-_jspver=2.2
-
-build() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src
-
-  . /etc/profile.d/apache-ant.sh
-
-  ant clean 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)
-  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 \
-

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2013-07-08 Thread Guillaume Alaux
Date: Monday, July 8, 2013 @ 22:41:53
  Author: guillaume
Revision: 189832

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 189831, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 189831, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 189831, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 189831, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  274 +++---
 systemd_tmpfiles.d_tomcat7.conf |6 
 systemd_tomcat7.service |   68 -
 tomcat7.install |   88 ++--
 4 files changed, 218 insertions(+), 218 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-07-08 20:40:53 UTC (rev 189831)
+++ PKGBUILD2013-07-08 20:41:53 UTC (rev 189832)
@@ -1,137 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat7
-pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.41
-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
-systemd_tomcat7.service
-systemd_tmpfiles.d_tomcat7.conf
-tomcat7.install)
-
-sha256sums=('283a80c5be1a1eda9fc8864b11dcd026ba3bf2433b0d8377a4da4c2536a07ea6'
-'a4a4759626433995cffba39e92152f921dde138b4502e9ac2dd08be83b472740'
-'6b3d9711319165c331b827cba40cb788c0d1ea60fd181a56b8da4ca41e2d2930'
-'4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
-'4db469bcbcfb043c63ce3db0412997552861ea0f9c09d8825808570ed75aa27b')
-
-_servletver=3.0
-_jspver=2.2
-
-build() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src
-
-  . /etc/profile.d/apache-ant.sh
-
-  ant clean 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)
-  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 \
-

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2013-06-11 Thread Guillaume Alaux
Date: Tuesday, June 11, 2013 @ 22:24:32
  Author: guillaume
Revision: 188183

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 188182, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 188182, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 188182, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 188182, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  274 +++---
 systemd_tmpfiles.d_tomcat7.conf |6 
 systemd_tomcat7.service |   68 -
 tomcat7.install |   88 ++--
 4 files changed, 218 insertions(+), 218 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-06-11 20:24:19 UTC (rev 188182)
+++ PKGBUILD2013-06-11 20:24:32 UTC (rev 188183)
@@ -1,137 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat7
-pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.40
-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
-systemd_tomcat7.service
-systemd_tmpfiles.d_tomcat7.conf
-tomcat7.install)
-
-sha256sums=('28dcc7bddb686f59804492065ba9c7320ce9dc7b3d76078bd6ad6c4b0c0c3179'
-'430a3eec73b6994dbbd6e17728f131fa3609bdd923547445a745d4ffb6d9cf01'
-'6b3d9711319165c331b827cba40cb788c0d1ea60fd181a56b8da4ca41e2d2930'
-'4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
-'4db469bcbcfb043c63ce3db0412997552861ea0f9c09d8825808570ed75aa27b')
-
-_servletver=3.0
-_jspver=2.2
-
-build() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src
-
-  . /etc/profile.d/apache-ant.sh
-
-  ant clean 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)
-  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 \
-

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2013-05-12 Thread Guillaume Alaux
Date: Sunday, May 12, 2013 @ 12:12:27
  Author: guillaume
Revision: 185231

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 185230, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 185230, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 185230, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 185230, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  274 +++---
 systemd_tmpfiles.d_tomcat7.conf |6 
 systemd_tomcat7.service |   68 -
 tomcat7.install |   88 ++--
 4 files changed, 218 insertions(+), 218 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-05-12 10:10:50 UTC (rev 185230)
+++ PKGBUILD2013-05-12 10:12:27 UTC (rev 185231)
@@ -1,137 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat7
-pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.39
-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
-systemd_tomcat7.service
-systemd_tmpfiles.d_tomcat7.conf
-tomcat7.install)
-
-sha256sums=('d9b4daceb2040bff84dbc37ea07d442cf6b0a608b2d161f15740147fac76101d'
-'0b56c2c6cb70ba017b2b72c4354ca1f7cb935421eca911395aff03d195ab8a96'
-'6b3d9711319165c331b827cba40cb788c0d1ea60fd181a56b8da4ca41e2d2930'
-'4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
-'4db469bcbcfb043c63ce3db0412997552861ea0f9c09d8825808570ed75aa27b')
-
-_servletver=3.0
-_jspver=2.2
-
-build() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src
-
-  . /etc/profile.d/apache-ant.sh
-
-  ant clean 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)
-  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 \
-

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2013-03-28 Thread Guillaume Alaux
Date: Thursday, March 28, 2013 @ 22:13:02
  Author: guillaume
Revision: 180965

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 180964, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 180964, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 180964, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 180964, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
  tomcat7/repos/extra-any/systemd_tomcat7.service
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  274 +++---
 systemd_tmpfiles.d_tomcat7.conf |6 
 systemd_tomcat7.service |   68 -
 tomcat7.install |   88 ++--
 4 files changed, 218 insertions(+), 218 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-03-28 21:12:49 UTC (rev 180964)
+++ PKGBUILD2013-03-28 21:13:02 UTC (rev 180965)
@@ -1,137 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat7
-pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.37
-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
-systemd_tomcat7.service
-systemd_tmpfiles.d_tomcat7.conf
-tomcat7.install)
-
-sha256sums=('eb9d3e6b6ff5024bb6865a8bab57d3f01e221f4e8761c07a894e067f8ca63c0c'
-'4955fc8ca6ee20886d078360f0f169c0490949556044d96542750428e814d9aa'
-'6b3d9711319165c331b827cba40cb788c0d1ea60fd181a56b8da4ca41e2d2930'
-'4bfeb2f4462547bf15cb2b72db545c0531c70f8640fa79344d520ceea6812a93'
-'4db469bcbcfb043c63ce3db0412997552861ea0f9c09d8825808570ed75aa27b')
-
-_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)
-  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 \
-

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2013-02-21 Thread Guillaume Alaux
Date: Thursday, February 21, 2013 @ 20:11:43
  Author: guillaume
Revision: 178418

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 178417, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 178417, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 178417, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 178417, 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|  283 ++
 conf.d_tomcat7  |   19 --
 rc.d_tomcat7|   77 --
 systemd_tmpfiles.d_tomcat7.conf |6 
 systemd_tomcat7.service |   69 -
 tomcat7.install |   71 +
 6 files changed, 218 insertions(+), 307 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-02-21 19:00:31 UTC (rev 178417)
+++ PKGBUILD2013-02-21 19:11:43 UTC (rev 178418)
@@ -1,146 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@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'
-'871d2ba81cc8a52da00873e4ecf03ecd5dd2ef23626c2ee825ed0654b72b'
-'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}
-
-  # 

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

2013-01-17 Thread Guillaume Alaux
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
===
--- PKGBUILD2013-01-17 08:41:55 UTC (rev 175359)
+++ PKGBUILD2013-01-17 08:42:56 UTC (rev 175360)
@@ -1,146 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@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'
-'871d2ba81cc8a52da00873e4ecf03ecd5dd2ef23626c2ee825ed0654b72b'
-'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 

[arch-commits] Commit in tomcat7/repos/extra-any (11 files)

2013-01-10 Thread Guillaume Alaux
Date: Thursday, January 10, 2013 @ 04:44:00
  Author: guillaume
Revision: 174998

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 174997, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/conf.d_tomcat7
(from rev 174997, tomcat7/trunk/conf.d_tomcat7)
  tomcat7/repos/extra-any/rc.d_tomcat7
(from rev 174997, tomcat7/trunk/rc.d_tomcat7)
  tomcat7/repos/extra-any/systemd_tmpfiles.d_tomcat7.conf
(from rev 174997, tomcat7/trunk/systemd_tmpfiles.d_tomcat7.conf)
  tomcat7/repos/extra-any/systemd_tomcat7.service
(from rev 174997, tomcat7/trunk/systemd_tomcat7.service)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 174997, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd.tomcat7.service
  tomcat7/repos/extra-any/tomcat7
  tomcat7/repos/extra-any/tomcat7.conf.d
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  283 +++---
 conf.d_tomcat7  |   19 ++
 rc.d_tomcat7|   77 ++
 systemd.tomcat7.service |   35 
 systemd_tmpfiles.d_tomcat7.conf |3 
 systemd_tomcat7.service |   35 
 tomcat7 |   77 --
 tomcat7.conf.d  |   19 --
 tomcat7.install |   54 +++
 9 files changed, 307 insertions(+), 295 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-01-10 09:41:18 UTC (rev 174997)
+++ PKGBUILD2013-01-10 09:44:00 UTC (rev 174998)
@@ -1,137 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat7
-pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.34
-pkgrel=2
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-makedepends=('java-environment' 'apache-ant=1.8' 'java-commons-daemon')
-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
-tomcat7.conf.d
-tomcat7
-tomcat7.install
-systemd.tomcat7.service)
-
-sha256sums=('c05b85928ff870244a061700166ee781e66bad68f4a7867ba22c48beeec19fc0'
-'4335136f0bee44aebfd7b4394c7fdfcc9d174a93ee4b1cf8d1f90ea164038e85'
-'a9a2d50244e5206e471af4cdf36fd8444e85d382d9f70ca776d72985c152b788'
-'7de8be5e501f0c697b6983f92e250702bb653fb8873a78bd04e15dce63670c01'
-'8ae4e12ccdd1a7be04fae1cf68b0c170a5ee7559f8dffca5f9ecf05c20b66c8e'
-'082227bd58187199503ac3222e3fcaa818eae0916d34c38dbcfa7f8fb7e5e6ce')
-
-_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 \
--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'
-   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 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2013-01-07 Thread Guillaume Alaux
Date: Monday, January 7, 2013 @ 07:31:09
  Author: guillaume
Revision: 174771

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 174770, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd.tomcat7.service
(from rev 174770, tomcat7/trunk/systemd.tomcat7.service)
  tomcat7/repos/extra-any/tomcat7
(from rev 174770, tomcat7/trunk/tomcat7)
  tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 174770, tomcat7/trunk/tomcat7.conf.d)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 174770, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd.tomcat7.service
  tomcat7/repos/extra-any/tomcat7
  tomcat7/repos/extra-any/tomcat7.conf.d
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  278 ++
 systemd.tomcat7.service |   70 +--
 tomcat7 |  154 -
 tomcat7.conf.d  |   38 +++---
 tomcat7.install |   54 
 5 files changed, 295 insertions(+), 299 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2013-01-07 12:29:21 UTC (rev 174770)
+++ PKGBUILD2013-01-07 12:31:09 UTC (rev 174771)
@@ -1,141 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat7
-pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.34
-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
-tomcat7.conf.d
-tomcat7
-tomcat7.install
-systemd.tomcat7.service)
-
-sha256sums=('c05b85928ff870244a061700166ee781e66bad68f4a7867ba22c48beeec19fc0'
-'4335136f0bee44aebfd7b4394c7fdfcc9d174a93ee4b1cf8d1f90ea164038e85'
-'a9a2d50244e5206e471af4cdf36fd8444e85d382d9f70ca776d72985c152b788'
-'7de8be5e501f0c697b6983f92e250702bb653fb8873a78bd04e15dce63670c01'
-'8ae4e12ccdd1a7be04fae1cf68b0c170a5ee7559f8dffca5f9ecf05c20b66c8e'
-'a64609f621ec1838a5476d9c5a7860800fed5644940fbb32b40828d14d17485f')
-
-_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 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2012-12-15 Thread Guillaume Alaux
Date: Saturday, December 15, 2012 @ 14:43:31
  Author: guillaume
Revision: 173237

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 173236, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd.tomcat7.service
(from rev 173236, tomcat7/trunk/systemd.tomcat7.service)
  tomcat7/repos/extra-any/tomcat7
(from rev 173236, tomcat7/trunk/tomcat7)
  tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 173236, tomcat7/trunk/tomcat7.conf.d)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 173236, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd.tomcat7.service
  tomcat7/repos/extra-any/tomcat7
  tomcat7/repos/extra-any/tomcat7.conf.d
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  282 +++---
 systemd.tomcat7.service |   70 +--
 tomcat7 |  154 -
 tomcat7.conf.d  |   38 +++---
 tomcat7.install |   54 
 5 files changed, 299 insertions(+), 299 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2012-12-15 19:42:30 UTC (rev 173236)
+++ PKGBUILD2012-12-15 19:43:31 UTC (rev 173237)
@@ -1,141 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat7
-pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.33
-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
-tomcat7.conf.d
-tomcat7
-tomcat7.install
-systemd.tomcat7.service)
-
-sha1sums=('1298bb628104146e37c157df905f1f747fafc280'
-  '9002fe245071262a23acb09eff0e6e52a770df6d'
-  '408a199f35a3b01818614bf330df10f553c4eb5e'
-  '9b1a4b9a1e1105123cfda4f57bcab074731f3b9d'
-  '8c9d41f706cc4131d6515392a1e54bfa8add3303'
-  '4bbe3faf56657342ae50bbc0c884960322c9c3cf')
-
-_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 

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2012-11-26 Thread Guillaume Alaux
Date: Monday, November 26, 2012 @ 08:06:43
  Author: guillaume
Revision: 172009

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 172008, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd.tomcat7.service
(from rev 172008, tomcat7/trunk/systemd.tomcat7.service)
  tomcat7/repos/extra-any/tomcat7
(from rev 172008, tomcat7/trunk/tomcat7)
  tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 172008, tomcat7/trunk/tomcat7.conf.d)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 172008, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd.tomcat7.service
  tomcat7/repos/extra-any/tomcat7
  tomcat7/repos/extra-any/tomcat7.conf.d
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  282 +++---
 systemd.tomcat7.service |   70 +--
 tomcat7 |  154 -
 tomcat7.conf.d  |   38 +++---
 tomcat7.install |   54 
 5 files changed, 299 insertions(+), 299 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2012-11-26 13:03:32 UTC (rev 172008)
+++ PKGBUILD2012-11-26 13:06:43 UTC (rev 172009)
@@ -1,141 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat7
-pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.32
-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
-tomcat7.conf.d
-tomcat7
-tomcat7.install
-systemd.tomcat7.service)
-
-md5sums=('daf3de124ec09702560931e87219deb6'
- '5c2576600ceb3c93a712820c7c16fa70'
- '5219c0d3a25f274ec956d3291b83b320'
- '361a41c02930a4e43245ab7379a617e9'
- '6c5b4ed6d71b227f305b751c349fa31b'
- '1e2fba29b10f29541d0f5811ede9cb76')
-
-_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 \
-

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2012-10-12 Thread Guillaume Alaux
Date: Friday, October 12, 2012 @ 03:20:49
  Author: guillaume
Revision: 168469

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 168468, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd.tomcat7.service
(from rev 168468, tomcat7/trunk/systemd.tomcat7.service)
  tomcat7/repos/extra-any/tomcat7
(from rev 168468, tomcat7/trunk/tomcat7)
  tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 168468, tomcat7/trunk/tomcat7.conf.d)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 168468, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd.tomcat7.service
  tomcat7/repos/extra-any/tomcat7
  tomcat7/repos/extra-any/tomcat7.conf.d
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  282 +++---
 systemd.tomcat7.service |   70 +--
 tomcat7 |  154 -
 tomcat7.conf.d  |   38 +++---
 tomcat7.install |   54 
 5 files changed, 299 insertions(+), 299 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2012-10-12 07:19:31 UTC (rev 168468)
+++ PKGBUILD2012-10-12 07:20:49 UTC (rev 168469)
@@ -1,141 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat7
-pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.30
-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
-tomcat7.conf.d
-tomcat7
-tomcat7.install
-systemd.tomcat7.service)
-
-md5sums=('18c61cc4a7b559ad34d34d6f4229ac28'
- '48c19559f28aa6f189bcb0b2c2e563cb'
- '5219c0d3a25f274ec956d3291b83b320'
- '361a41c02930a4e43245ab7379a617e9'
- '6c5b4ed6d71b227f305b751c349fa31b'
- '1e2fba29b10f29541d0f5811ede9cb76')
-
-_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 \
-

[arch-commits] Commit in tomcat7/repos/extra-any (10 files)

2012-09-06 Thread Guillaume Alaux
Date: Thursday, September 6, 2012 @ 15:59:33
  Author: guillaume
Revision: 166344

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 166343, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd.tomcat7.service
(from rev 166343, tomcat7/trunk/systemd.tomcat7.service)
  tomcat7/repos/extra-any/tomcat7
(from rev 166343, tomcat7/trunk/tomcat7)
  tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 166343, tomcat7/trunk/tomcat7.conf.d)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 166343, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/systemd.tomcat7.service
  tomcat7/repos/extra-any/tomcat7
  tomcat7/repos/extra-any/tomcat7.conf.d
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  282 +++---
 systemd.tomcat7.service |   66 +-
 tomcat7 |  154 -
 tomcat7.conf.d  |   37 +++---
 tomcat7.install |   54 
 5 files changed, 299 insertions(+), 294 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2012-09-06 19:58:31 UTC (rev 166343)
+++ PKGBUILD2012-09-06 19:59:33 UTC (rev 166344)
@@ -1,141 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat7
-pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.29
-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
-tomcat7.conf.d
-tomcat7
-tomcat7.install
-systemd.tomcat7.service)
-
-md5sums=('16b9f637e5ca623cf87a2a1514c8978e'
- '307076fa3827e19fa9b03f3ef7cf1f3f'
- 'f200548b6636bd5894b109474904952a'
- '361a41c02930a4e43245ab7379a617e9'
- '6c5b4ed6d71b227f305b751c349fa31b'
- '579ecebdbfcd9358d55e6425ae16bdeb')
-
-_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 \
-

[arch-commits] Commit in tomcat7/repos/extra-any (9 files)

2012-08-19 Thread Guillaume Alaux
Date: Sunday, August 19, 2012 @ 10:16:33
  Author: guillaume
Revision: 165438

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 165437, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/systemd.tomcat7.service
(from rev 165437, tomcat7/trunk/systemd.tomcat7.service)
  tomcat7/repos/extra-any/tomcat7
(from rev 165437, tomcat7/trunk/tomcat7)
  tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 165437, tomcat7/trunk/tomcat7.conf.d)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 165437, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/tomcat7
  tomcat7/repos/extra-any/tomcat7.conf.d
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  270 --
 systemd.tomcat7.service |   31 +
 tomcat7 |  154 +-
 tomcat7.conf.d  |   33 +++--
 tomcat7.install |   54 -
 5 files changed, 294 insertions(+), 248 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2012-08-19 14:16:07 UTC (rev 165437)
+++ PKGBUILD2012-08-19 14:16:33 UTC (rev 165438)
@@ -1,129 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat7
-pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.27
-pkgrel=1
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-# Does not build with JDK7. Same issue as with cassandra:
-# https://issues.apache.org/jira/browse/CASSANDRA-3275
-#makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon' 
'eclipse-ecj')
-makedepends=('java-environment=6' '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
-tomcat7.conf.d
-tomcat7
-tomcat7.install)
-
-md5sums=('a7fa41d09ccc1dc324c35fdebebd2afe'
- 'eea5573b0acd985bb8b630a20719db76'
- '361a41c02930a4e43245ab7379a617e9'
- '6c5b4ed6d71b227f305b751c349fa31b')
-
-_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
-}
-
-#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 /usr/share/java/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 

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2012-06-05 Thread Guillaume Alaux
Date: Tuesday, June 5, 2012 @ 15:20:59
  Author: guillaume
Revision: 160781

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 160780, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/tomcat7
(from rev 160780, tomcat7/trunk/tomcat7)
  tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 160780, tomcat7/trunk/tomcat7.conf.d)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 160780, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/tomcat7
  tomcat7/repos/extra-any/tomcat7.conf.d
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  258 +++---
 tomcat7 |  154 
 tomcat7.conf.d  |   30 +++---
 tomcat7.install |   54 +--
 4 files changed, 248 insertions(+), 248 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2012-06-05 19:20:32 UTC (rev 160780)
+++ PKGBUILD2012-06-05 19:20:59 UTC (rev 160781)
@@ -1,129 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat7
-pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.26
-pkgrel=1
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-# Does not build with JDK7. Same issue as with cassandra:
-# https://issues.apache.org/jira/browse/CASSANDRA-3275
-#makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon' 
'eclipse-ecj')
-makedepends=('java-environment=6' '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
-tomcat7.conf.d
-tomcat7
-tomcat7.install)
-
-md5sums=('eb8e7192b02b6031be6fc23afea2431f'
- 'eea5573b0acd985bb8b630a20719db76'
- '361a41c02930a4e43245ab7379a617e9'
- '6c5b4ed6d71b227f305b751c349fa31b')
-
-_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
-}
-
-#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 /usr/share/java/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
-  ln -s 

[arch-commits] Commit in tomcat7/repos/extra-any (PKGBUILD)

2012-04-01 Thread Guillaume Alaux
Date: Sunday, April 1, 2012 @ 09:52:58
  Author: guillaume
Revision: 155300

archrelease: copy trunk to extra-any

Modified:
  tomcat7/repos/extra-any/PKGBUILD

--+
 PKGBUILD |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-01 13:52:23 UTC (rev 155299)
+++ PKGBUILD2012-04-01 13:52:58 UTC (rev 155300)
@@ -1,8 +1,8 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgbase=tomcat7
 pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.25
-pkgrel=1
+pkgver=7.0.22
+pkgrel=2
 arch=('any')
 url='http://tomcat.apache.org/'
 license=('APACHE')
@@ -11,11 +11,13 @@
 #makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon' 
'eclipse-ecj')
 makedepends=('java-environment=6' '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://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.4-bin.tar.gz
 tomcat7.conf.d
 tomcat7
 tomcat7.install)
 
-md5sums=('12ebfd86a071184baac453eaf7c2a760'
+md5sums=('878bc216d86ce803f3bbc65fd40eb96c'
+ 'bd272e9611b0d880fd02493377d4691b'
  'eea5573b0acd985bb8b630a20719db76'
  '361a41c02930a4e43245ab7379a617e9'
  '6c5b4ed6d71b227f305b751c349fa31b')
@@ -30,7 +32,9 @@
   ant deploy \
 -Dbase.path=${srcdir}/DOWN_LIBS \
 -Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
+-Djdt.jar=/usr/share/java/eclipse-ecj.jar \
+-Dtomcat-dbcp.jar=${srcdir}/commons-dbcp-1.4/commons-dbcp-1.4.jar \
+
-Dtomcat-dbcp-src.jar=${srcdir}/commons-dbcp-1.4/commons-dbcp-1.4-sources.jar
 }
 
 #TODO add test ant test
@@ -64,8 +68,7 @@
 
 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})
+  depends=('java-runtime=6' 'java-jsvc' 'java-servlet3.0-tomcat' 
'java-jsp2.2-tomcat' 'eclipse-ecj')
   optdepends=('tomcat-native: to allow optimal performance in production 
environments')
   backup=(etc/tomcat7/catalina.policy
   etc/tomcat7/catalina.properties



[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2012-04-01 Thread Guillaume Alaux
Date: Sunday, April 1, 2012 @ 10:14:16
  Author: guillaume
Revision: 155301

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 155300, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/tomcat7
(from rev 155300, tomcat7/trunk/tomcat7)
  tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 155300, tomcat7/trunk/tomcat7.conf.d)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 155300, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/tomcat7
  tomcat7/repos/extra-any/tomcat7.conf.d
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  260 ++
 tomcat7 |  154 +++
 tomcat7.conf.d  |   30 +++---
 tomcat7.install |   54 +--
 4 files changed, 248 insertions(+), 250 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2012-04-01 13:52:58 UTC (rev 155300)
+++ PKGBUILD2012-04-01 14:14:16 UTC (rev 155301)
@@ -1,131 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat7
-pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.22
-pkgrel=2
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-# Does not build with JDK7. Same issue as with cassandra:
-# https://issues.apache.org/jira/browse/CASSANDRA-3275
-#makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon' 
'eclipse-ecj')
-makedepends=('java-environment=6' '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://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.4-bin.tar.gz
-tomcat7.conf.d
-tomcat7
-tomcat7.install)
-
-md5sums=('878bc216d86ce803f3bbc65fd40eb96c'
- 'bd272e9611b0d880fd02493377d4691b'
- 'eea5573b0acd985bb8b630a20719db76'
- '361a41c02930a4e43245ab7379a617e9'
- '6c5b4ed6d71b227f305b751c349fa31b')
-
-_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 \
--Dtomcat-dbcp.jar=${srcdir}/commons-dbcp-1.4/commons-dbcp-1.4.jar \
-
-Dtomcat-dbcp-src.jar=${srcdir}/commons-dbcp-1.4/commons-dbcp-1.4-sources.jar
-}
-
-#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' 'java-servlet3.0-tomcat' 
'java-jsp2.2-tomcat' 'eclipse-ecj')
-  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}
-
-  # 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 

[arch-commits] Commit in tomcat7/repos/extra-any (PKGBUILD)

2012-01-29 Thread Guillaume Alaux
Date: Sunday, January 29, 2012 @ 12:42:00
  Author: guillaume
Revision: 148003

archrelease: copy trunk to extra-any

Modified:
  tomcat7/repos/extra-any/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-29 17:41:38 UTC (rev 148002)
+++ PKGBUILD2012-01-29 17:42:00 UTC (rev 148003)
@@ -1,8 +1,8 @@
 # Maintainer: Guillaume ALAUX guilla...@archlinux.org
 pkgbase=tomcat7
 pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.23
-pkgrel=1
+pkgver=7.0.22
+pkgrel=2
 arch=('any')
 url='http://tomcat.apache.org/'
 license=('APACHE')
@@ -16,7 +16,7 @@
 tomcat7
 tomcat7.install)
 
-md5sums=('4d78b1b115a4c3fcd079c388a8bbd0ad'
+md5sums=('878bc216d86ce803f3bbc65fd40eb96c'
  'bd272e9611b0d880fd02493377d4691b'
  'eea5573b0acd985bb8b630a20719db76'
  '361a41c02930a4e43245ab7379a617e9'
@@ -68,8 +68,7 @@
 
 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})
+  depends=('java-runtime=6' 'java-jsvc' 'java-servlet3.0-tomcat' 
'java-jsp2.2-tomcat' 'eclipse-ecj')
   optdepends=('tomcat-native: to allow optimal performance in production 
environments')
   backup=(etc/tomcat7/catalina.policy
   etc/tomcat7/catalina.properties



[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2012-01-29 Thread Ionut Biru
Date: Sunday, January 29, 2012 @ 13:12:23
  Author: ibiru
Revision: 148004

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 148003, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/tomcat7
(from rev 148003, tomcat7/trunk/tomcat7)
  tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 148003, tomcat7/trunk/tomcat7.conf.d)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 148003, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/tomcat7
  tomcat7/repos/extra-any/tomcat7.conf.d
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  259 ++
 tomcat7 |  154 
 tomcat7.conf.d  |   30 +++---
 tomcat7.install |   54 +--
 4 files changed, 247 insertions(+), 250 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2012-01-29 17:42:00 UTC (rev 148003)
+++ PKGBUILD2012-01-29 18:12:23 UTC (rev 148004)
@@ -1,131 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgbase=tomcat7
-pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
-pkgver=7.0.22
-pkgrel=2
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-# Does not build with JDK7. Same issue as with cassandra:
-# https://issues.apache.org/jira/browse/CASSANDRA-3275
-#makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon' 
'eclipse-ecj')
-makedepends=('java-environment=6' '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://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.4-bin.tar.gz
-tomcat7.conf.d
-tomcat7
-tomcat7.install)
-
-md5sums=('878bc216d86ce803f3bbc65fd40eb96c'
- 'bd272e9611b0d880fd02493377d4691b'
- 'eea5573b0acd985bb8b630a20719db76'
- '361a41c02930a4e43245ab7379a617e9'
- '6c5b4ed6d71b227f305b751c349fa31b')
-
-_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 \
--Dtomcat-dbcp.jar=${srcdir}/commons-dbcp-1.4/commons-dbcp-1.4.jar \
-
-Dtomcat-dbcp-src.jar=${srcdir}/commons-dbcp-1.4/commons-dbcp-1.4-sources.jar
-}
-
-#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' 'java-servlet3.0-tomcat' 
'java-jsp2.2-tomcat' 'eclipse-ecj')
-  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}
-
-  # 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 

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2011-11-01 Thread Guillaume Alaux
Date: Tuesday, November 1, 2011 @ 13:47:48
  Author: guillaume
Revision: 141662

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 141661, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/tomcat7
(from rev 141661, tomcat7/trunk/tomcat7)
  tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 141661, tomcat7/trunk/tomcat7.conf.d)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 141661, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/tomcat7
  tomcat7/repos/extra-any/tomcat7.conf.d
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  211 +-
 tomcat7 |  154 +++
 tomcat7.conf.d  |   30 +++
 tomcat7.install |   54 ++---
 4 files changed, 250 insertions(+), 199 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-11-01 17:46:51 UTC (rev 141661)
+++ PKGBUILD2011-11-01 17:47:48 UTC (rev 141662)
@@ -1,80 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.22
-pkgrel=1
-pkgdesc=Servlet-3.0/JSP-2.2 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
-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
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-tomcat7.conf.d
-tomcat7
-tomcat7.install)
-
-md5sums=('878bc216d86ce803f3bbc65fd40eb96c'
- '0fa46eae1746d6cd564905bfb0072776'
- '361a41c02930a4e43245ab7379a617e9'
- '6c5b4ed6d71b227f305b751c349fa31b')
-
-build() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src
-
-  . /etc/profile.d/apache-ant.sh
-  ant \
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
-  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 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  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}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-

Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 141661, 
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-11-01 17:47:48 UTC (rev 141662)
@@ -0,0 +1,131 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgbase=tomcat7
+pkgname=('java-servlet3.0-tomcat' 'java-jsp2.2-tomcat' 'tomcat7')
+pkgver=7.0.22
+pkgrel=2
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+# Does not build with JDK7. Same issue as with cassandra:
+# https://issues.apache.org/jira/browse/CASSANDRA-3275
+#makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon' 
'eclipse-ecj')
+makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon' 
'eclipse-ecj')

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2011-10-01 Thread Guillaume Alaux
Date: Saturday, October 1, 2011 @ 12:58:06
  Author: guillaume
Revision: 139199

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 139198, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/tomcat7
(from rev 139198, tomcat7/trunk/tomcat7)
  tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 139198, tomcat7/trunk/tomcat7.conf.d)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 139198, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/tomcat7
  tomcat7/repos/extra-any/tomcat7.conf.d
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  160 +++---
 tomcat7 |  154 +--
 tomcat7.conf.d  |   30 +-
 tomcat7.install |   54 +-
 4 files changed, 199 insertions(+), 199 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-10-01 16:57:12 UTC (rev 139198)
+++ PKGBUILD2011-10-01 16:58:06 UTC (rev 139199)
@@ -1,80 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.21
-pkgrel=2
-pkgdesc=Servlet-3.0/JSP-2.2 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
-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
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-tomcat7.conf.d
-tomcat7
-tomcat7.install)
-
-md5sums=('40d71249a54526ab0145fd5b41008518'
- '0fa46eae1746d6cd564905bfb0072776'
- '361a41c02930a4e43245ab7379a617e9'
- '6c5b4ed6d71b227f305b751c349fa31b')
-
-build() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src
-
-  . /etc/profile.d/apache-ant.sh
-  ant \
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
-  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 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  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}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-

Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 139198, 
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-10-01 16:58:06 UTC (rev 139199)
@@ -0,0 +1,80 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=tomcat7
+pkgver=7.0.22
+pkgrel=1
+pkgdesc=Servlet-3.0/JSP-2.2 Container
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
+makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
+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
+

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2011-09-07 Thread Guillaume Alaux
Date: Wednesday, September 7, 2011 @ 09:58:22
  Author: guillaume
Revision: 137349

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 137348, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/tomcat7
(from rev 137348, tomcat7/trunk/tomcat7)
  tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 137348, tomcat7/trunk/tomcat7.conf.d)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 137348, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/tomcat7
  tomcat7/repos/extra-any/tomcat7.conf.d
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  159 +++---
 tomcat7 |  154 ++--
 tomcat7.conf.d  |   30 +-
 tomcat7.install |   54 +-
 4 files changed, 199 insertions(+), 198 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-09-07 13:57:25 UTC (rev 137348)
+++ PKGBUILD2011-09-07 13:58:22 UTC (rev 137349)
@@ -1,79 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.21
-pkgrel=1
-pkgdesc=Servlet-3.0/JSP-2.2 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
-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
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-tomcat7.conf.d
-tomcat7
-tomcat7.install)
-
-md5sums=('40d71249a54526ab0145fd5b41008518'
- '0fa46eae1746d6cd564905bfb0072776'
- '361a41c02930a4e43245ab7379a617e9'
- '1be39071bd27781c352b2d73b765e29d')
-
-build() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src
-
-  . /etc/profile.d/apache-ant.sh
-  ant \
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
-  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 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  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 -dm770 ${pkgdir}/etc/${pkgname}
-  install -m660 conf/* ${pkgdir}/etc/${pkgname}
-  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}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-

Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 137348, 
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-09-07 13:58:22 UTC (rev 137349)
@@ -0,0 +1,80 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=tomcat7
+pkgver=7.0.21
+pkgrel=2
+pkgdesc=Servlet-3.0/JSP-2.2 Container
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
+makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
+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
+

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2011-09-02 Thread Guillaume Alaux
Date: Friday, September 2, 2011 @ 13:56:32
  Author: guillaume
Revision: 136903

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 136902, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/tomcat7
(from rev 136902, tomcat7/trunk/tomcat7)
  tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 136902, tomcat7/trunk/tomcat7.conf.d)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 136902, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/tomcat7
  tomcat7/repos/extra-any/tomcat7.conf.d
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  158 +++---
 tomcat7 |  154 ++--
 tomcat7.conf.d  |   30 +-
 tomcat7.install |   54 +-
 4 files changed, 198 insertions(+), 198 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-09-02 17:55:31 UTC (rev 136902)
+++ PKGBUILD2011-09-02 17:56:32 UTC (rev 136903)
@@ -1,79 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.20
-pkgrel=2
-pkgdesc=Servlet-3.0/JSP-2.2 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
-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
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-tomcat7.conf.d
-tomcat7
-tomcat7.install)
-
-md5sums=('bb13b2910cc71c29e571ea062ad6ab3a'
- '0fa46eae1746d6cd564905bfb0072776'
- '361a41c02930a4e43245ab7379a617e9'
- '1be39071bd27781c352b2d73b765e29d')
-
-build() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src
-
-  . /etc/profile.d/apache-ant.sh
-  ant \
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
-  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 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  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 -dm770 ${pkgdir}/etc/${pkgname}
-  install -m660 conf/* ${pkgdir}/etc/${pkgname}
-  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}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-

Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 136902, 
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-09-02 17:56:32 UTC (rev 136903)
@@ -0,0 +1,79 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=tomcat7
+pkgver=7.0.21
+pkgrel=1
+pkgdesc=Servlet-3.0/JSP-2.2 Container
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
+makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
+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
+

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2011-08-21 Thread Guillaume Alaux
Date: Sunday, August 21, 2011 @ 17:09:53
  Author: guillaume
Revision: 136031

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 136030, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/tomcat7
(from rev 136030, tomcat7/trunk/tomcat7)
  tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 136030, tomcat7/trunk/tomcat7.conf.d)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 136030, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/tomcat7
  tomcat7/repos/extra-any/tomcat7.conf.d
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  159 ++
 tomcat7 |  158 ++---
 tomcat7.conf.d  |   26 +---
 tomcat7.install |   54 +-
 4 files changed, 198 insertions(+), 199 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 21:08:54 UTC (rev 136030)
+++ PKGBUILD2011-08-21 21:09:53 UTC (rev 136031)
@@ -1,80 +0,0 @@
-# Maintainer: Guillaume ALAUX guilla...@archlinux.org
-pkgname=tomcat7
-pkgver=7.0.20
-pkgrel=1
-pkgdesc=Servlet-3.0/JSP-2.2 Container
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
-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
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-tomcat7.conf.d
-tomcat7
-tomcat7.install)
-
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('bb13b2910cc71c29e571ea062ad6ab3a'
- '13eb5570b4d7dcbbe8b8372575c010c9'
- '70eabcf5bbfa0978e738d95c64abb7a7'
- '1be39071bd27781c352b2d73b765e29d')
-
-build() {
-  cd ${srcdir}/apache-tomcat-${pkgver}-src
-
-  . /etc/profile.d/apache-ant.sh
-  ant \
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
-  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 lib/* ${pkgdir}/usr/share/java/${pkgname}
-  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 -dm770 ${pkgdir}/etc/${pkgname}
-  install -m660 conf/* ${pkgdir}/etc/${pkgname}
-  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}/tomcat7.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/tomcat7 ${pkgdir}/etc/rc.d/${pkgname}
-}
-

Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 136030, 
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 21:09:53 UTC (rev 136031)
@@ -0,0 +1,79 @@
+# Maintainer: Guillaume ALAUX guilla...@archlinux.org
+pkgname=tomcat7
+pkgver=7.0.20
+pkgrel=2
+pkgdesc=Servlet-3.0/JSP-2.2 Container
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime=6' 'java-jsvc' 'eclipse-ecj')
+makedepends=('java-environment=6' 'apache-ant=1.8' 'java-commons-daemon')
+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
+

[arch-commits] Commit in tomcat7/repos (extra-any)

2011-08-12 Thread Guillaume Alaux
Date: Friday, August 12, 2011 @ 09:24:04
  Author: guillaume
Revision: 135304

archrelease: remove extra-any

Deleted:
  tomcat7/repos/extra-any/



[arch-commits] Commit in tomcat7/repos (extra-any)

2011-08-12 Thread Guillaume Alaux
Date: Friday, August 12, 2011 @ 09:24:18
  Author: guillaume
Revision: 135305

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/



[arch-commits] Commit in tomcat7/repos (extra-any)

2011-07-19 Thread Guillaume Alaux
Date: Tuesday, July 19, 2011 @ 16:03:00
  Author: guillaume
Revision: 132072

archrelease: remove extra-any

Deleted:
  tomcat7/repos/extra-any/



[arch-commits] Commit in tomcat7/repos (extra-any)

2011-07-19 Thread Guillaume Alaux
Date: Tuesday, July 19, 2011 @ 16:03:20
  Author: guillaume
Revision: 132073

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/



[arch-commits] Commit in tomcat7/repos (extra-any)

2011-06-27 Thread Guillaume Alaux
Date: Monday, June 27, 2011 @ 07:09:54
  Author: guillaume
Revision: 129402

archrelease: remove extra-any

Deleted:
  tomcat7/repos/extra-any/



[arch-commits] Commit in tomcat7/repos (extra-any)

2011-06-27 Thread Guillaume Alaux
Date: Monday, June 27, 2011 @ 07:10:06
  Author: guillaume
Revision: 129403

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/



[arch-commits] Commit in tomcat7/repos (extra-any)

2011-06-17 Thread Guillaume Alaux
Date: Friday, June 17, 2011 @ 11:48:57
  Author: guillaume
Revision: 127658

archrelease: remove extra-any

Deleted:
  tomcat7/repos/extra-any/



[arch-commits] Commit in tomcat7/repos (extra-any)

2011-06-17 Thread Guillaume Alaux
Date: Friday, June 17, 2011 @ 11:49:10
  Author: guillaume
Revision: 127659

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/



[arch-commits] Commit in tomcat7/repos (extra-any)

2011-05-13 Thread Guillaume Alaux
Date: Friday, May 13, 2011 @ 03:54:53
  Author: guillaume
Revision: 123800

archrelease: remove extra-any

Deleted:
  tomcat7/repos/extra-any/



[arch-commits] Commit in tomcat7/repos (extra-any)

2011-05-13 Thread Guillaume Alaux
Date: Friday, May 13, 2011 @ 03:55:04
  Author: guillaume
Revision: 123801

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/



[arch-commits] Commit in tomcat7/repos (extra-any)

2011-05-09 Thread Guillaume Alaux
Date: Monday, May 9, 2011 @ 17:18:23
  Author: guillaume
Revision: 123306

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/