[Git][java-team/tomcat9][master] 3 commits: Also drop tomcat9-user and tomcat9-common.
Markus Koschany (@apo)
gitlab at salsa.debian.org
Sat May 27 17:08:25 BST 2023
Markus Koschany pushed to branch master at Debian Java Maintainers / tomcat9
Commits:
590e5fe1 by Markus Koschany at 2023-05-27T17:50:03+02:00
Also drop tomcat9-user and tomcat9-common.
- - - - -
71f00381 by Markus Koschany at 2023-05-27T17:51:37+02:00
Update changelog
- - - - -
42739d93 by Markus Koschany at 2023-05-27T17:54:43+02:00
Update debian/rules
- - - - -
12 changed files:
- debian/changelog
- debian/control
- − debian/logging.properties
- debian/rules
- − debian/tomcat9-common.docs
- − debian/tomcat9-common.install
- − debian/tomcat9-common.links
- − debian/tomcat9-instance-create
- − debian/tomcat9-instance-create.1
- − debian/tomcat9-user.install
- − debian/tomcat9-user.manpages
- − debian/tomcat9.postrm.in
Changes:
=====================================
debian/changelog
=====================================
@@ -1,12 +1,12 @@
-tomcat9 (9.0.70-2) UNRELEASED; urgency=medium
+tomcat9 (9.0.70-2) unstable; urgency=medium
* Team upload.
* Drop tomcat9 server packages because only one Tomcat version is supported
- per release. Only retain tomcat9-user, tomcat9-common and libtomcat9-java.
- Users are strongly encouraged to switch to Tomcat 10 instead.
+ per release. Only retain libtomcat9-java because of compatibility reasons
+ for now. Users are strongly encouraged to switch to Tomcat 10 instead.
(Closes: #1034824)
- -- Markus Koschany <apo at debian.org> Fri, 26 May 2023 20:57:11 +0200
+ -- Markus Koschany <apo at debian.org> Sat, 27 May 2023 17:51:32 +0200
tomcat9 (9.0.70-1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -29,50 +29,6 @@ Vcs-Git: https://salsa.debian.org/java-team/tomcat9.git
Vcs-Browser: https://salsa.debian.org/java-team/tomcat9
Homepage: http://tomcat.apache.org
-Package: tomcat9-common
-Architecture: all
-Depends:
- default-jre-headless | java11-runtime-headless | java11-runtime,
- libtomcat9-java (>= ${source:Version}),
- ${misc:Depends}
-Description: Apache Tomcat 9 - Servlet and JSP engine -- common files
- Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
- specifications from Oracle, and provides a "pure Java" HTTP web
- server environment for Java code to run.
- .
- This package contains common files needed by the tomcat9-user package (Tomcat
- 9 scripts and libraries).
- .
- WARNING: DO NOT USE FOR PRODUCTION PURPOSES. THIS PACKAGE DOES NOT RECEIVE ANY
- SECURITY SUPPORT.
- .
- Users are advised to switch to tomcat10-common instead.
-
-Package: tomcat9-user
-Architecture: all
-Depends:
- netcat-openbsd,
- tomcat9-common (>= ${source:Version}),
- ${misc:Depends}
-Suggests:
- tomcat9 (>= ${source:Version}),
- tomcat9-admin (>= ${source:Version}),
- tomcat9-docs (>= ${source:Version}),
- tomcat9-examples (>= ${source:Version})
-Description: Apache Tomcat 9 - Servlet and JSP engine -- tools to create user instances
- Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
- specifications from Oracle, and provides a "pure Java" HTTP web
- server environment for Java code to run.
- .
- This package contains files needed to create a user Tomcat instance.
- This user Tomcat instance can be started and stopped using the scripts
- provided in the Tomcat instance directory.
- .
- WARNING: DO NOT USE FOR PRODUCTION PURPOSES. THIS PACKAGE DOES NOT RECEIVE ANY
- SECURITY SUPPORT.
- .
- Users are advised to switch to tomcat10-user instead.
-
Package: libtomcat9-java
Architecture: all
Depends: libeclipse-jdt-core-java (>= 3.26.0), ${misc:Depends}
=====================================
debian/logging.properties deleted
=====================================
@@ -1,58 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
-
-.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-1catalina.org.apache.juli.AsyncFileHandler.level = FINE
-1catalina.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
-1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina.
-1catalina.org.apache.juli.AsyncFileHandler.maxDays = 90
-
-2localhost.org.apache.juli.AsyncFileHandler.level = FINE
-2localhost.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
-2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost.
-2localhost.org.apache.juli.AsyncFileHandler.maxDays = 90
-
-java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = org.apache.juli.SystemdFormatter
-
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.AsyncFileHandler
-
-# For example, set the org.apache.catalina.util.LifecycleBase logger to log
-# each component that extends LifecycleBase changing state:
-#org.apache.catalina.util.LifecycleBase.level = FINE
-
-# To see debug messages in TldLocationsCache, uncomment the following line:
-#org.apache.jasper.compiler.TldLocationsCache.level = FINE
-
-# To see debug messages for HTTP/2 handling, uncomment the following line:
-#org.apache.coyote.http2.level = FINE
-
-# To see debug messages for WebSocket handling, uncomment the following line:
-#org.apache.tomcat.websocket.level = FINE
=====================================
debian/rules
=====================================
@@ -26,7 +26,3 @@ endif
override_dh_install-indep:
dh_install -i --exclude=.bat --exclude=Thumbs.db
- # update the checksum for the root webapp
- unset rwmd5sum \
- && rwmd5sum=`cat debian/default_root/index.html debian/default_root/META-INF/context.xml | md5sum - 2>/dev/null | cut -d " " -f1` \
- && sed "s/\@ROOT_WEBAPP_MD5SUM\@/$$rwmd5sum/" debian/tomcat9.postrm.in > debian/tomcat9.postrm
=====================================
debian/tomcat9-common.docs deleted
=====================================
@@ -1,2 +0,0 @@
-RELEASE-NOTES
-RUNNING.txt
=====================================
debian/tomcat9-common.install deleted
=====================================
@@ -1,4 +0,0 @@
-output/build/bin/bootstrap.jar /usr/share/tomcat9/bin/
-bin/* /usr/share/tomcat9/bin/
-
-debian/libexec/tomcat-locate-java.sh /usr/libexec/tomcat9/
=====================================
debian/tomcat9-common.links deleted
=====================================
@@ -1,26 +0,0 @@
-/usr/share/java/tomcat9-annotations-api.jar /usr/share/tomcat9/lib/annotations-api.jar
-/usr/share/java/tomcat9-api.jar /usr/share/tomcat9/lib/tomcat-api.jar
-/usr/share/java/tomcat9-catalina.jar /usr/share/tomcat9/lib/catalina.jar
-/usr/share/java/tomcat9-catalina-ant.jar /usr/share/tomcat9/lib/catalina-ant.jar
-/usr/share/java/tomcat9-catalina-ha.jar /usr/share/tomcat9/lib/catalina-ha.jar
-/usr/share/java/tomcat9-coyote.jar /usr/share/tomcat9/lib/tomcat-coyote.jar
-/usr/share/java/tomcat9-dbcp.jar /usr/share/tomcat9/lib/tomcat-dbcp.jar
-/usr/share/java/tomcat9-el-api.jar /usr/share/tomcat9/lib/el-api.jar
-/usr/share/java/tomcat9-i18n-es.jar /usr/share/tomcat9/lib/tomcat-i18n-es.jar
-/usr/share/java/tomcat9-i18n-fr.jar /usr/share/tomcat9/lib/tomcat-i18n-fr.jar
-/usr/share/java/tomcat9-i18n-ja.jar /usr/share/tomcat9/lib/tomcat-i18n-ja.jar
-/usr/share/java/tomcat9-i18n-ru.jar /usr/share/tomcat9/lib/tomcat-i18n-ru.jar
-/usr/share/java/tomcat9-jasper.jar /usr/share/tomcat9/lib/jasper.jar
-/usr/share/java/tomcat9-jasper-el.jar /usr/share/tomcat9/lib/jasper-el.jar
-/usr/share/java/tomcat9-jaspic-api.jar /usr/share/tomcat9/lib/jaspic-api.jar
-/usr/share/java/tomcat9-jdbc.jar /usr/share/tomcat9/lib/tomcat-jdbc.jar
-/usr/share/java/tomcat9-jni.jar /usr/share/tomcat9/lib/tomcat-jni.jar
-/usr/share/java/tomcat9-jsp-api.jar /usr/share/tomcat9/lib/jsp-api.jar
-/usr/share/java/tomcat9-juli.jar /usr/share/tomcat9/bin/tomcat-juli.jar
-/usr/share/java/tomcat9-servlet-api.jar /usr/share/tomcat9/lib/servlet-api.jar
-/usr/share/java/tomcat9-storeconfig.jar /usr/share/tomcat9/lib/catalina-storeconfig.jar
-/usr/share/java/tomcat9-tribes.jar /usr/share/tomcat9/lib/catalina-tribes.jar
-/usr/share/java/tomcat9-util.jar /usr/share/tomcat9/lib/tomcat-util.jar
-/usr/share/java/tomcat9-util-scan.jar /usr/share/tomcat9/lib/tomcat-util-scan.jar
-/usr/share/java/tomcat9-websocket.jar /usr/share/tomcat9/lib/tomcat-websocket.jar
-/usr/share/java/tomcat9-websocket-api.jar /usr/share/tomcat9/lib/websocket-api.jar
=====================================
debian/tomcat9-instance-create deleted
=====================================
@@ -1,139 +0,0 @@
-#!/bin/sh
-# Script to create a CATALINA_BASE directory for your own tomcat
-
-PROG=`basename $0`
-TARGET=""
-HPORT=8080
-CPORT=8005
-CWORD="SHUTDOWN"
-warned=0
-warnlowport=0
-
-usage() {
- echo "Usage: $PROG [options] <directoryname>"
- echo " directoryname: name of the tomcat instance directory to create"
- echo "Options:"
- echo " -h, --help Display this help message"
- echo " -p httpport HTTP port to be used by Tomcat (default is $HPORT)"
- echo " -c controlport Server shutdown control port (default is $CPORT)"
- echo " -w magicword Word to send to trigger shutdown (default is $CWORD)"
-}
-
-checkport() {
- type=$1
- port=$2
- # Fail if port is non-numeric
- num=`expr ${port} + 1 2> /dev/null`
- if [ $? != 0 ] || [ $num -lt 2 ]; then
- echo "Error: ${type} port '${port}' is not a valid TCP port number."
- exit 1
- fi
-
- # Fail if port is above 65535
- if [ ${port} -gt 65535 ]; then
- echo "Error: ${type} port ${port} is above TCP port numbers (> 65535)."
- exit 1
- fi
-
- # Warn if port is below 1024 (once)
- if [ ${warnlowport} -eq 0 ]; then
- if [ ${port} -lt 1024 ]; then
- echo "Warning: ports below 1024 are reserved to the super-user."
- warnlowport=1
- warned=1
- fi
- fi
-
- # Warn if port appears to be in use
- if nc localhost "${port}" -z > /dev/null; then
- echo "Warning: ${type} port ${port} appears to be in use."
- warned=1
- fi
-}
-
-if [ "$#" -lt 1 ]; then
- usage
- exit 1
-fi
-if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
- usage
- exit 0
-fi
-
-
-
-while getopts ":p:c:w:h" options; do
- case $options in
- p ) HPORT=$OPTARG ;;
- c ) CPORT=$OPTARG ;;
- w ) CWORD=$OPTARG ;;
- h ) usage;;
- * ) echo "Error: Unknown parameter '$OPTARG'."
- exit 1;;
- esac
-done
-
-shift $(($OPTIND - 1))
-TARGET=$1
-shift
-echo "You are about to create a Tomcat instance in directory '$TARGET'"
-
-# Fail if no target specified
-if [ -z "${TARGET}" ]; then
- echo "Error: No target directory specified (use -d)."
- exit 1
-fi
-
-# Fail if ports are the same
-if [ "${HPORT}" = "${CPORT}" ]; then
- echo "Error: HTTP port and control port must be different."
- exit 1
-fi
-
-# Fail if target directory already exists
-if [ -d "${TARGET}" ]; then
- echo "Error: Target directory already exists."
- exit 1
-fi
-
-# Check ports
-checkport HTTP "${HPORT}"
-checkport Control "${CPORT}"
-
-# Ask for confirmation if warnings were printed out
-if [ ${warned} -eq 1 ]; then
- echo "Type <ENTER> to continue, <CTRL-C> to abort."
- read answer
-fi
-
-mkdir -p "${TARGET}"
-
-FULLTARGET=`cd "${TARGET}" > /dev/null && pwd`
-
-mkdir "${TARGET}/conf"
-mkdir "${TARGET}/logs"
-mkdir "${TARGET}/webapps"
-mkdir "${TARGET}/work"
-mkdir "${TARGET}/temp"
-cp -r /usr/share/tomcat9/skel/* "${TARGET}"
-
-sed -i -e "s/Connector port=\"8080\"/Connector port=\"${HPORT}\"/;s/Server port=\"-1\" shutdown=\"SHUTDOWN\"/Server port=\"${CPORT}\" shutdown=\"${CWORD}\"/" "${TARGET}/conf/server.xml"
-
-cat > "${TARGET}/bin/startup.sh" << EOT
-#!/bin/sh
-export CATALINA_BASE="${FULLTARGET}"
-/usr/share/tomcat9/bin/startup.sh
-echo "Tomcat started"
-EOT
-
-cat > "${TARGET}/bin/shutdown.sh" << EOT
-#!/bin/sh
-export CATALINA_BASE="${FULLTARGET}"
-/usr/share/tomcat9/bin/shutdown.sh
-echo "Tomcat stopped"
-EOT
-
-chmod a+x "${TARGET}/bin/startup.sh" "${TARGET}/bin/shutdown.sh"
-echo "* New Tomcat instance created in ${TARGET}"
-echo "* You might want to edit default configuration in ${TARGET}/conf"
-echo "* Run ${TARGET}/bin/startup.sh to start your Tomcat instance"
=====================================
debian/tomcat9-instance-create.1 deleted
=====================================
@@ -1,24 +0,0 @@
-.TH "TOMCAT9-INSTANCE-CREATE" "2" "Feb 2010" "" ""
-.SH "NAME"
-tomcat9\-instance\-create \- creates a Tomcat 9 instance
-.SH "SYNOPSIS"
-.B tomcat9\-instance\-create [\fIOPTIONS\fR] \fIDIRECTORYNAME\fR
-.SH "DESCRIPTION"
-The
-.B tomcat9\-instance\-create
-script creates a directory with all required Tomcat 9 CATALINA_BASE elements so that a separate Tomcat 9 instance with its own configuration, libraries or web applications can be run by a user. bin/startup.sh and bin/shutdown.sh scripts are also generated to allow the instance to be started and stopped.
-.TP
-.B DIRECTORYNAME
-The name of the directory where the instance will be created. It should not exist and will be created automatically.
-.SH "OPTIONS"
-.TP
-.B \-p HTTPPORT
-The TCP port to use for the default HTTP connector in the instance. The default port is 8080.
-.TP
-.B \-c CONTROLPORT
-The TCP port to use for Tomcat shutdown control port. The default port is 8005.
-.TP
-.B \-w MAGICWORD
-The magic word that sent to the control port will trigger the shutdown of the Tomcat instance. The default word is SHUTDOWN.
-.SH "AUTHOR"
-This man page was written by Thierry Carrez <thierry.carrez at ubuntu.com> and is copyright (C) 2008 Canonical Ltd.
=====================================
debian/tomcat9-user.install deleted
=====================================
@@ -1,6 +0,0 @@
-conf/*.xml /usr/share/tomcat9/skel/conf/
-conf/catalina.properties /usr/share/tomcat9/skel/conf/
-conf/catalina.policy /usr/share/tomcat9/skel/policy/
-debian/logging.properties /usr/share/tomcat9/skel/conf/
-debian/setenv.sh /usr/share/tomcat9/skel/bin/
-debian/tomcat9-instance-create /usr/bin/
=====================================
debian/tomcat9-user.manpages deleted
=====================================
@@ -1 +0,0 @@
-debian/tomcat9-instance-create.1
=====================================
debian/tomcat9.postrm.in deleted
=====================================
@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-# Post removal script for Tomcat
-#
-
-set -e
-
-#DEBHELPER#
-
-CONFFILES="tomcat-users.xml web.xml server.xml logging.properties context.xml catalina.properties jaspic-providers.xml"
-
-case "$1" in
- remove)
- # Remove the ROOT webapp if not modified
- RWLOC="/var/lib/tomcat9/webapps/ROOT"
- RWFILES="$RWLOC/index.html $RWLOC/META-INF/context.xml"
- if [ "`(cat $RWFILES | md5sum -) 2>/dev/null | cut -d ' ' -f 1`" \
- = "@ROOT_WEBAPP_MD5SUM@" ] ; then
- rm $RWFILES
- rmdir --ignore-fail-on-non-empty \
- /var/lib/tomcat9/webapps/ROOT/META-INF \
- /var/lib/tomcat9/webapps/ROOT \
- /var/lib/tomcat9/webapps \
- /var/lib/tomcat9 || true
- fi
-
- # Remove CATALINA_BASE/lib if not empty
- if [ -d /var/lib/tomcat9/lib ] && [ -z "`(find var/lib/tomcat9/lib/classes -type f)`" ] ; then
- rmdir --ignore-fail-on-non-empty \
- /var/lib/tomcat9/lib/classes \
- /var/lib/tomcat9/lib || true
- fi
-
- # Remove the cache files (compiled JSP files)
- if [ -d "/var/cache/tomcat9" ] ; then
- rm -rf /var/cache/tomcat9
- fi
-
- # Remove the auto-generated catalina.policy file
- if [ -d "/var/lib/tomcat9/policy" ] ; then
- rm -rf /var/lib/tomcat9/policy
- fi
- ;;
-
- purge)
- # Ignore errors during purge
- set +e
-
- # Remove the configuration files
- rm -rf /etc/logrotate.d/tomcat9
- rm -rf /etc/default/tomcat9
- for conffile in $CONFFILES;
- do
- rm -f /etc/tomcat9/$conffile
- done
-
- # Unregister the configuration files from ucf
- if which ucf >/dev/null; then
- ucf --purge /etc/logrotate.d/tomcat9
- ucf --purge /etc/default/tomcat9
- for conffile in $CONFFILES;
- do
- ucf --purge /etc/tomcat9/$conffile
- done
- fi
-
- # Remove the log files
- rm -rf /var/log/tomcat9
-
- # Remove the temp directory
- rm -rf /var/lib/tomcat9/temp
-
- # Remove the CATALINA_BASE directory if empty
- if [ -d "/var/lib/tomcat9" ] ; then
- rmdir --ignore-fail-on-non-empty /var/lib/tomcat9
- fi
-
- # Remove the configuration directories
- rmdir --ignore-fail-on-non-empty /etc/tomcat9/policy.d /etc/tomcat9/Catalina/* /etc/tomcat9/Catalina /etc/tomcat9
-
- set -e
- ;;
-
- upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- # Nothing to do here
- ;;
-
- *)
- echo "$0 called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
View it on GitLab: https://salsa.debian.org/java-team/tomcat9/-/compare/f63cd3d2b9ccbd8956308ff4105b95ab29dd4af9...42739d93aab7e0fc8e33704a1d53d5aa7ac60648
--
View it on GitLab: https://salsa.debian.org/java-team/tomcat9/-/compare/f63cd3d2b9ccbd8956308ff4105b95ab29dd4af9...42739d93aab7e0fc8e33704a1d53d5aa7ac60648
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20230527/5e818654/attachment.htm>
More information about the pkg-java-commits
mailing list