From 38e917d3438f16ad167a2620bc83b15799646fe9 Mon Sep 17 00:00:00 2001
From: Coty Sutherland <csutherl@redhat.com>
Date: Fri, 15 Jun 2018 14:16:40 -0400
Subject: [PATCH] Add ant and tools jars to the classpath to enable JSP
 compilation at runtime

---
 pki-servlet-container.spec | 2 ++
 tomcat-preamble            | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/pki-servlet-container.spec b/pki-servlet-container.spec
index 0c39d1b..bb8ee5d 100644
--- a/pki-servlet-container.spec
+++ b/pki-servlet-container.spec
@@ -101,7 +101,9 @@ BuildRequires: jpackage-utils >= 0:1.7.0
 BuildRequires: javapackages-local
 %endif
 
+Requires:      ant
 Requires:      java-headless >= 1:1.8.0
+Requires:      java-devel >= 1:1.8.0
 Requires:      jpackage-utils
 Requires:      procps
 Requires(pre):    shadow-utils
diff --git a/tomcat-preamble b/tomcat-preamble
index c3c1183..07d28a3 100644
--- a/tomcat-preamble
+++ b/tomcat-preamble
@@ -43,6 +43,11 @@ fi
 CLASSPATH="${CLASSPATH}${CATALINA_HOME}/bin/bootstrap.jar"
 CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
 
+# Since ECJ is no longer available, add ant, ant-launcher, and tools jars to the
+# classpath so that runtime compilation of JSPs still works.
+CLASSPATH="${CLASSPATH}:/usr/share/java/ant.jar:/usr/share/java/ant-launcher.jar"
+CLASSPATH="${CLASSPATH}:/usr/lib/jvm/java/lib/tools.jar"
+
 if [ -z "$LOGGING_PROPERTIES" ] ; then
   LOGGING_PROPERTIES="${CATALINA_BASE}/conf/logging.properties"
   if [ ! -f "${LOGGING_PROPERTIES}" ] ; then