commit 167370bb1553653d4badbe6b94aea42efe3b9f8f
Author: Ivan Afonichev <ivan.afonichev(a)gmail.com>
Date: Wed Apr 27 09:54:04 2011 +0400
Tomcat 7
.gitignore | 4 +-
jsp-api-OSGi-MANIFEST.MF | 12 ++--
servlet-api-OSGi-MANIFEST.MF | 6 +-
sources | 3 +-
tomcat6-6.0-rhbz-674601.patch | 18 ------
...atch => tomcat7-7.0-bootstrap-MANIFEST.MF.patch | 2 +-
...-6.0-digest.script => tomcat7-7.0-digest.script | 6 +-
...og4j.properties => tomcat7-7.0-log4j.properties | 0
....patch => tomcat7-7.0-tomcat-users-webapp.patch | 0
...apper.script => tomcat7-7.0-tool-wrapper.script | 6 +-
tomcat6-6.0.conf => tomcat7-7.0.conf | 10 ++--
tomcat6-6.0.init => tomcat7-7.0.init | 20 +++---
tomcat6-6.0.logrotate => tomcat7-7.0.logrotate | 0
tomcat6-6.0.sysconfig => tomcat7-7.0.sysconfig | 14 ++--
tomcat6-6.0.wrapper => tomcat7-7.0.wrapper | 2 +-
tomcat6.spec => tomcat7.spec | 62 +++++++++++--------
16 files changed, 79 insertions(+), 86 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5ff9c77..3cd0629 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,6 @@ apache-tomcat-6.0.24-src.tar.gz
apache-tomcat-6.0.26-src.tar.gz
apache-tomcat-6.0.29-src.tar.gz
apache-tomcat-6.0.30-src.tar.gz
-/apache-tomcat-6.0.32-src.tar.gz
+apache-tomcat-6.0.32-src.tar.gz
+apache-tomcat-7.0.12-src.tar.gz
+
diff --git a/jsp-api-OSGi-MANIFEST.MF b/jsp-api-OSGi-MANIFEST.MF
index d5ecf7e..6470b0d 100644
--- a/jsp-api-OSGi-MANIFEST.MF
+++ b/jsp-api-OSGi-MANIFEST.MF
@@ -4,10 +4,10 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
Bundle-Name: %bundleName
Bundle-SymbolicName: javax.servlet.jsp
-Export-Package: javax.servlet.jsp; version=2.0,javax.servlet.jsp.el; v
- ersion=2.0,javax.servlet.jsp.resources; version=2.0,javax.servlet.jsp
- .tagext; version=2.0
-Bundle-Version: 2.0.0.v200806031607
+Export-Package: javax.servlet.jsp; version=2.2,javax.servlet.jsp.el; v
+ ersion=2.2,javax.servlet.jsp.resources; version=2.2,javax.servlet.jsp
+ .tagext; version=2.2
+Bundle-Version: 2.2.0.v200806031607
Bundle-ManifestVersion: 2
-Import-Package: javax.servlet; version=2.4,javax.servlet.http; version
- =2.4,javax.servlet.resources; version=2.4
+Import-Package: javax.servlet; version=3.0,javax.servlet.http; version
+ =3.0,javax.servlet.resources; version=3.0
diff --git a/servlet-api-OSGi-MANIFEST.MF b/servlet-api-OSGi-MANIFEST.MF
index 957cb38..67c80b8 100644
--- a/servlet-api-OSGi-MANIFEST.MF
+++ b/servlet-api-OSGi-MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: javax.servlet
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-Localization: plugin
-Bundle-Version: 2.5.0.v200806031605
+Bundle-Version: 3.0.0
Bundle-Vendor: %bundleProvider
-Export-Package: javax.servlet;version="2.5",javax.servlet.http;version
- ="2.5",javax.servlet.resources;version="2.5"
+Export-Package: javax.servlet;version="3.0",javax.servlet.http;version
+ ="3.0",javax.servlet.resources;version="3.0"
diff --git a/sources b/sources
index f1dcb10..99e67fa 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-7b811c9092bcb7779bd8df772744ac15 apache-tomcat-6.0.30-src.tar.gz
-19a1eaa9c9938b520d3c360d8cf4af22 apache-tomcat-6.0.32-src.tar.gz
+edfd253c21b51ccadce8ec05be5e61fb apache-tomcat-7.0.12-src.tar.gz
diff --git a/tomcat6-6.0-bootstrap-MANIFEST.MF.patch
b/tomcat7-7.0-bootstrap-MANIFEST.MF.patch
similarity index 89%
rename from tomcat6-6.0-bootstrap-MANIFEST.MF.patch
rename to tomcat7-7.0-bootstrap-MANIFEST.MF.patch
index ac94aac..e2ee93e 100644
--- a/tomcat6-6.0-bootstrap-MANIFEST.MF.patch
+++ b/tomcat7-7.0-bootstrap-MANIFEST.MF.patch
@@ -3,7 +3,7 @@
@@ -1,6 +1,5 @@
Manifest-Version: 1.0
Main-Class: org.apache.catalina.startup.Bootstrap
--Class-Path: commons-daemon.jar tomcat-juli.jar
+-Class-Path: commons-daemon.jar
Specification-Title: Apache Tomcat Bootstrap
Specification-Version: @VERSION_MAJOR_MINOR@
Specification-Vendor: Apache Software Foundation
diff --git a/tomcat6-6.0-digest.script b/tomcat7-7.0-digest.script
similarity index 89%
rename from tomcat6-6.0-digest.script
rename to tomcat7-7.0-digest.script
index 41ef58e..409dc86 100644
--- a/tomcat6-6.0-digest.script
+++ b/tomcat7-7.0-digest.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# tomcat6-digest script
+# tomcat7-digest script
# JPackage Project <
http://www.jpackage.org/>
# Source functions library
@@ -13,7 +13,7 @@ fi
# Get the tomcat config (use this for environment specific settings)
if [ -z "${TOMCAT_CFG}" ]; then
- TOMCAT_CFG="/etc/tomcat6/tomcat6.conf"
+ TOMCAT_CFG="/etc/tomcat7/tomcat7.conf"
fi
if [ -r "$TOMCAT_CFG" ]; then
@@ -34,7 +34,7 @@ export CLASSPATH
MAIN_CLASS="org.apache.catalina.startup.Tool"
BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\""
BASE_OPTIONS=""
-BASE_JARS="commons-daemon tomcat6/catalina servlet"
+BASE_JARS="commons-daemon tomcat7/catalina servlet"
# Set parameters
set_classpath $BASE_JARS
diff --git a/tomcat6-6.0-log4j.properties b/tomcat7-7.0-log4j.properties
similarity index 100%
rename from tomcat6-6.0-log4j.properties
rename to tomcat7-7.0-log4j.properties
diff --git a/tomcat6-6.0-tomcat-users-webapp.patch
b/tomcat7-7.0-tomcat-users-webapp.patch
similarity index 100%
rename from tomcat6-6.0-tomcat-users-webapp.patch
rename to tomcat7-7.0-tomcat-users-webapp.patch
diff --git a/tomcat6-6.0-tool-wrapper.script b/tomcat7-7.0-tool-wrapper.script
similarity index 88%
rename from tomcat6-6.0-tool-wrapper.script
rename to tomcat7-7.0-tool-wrapper.script
index bcd7561..ad75a09 100644
--- a/tomcat6-6.0-tool-wrapper.script
+++ b/tomcat7-7.0-tool-wrapper.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# tomcat6-digest script
+# tomcat7-digest script
# JPackage Project <
http://www.jpackage.org/>
# Source functions library
@@ -13,7 +13,7 @@ fi
# Get the tomcat config (use this for environment specific settings)
if [ -z "${TOMCAT_CFG}" ]; then
- TOMCAT_CFG="/etc/tomcat6/tomcat6.conf"
+ TOMCAT_CFG="/etc/tomcat7/tomcat7.conf"
fi
if [ -r "$TOMCAT_CFG" ]; then
@@ -34,7 +34,7 @@ export CLASSPATH
MAIN_CLASS="org.apache.catalina.startup.Tool"
BASE_OPTIONS=""
BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\""
-BASE_JARS="commons-daemon tomcat6/catalina servlet"
+BASE_JARS="commons-daemon tomcat7/catalina servlet"
# Set parameters
set_classpath $BASE_JARS
diff --git a/tomcat6-6.0.conf b/tomcat7-7.0.conf
similarity index 82%
rename from tomcat6-6.0.conf
rename to tomcat7-7.0.conf
index f2fe56e..3ac47d9 100644
--- a/tomcat6-6.0.conf
+++ b/tomcat7-7.0.conf
@@ -1,11 +1,11 @@
-# System-wide configuration file for tomcat6 services
-# This will be sourced by tomcat6 and any secondary service
+# System-wide configuration file for tomcat7 services
+# This will be sourced by tomcat7 and any secondary service
# Values will be overridden by service-specific configuration
# files in /etc/sysconfig
#
# Use this one to change default values for all services
# Change the service specific ones to affect only one service
-# (see, for instance, /etc/sysconfig/tomcat6)
+# (see, for instance, /etc/sysconfig/tomcat7)
#
# Where your java installation lives
@@ -39,9 +39,9 @@ SHUTDOWN_WAIT="30"
SHUTDOWN_VERBOSE="false"
# Set the TOMCAT_PID location
-CATALINA_PID="/var/run/tomcat6.pid"
+CATALINA_PID="/var/run/tomcat7.pid"
-# Connector port is 8080 for this tomcat6 instance
+# Connector port is 8080 for this tomcat7 instance
#CONNECTOR_PORT="8080"
# If you wish to further customize your tomcat environment,
diff --git a/tomcat6-6.0.init b/tomcat7-7.0.init
similarity index 94%
rename from tomcat6-6.0.init
rename to tomcat7-7.0.init
index ad81343..e3887d4 100644
--- a/tomcat6-6.0.init
+++ b/tomcat7-7.0.init
@@ -1,16 +1,16 @@
#!/bin/bash
#
-# tomcat6 This shell script takes care of starting and stopping Tomcat
+# tomcat7 This shell script takes care of starting and stopping Tomcat
#
# chkconfig: - 80 20
#
### BEGIN INIT INFO
-# Provides: tomcat6
+# Provides: tomcat7
# Required-Start: $network $syslog
# Required-Stop: $network $syslog
# Default-Start:
# Default-Stop:
-# Description: Release implementation for Servlet 2.5 and JSP 2.1
+# Description: Release implementation for Servlet 3.0 and JSP 2.2
# Short-Description: start and stop tomcat
### END INIT INFO
#
@@ -44,7 +44,7 @@ else
fi
# Get the tomcat config (use this for environment specific settings)
-TOMCAT_CFG="/etc/tomcat6/tomcat6.conf"
+TOMCAT_CFG="/etc/tomcat7/tomcat7.conf"
if [ -r "$TOMCAT_CFG" ]; then
. $TOMCAT_CFG
fi
@@ -58,7 +58,7 @@ fi
CONNECTOR_PORT="${CONNECTOR_PORT:-8080}"
# Path to the tomcat launch script
-TOMCAT_SCRIPT="/usr/sbin/tomcat6"
+TOMCAT_SCRIPT="/usr/sbin/tomcat7"
# Tomcat program name
TOMCAT_PROG="${NAME}"
@@ -67,7 +67,7 @@ TOMCAT_PROG="${NAME}"
TOMCAT_USER="${TOMCAT_USER:-tomcat}"
# Define the tomcat log file
-TOMCAT_LOG="${TOMCAT_LOG:-/var/log/tomcat6/catalina.out}"
+TOMCAT_LOG="${TOMCAT_LOG:-/var/log/tomcat7/catalina.out}"
RETVAL="0"
@@ -109,7 +109,7 @@ function makeHomeDir() {
echo "$CATALINA_HOME does not exist, creating"
if [ ! -d "/usr/share/${NAME}" ]; then
mkdir /usr/share/${NAME}
- cp -pLR /usr/share/tomcat6/* /usr/share/${NAME}
+ cp -pLR /usr/share/tomcat7/* /usr/share/${NAME}
fi
mkdir -p /var/log/${NAME} \
/var/cache/${NAME} \
@@ -118,8 +118,8 @@ function makeHomeDir() {
ln -fs /var/tmp/${NAME} ${CATALINA_HOME}/temp
cp -pLR /usr/share/${NAME}/bin $CATALINA_HOME
cp -pLR /usr/share/${NAME}/conf $CATALINA_HOME
- ln -fs /usr/share/java/tomcat6 ${CATALINA_HOME}/lib
- ln -fs /usr/share/tomcat6/webapps ${CATALINA_HOME}/webapps
+ ln -fs /usr/share/java/tomcat7 ${CATALINA_HOME}/lib
+ ln -fs /usr/share/tomcat7/webapps ${CATALINA_HOME}/webapps
chown ${TOMCAT_USER}:${TOMCAT_USER} /var/log/${NAME}
fi
}
@@ -171,7 +171,7 @@ function start() {
if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ];
then
chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG
fi
- if [ "$CATALINA_HOME" != "/usr/share/tomcat6" -a
"$RETVAL" -eq "0" ]; then
+ if [ "$CATALINA_HOME" != "/usr/share/tomcat7" -a
"$RETVAL" -eq "0" ]; then
# Create a tomcat directory if it doesn't exist
makeHomeDir
# If CATALINA_HOME doesn't exist modify port number so that
diff --git a/tomcat6-6.0.logrotate b/tomcat7-7.0.logrotate
similarity index 100%
rename from tomcat6-6.0.logrotate
rename to tomcat7-7.0.logrotate
diff --git a/tomcat6-6.0.sysconfig b/tomcat7-7.0.sysconfig
similarity index 79%
rename from tomcat6-6.0.sysconfig
rename to tomcat7-7.0.sysconfig
index caefeed..69cd0a1 100644
--- a/tomcat6-6.0.sysconfig
+++ b/tomcat7-7.0.sysconfig
@@ -1,15 +1,15 @@
-# Service-specific configuration file for tomcat6. This will be sourced by
+# Service-specific configuration file for tomcat7. This will be sourced by
# the SysV init script after the global configuration file
-# /etc/tomcat6/tomcat6.conf, thus allowing values to be overridden in
+# /etc/tomcat7/tomcat7.conf, thus allowing values to be overridden in
# a per-service manner.
#
# NEVER change the init script itself. To change values for all services make
-# your changes in /etc/tomcat6/tomcat6.conf
+# your changes in /etc/tomcat7/tomcat7.conf
#
# To change values for a specific service make your edits here.
# To create a new service create a link from /etc/init.d/<your new service> to
-# /etc/init.d/tomcat6 (do not copy the init script) and make a copy of the
-# /etc/sysconfig/tomcat6 file to /etc/sysconfig/<your new service> and change
+# /etc/init.d/tomcat7 (do not copy the init script) and make a copy of the
+# /etc/sysconfig/tomcat7 file to /etc/sysconfig/<your new service> and change
# the property values so the two services won't conflict. Register the new
# service in the system as usual (see chkconfig and similars).
#
@@ -45,9 +45,9 @@
#SHUTDOWN_VERBOSE="false"
# Set the TOMCAT_PID location
-#CATALINA_PID="/var/run/tomcat6.pid"
+#CATALINA_PID="/var/run/tomcat7.pid"
-# Connector port is 8080 for this tomcat6 instance
+# Connector port is 8080 for this tomcat7 instance
#CONNECTOR_PORT="8080"
# If you wish to further customize your tomcat environment,
diff --git a/tomcat6-6.0.wrapper b/tomcat7-7.0.wrapper
similarity index 98%
rename from tomcat6-6.0.wrapper
rename to tomcat7-7.0.wrapper
index 0e95331..dc3a6f1 100644
--- a/tomcat6-6.0.wrapper
+++ b/tomcat7-7.0.wrapper
@@ -9,7 +9,7 @@ fi
# Get the tomcat config (use this for environment specific settings)
#if [ -z "${TOMCAT_CFG}" ]; then
-# TOMCAT_CFG="/etc/tomcat6/tomcat6.conf"
+# TOMCAT_CFG="/etc/tomcat7/tomcat7.conf"
#fi
#if [ -r "$TOMCAT_CFG" ]; then
diff --git a/tomcat6.spec b/tomcat7.spec
similarity index 95%
rename from tomcat6.spec
rename to tomcat7.spec
index da3c337..2a850b5 100644
--- a/tomcat6.spec
+++ b/tomcat7.spec
@@ -28,13 +28,13 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%global jspspec 2.1
-%global major_version 6
+%global jspspec 2.2
+%global major_version 7
%global minor_version 0
-%global micro_version 32
+%global micro_version 12
%global packdname apache-tomcat-%{version}-src
-%global servletspec 2.5
-%global elspec 2.1
+%global servletspec 3.0
+%global elspec 2.2
%global tcuid 91
# FHS 2.3 compliant tree structure -
http://www.pathname.com/fhs/2.3/
@@ -50,10 +50,10 @@
%global workdir %{cachedir}/work
%global _initrddir %{_sysconfdir}/init.d
-Name: tomcat6
+Name: tomcat7
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 7%{?dist}
+Release: 1%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec}
API
Group: Networking/Daemons
@@ -72,8 +72,7 @@ Source9: jsp-api-OSGi-MANIFEST.MF
Source10: %{name}-%{major_version}.%{minor_version}-log4j.properties
Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
-# In 6.0.32 source
-#Patch2: %{name}-%{major_version}.%{minor_version}-rhbz-674601.patch
+
BuildArch: noarch
BuildRequires: ant
@@ -146,7 +145,7 @@ Javadoc generated documentation for Apache Tomcat.
Group: Internet/WWW/Dynamic Content
Summary: Apache Tomcat JSP API implementation classes
Provides: jsp = %{jspspec}
-Provides: jsp21
+Provides: jsp22
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
Requires(post): chkconfig
Requires(postun): chkconfig
@@ -175,7 +174,7 @@ Group: Internet/WWW/Dynamic Content
Summary: Apache Tomcat Servlet API implementation classes
Provides: servlet = %{servletspec}
Provides: servlet6
-Provides: servlet25
+Provides: servlet3
Requires(post): chkconfig
Requires(postun): chkconfig
@@ -228,14 +227,22 @@ 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" \
-Dversion="%{version}" \
-Dversion.build="%{micro_version}"
# javadoc generation
- %{ant} -f dist.xml dist-prepare
- %{ant} -f dist.xml dist-source
- %{ant} -f dist.xml dist-javadoc
+ %{ant} -Dbase.path="." \
+ -Dbuild.compiler="modern" \
+ -Dcommons-collections.jar="$(build-classpath apache-commons-collections)"
\
+ -Dcommons-daemon.jar="$(build-classpath apache-commons-daemon)" \
+ -Dcommons-daemon.native.src.tgz="HACK" \
+ -Djasper-jdt.jar="$(build-classpath ecj)" \
+ -Djdt.jar="$(build-classpath ecj)" \
+ -Dtomcat-native.tar.gz="HACK" \
+ -Dversion="%{version}" \
+ -Dversion.build="%{micro_version}" \
+ dist-prepare dist-source javadoc
+
# remove some jars that we'll replace with symlinks later
%{__rm} output/build/bin/commons-daemon.jar \
output/build/lib/ecj.jar
@@ -341,7 +348,7 @@ pushd ${RPM_BUILD_ROOT}%{libdir}
%{__ln_s} $(build-classpath log4j) log4j.jar
%{__ln_s} $(build-classpath ecj) jasper-jdt.jar
- # Link the juli jar into /usr/share/java/tomcat6
+ # Link the juli jar into /usr/share/java/tomcat7
%{__ln_s} %{bindir}/tomcat-juli.jar .
popd
@@ -364,7 +371,7 @@ popd
# Generate a depmap fragment javax.servlet:servlet-api pointing to
-# tomcat6-servlet-2.5-api for backwards compatibility
+# tomcat7-servlet-3.0-api for backwards compatibility
%add_to_maven_depmap javax.servlet servlet-api %{servletspec} JPP
%{name}-servlet-%{servletspec}-api
# also provide jetty depmap (originally in jetty package, but it's cleaner to have it
here)
%add_to_maven_depmap org.mortbay.jetty servlet-api %{servletspec} JPP
%{name}-servlet-%{servletspec}-api
@@ -379,25 +386,25 @@ for pom in *.pom; do
done
# we won't install dbcp, juli-adapters and juli-extras pom files
-for pom in annotations-api.pom catalina.pom jasper-el.pom jasper.pom \
- catalina-ha.pom el-api.pom; do
+for pom in tomcat-annotations-api.pom tomcat-catalina.pom tomcat-jasper-el.pom
tomcat-jasper.pom \
+ tomcat-catalina-ha.pom tomcat-el-api.pom; do
%{__cp} -a $pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-$pom
base=`basename $pom .pom`
%add_to_maven_depmap org.apache.tomcat $base %{version} JPP/%{name} $base
done
-# servlet-api jsp-api and el-api are not in tomcat6 subdir, since they are widely re-used
elsewhere
-for pom in jsp-api.pom servlet-api.pom el-api.pom;do
+# servlet-api jsp-api and el-api are not in tomcat7 subdir, since they are widely re-used
elsewhere
+for pom in tomcat-jsp-api.pom tomcat-servlet-api.pom tomcat-el-api.pom;do
%{__cp} -a $pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-%{name}-$pom
base=`basename $pom .pom`
%add_to_maven_depmap org.apache.tomcat $base %{version} JPP %{name}-$base
done
# two special pom where jar files have different names
-%{__cp} -a tribes.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
+%{__cp} -a tomcat-tribes.pom
${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
%add_to_maven_depmap org.apache.tomcat tribes %{version} JPP/%{name} catalina-tribes
-%{__cp} -a juli.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
+%{__cp} -a tomcat-juli.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
%add_to_maven_depmap org.apache.tomcat juli %{version} JPP/%{name} tomcat-juli
@@ -539,7 +546,7 @@ fi
%defattr(-,root,root,-)
%{_javadir}/%{name}-jsp-%{jspspec}*.jar
%{_javadir}/%{name}-jsp-api.jar
-%{_mavenpomdir}/JPP-%{name}-jsp-api.pom
+%{_mavenpomdir}/JPP-%{name}-tomcat-jsp-api.pom
%files lib
%defattr(-,root,root,-)
@@ -550,14 +557,14 @@ fi
%{_javadir}/%{name}-servlet-%{servletspec}*.jar
%{_javadir}/%{name}-servlet-api.jar
%{_mavendepmapfragdir}/%{name}-servlet-api
-%{_mavenpomdir}/JPP-%{name}-servlet-api.pom
+%{_mavenpomdir}/JPP-%{name}-tomcat-servlet-api.pom
%files el-%{elspec}-api
%defattr(-,root,root,-)
%{_javadir}/%{name}-el-%{elspec}-api.jar
%{_javadir}/%{name}-el-api.jar
%{_javadir}/%{name}/%{name}-el-%{elspec}-api.jar
-%{_mavenpomdir}/JPP-%{name}-el-api.pom
+%{_mavenpomdir}/JPP-%{name}-tomcat-el-api.pom
%files webapps
%defattr(0664,root,tomcat,0775)
@@ -566,6 +573,9 @@ fi
%{appdir}/sample
%changelog
+* Wed Apr 27 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.12-1
+- Tomcat7
+
* Wed Apr 13 2011 David Knox <dknox(a)redhat.com> 0:6.0.32-7
- Resolve: rhbz 693292 - manager app doesn't work (directory permissions)
- Resolve: rhbz 677414 - incorrect directory permissions