diff --git a/tomcat-7.0-bootstrap-MANIFEST.MF.patch b/tomcat-7.0-bootstrap-MANIFEST.MF.patch
deleted file mode 100644
index e2ee93e..0000000
--- a/tomcat-7.0-bootstrap-MANIFEST.MF.patch
+++ /dev/null
@@ -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
diff --git a/tomcat-7.0-digest.script b/tomcat-7.0-digest.script
deleted file mode 100644
index 2ff7e64..0000000
--- a/tomcat-7.0-digest.script
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# tomcat-digest script
-# JPackage Project
-
-# 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"
-
-# Set parameters
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run -server org.apache.catalina.realm.RealmBase "$@"
diff --git a/tomcat-7.0-jsvc.service b/tomcat-7.0-jsvc.service
deleted file mode 100644
index 8275796..0000000
--- a/tomcat-7.0-jsvc.service
+++ /dev/null
@@ -1,21 +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"
-ExecStart=/usr/libexec/tomcat/server start
-ExecStop=/usr/libexec/tomcat/server stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/tomcat-7.0-log4j.properties b/tomcat-7.0-log4j.properties
deleted file mode 100644
index dfc2309..0000000
--- a/tomcat-7.0-log4j.properties
+++ /dev/null
@@ -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
diff --git a/tomcat-7.0-tomcat-users-webapp.patch b/tomcat-7.0-tomcat-users-webapp.patch
deleted file mode 100644
index 9f05e37..0000000
--- a/tomcat-7.0-tomcat-users-webapp.patch
+++ /dev/null
@@ -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 @@
-
-
- -->
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
diff --git a/tomcat-7.0-tool-wrapper.script b/tomcat-7.0-tool-wrapper.script
deleted file mode 100644
index 2640ce2..0000000
--- a/tomcat-7.0-tool-wrapper.script
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# tomcat-digest script
-# JPackage Project
-
-# 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"
-
-# Set parameters
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run "$@"
diff --git a/tomcat-7.0.conf b/tomcat-7.0.conf
deleted file mode 100644
index 03119b7..0000000
--- a/tomcat-7.0.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-# System-wide configuration file for tomcat services
-# This will be loaded by systemd as an environment file,
-# so please keep the syntax.
-#
-# 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"
-
-# You can change your tomcat locale here
-#LANG="en_US"
-
-# Run tomcat under the Java Security Manager
-SECURITY_MANAGER="false"
-
-# Time to wait in seconds, before killing process
-# TODO(stingray): does nothing, fix.
-# SHUTDOWN_WAIT="30"
-
-# If you wish to further customize your tomcat environment,
-# put your own definitions here
-# (i.e. LD_LIBRARY_PATH for some jdbc drivers)
diff --git a/tomcat-7.0.logrotate b/tomcat-7.0.logrotate
deleted file mode 100644
index a87b4c0..0000000
--- a/tomcat-7.0.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-@@@TCLOG@@@/catalina.out {
- copytruncate
- weekly
- rotate 52
- compress
- missingok
- create 0644 tomcat tomcat
-}
diff --git a/tomcat-7.0.service b/tomcat-7.0.service
deleted file mode 100644
index 103d464..0000000
--- a/tomcat-7.0.service
+++ /dev/null
@@ -1,23 +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
-ExecStop=/usr/libexec/tomcat/server stop
-SuccessExitStatus=143
-User=tomcat
-Group=tomcat
-
-
-[Install]
-WantedBy=multi-user.target
diff --git a/tomcat-7.0.sysconfig b/tomcat-7.0.sysconfig
deleted file mode 100644
index 3117bf7..0000000
--- a/tomcat-7.0.sysconfig
+++ /dev/null
@@ -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.
diff --git a/tomcat-7.0.wrapper b/tomcat-7.0.wrapper
deleted file mode 100644
index c97cb85..0000000
--- a/tomcat-7.0.wrapper
+++ /dev/null
@@ -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
diff --git a/tomcat-8.0-bootstrap-MANIFEST.MF.patch b/tomcat-8.0-bootstrap-MANIFEST.MF.patch
new file mode 100644
index 0000000..e2ee93e
--- /dev/null
+++ b/tomcat-8.0-bootstrap-MANIFEST.MF.patch
@@ -0,0 +1,9 @@
+--- 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
diff --git a/tomcat-8.0-digest.script b/tomcat-8.0-digest.script
new file mode 100644
index 0000000..2ff7e64
--- /dev/null
+++ b/tomcat-8.0-digest.script
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# tomcat-digest script
+# JPackage Project
+
+# 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"
+
+# Set parameters
+set_classpath $BASE_JARS
+set_flags $BASE_FLAGS
+set_options $BASE_OPTIONS
+
+# Let's start
+run -server org.apache.catalina.realm.RealmBase "$@"
diff --git a/tomcat-8.0-jsvc.service b/tomcat-8.0-jsvc.service
new file mode 100644
index 0000000..8275796
--- /dev/null
+++ b/tomcat-8.0-jsvc.service
@@ -0,0 +1,21 @@
+# 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"
+ExecStart=/usr/libexec/tomcat/server start
+ExecStop=/usr/libexec/tomcat/server stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/tomcat-8.0-log4j.properties b/tomcat-8.0-log4j.properties
new file mode 100644
index 0000000..dfc2309
--- /dev/null
+++ b/tomcat-8.0-log4j.properties
@@ -0,0 +1,11 @@
+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
diff --git a/tomcat-8.0-tomcat-users-webapp.patch b/tomcat-8.0-tomcat-users-webapp.patch
new file mode 100644
index 0000000..9f05e37
--- /dev/null
+++ b/tomcat-8.0-tomcat-users-webapp.patch
@@ -0,0 +1,17 @@
+--- 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 @@
+
+
+ -->
++
++
++
++
++
++
++
++
++
++
+
diff --git a/tomcat-8.0-tool-wrapper.script b/tomcat-8.0-tool-wrapper.script
new file mode 100644
index 0000000..2640ce2
--- /dev/null
+++ b/tomcat-8.0-tool-wrapper.script
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# tomcat-digest script
+# JPackage Project
+
+# 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"
+
+# Set parameters
+set_classpath $BASE_JARS
+set_flags $BASE_FLAGS
+set_options $BASE_OPTIONS
+
+# Let's start
+run "$@"
diff --git a/tomcat-8.0.conf b/tomcat-8.0.conf
new file mode 100644
index 0000000..03119b7
--- /dev/null
+++ b/tomcat-8.0.conf
@@ -0,0 +1,48 @@
+# System-wide configuration file for tomcat services
+# This will be loaded by systemd as an environment file,
+# so please keep the syntax.
+#
+# 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"
+
+# You can change your tomcat locale here
+#LANG="en_US"
+
+# Run tomcat under the Java Security Manager
+SECURITY_MANAGER="false"
+
+# Time to wait in seconds, before killing process
+# TODO(stingray): does nothing, fix.
+# SHUTDOWN_WAIT="30"
+
+# If you wish to further customize your tomcat environment,
+# put your own definitions here
+# (i.e. LD_LIBRARY_PATH for some jdbc drivers)
diff --git a/tomcat-8.0.logrotate b/tomcat-8.0.logrotate
new file mode 100644
index 0000000..a87b4c0
--- /dev/null
+++ b/tomcat-8.0.logrotate
@@ -0,0 +1,8 @@
+@@@TCLOG@@@/catalina.out {
+ copytruncate
+ weekly
+ rotate 52
+ compress
+ missingok
+ create 0644 tomcat tomcat
+}
diff --git a/tomcat-8.0.service b/tomcat-8.0.service
new file mode 100644
index 0000000..103d464
--- /dev/null
+++ b/tomcat-8.0.service
@@ -0,0 +1,23 @@
+# 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
+ExecStop=/usr/libexec/tomcat/server stop
+SuccessExitStatus=143
+User=tomcat
+Group=tomcat
+
+
+[Install]
+WantedBy=multi-user.target
diff --git a/tomcat-8.0.sysconfig b/tomcat-8.0.sysconfig
new file mode 100644
index 0000000..3117bf7
--- /dev/null
+++ b/tomcat-8.0.sysconfig
@@ -0,0 +1,11 @@
+# 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.
diff --git a/tomcat-8.0.wrapper b/tomcat-8.0.wrapper
new file mode 100644
index 0000000..c97cb85
--- /dev/null
+++ b/tomcat-8.0.wrapper
@@ -0,0 +1,24 @@
+#!/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
diff --git a/tomcat-server b/tomcat-server
index bd55999..951b3ee 100644
--- a/tomcat-server
+++ b/tomcat-server
@@ -4,7 +4,7 @@
MAIN_CLASS=org.apache.catalina.startup.Bootstrap
-FLAGS="$JAVA_OPTS $CATALINA_OPTS"
+FLAGS="$JAVA_OPTS"
OPTIONS="-Dcatalina.base=$CATALINA_BASE \
-Dcatalina.home=$CATALINA_HOME \
-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
@@ -14,6 +14,7 @@ OPTIONS="-Dcatalina.base=$CATALINA_BASE \
if [ "$1" = "start" ] ; then
if [ "${SECURITY_MANAGER}" = "true" ] ; then
+ FLAGS="${FLAGS} $CATALINA_OPTS"
OPTIONS="${OPTIONS} \
-Djava.security.manager \
-Djava.security.policy==${CATALINA_BASE}/conf/catalina.policy"
diff --git a/tomcat.spec b/tomcat.spec
index d9de221..a0a96bb 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -28,13 +28,13 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%global jspspec 2.2
-%global major_version 7
+%global jspspec 2.3
+%global major_version 8
%global minor_version 0
-%global micro_version 54
+%global micro_version 12
%global packdname apache-tomcat-%{version}-src
-%global servletspec 3.0
-%global elspec 2.2
+%global servletspec 3.1
+%global elspec 3.0
%global tcuid 91
# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
@@ -54,7 +54,7 @@
Name: tomcat
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -88,7 +88,7 @@ Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.pat
BuildArch: noarch
BuildRequires: ant
-BuildRequires: ecj >= 1:4.2.1
+BuildRequires: ecj >= 1:4.4.0
BuildRequires: findutils
BuildRequires: apache-commons-collections
BuildRequires: apache-commons-daemon
@@ -168,6 +168,8 @@ Group: Development/Libraries
Summary: Apache Tomcat JSP API implementation classes
Provides: jsp = %{jspspec}
Provides: jsp22
+Provides: %{name}-jsp-2.2-api
+Obsoletes: %{name}-jsp-2.2-api
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
Requires(post): chkconfig
@@ -205,6 +207,8 @@ Summary: Apache Tomcat Servlet API implementation classes
Provides: servlet = %{servletspec}
Provides: servlet6
Provides: servlet3
+Provides: %{name}-servlet-3.0-api
+Obsoletes: %{name}-servlet-3.0-api
Requires(post): chkconfig
Requires(postun): chkconfig
@@ -213,14 +217,16 @@ Apache Tomcat Servlet API implementation classes.
%package el-%{elspec}-api
Group: Development/Libraries
-Summary: Expression Language v1.0 API
+Summary: Expression Language v%{elspec} API
Provides: el_1_0_api = %{epoch}:%{version}-%{release}
Provides: el_api = %{elspec}
+Provides: %{name}-el-2.2-api
+Obsoletes: %{name}-el-2.2-api
Requires(post): chkconfig
Requires(postun): chkconfig
%description el-%{elspec}-api
-Expression Language 1.0.
+Expression Language %{elspec}.
%package webapps
Group: Applications/Internet
@@ -250,6 +256,8 @@ export OPT_JAR_LIST="xalan-j2-serializer"
touch HACK
%{__mkdir_p} HACKDIR
touch HACKDIR/build.xml
+ touch HACKDIR/LICENSE
+
# who needs a build.properties file anyway
%{ant} -Dbase.path="." \
-Dbuild.compiler="modern" \
@@ -258,9 +266,9 @@ export OPT_JAR_LIST="xalan-j2-serializer"
-Dcommons-daemon.native.src.tgz="HACK" \
-Djasper-jdt.jar="$(build-classpath ecj)" \
-Djdt.jar="$(build-classpath ecj)" \
- -Dtomcat-dbcp.jar="$(build-classpath apache-commons-dbcp)" \
-Dtomcat-native.tar.gz="HACK" \
-Dtomcat-native.home="." \
+ -Dtomcat-native.win.path="HACKDIR" \
-Dcommons-daemon.native.win.mgr.exe="HACK" \
-Dnsis.exe="HACK" \
-Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \
@@ -275,8 +283,7 @@ export OPT_JAR_LIST="xalan-j2-serializer"
# remove some jars that we'll replace with symlinks later
%{__rm} output/build/bin/commons-daemon.jar \
- output/build/lib/ecj.jar \
- output/build/lib/apache-commons-dbcp.jar
+ output/build/lib/ecj.jar
# remove the cruft we created
%{__rm} output/build/bin/tomcat-native.tar.gz
@@ -384,6 +391,13 @@ popd
%{__install} -m 0644 %{SOURCE32} \
${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service
+# Substitute libnames in catalina-tasks.xml
+sed -i \
+ "s,el-api.jar,%{name}-el-%{elspec}-api.jar,;
+ s,servlet-api.jar,%{name}-servlet-%{servletspec}-api.jar,;
+ s,jsp-api.jar,%{name}-jsp-%{jspspec}-api.jar,;" \
+ ${RPM_BUILD_ROOT}%{bindir}/catalina-tasks.xml
+
# create jsp and servlet API symlinks
pushd ${RPM_BUILD_ROOT}%{_javadir}
%{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api.jar
@@ -467,7 +481,7 @@ done
%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "org.eclipse.jetty.orbit:javax.servlet.jsp"
%{__cp} -a tomcat-el-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-el-api.pom
-%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "org.eclipse.jetty.orbit:javax.el"
+%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "org.eclipse.jetty.orbit:javax.el,javax.el:el-api"
%{__cp} -a tomcat-servlet-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-servlet-api.pom
# Generate a depmap fragment javax.servlet:servlet-api pointing to
@@ -643,7 +657,7 @@ fi
%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom
%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom
%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom
-%{_datadir}/maven-metadata/tomcat.xml
+%{_datadir}/maven-fragments/%{name}
%exclude %{libdir}/%{name}-el-%{elspec}-api.jar
%exclude %{libdir}/log4j.jar
@@ -669,6 +683,11 @@ fi
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog
+* Sat Sep 20 2014 Ivan Afonichev 0:8.0.12-1
+- Updated to 8.0.12
+- Substitute libnames in catalina-tasks.xml, resolves: rhbz#1126439
+- Use CATALINA_OPTS only on start, resolves: rhbz#1051194
+
* Mon Jun 16 2014 Michal Srb - 0:7.0.54-3
- jsp-api requires el-api