#2170293 Remove tomcat from epel8 because it is added to RHEL 8.8

This reintroduces two upstream bugs dealing with metadata; see
https://bz.apache.org/bugzilla/show_bug.cgi?id=64849 & https://bz.apache.org/bugzilla/show_bug.cgi?id=64751

.gitignore

@@ -1,4 +0,0 @@
-apache-tomcat-*-src.tar.gz
-results_tomcat
-tomcat*.src.rpm
-apache-tomcat-*-src/

dead.package

@@ -0,0 +1 @@
+#2170293 Remove tomcat from epel8 because it is added to RHEL 8.8

java-9-start-up-parameters.conf

@@ -1,7 +0,0 @@
-# Add the JAVA 9 specific start-up parameters required by Tomcat
-JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.lang=ALL-UNNAMED"
-JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.io=ALL-UNNAMED"
-JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util=ALL-UNNAMED"
-JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED"
-JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
-export JDK_JAVA_OPTIONS

rhbz-1857043.patch

@@ -1,200 +0,0 @@
-diff -up ./build.xml.orig ./build.xml
---- build.xml.orig	2021-07-07 10:53:55.493742841 +0800
-+++ build.xml	2021-07-07 11:09:43.107968515 +0800
-@@ -1020,7 +1020,7 @@
-       filesDir="${tomcat.classes}"
-       filesId="files.annotations-api"
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Servlet Implementation JAR File -->
-     <jarIt jarfile="${servlet-api.jar}"
-@@ -1029,41 +1029,41 @@
-       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- EL Implementation JAR File -->
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- JSP Implementation JAR File -->
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- WebSocket API JAR File -->
-     <jarIt jarfile="${websocket-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.websocket-api"
-       manifest="${tomcat.manifests}/websocket-api.jar.manifest"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- JASPIC API JAR File -->
-     <jarIt jarfile="${jaspic-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jaspic-api"
-       manifest="${tomcat.manifests}/jaspic-api.jar.manifest"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Tomcat-juli JAR File -->
-     <jarIt jarfile="${tomcat-juli.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-juli"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Bootstrap JAR File -->
-     <jarIt jarfile="${bootstrap.jar}"
-@@ -1075,61 +1075,61 @@
-     <jarIt jarfile="${tomcat-util.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-util"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Tomcat API JAR File -->
-     <jarIt jarfile="${tomcat-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-api"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Tomcat Util Scan JAR File -->
-     <jarIt jarfile="${tomcat-util-scan.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-util-scan"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <jarIt jarfile="${tomcat-jni.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-jni"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Protocol handlers - Coyote -->
-     <jarIt jarfile="${tomcat-coyote.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-coyote"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- WebSocket implementation JAR File -->
-     <jarIt jarfile="${tomcat-websocket.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-websocket"
-       meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Catalina GroupCom/Tribes JAR File -->
-     <jarIt jarfile="${catalina-tribes.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.catalina-tribes"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Catalina Main JAR File -->
-     <jarIt jarfile="${catalina.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.catalina"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Catalina Cluster/HA JAR File -->
-     <jarIt jarfile="${catalina-ha.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.catalina-ha"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Server-Side Includes (SSI) -->
-     <jarIt jarfile="${catalina-ssi.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.catalina-ssi"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Catalina Ant Tasks JAR File -->
-     <jarIt jarfile="${catalina-ant.jar}"
-@@ -1140,27 +1140,27 @@
-     <jarIt jarfile="${catalina-storeconfig.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.catalina-storeconfig"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Jasper EL Implementation JAR File -->
-     <jarIt jarfile="${jasper-el.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jasper-el"
-       meta-inf="${tomcat.manifests}/jasper-el.jar"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Jasper Implementation JAR File -->
-     <jarIt jarfile="${jasper.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jasper"
-       meta-inf="${tomcat.manifests}/jasper.jar"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- Re-packaged Apache Commons DBCP 2-->
-     <jarIt jarfile="${tomcat-dbcp.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-dbcp"
--      addOSGi="true" />
-+      addOSGi="false" />
- 
-     <!-- i18n JARs -->
-     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1620,7 +1620,7 @@
-            filesId="files.tomcat-embed-core"
-            notice="${tomcat.manifests}/servlet-api.jar.notice"
-            license="${tomcat.manifests}/servlet-api.jar.license"
--           addOSGi="true"
-+           addOSGi="false"
-            addGraal="true"
-            graalPrefix="org.apache.tomcat.embed/tomcat-embed-core"
-            graalFiles="res/graal/tomcat-embed-core/native-image"
-@@ -1628,7 +1628,7 @@
-     <jarIt jarfile="${tomcat-embed-el.jar}"
-            filesDir="${tomcat.classes}"
-            filesId="files.tomcat-embed-el"
--           addOSGi="true"
-+           addOSGi="false"
-            addGraal="true"
-            graalPrefix="org.apache.tomcat.embed/tomcat-embed-el"
-            graalFiles="res/graal/tomcat-embed-el/native-image"
-@@ -1637,7 +1637,7 @@
-            filesDir="${tomcat.classes}"
-            filesId="files.tomcat-embed-jasper"
-            meta-inf="${tomcat.manifests}/jasper.jar"
--           addOSGi="true"
-+           addOSGi="false"
-            addGraal="true"
-            graalPrefix="org.apache.tomcat.embed/tomcat-embed-jasper"
-            graalFiles="res/graal/tomcat-embed-jasper/native-image"
-@@ -1646,7 +1646,7 @@
-            filesDir="${tomcat.classes}"
-            filesId="files.tomcat-embed-websocket"
-            meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
--           addOSGi="true"
-+           addOSGi="false"
-            addGraal="true"
-            graalPrefix="org.apache.tomcat.embed/tomcat-embed-websocket"
-            graalFiles="res/graal/tomcat-embed-websocket/native-image"

sources

@@ -1 +0,0 @@
-SHA512 (apache-tomcat-9.0.65-src.tar.gz) = 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc

tomcat-9.0-JDTCompiler.patch

@@ -1,24 +0,0 @@
-diff -up ./java/org/apache/jasper/compiler/JDTCompiler.java ./java/org/apache/jasper/compiler/JDTCompiler.java
-index 2e361f2..277d8f4 100644
---- java/org/apache/jasper/compiler/JDTCompiler.java
-+++ java/org/apache/jasper/compiler/JDTCompiler.java
-@@ -310,7 +310,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
-             } else if(opt.equals("15")) {
-                 settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_15);
-             } else if(opt.equals("16")) {
--                settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_16);
-+                settings.put(CompilerOptions.OPTION_Source, "16");
-             } else if(opt.equals("17")) {
-                 // Constant not available in latest ECJ version that runs on
-                 // Java 8.
-@@ -377,8 +377,8 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
-                 settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_15);
-                 settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_15);
-             } else if(opt.equals("16")) {
--                settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_16);
--                settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_16);
-+                settings.put(CompilerOptions.OPTION_TargetPlatform, "16");
-+                settings.put(CompilerOptions.OPTION_Compliance, "16");
-             } else if(opt.equals("17")) {
-                 // Constant not available in latest ECJ version that runs on
-                 // Java 8.

tomcat-9.0-bootstrap-MANIFEST.MF.patch

@@ -1,9 +0,0 @@
---- res/META-INF/bootstrap.jar.manifest.orig	2010-04-06 10:11:09.000000000 -0600
-+++ res/META-INF/bootstrap.jar.manifest	2010-04-06 10:45:56.000000000 -0600
-@@ -1,6 +1,5 @@
- Manifest-Version: 1.0
- Main-Class: org.apache.catalina.startup.Bootstrap
--Class-Path: commons-daemon.jar
- Specification-Title: Apache Tomcat Bootstrap
- Specification-Version: @VERSION_MAJOR_MINOR@
- Specification-Vendor: Apache Software Foundation

tomcat-9.0-catalina-policy.patch

@@ -1,26 +0,0 @@
---- conf/catalina.policy.orig	2021-07-07 10:25:53.461393329 +0800
-+++ conf/catalina.policy	2021-07-07 10:27:47.688682404 +0800
-@@ -56,6 +56,16 @@ grant codeBase "file:${java.home}/lib/ex
- //        permission java.security.AllPermission;
- //};
- 
-+// ========== RHEL SPECIFIC CODE PERMISSIONS =======================================
-+
-+
-+// Allowing everything in /usr/share/java allows too many unknowns to be permitted
-+// Specifying the individual jars that tomcat needs to function with the security manager
-+// is the safest way forward.
-+grant codeBase "file:/usr/share/java/ecj/ecj.jar" {
-+        permission java.security.AllPermission;
-+};
-+
- 
- // ========== CATALINA CODE PERMISSIONS =======================================
- 
-@@ -261,4 +271,4 @@ grant codeBase "file:${catalina.home}/we
- //
- // The permissions granted to a specific JAR
- // grant codeBase "war:file:${catalina.base}/webapps/examples.war*/WEB-INF/lib/foo.jar" {
--// };
-\ No newline at end of file
-+// };

tomcat-9.0-digest.script

@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# tomcat-digest script
-# JPackage Project <http://www.jpackage.org/>
-
-# Source functions library
-if [ -f /usr/share/java-utils/java-functions ] ; then
-  . /usr/share/java-utils/java-functions
-else
-  echo "Can't find functions library, aborting"
-  exit 1
-fi
-
-# Get the tomcat config (use this for environment specific settings)
-if [ -z "${TOMCAT_CFG}" ]; then
-    TOMCAT_CFG="/etc/tomcat/tomcat.conf"
-fi
-
-if [ -r "$TOMCAT_CFG" ]; then
-    . $TOMCAT_CFG
-fi
-
-set_javacmd
-
-# CLASSPATH munging
-if [ -n "$JSSE_HOME" ]; then
-  CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)"
-fi
-CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar"
-CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
-export CLASSPATH
-
-# Configuration
-MAIN_CLASS="org.apache.catalina.startup.Tool"
-BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\""
-BASE_OPTIONS=""
-BASE_JARS="commons-daemon tomcat/catalina servlet tomcat/tomcat-util tomcat/tomcat-coyote tomcat/tomcat-api tomcat/tomcat-util-scan"
-
-# Set parameters
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run -server org.apache.catalina.realm.RealmBase "$@"

tomcat-9.0-log4j.properties

@@ -1,11 +0,0 @@
-log4j.rootLogger=debug, R 
-log4j.appender.R=org.apache.log4j.RollingFileAppender 
-log4j.appender.R.File=${catalina.base}/logs/tomcat.log 
-log4j.appender.R.MaxFileSize=10MB 
-log4j.appender.R.MaxBackupIndex=10 
-log4j.appender.R.layout=org.apache.log4j.PatternLayout 
-log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n 
-log4j.logger.org.apache.catalina=DEBUG, R
-log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost]=DEBUG, R
-log4j.logger.org.apache.catalina.core=DEBUG, R
-log4j.logger.org.apache.catalina.session=DEBUG, R

tomcat-9.0-osgi-annotations.patch

@@ -1,66 +0,0 @@
---- build.properties.default.orig       2022-06-21 20:30:04.498997718 +0800
-+++ build.properties.default    2022-06-21 20:30:57.579522800 +0800
-@@ -308,6 +308,16 @@ bnd.home=${base.path}/bnd-${bnd.version}
- bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
- bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
-
-+# ----- OSGi annotations bundle, version 1.0.0 or later            -----
-+# ----- required to avoid Javadoc error when using bnd annotations -----
-+osgi-annotations.version=1.1.1
-+osgi-annotations.checksum.enabled=true
-+osgi-annotations.checksum.algorithm=MD5|SHA-1
-+osgi-annotations.checksum.value=04e5db48a469cb53dd0e4e954deab2e0|a1644f3dbbb614f2a44671d27dd13c4d9142007d
-+osgi-annotations.home=${base.path}/osgi-annotations-${osgi-annotations.version}
-+osgi-annotations.jar=${osgi-annotations.home}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
-+osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
-+
- # ----- JSign, version 4.1 or later -----
- jsign.version=4.1
-
---- build.xml.orig	2022-06-21 20:36:12.785560093 +0800
-+++ build.xml	2022-06-21 20:40:41.155154959 +0800
-@@ -213,6 +213,7 @@
-   <!-- Classpaths -->
-   <path id="compile.classpath">
-     <pathelement location="${bnd.jar}"/>
-+    <pathelement location="${osgi-annotations.jar}"/>
-     <pathelement location="${jdt.jar}"/>
-     <pathelement location="${jaxrpc-lib.jar}"/>
-     <pathelement location="${wsdl4j-lib.jar}"/>
-@@ -2270,7 +2271,8 @@ Apache Tomcat ${version} native binaries
-       failonwarning="true">
-       <classpath>
-         <path refid="compile.classpath"/>
--        <path location="${ant.core.lib}"/>
-+	<path location="${ant.core.lib}"/>
-+	<path location="${osgi-annotations.jar}"/>
-       </classpath>
-       <link href="../annotationapi"/>
-       <link href="../servletapi"/>
-@@ -3671,12 +3673,26 @@ Read the Building page on the Apache Tom
-       <param name="checksum.algorithm" value="${bnd.checksum.algorithm}"/>
-       <param name="checksum.value" value="${bnd.checksum.value}"/>
-     </antcall>
-+    <!-- Download OSGi annotations -->
-+    <antcall target="downloadfile">
-+      <param name="sourcefile" value="${osgi-annotations.loc}"/>
-+      <param name="destfile" value="${osgi-annotations.jar}"/>
-+      <param name="destdir" value="${osgi-annotations.home}"/>
-+      <param name="checksum.enabled" value="${osgi-annotations.checksum.enabled}"/>
-+      <param name="checksum.algorithm" value="${osgi-annotations.checksum.algorithm}"/>
-+      <param name="checksum.value" value="${osgi-annotations.checksum.value}"/>
-+    </antcall>
-   </target>
- 
-   <target name="setup-bnd" depends="download-bnd">
-     <!-- Add bnd tasks to project -->
-     <path id="bnd.classpath">
-       <fileset file="${bnd.jar}" />
-+      <fileset file="${bndlib.jar}" />
-+      <fileset file="${bndlibg.jar}" />
-+      <fileset file="${bndannotation.jar}" />
-+      <fileset file="${slf4j-api.jar}" />
-+      <fileset file="${osgi-cmpn.jar}" />
-     </path>
- 
-     <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath" />

tomcat-9.0-tomcat-users-webapp.patch

@@ -1,17 +0,0 @@
---- conf/tomcat-users.xml~	2008-01-28 17:41:06.000000000 -0500
-+++ conf/tomcat-users.xml	2008-03-07 19:40:07.000000000 -0500
-@@ -53,4 +53,14 @@
-   <user username="both" password="<must-be-changed>" roles="tomcat,role1"/>
-   <user username="role1" password="<must-be-changed>" roles="role1"/>
- -->
-+
-+<!-- <role rolename="admin"/> -->
-+<!-- <role rolename="admin-gui"/> -->
-+<!-- <role rolename="admin-script"/> -->
-+<!-- <role rolename="manager"/> -->
-+<!-- <role rolename="manager-gui"/> -->
-+<!-- <role rolename="manager-script"/> -->
-+<!-- <role rolename="manager-jmx"/> -->
-+<!-- <role rolename="manager-status"/> -->
-+<!-- <user name="admin" password="<must-be-changed>" roles="admin,manager,admin-gui,admin-script,manager-gui,manager-script,manager-jmx,manager-status" /> -->
- </tomcat-users>

tomcat-9.0-tool-wrapper.script

@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# tomcat-digest script
-# JPackage Project <http://www.jpackage.org/>
-
-# Source functions library
-if [ -f /usr/share/java-utils/java-functions ] ; then
-  . /usr/share/java-utils/java-functions
-else
-  echo "Can't find functions library, aborting"
-  exit 1
-fi
-
-# Get the tomcat config (use this for environment specific settings)
-if [ -z "${TOMCAT_CFG}" ]; then
-    TOMCAT_CFG="/etc/tomcat/tomcat.conf"
-fi
-
-if [ -r "$TOMCAT_CFG" ]; then
-    . $TOMCAT_CFG
-fi
-
-set_javacmd
-
-# CLASSPATH munging
-if [ -n "$JSSE_HOME" ]; then
-  CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)"
-fi
-CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar"
-CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
-export CLASSPATH
-
-# Configuration
-MAIN_CLASS="org.apache.catalina.startup.Tool"
-BASE_OPTIONS=""
-BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\""
-BASE_JARS="commons-daemon tomcat/catalina servlet tomcat/tomcat-util tomcat/tomcat-coyote tomcat/tomcat-api tomcat/tomcat-util-scan"
-
-# Set parameters
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run "$@"

tomcat-9.0.conf

@@ -1,51 +0,0 @@
-# System-wide configuration file for tomcat services
-# This will be loaded by systemd as an environment file,
-# so please keep the syntax. For shell expansion support
-# place your custom files as /etc/tomcat/conf.d/*.conf
-#
-# There are 2 "classes" of startup behavior in this package.
-# The old one, the default service named tomcat.service.
-# The new named instances are called tomcat@instance.service.
-#
-# Use this file to change default values for all services.
-# Change the service specific ones to affect only one service.
-# For tomcat.service it's /etc/sysconfig/tomcat, for
-# tomcat@instance it's /etc/sysconfig/tomcat@instance.
-
-# This variable is used to figure out if config is loaded or not.
-TOMCAT_CFG_LOADED="1"
-
-# In new-style instances, if CATALINA_BASE isn't specified, it will
-# be constructed by joining TOMCATS_BASE and NAME.
-TOMCATS_BASE="/var/lib/tomcats/"
-
-# Where your java installation lives
-JAVA_HOME="/usr/lib/jvm/jre"
-
-# Where your tomcat installation lives
-CATALINA_HOME="@@@TCHOME@@@"
-
-# System-wide tmp
-CATALINA_TMPDIR="/var/cache/tomcat/temp"
-
-# You can pass some parameters to java here if you wish to
-#JAVA_OPTS="-Xminf0.1 -Xmaxf0.3"
-
-# Use JAVA_OPTS to set java.library.path for libtcnative.so
-#JAVA_OPTS="-Djava.library.path=/usr/lib"
-
-# Set default javax.sql.DataSource factory to apache commons one. See rhbz#1214381
-JAVA_OPTS="-Djavax.sql.DataSource.Factory=org.apache.commons.dbcp.BasicDataSourceFactory"
-
-# You can change your tomcat locale here
-#LANG="en_US"
-
-# Run tomcat under the Java Security Manager
-SECURITY_MANAGER="false"
-
-# SHUTDOWN_WAIT has been deprecated. To change the shutdown wait time, set
-# TimeoutStopSec in tomcat.service.
-
-# If you wish to further customize your tomcat environment,
-# put your own definitions here
-# (i.e. LD_LIBRARY_PATH for some jdbc drivers)

tomcat-9.0.logrotate

@@ -1,11 +0,0 @@
-# This is an example config only and is disabled by default
-# If you wish to use it, you'll need to update /etc/tomcat/logging.properties
-# to prevent catalina*.log from being rotated by Tomcat
-@@@TCLOG@@@/catalina*.log {
-    copytruncate
-    weekly
-    rotate 52
-    compress
-    missingok
-    create 0644 tomcat tomcat
-}

tomcat-9.0.service

@@ -1,20 +0,0 @@
-# Systemd unit file for default tomcat
-# 
-# To create clones of this service:
-# DO NOTHING, use tomcat@.service instead.
-
-[Unit]
-Description=Apache Tomcat Web Application Container
-After=syslog.target network.target
-
-[Service]
-Type=simple
-EnvironmentFile=/etc/tomcat/tomcat.conf
-Environment="NAME="
-EnvironmentFile=-/etc/sysconfig/tomcat
-ExecStart=/usr/libexec/tomcat/server start
-SuccessExitStatus=143
-User=tomcat
-
-[Install]
-WantedBy=multi-user.target

tomcat-9.0.sysconfig

@@ -1,11 +0,0 @@
-# Service-specific configuration file for tomcat. This will be sourced by
-# systemd for the default service (tomcat.service)
-# If you want to customize named instance, make a similar file
-# and name it tomcat@instancename.
-
-# You will not need to set this, usually. For default service it equals
-# CATALINA_HOME. For named service, it equals ${TOMCATS_BASE}${NAME}
-#CATALINA_BASE="@@@TCHOME@@@"
-
-# Please take a look at /etc/tomcat/tomcat.conf to have an idea what you
-# can override.

tomcat-9.0.wrapper

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-if [ "$1" = "version" ]; then
-  . /usr/libexec/tomcat/preamble
-  exec ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \
-    org.apache.catalina.util.ServerInfo
-fi
-
-SRV="tomcat"
-if [ -n "$2" ]; then
-  SRV="tomcat@$2"
-fi
-
-if [ "$1" = "start" ]; then
-  systemctl start ${SRV}.service
-elif [ "$1" = "stop" ]; then
-  systemctl stop ${SRV}.service
-elif [ "$1" = "version" ]; then
-  ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \
-    org.apache.catalina.util.ServerInfo
-else
-  echo "Usage: $0 {start|stop|version} [server-id]"
-  exit 1
-fi

tomcat-build.patch

@@ -1,12 +0,0 @@
-diff -up ./res/bnd/build-defaults.bnd.orig ./res/bnd/build-defaults.bnd
---- ./res/bnd/build-defaults.bnd.orig	2020-07-13 13:47:01.229077747 -0400
-+++ ./res/bnd/build-defaults.bnd	2020-07-13 13:47:12.923095618 -0400
-@@ -13,7 +13,7 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
-
--Bundle-Version: ${version_cleanup;${version}}
-+Bundle-Version: ${version}
-
- Specification-Title: Apache Tomcat
- Specification-Version: ${version.major.minor}

tomcat-functions

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-if [ -r /usr/share/java-utils/java-functions ]; then
-  . /usr/share/java-utils/java-functions
-else
-  echo "Can't read Java functions library, aborting"
-  exit 1
-fi
-
-_save_function() {
-    local ORIG_FUNC=$(declare -f $1)
-    local NEWNAME_FUNC="$2${ORIG_FUNC#$1}"
-    eval "$NEWNAME_FUNC"
-}
-
-run_jsvc(){
-    if [ -x /usr/bin/jsvc ]; then
-        TOMCAT_USER="${TOMCAT_USER:-tomcat}"
-        JSVC="/usr/bin/jsvc"
-
-        JSVC_OPTS="-nodetach -pidfile /var/run/jsvc-tomcat${NAME}.pid -user ${TOMCAT_USER} -outfile ${CATALINA_BASE}/logs/catalina.out -errfile ${CATALINA_BASE}/logs/catalina.out"
-        if [ "$1" = "stop" ]; then
-            JSVC_OPTS="${JSVC_OPTS} -stop"
-    	fi
-
-        exec "${JSVC}" ${JSVC_OPTS} ${FLAGS} -classpath "${CLASSPATH}" ${OPTIONS} "${MAIN_CLASS}" "${@}"
-    else
-       	echo "Can't find /usr/bin/jsvc executable"
-    fi
-
-}
-
-_save_function run run_java
-
-run() {
-   if [ "${USE_JSVC}" = "true" ] ; then
-	run_jsvc $@
-   else
-	run_java $@
-   fi
-}
-

tomcat-named.service

@@ -1,24 +0,0 @@
-# Systemd unit file for tomcat instances.
-# 
-# To create clones of this service:
-# 0. systemctl enable tomcat@name.service
-# 1. create catalina.base directory structure in
-#    /var/lib/tomcats/name
-# 2. profit.
-
-[Unit]
-Description=Apache Tomcat Web Application Container
-After=syslog.target network.target
-
-[Service]
-Type=simple
-EnvironmentFile=/etc/tomcat/tomcat.conf
-Environment="NAME=%i"
-EnvironmentFile=-/etc/sysconfig/tomcat@%i
-ExecStart=/usr/libexec/tomcat/server start
-ExecStop=/usr/libexec/tomcat/server stop
-SuccessExitStatus=143
-User=tomcat
-
-[Install]
-WantedBy=multi-user.target

tomcat-preamble

@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /usr/libexec/tomcat/functions
-
-# Get the tomcat config (use this for environment specific settings)
-
-if [ -z "${TOMCAT_CFG_LOADED}" ]; then
-  if [ -z "${TOMCAT_CFG}" ]; then
-    TOMCAT_CFG="/etc/tomcat/tomcat.conf"
-  fi
-  . $TOMCAT_CFG
-fi
-
-if [ -d "${TOMCAT_CONFD=/etc/tomcat/conf.d}" ]; then
-  for file in ${TOMCAT_CONFD}/*.conf ; do
-    if [ -f "$file" ] ; then
-      . "$file"
-    fi
-  done
-fi
-
-if [ -z "$CATALINA_BASE" ]; then
-  if [ -n "$NAME" ]; then
-    if [ -z "$TOMCATS_BASE" ]; then
-      TOMCATS_BASE="/var/lib/tomcats/"
-    fi
-    CATALINA_BASE="${TOMCATS_BASE}${NAME}"
-  else
-    CATALINA_BASE="${CATALINA_HOME}"
-  fi
-fi
-VERBOSE=1
-set_javacmd
-cd ${CATALINA_HOME}
-# CLASSPATH munging
-if [ ! -z "$CLASSPATH" ] ; then
-  CLASSPATH="$CLASSPATH":
-fi
-
-if [ -n "$JSSE_HOME" ]; then
-  CLASSPATH="${CLASSPATH}$(build-classpath jcert jnet jsse 2>/dev/null):"
-fi
-CLASSPATH="${CLASSPATH}${CATALINA_HOME}/bin/bootstrap.jar"
-CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
-CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)"
-
-if [ -z "$LOGGING_PROPERTIES" ] ; then
-  LOGGING_PROPERTIES="${CATALINA_BASE}/conf/logging.properties"
-  if [ ! -f "${LOGGING_PROPERTIES}" ] ; then
-    LOGGING_PROPERTIES="${CATALINA_HOME}/conf/logging.properties"
-  fi
-fi

tomcat-server

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-. /usr/libexec/tomcat/preamble
-
-MAIN_CLASS=org.apache.catalina.startup.Bootstrap
-
-FLAGS="$JAVA_OPTS"
-OPTIONS="-Dcatalina.base=$CATALINA_BASE \
--Dcatalina.home=$CATALINA_HOME \
--Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
--Djava.io.tmpdir=$CATALINA_TMPDIR \
--Djava.util.logging.config.file=${LOGGING_PROPERTIES} \
--Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
-
-if [ "$1" = "start" ] ; then
-  FLAGS="${FLAGS} $CATALINA_OPTS"
-  if [ "${SECURITY_MANAGER}" = "true" ] ; then
-    OPTIONS="${OPTIONS} \
-    -Djava.security.manager \
-    -Djava.security.policy==${CATALINA_BASE}/conf/catalina.policy"
-  fi
-  run start
-elif [ "$1" = "stop" ] ; then
-  run stop
-fi