This branch was for a module that was in development and not ready for release, and is therefore unsupported

.gitignore

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

dead.package

@@ -0,0 +1 @@
+This branch was for a module that was in development and not ready for release, and is therefore unsupported

sources

@@ -1 +0,0 @@
-SHA512 (apache-tomcat-9.0.21-src.tar.gz) = 6df978bbe9bb3a327d784d81a46affa4cfe5d370c2b847e102d25a792752ba487ebae329d1763ed7459cb3d49098c3d0cf6b01155536a04c17c4ffdf9e9a774f

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,39 +0,0 @@
---- conf/catalina.policy~	2016-06-17 10:20:17.649171968 -0400
-+++ conf/catalina.policy	2016-06-17 10:23:35.358309244 -0400
-@@ -50,6 +50,36 @@ 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/tomcat-servlet-3.0-api.jar" {
-+        permission java.security.AllPermission;
-+};
-+grant codeBase "file:/usr/share/java/tomcat-jsp-2.2-api.jar" {
-+        permission java.security.AllPermission;
-+};
-+grant codeBase "file:/usr/share/java/tomcat-el-2.2-api.jar" {
-+        permission java.security.AllPermission;
-+};
-+grant codeBase "file:/usr/share/java/log4j.jar" {
-+        permission java.security.AllPermission;
-+};
-+grant codeBase "file:/usr/share/java/ecj.jar" {
-+        permission java.security.AllPermission;
-+};
-+grant codeBase "file:/usr/share/java/apache-commons-pool.jar" {
-+        permission java.security.AllPermission;
-+};
-+grant codeBase "file:/usr/share/java/apache-commons-dbcp.jar" {
-+        permission java.security.AllPermission;
-+};
-+grant codeBase "file:/usr/share/java/apache-commons-collections.jar" {
-+        permission java.security.AllPermission;
-+};
-+
- 
- // ========== CATALINA CODE PERMISSIONS =======================================
- 

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-jsvc.service

@@ -1,22 +0,0 @@
-# Systemd unit file for tomcat
-# 
-# To create clones of this service:
-# 1) By default SERVICE_NAME=tomcat. When cloned, the value must be defined 
-# before tomcat-sysd is called.
-# 2) Create /etc/sysconfig/${SERVICE_NAME} from /etc/sysconfig/tomcat
-# to override tomcat defaults
-
-[Unit]
-Description=Apache Tomcat Web Application Container JSVC wrapper
-After=syslog.target network.target
-
-[Service]
-Type=simple
-EnvironmentFile=/etc/tomcat/tomcat.conf
-Environment="NAME=" "USE_JSVC=true"
-EnvironmentFile=-/etc/sysconfig/tomcat
-ExecStart=/usr/libexec/tomcat/server start
-ExecStop=/usr/libexec/tomcat/server stop
-
-[Install]
-WantedBy=multi-user.target

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-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
-@@ -23,4 +23,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,8 +0,0 @@
-@@@TCLOG@@@/catalina.out {
-    copytruncate
-    weekly
-    rotate 52
-    compress
-    missingok
-    create 0644 tomcat tomcat
-}

tomcat-9.0.service

@@ -1,22 +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
-Group=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 @@
---- build.xml.orig	2018-08-07 10:32:04.994403913 -0400
-+++ build.xml	2018-08-07 10:32:30.874319588 -0400
-@@ -2989,6 +2989,9 @@ Read the Building page on the Apache Tom
-     <path id="bndlib.classpath">
-       <fileset file="${bnd.jar}" />
-       <fileset file="${bndlib.jar}" />
-+      <fileset file="${bndlibg.jar}" />
-+      <fileset file="${bndannotation.jar}" />
-+      <fileset file="${slf4j-api.jar}" />
-     </path>
- 
-     <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bndlib.classpath" />

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,26 +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
-Group=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