www-servers/tomcat: dropped tomcat 7 (eol in mid 2021)

Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

2 files changed, 0 insertions, 403 deletions

diff --git a/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch
deleted file mode 100644
index 29cf6c2e403c..000000000000
--- a/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-diff --git a/build.xml b/build.xml
-index dbad7cb..101bc57 100644
---- a/build.xml
-+++ b/build.xml
-@@ -715,12 +715,14 @@
-       </fileset>
-     </copy>
-     <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
-     <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
-       <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
-         <include name="*" />
-         <exclude name="jspxml*" />
-       </fileset>
-     </copy>
-+-->
- 
-     <!-- Convert the message files from UTF-8 to ASCII. This can be removed
-     after upgrading to Java 9+ as the minimum JRE and specifying the encoding
-@@ -776,26 +778,32 @@
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
-     <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
- 
-     <!-- JSP 2.2 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
-       notice="${tomcat.manifests}/jsp-api.jar.notice"
-       license="${tomcat.manifests}/jsp-api.jar.license" />
-+-->
- 
-     <!-- JSP 2.2 EL Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
- 
-     <!-- Bootstrap JAR File -->
-     <jarIt jarfile="${bootstrap.jar}"
-@@ -854,9 +862,9 @@
-       filesId="files.jasper-el" />
- 
-     <!-- Re-packaged Apache Commons DBCP 1-->
--    <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!--    <jarIt jarfile="${tomcat-dbcp.jar}"
-       filesDir="${tomcat.classes}"
--      filesId="files.tomcat-dbcp" />
-+      filesId="files.tomcat-dbcp" /> -->
- 
-     <!-- i18n JARs -->
-     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar"
-@@ -1087,9 +1095,9 @@
- 
-   <target name="deploy" depends="package,build-docs,compile-webapp-examples"
-           description="Default. Builds a working Tomcat instance">
--
-+<!--
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -1149,7 +1157,7 @@
-         <exclude name="${jdt.jar.filename}"/>
-       </fileset>
-     </delete>
--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
-@@ -1839,7 +1847,7 @@
- 
-   <target name="extras-webservices-prepare"
-           depends="extras-prepare"
--          description="Prepare to build web services extras package">
-+          description="Prepare to build web services extras package" unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -2034,11 +2042,12 @@
-     </copy>
- 
-     <!-- Source bundles for native components -->
-+<!--
-     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
--
-+-->
-     <!-- platform README files -->
-     <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -2070,6 +2079,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-         <path location="${ant.core.lib}"/>
-       </classpath>
-     </javadoc>
-+<!--
-     <javadoc packagenames="javax.servlet.*"
-       excludepackagenames="javax.servlet.jsp.*"
-       sourcepath="${tomcat.dist}/src/java"
-@@ -2137,6 +2147,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-         <path location="${ant.core.lib}"/>
-       </classpath>
-     </javadoc>
-+-->
-     <javadoc packagenames="javax.websocket.*"
-       sourcepath="${tomcat.dist}/src/java"
-       destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2181,9 +2192,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-         <path location="${ant.core.lib}"/>
-       </classpath>
-       <link href="../annotationapi"/>
-+<!--
-       <link href="../servletapi"/>
-       <link href="../jspapi"/>
-       <link href="../elapi"/>
-+-->
-       <link href="../websocketapi"/>
-       <link href="https://docs.oracle.com/javase/7/docs/api/"/>
-       <link href="https://docs.oracle.com/javaee/6/api/"/>
-@@ -2889,7 +2902,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-compile"
--          description="Download components necessary to compile" >
-+          description="Download components necessary to compile" unless="noget" >
- 
-     <!-- Download Commons Daemon -->
-     <antcall target="downloadgz-2">
-@@ -2925,7 +2938,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-test-compile"
--          description="Download additional components for the tests" >
-+          description="Download additional components for the tests" unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${junit.loc}"/>
-@@ -2989,7 +3002,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-dist"
--          description="Download additional components for a distribution" >
-+          description="Download additional components for a distribution" unless="noget">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
diff --git a/www-servers/tomcat/files/tomcat-instance-manager-r1.bash b/www-servers/tomcat/files/tomcat-instance-manager-r1.bash
deleted file mode 100644
index de5152198b3e..000000000000
--- a/www-servers/tomcat/files/tomcat-instance-manager-r1.bash
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Author: Ralph Sennhauser <sera@gentoo.org>
-
-die() {
-	echo "${@}"
-	exit 1
-}
-
-usage() {
-	cat <<EOL
-Usage: ${BASH_SOURCE} <--create|--remove|--help> [--suffix s][--user u][--group g]
-
-  Options:
-    --help:
-      show this text.
-    --create:
-      create a new instance
-    --remove:
-      remove an existing instance.
-    --suffix SUFFIX:
-      a suffix for this instance. the suffix may not collide with an already
-      existing instance, defaults to empty.
-    --user USER:
-      the user for which to configure this instance for. The user needs to
-      exist already. defaults to tomcat.
-    --group GROUP:
-      the group for which to configure this instance for. The group needs to
-      exist already. defaults to tomcat.
-
-  Examples:
-    ${BASH_SOURCE} --create --suffix testing --user tacmot --group tacmot
-    ${BASH_SOURCE} --remove --suffix testing
-EOL
-}
-
-parse_argv() {
-	action="not specified"
-	instance_name="tomcat-@SLOT@"
-	instance_user="tomcat"
-	instance_group="tomcat"
-
-	while [[ -n $1 ]]; do
-		case $1 in
-			--help)
-				usage
-				exit 0;;
-			--suffix)
-				instance_name+="-$2"
-				shift; shift;;
-			--user)
-				instance_user="$2"
-				shift; shift;;
-			--group)
-				instance_group="$2"
-				shift; shift;;
-			--create)
-				action=create
-				shift;;
-			--remove)
-				action=remove
-				shift;;
-			--backup)
-				action=backup
-				shift;;
-			--restore)
-				action=restore
-				shift;;
-			--update)
-				action=update
-				shift;;
-			*)
-				echo "Invalid option '$1'"
-				usage
-				exit 2;;
-		esac
-	done
-
-	tomcat_home="/@GENTOO_PORTAGE_EPREFIX@usr/share/tomcat-@SLOT@"
-	instance_base="/@GENTOO_PORTAGE_EPREFIX@var/lib/${instance_name}"
-	instance_conf="/@GENTOO_PORTAGE_EPREFIX@etc/${instance_name}"
-	instance_logs="/@GENTOO_PORTAGE_EPREFIX@var/log/${instance_name}"
-	instance_temp="/@GENTOO_PORTAGE_EPREFIX@var/tmp/${instance_name}"
-
-	all_targets=(
-		"${instance_base}"
-		"${instance_logs}"
-		"${instance_temp}"
-		"/@GENTOO_PORTAGE_EPREFIX@etc/${instance_name}"
-		"/@GENTOO_PORTAGE_EPREFIX@etc/init.d/${instance_name}"
-		"/@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${instance_name}"
-	)
-}
-	
-test_can_deploy() {
-	local no_deploy target
-	for target in "${all_targets[@]}"; do
-		if [[ -e "${target}" ]]; then 
-			echo "Error: '${target}' already exists."
-			no_deploy=yes
-		fi
-	done
-	if [[ -n "${no_deploy}" ]]; then
-		cat <<-EOL
-
-			To protect an existing installation no new instance was deployed. You can use
-			'${BASH_SOURCE} --remove'
-			to remove an existing instance first or run
-			'${BASH_SOURCE} --create --sufix <instance_suffix>'
-			to deploy an instance under a different name
-
-		EOL
-		usage
-		exit 1
-	fi
-
-	if ! getent passwd | cut -d: -f1 | grep -Fx "${instance_user}" > /dev/null; then
-		echo "Error: user '${instance_user}' doesn't exist."
-		exit 1
-	fi
-
-	if ! getent group | cut -d: -f1 | grep -Fx "${instance_group}" > /dev/null; then
-		echo "Error: group '${instance_group}' doesn't exist."
-		exit 1
-	fi
-}
-
-deploy_instance() {
-	test_can_deploy
-
-	mkdir -p "${instance_base}"/{work,webapps} || die
-	mkdir -p "${instance_logs}" || die
-	mkdir -p "${instance_temp}" || die
-
-	cp -r "${tomcat_home}"/webapps/ROOT "${instance_base}"/webapps || die
-
-	chown -R "${instance_user}":"${instance_group}" \
-		"${instance_base}" "${instance_logs}" "${instance_temp}" || die
-
-	find "${instance_base}"/webapps -type d -exec chmod 750 {} + || die
-	find "${instance_base}"/webapps -type f -exec chmod 640 {} + || die
-
-	# initial config #
-
-	cp -r "${tomcat_home}"/conf "${instance_conf}" || die
-
-	sed -i -e "s|\${catalina.base}/logs|${instance_logs}|" \
-		"${instance_conf}"/logging.properties || die
-	sed -i -e "s|directory=\"logs\"|directory=\"${instance_logs}\"|" \
-		"${instance_conf}"/server.xml || die
-
-	mkdir -p "${instance_conf}"/Catalina/localhost || die
-	cat > "${instance_conf}"/Catalina/localhost/host-manager.xml <<-'EOF'
-		<?xml version="1.0" encoding="UTF-8"?>
-		<Context docBase="${catalina.home}/webapps/host-manager"
-				antiResourceLocking="false" privileged="true" />
-	EOF
-
-	cat > "${instance_conf}"/Catalina/localhost/manager.xml <<-'EOF'
-		<?xml version="1.0" encoding="UTF-8"?>
-		<Context docBase="${catalina.home}/webapps/manager"
-				antiResourceLocking="false" privileged="true" />
-	EOF
-
-	if [[ -d "${tomcat_home}"/webapps/docs ]]; then
-		cat > "${instance_conf}"/Catalina/localhost/docs.xml <<-'EOF'
-			<?xml version="1.0" encoding="UTF-8"?>
-			<Context docBase="${catalina.home}/webapps/docs" />
-		EOF
-	fi
-
-	if [[ -d "${tomcat_home}"/webapps/examples ]]; then
-		cat > "${instance_conf}"/Catalina/localhost/examples.xml <<-'EOF'
-			<?xml version="1.0" encoding="UTF-8"?>
-			<Context docBase="${catalina.home}/webapps/examples" />
-		EOF
-	fi
-
-	chown -R "${instance_user}":"${instance_group}" "${instance_conf}" || die
-	find "${instance_conf}" -type d -exec chmod 750 {} + || die
-	find "${instance_conf}" -type f -exec chmod 640 {} + || die
-
-	# rc script #
-
-	cp "${tomcat_home}"/gentoo/tomcat.init \
-		"/@GENTOO_PORTAGE_EPREFIX@etc/init.d/${instance_name}" || die
-
-	sed -e "s|@INSTANCE_NAME@|${instance_name}|g" \
-		-e "s|@INSTANCE_USER@|${instance_user}|g" \
-		-e "s|@INSTANCE_GROUP@|${instance_group}|g" \
-		"${tomcat_home}"/gentoo/tomcat.conf \
-		> "/@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${instance_name}" || die
-
-	# some symlinks for tomcat and netbeans #
-
-	ln -s "${instance_conf}" "${instance_base}"/conf || die
-	ln -s "${instance_temp}" "${instance_base}"/temp || die
-
-	# a note to update the default configuration #
-
-	cat <<-EOL
-		Successfully created instance '${instance_name}'
-		It's strongly recommended for production systems to go carefully through the
-		configuration files at '${instance_conf}'.
-		The generated initial configuration is close to upstreams default which
-		favours the demo aspect over hardening.
-	EOL
-}
-
-remove_instance() {
-	echo "The following files will be removed permanently:"
-	local target; for target in "${all_targets[@]}"; do
-		find ${target}
-	done
-
-	echo "Type 'yes' to continue"
-	read
-	if [[ ${REPLY} == yes ]]; then
-		rm -rv "${all_targets[@]}"
-	else 
-		echo "Aborting as requested ..."
-	fi
-}
-
-parse_argv "$@"
-
-if [[ ${action} == create ]]; then
-	deploy_instance
-elif [[ ${action} == remove ]]; then
-	remove_instance
-elif [[ ${action} == "not specified" ]]; then
-	echo "No action specified!"
-	usage
-	exit 1
-else
-	echo "${action} not yet implemented!"
-	usage
-	exit 1
-fi