[packages/tomcat] Up to 11.0.18.
arekm
arekm at pld-linux.org
Tue Mar 10 18:20:41 CET 2026
commit 9f2774187c7de7d572b7deeec456fafd04521ed4
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Mar 10 18:20:33 2026 +0100
Up to 11.0.18.
apache-tomcat.init | 21 ++-
jakartaee-migration-stubs.patch | 55 ++++++++
no-bnd-osgi.patch | 302 ++++++++++++++++++++++++++++++++++++++++
tomcat-build.properties | 38 +----
tomcat-context-ROOT.xml | 4 +-
tomcat-context-docs.xml | 4 +-
tomcat-context-examples.xml | 4 +-
tomcat-context-host-manager.xml | 4 +-
tomcat-context-manager.xml | 4 +-
tomcat.spec | 243 +++++++++-----------------------
10 files changed, 448 insertions(+), 231 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index 7792a44..031fbb3 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -1,26 +1,23 @@
# Conditional build:
%bcond_without javadoc # skip building javadocs
-%bcond_without extras # skip building extras
-%define jspapiver 2.2
-%define servletapiver 3.0
+%define jspapiver 4.0
+%define servletapiver 6.1
+%define elapiver 6.0
+%define wsapiver 2.2
-%define tomcatnatver 1.1.27
-
-# Java Commons Logging version. Must be >= 1.1.
-%define jclver 1.2
+%define tomcatnatver 2.0.12
Summary: Web server and Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP %{jspapiver} API
Summary(pl.UTF-8): Serwer www i silnik Servlet/JSP będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
Name: tomcat
-# 7.x is EOL
-Version: 7.0.109
+Version: 11.0.18
Release: 1
License: Apache v2.0
Group: Networking/Daemons/Java
-Source0: https://archive.apache.org/dist/tomcat/tomcat-7/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
-# Source0-md5: 05cbc0fe6bf17dc12a569c766aabfb4f
+Source0: https://archive.apache.org/dist/tomcat/tomcat-11/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
+# Source0-md5: d1108b6e6b9818dbaeee804e79d4e566
Source1: apache-%{name}.init
Source2: apache-%{name}.sysconfig
Source3: %{name}-build.properties
@@ -30,33 +27,13 @@ Source12: %{name}-context-manager.xml
Source13: %{name}-context-host-manager.xml
Source14: %{name}-context-examples.xml
Source15: %{name}.logrotate
-Source16: log4j.properties
-Source100: http://www.apache.org/dist/commons/logging/source/commons-logging-%{jclver}-src.tar.gz
-# Source100-md5: ce977548f1cbf46918e93cd38ac35163
-Patch0: %{name}-build.xml.patch
-Patch1: server.xml-URIEncoding-utf8.patch
-Patch2: %{name}-LDAPUserDatabase.patch
-Patch3: %{name}-catalina.policy-javadir.patch
-Patch4: %{name}-userdir.patch
-Patch5: logging.patch
-Patch6: jcl.patch
-Patch7: %{name}-build.patch
-Patch100: jcl-build.xml.patch
-URL: http://tomcat.apache.org/
-BuildRequires: ant >= 1.5.3
-BuildRequires: java(JSR109)
-BuildRequires: java-avalon-framework
-BuildRequires: java-avalon-logkit
+Patch0: no-bnd-osgi.patch
+Patch1: jakartaee-migration-stubs.patch
+URL: https://tomcat.apache.org/
+BuildRequires: ant >= 1.10.2
BuildRequires: java-commons-daemon >= 1.0
-BuildRequires: java-commons-dbcp-tomcat5 >= 0:1.1
-BuildRequires: java-commons-pool-tomcat5
BuildRequires: java-eclipse-jdt >= 4.4.2
-BuildRequires: java-geronimo-spec-jaxrpc
-BuildRequires: java-jdbc-mysql
-BuildRequires: java-junit
-BuildRequires: java-log4j
-BuildRequires: java-mail
-BuildRequires: jdk >= 1.6
+BuildRequires: jdk >= 17
BuildRequires: jpackage-utils
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
@@ -69,18 +46,12 @@ Requires(pre): /bin/id
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
-Requires: java(jaxp_parser_impl)
-Requires: java(jndi) >= 1.2.1
Requires: java-%{name}-catalina = %{version}-%{release}
Requires: java-%{name}-coyote = %{version}-%{release}
Requires: java-%{name}-jasper = %{version}-%{release}
-Requires: java-commons-dbcp-tomcat5 >= 0:1.1
-Requires: java-commons-pool-tomcat5
-Requires: java-jdbc-mysql
-Requires: java-mail
Requires: java-servletapi = %{version}-%{release}
Requires: jpackage-utils
-Requires: jre >= 1.2
+Requires: jre >= 17
Requires: jsvc
Requires: rc-scripts
Suggests: logrotate
@@ -103,9 +74,9 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
Tomcat is the servlet container that is used in the official Reference
-Implementation for the Java Servlet and JavaServer Pages technologies.
-The Java Servlet and JavaServer Pages specifications are developed by
-Sun under the Java Community Process.
+Implementation for the Jakarta Servlet and Jakarta Pages technologies.
+The Jakarta Servlet and Jakarta Pages specifications are developed
+under the Eclipse Foundation Jakarta EE process.
Tomcat is developed in an open and participatory environment and
released under the Apache Software License. Tomcat is intended to be a
@@ -113,9 +84,9 @@ collaboration of the best-of-breed developers from around the world.
%description -l pl.UTF-8
Tomcat to kontener serwletowy używany przez oficjalną implementację
-wzorcową technologii Java Servlet i JavaServer Pages. Specyfikacje
-Java Servlet i JavaServer Pages są rozwijane przez Suna zgodnie z Java
-Community Process.
+wzorcową technologii Jakarta Servlet i Jakarta Pages. Specyfikacje
+Jakarta Servlet i Jakarta Pages są rozwijane zgodnie z procesem
+Jakarta EE w ramach Eclipse Foundation.
%package webapp-docs
Summary: The Apache Tomcat Servlet/JSP Container documentation
@@ -169,33 +140,6 @@ The Apache Tomcat Servlet/JSP example applications.
%description webapp-examples -l pl.UTF-8
Przykładowe aplikacje dla Tomcata.
-%package webservices
-Summary: Web Services support (JSR 109)
-Summary(pl.UTF-8): Wsparcie dla Web Services (JSR 109)
-Group: Libraries/Java
-Requires: %{name} = %{version}-%{release}
-Requires: java(JSR109)
-Requires: java-geronimo-spec-jaxrpc
-
-%description webservices
-Factories for JSR 109 which may be used to resolve web services
-references.
-
-%description webservices -l pl.UTF-8
-Wsparcie dla JSR 109 (Web Services).
-
-%package jmx
-Summary: JMX remote interface for Tomcat
-Summary(pl.UTF-8): Zdalny interfejs JMX dla Tomcata
-Group: Libraries/Java
-Requires: %{name} = %{version}-%{release}
-
-%description jmx
-JMX remote interface for Tomcat.
-
-%description jmx -l pl.UTF-8
-Zdalny interfejs JMX dla Tomcata.
-
%package -n java-tomcat-catalina
Summary: Tomcat's servlet engine
Summary(pl.UTF-8): Silnik servletów dla Tomcata.
@@ -203,8 +147,8 @@ Group: Libraries/Java
Requires: jpackage-utils
%description -n java-tomcat-catalina
-Catalina is Tomcat's servlet container. Catalina implements Sun
-Microsystems' specifications for servlet and JavaServer Pages (JSP).
+Catalina is Tomcat's servlet container. Catalina implements the
+Jakarta Servlet and Jakarta Pages (JSP) specifications.
%description -n java-tomcat-catalina -l pl.UTF-8
Bibliotek Javy zawierające silnik servletów i JSP tomcata.
@@ -235,92 +179,54 @@ Obsoletes: apache-tomcat-jasper
Obsoletes: tomcat-jasper
%description -n java-tomcat-jasper
-Jasper is Java ServerPages compiler used by Apache Tomcat servlet
+Jasper is Jakarta ServerPages compiler used by Apache Tomcat servlet
container.
%description -n java-tomcat-jasper -l pl.UTF-8
-Jasper jest kompilatorem Java ServerPages używanym przez kontener
+Jasper jest kompilatorem Jakarta ServerPages używanym przez kontener
servletów Apache Tomcat.
%package -n java-servletapi
-Summary: Java servlet and JSP implementation classes
-Summary(pl.UTF-8): Klasy z implementacją Java Servlet i JSP
+Summary: Jakarta Servlet, Pages, EL, and WebSocket implementation classes
+Summary(pl.UTF-8): Klasy z implementacją Jakarta Servlet, Pages, EL i WebSocket
Group: Libraries/Java
Provides: java(jsp) = %{jspapiver}
Provides: java(servlet) = %{servletapiver}
-Obsoletes: jakarta-servletapi5
+Provides: java(el) = %{elapiver}
+Provides: java(websocket) = %{wsapiver}
Obsoletes: jakarta-servletapi5
Obsoletes: java-servletapi5
%description -n java-servletapi
-Implementation classes of the Java Servlet and JSP APIs (packages
-javax.servlet, javax.servlet.http, javax.servlet.jsp, and
-javax.servlet.jsp.tagext).
+Implementation classes of the Jakarta Servlet, Pages, Expression
+Language, and WebSocket APIs (packages jakarta.servlet,
+jakarta.servlet.http, jakarta.servlet.jsp, and
+jakarta.servlet.jsp.tagext).
%description -n java-servletapi -l pl.UTF-8
-Implementacje klas API Java Servlet i JSP (pakiety javax.servlet,
-javax.servlet.http, javax.servlet.jsp i java.servlet.jsp.tagext).
+Implementacje klas API Jakarta Servlet, Pages, EL i WebSocket (pakiety
+jakarta.servlet, jakarta.servlet.http, jakarta.servlet.jsp i
+jakarta.servlet.jsp.tagext).
%prep
-%setup -q -a100 -n apache-%{name}-%{version}-src
+%setup -q -n apache-%{name}-%{version}-src
%patch -P0 -p1
%patch -P1 -p1
-%patch -P2 -p1
-%patch -P3 -p1
-%patch -P4 -p1
-%patch -P5 -p1
-%patch -P6 -p1
-%patch -P7 -p1
-
-# Prepare java-commmons-logging sources
-install -d output/extras/logging
-mv commons-logging-%{jclver}-src output/extras/logging
-cd output/extras/logging/commons-logging-%{jclver}-src
-%undos build.xml
-%patch -P100 -p1
-cd -
# we don't need those scripts
rm bin/*.bat
-rm bin/{startup,shutdown}.sh
cp -p %{SOURCE3} build.properties
%build
-if test ! -e build.properties.local; then
- cat > build.properties.local <<-EOF
- log4j.jar=$(find-jar log4j)
- log4j12.jar=$(find-jar log4j)
- junit.jar=$(find-jar junit)
- logkit.jar=$(find-jar avalon-logkit)
- avalon-framework-impl.jar=$(find-jar avalon-framework-impl.jar)
- avalon-framework-api.jar=$(find-jar avalon-framework-api.jar)
- servletapi.jar=$(pwd)/output/build/lib/servlet-api.jar
- commons-logging.version=%{jclver}
- java.7.home=%{java_home}
- EOF
- cat build.properties.local >> build.properties
-fi
-if grep '=$' build.properties; then
- : Some .jar could not be found
- exit 1
-fi
-
export LC_ALL=en_US
# Base package
%ant
-%if %{with extras}
-install -d output/extras/webservices
-ln -sf %{_javadir}/geronimo-spec-jaxrpc.jar output/extras/webservices/jaxrpc.jar
-ln -sf %{_javadir}/jsr109.jar output/extras/webservices/wsdl4j.jar
-%ant extras
-%endif
-
# Javadoc
%if %{with javadoc}
-%ant javadoc
+%ant javadoc -Djavadoc.failonerror=false -Djavadoc.failonwarning=false
%endif
%install
@@ -356,7 +262,6 @@ cp -p %{SOURCE15} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
%if "%{pld_release}" == "ac"
%{__sed} -i -e '/su/d' $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
%endif
-cp -p %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
cp -a bin lib webapps $TOMCATDIR
cp -a temp $CATALINADIR
@@ -367,13 +272,13 @@ ln -sf $TOMCATDIRREV%{_vardir}/work $TOMCATDIR/work
ln -sf $TOMCATDIRREV%{_vardir}/conf $TOMCATDIR/conf
# symlinks instead of copies
-jars="commons-daemon commons-logging-api"
+jars="commons-daemon"
for jar in $jars; do
jar=$(find-jar $jar)
ln -sf $jar $TOMCATDIR/bin
done
-jars="commons-pool-tomcat5 commons-dbcp-tomcat5 mysql-connector-java org.eclipse.jdt.core mail"
+jars="org.eclipse.jdt.core"
for jar in $jars; do
jar=$(find-jar $jar)
ln -sf $jar $TOMCATDIR/lib
@@ -383,39 +288,34 @@ install -d $RPM_BUILD_ROOT%{_javadir}
mv $TOMCATDIR/lib/jasper*.jar $RPM_BUILD_ROOT%{_javadir}
mv $TOMCATDIR/lib/jsp-api.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api-%{jspapiver}.jar
mv $TOMCATDIR/lib/servlet-api.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api-%{servletapiver}.jar
+mv $TOMCATDIR/lib/el-api.jar $RPM_BUILD_ROOT%{_javadir}/el-api-%{elapiver}.jar
+mv $TOMCATDIR/lib/websocket-api.jar $RPM_BUILD_ROOT%{_javadir}/websocket-api-%{wsapiver}.jar
mv $TOMCATDIR/lib/catalina.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-catalina.jar
mv $TOMCATDIR/lib/tomcat-coyote.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-coyote.jar
mv $TOMCATDIR/lib/tomcat-util.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-util.jar
+mv $TOMCATDIR/lib/tomcat-util-scan.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-util-scan.jar
mv $TOMCATDIR/lib/tomcat-api.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-api.jar
ln -s jsp-api-%{jspapiver}.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api.jar
ln -s servlet-api-%{servletapiver}.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api.jar
+ln -s el-api-%{elapiver}.jar $RPM_BUILD_ROOT%{_javadir}/el-api.jar
+ln -s websocket-api-%{wsapiver}.jar $RPM_BUILD_ROOT%{_javadir}/websocket-api.jar
-# XXX add softlinks jasper-compiler.jar and jasper-runtime for compatibility with tomcat 5.5?
ln -sf %{_javadir}/jasper-el.jar $TOMCATDIR/lib
ln -sf %{_javadir}/jasper.jar $TOMCATDIR/lib
ln -sf %{_javadir}/jsp-api-%{jspapiver}.jar $TOMCATDIR/lib/jsp-api.jar
ln -sf %{_javadir}/servlet-api-%{servletapiver}.jar $TOMCATDIR/lib/servlet-api.jar
+ln -sf %{_javadir}/el-api-%{elapiver}.jar $TOMCATDIR/lib/el-api.jar
+ln -sf %{_javadir}/websocket-api-%{wsapiver}.jar $TOMCATDIR/lib/websocket-api.jar
ln -sf %{_javadir}/tomcat-catalina.jar $TOMCATDIR/lib/catalina.jar
ln -sf %{_javadir}/tomcat-util.jar $TOMCATDIR/lib/util.jar
+ln -sf %{_javadir}/tomcat-util-scan.jar $TOMCATDIR/lib/util-scan.jar
ln -sf %{_javadir}/tomcat-api.jar $TOMCATDIR/lib/api.jar
ln -sf %{_javadir}/tomcat-coyote.jar $TOMCATDIR/lib/tomcat-coyote.jar
-%if %{with extras}
-cp -a ../extras/catalina-ws.jar $TOMCATDIR/lib/catalina-ws.jar
-cp -a ../extras/catalina-jmx-remote.jar $TOMCATDIR/lib/catalina-jmx-remote.jar
-cp -a ../extras/tomcat-juli-adapters.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-juli-adapters.jar
-cp -a ../extras/tomcat-juli.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-juli.jar
-ln -sf %{_javadir}/tomcat-juli-adapters.jar $TOMCATDIR/lib/juli-adapters.jar
-ln -sf %{_javadir}/tomcat-juli.jar $TOMCATDIR/lib/juli.jar
-%endif
-
-ln -s %{_javadir}/geronimo-spec-jaxrpc.jar $TOMCATDIR/lib/jaxrpc.jar
-ln -s %{_javadir}/jsr109.jar $TOMCATDIR/lib/jsr109.jar
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -477,9 +377,9 @@ fi
%dir %attr(770,root,tomcat) %{_sysconfdir}/%{name}/Catalina
%dir %{_sysconfdir}/%{name}/Catalina/localhost
# tomcat config has to be writeable because of tomcat-users.xml file and Catalina dir
-%config(noreplace) %attr(660,root,tomcat) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/catalina.policy
%config(noreplace) %attr(660,root,tomcat) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.properties
%config(noreplace) %attr(660,root,tomcat) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.xml
+%{_sysconfdir}/%{name}/*.xsd
%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/Catalina/localhost/ROOT.xml
@@ -496,31 +396,35 @@ fi
%{_tomcatdir}/lib/catalina-ant.jar
%{_tomcatdir}/lib/catalina-ha.jar
%{_tomcatdir}/lib/catalina.jar
+%{_tomcatdir}/lib/catalina-ssi.jar
+%{_tomcatdir}/lib/catalina-storeconfig.jar
%{_tomcatdir}/lib/catalina-tribes.jar
-%{_tomcatdir}/lib/commons-dbcp-tomcat5.jar
-%{_tomcatdir}/lib/commons-pool-tomcat5.jar
%{_tomcatdir}/lib/el-api.jar
%{_tomcatdir}/lib/jasper-el.jar
%{_tomcatdir}/lib/jasper.jar
%{_tomcatdir}/lib/jsp-api.jar
-%{_tomcatdir}/lib/mail.jar
-%{_tomcatdir}/lib/mysql-connector-java.jar
%{_tomcatdir}/lib/org.eclipse.jdt.core.jar
%{_tomcatdir}/lib/servlet-api.jar
-%{_tomcatdir}/lib/tomcat-jdbc.jar
+%{_tomcatdir}/lib/jaspic-api.jar
%{_tomcatdir}/lib/tomcat-coyote.jar
+%{_tomcatdir}/lib/tomcat-coyote-ffm.jar
%{_tomcatdir}/lib/tomcat-dbcp.jar
+%{_tomcatdir}/lib/tomcat-i18n-cs.jar
+%{_tomcatdir}/lib/tomcat-i18n-de.jar
%{_tomcatdir}/lib/tomcat-i18n-es.jar
%{_tomcatdir}/lib/tomcat-i18n-fr.jar
%{_tomcatdir}/lib/tomcat-i18n-ja.jar
+%{_tomcatdir}/lib/tomcat-i18n-ko.jar
+%{_tomcatdir}/lib/tomcat-i18n-pt-BR.jar
%{_tomcatdir}/lib/tomcat-i18n-ru.jar
-%{_tomcatdir}/lib/tomcat7-websocket.jar
-%{_tomcatdir}/lib/websocket-api.jar
+%{_tomcatdir}/lib/tomcat-i18n-zh-CN.jar
+%{_tomcatdir}/lib/tomcat-jdbc.jar
+%{_tomcatdir}/lib/tomcat-jni.jar
+%{_tomcatdir}/lib/tomcat-websocket.jar
%{_tomcatdir}/lib/util.jar
-%if %{with extras}
-%{_tomcatdir}/lib/juli-adapters.jar
-%{_tomcatdir}/lib/juli.jar
-%endif
+%{_tomcatdir}/lib/util-scan.jar
+%{_tomcatdir}/lib/websocket-api.jar
+%{_tomcatdir}/lib/websocket-client-api.jar
%dir %{_tomcatdir}/webapps
@@ -557,20 +461,6 @@ fi
%config(noreplace,missingok) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/Catalina/localhost/examples.xml
%{_tomcatdir}/webapps/examples
-%files webservices
-%defattr(644,root,root,755)
-%{_tomcatdir}/lib/jsr109.jar
-%{_tomcatdir}/lib/jaxrpc.jar
-%if %{with extras}
-%{_tomcatdir}/lib/catalina-ws.jar
-%endif
-
-%if %{with extras}
-%files jmx
-%defattr(644,root,root,755)
-%{_tomcatdir}/lib/catalina-jmx-remote.jar
-%endif
-
%files -n java-tomcat-jasper
%defattr(644,root,root,755)
%{_javadir}/jasper-el.jar
@@ -581,10 +471,7 @@ fi
%{_javadir}/tomcat-api.jar
%{_javadir}/tomcat-catalina.jar
%{_javadir}/tomcat-util.jar
-%if %{with extras}
-%{_javadir}/tomcat-juli-adapters.jar
-%{_javadir}/tomcat-juli.jar
-%endif
+%{_javadir}/tomcat-util-scan.jar
%files -n java-tomcat-coyote
%defattr(644,root,root,755)
@@ -594,3 +481,5 @@ fi
%defattr(644,root,root,755)
%{_javadir}/jsp-api*.jar
%{_javadir}/servlet-api*.jar
+%{_javadir}/el-api*.jar
+%{_javadir}/websocket-api*.jar
diff --git a/apache-tomcat.init b/apache-tomcat.init
index 83e5a93..f0ba633 100755
--- a/apache-tomcat.init
+++ b/apache-tomcat.init
@@ -26,7 +26,14 @@ fi
set_jvm
# Set default options
-CATALINA_OPTS="-Xmx384M -XX:MaxPermSize=192m -XX:PermSize=128m"
+# --add-opens flags per Tomcat 11 setup docs for jsvc usage:
+# https://tomcat.apache.org/tomcat-11.0-doc/setup.html
+CATALINA_OPTS="-Xmx384M \
+ --add-opens=java.base/java.lang=ALL-UNNAMED \
+ --add-opens=java.base/java.io=ALL-UNNAMED \
+ --add-opens=java.base/java.util=ALL-UNNAMED \
+ --add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
+ --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
# Get service config - may override defaults
[ -f /etc/sysconfig/tomcat ] && . /etc/sysconfig/tomcat
@@ -35,7 +42,7 @@ unset TMPDIR
unset TMP
COMMONSDAEMON=$(find-jar commons-daemon)
-TOMCATLIBS=/usr/share/tomcat/bin/bootstrap.jar:$(build-classpath-directory /usr/share/tomcat/lib)
+TOMCATLIBS=/usr/share/tomcat/bin/bootstrap.jar:/usr/share/tomcat/bin/tomcat-juli.jar:$(build-classpath-directory /usr/share/tomcat/lib)
CLASSPATH=${CLASSPATH:+"$CLASSPATH:"}$COMMONSDAEMON:$TOMCATLIBS
CATALINA_HOME=/usr/share/tomcat
@@ -46,16 +53,6 @@ JSVC_OPTS="-classpath ${CLASSPATH} \
-home ${JAVA_HOME} \
-pidfile /var/run/tomcat.pid"
-if is_yes "${SECURITY_MANAGER}"; then
- CATALINA_OPTS="$CATALINA_OPTS \
- -Djava.security.manager \
- -Djava.security.policy==${CATALINA_BASE}/conf/catalina.policy"
- if [ -n "${SECURITY_MANAGER_DEBUG}" ]; then
- CATALINA_OPTS="$CATALINA_OPTS \
- -Djava.security.debug=${SECURITY_MANAGER_DEBUG}"
- fi
-fi
-
start() {
# Check if the service is already running?
if [ -f /var/lock/subsys/tomcat ]; then
diff --git a/jakartaee-migration-stubs.patch b/jakartaee-migration-stubs.patch
new file mode 100644
index 0000000..f55710f
--- /dev/null
+++ b/jakartaee-migration-stubs.patch
@@ -0,0 +1,55 @@
+# Provide no-op stub classes for the jakartaee migration tool
+# (tomcat-jakartaee-migration). The migration tool converts old javax.*
+# servlet apps to jakarta.* namespace at runtime. Tomcat 11 is fully
+# Jakarta EE native, so this is only needed for running legacy javax.*
+# webapps. Stubs satisfy compilation without pulling in the migration
+# tool as a dependency.
+diff -urN apache-tomcat-11.0.18-src.orig/build.xml apache-tomcat-11.0.18-src.jakartaee/build.xml
+--- apache-tomcat-11.0.18-src.orig/build.xml 2026-01-23 11:22:57.000000000 +0100
++++ apache-tomcat-11.0.18-src.jakartaee/build.xml 2026-03-10 17:52:18.014295687 +0100
+@@ -1595,7 +1595,7 @@
+ <exclude name="${migration-lib.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
++ <!-- migration jar not included - we use stubs instead -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+diff -urN apache-tomcat-11.0.18-src.orig/java/org/apache/tomcat/jakartaee/ClassConverter.java apache-tomcat-11.0.18-src.jakartaee/java/org/apache/tomcat/jakartaee/ClassConverter.java
+--- apache-tomcat-11.0.18-src.orig/java/org/apache/tomcat/jakartaee/ClassConverter.java 1970-01-01 01:00:00.000000000 +0100
++++ apache-tomcat-11.0.18-src.jakartaee/java/org/apache/tomcat/jakartaee/ClassConverter.java 2026-03-10 17:52:31.626052747 +0100
+@@ -0,0 +1,7 @@
++package org.apache.tomcat.jakartaee;
++public class ClassConverter implements java.lang.instrument.ClassFileTransformer {
++ public ClassConverter() {}
++ public ClassConverter(EESpecProfile profile) {}
++ public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined,
++ java.security.ProtectionDomain protectionDomain, byte[] classfileBuffer) { return null; }
++}
+diff -urN apache-tomcat-11.0.18-src.orig/java/org/apache/tomcat/jakartaee/EESpecProfile.java apache-tomcat-11.0.18-src.jakartaee/java/org/apache/tomcat/jakartaee/EESpecProfile.java
+--- apache-tomcat-11.0.18-src.orig/java/org/apache/tomcat/jakartaee/EESpecProfile.java 1970-01-01 01:00:00.000000000 +0100
++++ apache-tomcat-11.0.18-src.jakartaee/java/org/apache/tomcat/jakartaee/EESpecProfile.java 2026-03-10 17:52:31.626091684 +0100
+@@ -0,0 +1,2 @@
++package org.apache.tomcat.jakartaee;
++public interface EESpecProfile {}
+diff -urN apache-tomcat-11.0.18-src.orig/java/org/apache/tomcat/jakartaee/EESpecProfiles.java apache-tomcat-11.0.18-src.jakartaee/java/org/apache/tomcat/jakartaee/EESpecProfiles.java
+--- apache-tomcat-11.0.18-src.orig/java/org/apache/tomcat/jakartaee/EESpecProfiles.java 1970-01-01 01:00:00.000000000 +0100
++++ apache-tomcat-11.0.18-src.jakartaee/java/org/apache/tomcat/jakartaee/EESpecProfiles.java 2026-03-10 17:52:31.626122949 +0100
+@@ -0,0 +1,4 @@
++package org.apache.tomcat.jakartaee;
++public enum EESpecProfiles implements EESpecProfile {
++ TOMCAT;
++}
+diff -urN apache-tomcat-11.0.18-src.orig/java/org/apache/tomcat/jakartaee/Migration.java apache-tomcat-11.0.18-src.jakartaee/java/org/apache/tomcat/jakartaee/Migration.java
+--- apache-tomcat-11.0.18-src.orig/java/org/apache/tomcat/jakartaee/Migration.java 1970-01-01 01:00:00.000000000 +0100
++++ apache-tomcat-11.0.18-src.jakartaee/java/org/apache/tomcat/jakartaee/Migration.java 2026-03-10 17:52:31.626147838 +0100
+@@ -0,0 +1,8 @@
++package org.apache.tomcat.jakartaee;
++public class Migration {
++ public void setEESpecProfile(EESpecProfile profile) {}
++ public void setSource(java.io.File src) {}
++ public void setDestination(java.io.File dest) {}
++ public void execute() throws java.io.IOException {}
++ public void convert(java.io.File src, java.io.File dest) throws java.io.IOException {}
++}
diff --git a/no-bnd-osgi.patch b/no-bnd-osgi.patch
new file mode 100644
index 0000000..7ae12c6
--- /dev/null
+++ b/no-bnd-osgi.patch
@@ -0,0 +1,302 @@
+# Disable OSGi metadata generation and remove bnd annotations.
+# Tomcat doesn't use OSGi at runtime, almost nobody deploys Tomcat as OSGi
+# bundles, and the OSGi ecosystem has largely been superseded by Java 9+
+# modules (JPMS). Not worth packaging bnd/osgi just for unused manifest
+# entries.
+diff -urN apache-tomcat-11.0.18-src.orig/build.xml apache-tomcat-11.0.18-src.bnd/build.xml
+--- apache-tomcat-11.0.18-src.orig/build.xml 2026-01-23 11:22:57.000000000 +0100
++++ apache-tomcat-11.0.18-src.bnd/build.xml 2026-03-10 17:51:48.409984756 +0100
+@@ -1130,7 +1130,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}"
+@@ -1139,48 +1139,48 @@
+ 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" />
+
+ <!-- WebSocket Client API JAR File -->
+ <jarIt jarfile="${websocket-client-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.websocket-client-api"
+ manifest="${tomcat.manifests}/websocket-client-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}"
+@@ -1192,68 +1192,68 @@
+ <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" />
+
+ <!-- OpenSSL FFM - Coyote -->
+ <jarIt jarfile="${tomcat-coyote-ffm.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.tomcat-coyote-ffm"
+ manifest="${tomcat.manifests}/tomcat-coyote-ffm.jar.manifest"
+- 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}"
+@@ -1264,27 +1264,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"
+@@ -1748,7 +1748,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"
+@@ -1756,7 +1756,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"
+@@ -1765,7 +1765,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"
+@@ -1774,7 +1774,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"
+@@ -4243,26 +4243,9 @@
+ <taskdef name="jsign" classname="net.jsign.JsignTask" classpathref="jsign.classpath" />
+ </target>
+
+- <target name="download-bnd" >
+- <!-- Download bnd -->
+- <antcall target="downloadfile">
+- <param name="sourcefile" value="${bnd.loc}"/>
+- <param name="destfile" value="${bnd.jar}"/>
+- <param name="destdir" value="${bnd.home}"/>
+- <param name="checksum.enabled" value="${bnd.checksum.enabled}"/>
+- <param name="checksum.algorithm" value="${bnd.checksum.algorithm}"/>
+- <param name="checksum.value" value="${bnd.checksum.value}"/>
+- </antcall>
+- </target>
+-
+- <target name="setup-bnd" depends="download-bnd" unless="${skip.build.java.version}">
+- <!-- Add bnd tasks to project -->
+- <path id="bnd.classpath">
+- <fileset file="${bnd.jar}" />
+- </path>
++ <target name="download-bnd" />
+
+- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath" />
+- </target>
++ <target name="setup-bnd" depends="download-bnd" />
+
+ <macrodef name="jarIt" description="utility macro for standard JAR packaging">
+ <attribute name="jarfile"
+diff -urN apache-tomcat-11.0.18-src.orig/java/org/apache/el/ExpressionFactoryImpl.java apache-tomcat-11.0.18-src.bnd/java/org/apache/el/ExpressionFactoryImpl.java
+--- apache-tomcat-11.0.18-src.orig/java/org/apache/el/ExpressionFactoryImpl.java 2026-01-23 11:22:57.000000000 +0100
++++ apache-tomcat-11.0.18-src.bnd/java/org/apache/el/ExpressionFactoryImpl.java 2026-03-10 17:52:05.189984748 +0100
+@@ -31,7 +31,6 @@
+ /**
+ * @see jakarta.el.ExpressionFactory
+ */
+- at aQute.bnd.annotation.spi.ServiceProvider(value = ExpressionFactory.class)
+ public class ExpressionFactoryImpl extends ExpressionFactory {
+
+ static {
+diff -urN apache-tomcat-11.0.18-src.orig/java/org/apache/juli/logging/LogFactory.java apache-tomcat-11.0.18-src.bnd/java/org/apache/juli/logging/LogFactory.java
+--- apache-tomcat-11.0.18-src.orig/java/org/apache/juli/logging/LogFactory.java 2026-01-23 11:22:57.000000000 +0100
++++ apache-tomcat-11.0.18-src.bnd/java/org/apache/juli/logging/LogFactory.java 2026-03-10 17:52:05.195443638 +0100
+@@ -21,7 +21,6 @@
+ import java.util.ServiceLoader;
+ import java.util.logging.LogManager;
+
+-import aQute.bnd.annotation.spi.ServiceConsumer;
+
+ /**
+ * This is a modified LogFactory that uses a simple {@link ServiceLoader} based discovery mechanism with a default of
+@@ -50,7 +49,6 @@
+ * <strong>IMPLEMENTATION NOTE</strong> - This implementation is heavily based on the SAXParserFactory and
+ * DocumentBuilderFactory implementations (corresponding to the JAXP pluggability APIs) found in Apache Xerces.
+ */
+- at ServiceConsumer(value = Log.class)
+ public class LogFactory {
+
+ private static final LogFactory singleton = new LogFactory();
+diff -urN apache-tomcat-11.0.18-src.orig/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java apache-tomcat-11.0.18-src.bnd/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
+--- apache-tomcat-11.0.18-src.orig/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java 2026-01-23 11:22:57.000000000 +0100
++++ apache-tomcat-11.0.18-src.bnd/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java 2026-03-10 17:52:05.193496336 +0100
+@@ -26,7 +26,6 @@
+ import jakarta.websocket.server.HandshakeRequest;
+ import jakarta.websocket.server.ServerEndpointConfig;
+
+- at aQute.bnd.annotation.spi.ServiceProvider(value = ServerEndpointConfig.Configurator.class)
+ public class DefaultServerEndpointConfigurator extends ServerEndpointConfig.Configurator {
+
+ @Override
+diff -urN apache-tomcat-11.0.18-src.orig/java/org/apache/tomcat/websocket/WsContainerProvider.java apache-tomcat-11.0.18-src.bnd/java/org/apache/tomcat/websocket/WsContainerProvider.java
+--- apache-tomcat-11.0.18-src.orig/java/org/apache/tomcat/websocket/WsContainerProvider.java 2026-01-23 11:22:57.000000000 +0100
++++ apache-tomcat-11.0.18-src.bnd/java/org/apache/tomcat/websocket/WsContainerProvider.java 2026-03-10 17:52:05.193433026 +0100
+@@ -19,7 +19,6 @@
+ import jakarta.websocket.ContainerProvider;
+ import jakarta.websocket.WebSocketContainer;
+
+- at aQute.bnd.annotation.spi.ServiceProvider(value = ContainerProvider.class)
+ public class WsContainerProvider extends ContainerProvider {
+
+ @Override
diff --git a/tomcat-build.properties b/tomcat-build.properties
index ddca15e..55a2e09 100644
--- a/tomcat-build.properties
+++ b/tomcat-build.properties
@@ -14,47 +14,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# -----------------------------------------------------------------------------
-# build.properties.sample
-#
-# This is an example "build.properties" file, used to customize building
-# Tomcat for your local environment. It defines the location of all external
-# modules that Tomcat depends on. Copy this file to "build.properties"
-# in the top-level source directory, and customize it as needed.
-#
-# $Id$
-# -----------------------------------------------------------------------------
# ----- Default Base Path for Dependent Packages -----
-# Please note this path must be absolute, not relative,
-# as it is referenced with different working directory
-# contexts by the various build scripts.
base.path=/usr/share/java
-compile.source=1.6
-compile.target=1.6
compile.debug=true
-# ----- Webservices - JAX RPC -----
-jaxrpc-lib.version=1.1-rc4
-jaxrpc-lib.jar=${base.path}/geronimo-spec-jaxrpc.jar
+# Do not download anything
+execute.download=false
+skip.installer=true
-# ----- Webservices - WSDL4J -----
-wsdl4j-lib.jar=${base.path}/wsdl4j.jar
-
-# ----- Eclipse JDT, version 3.2 or later -----
+# ----- Eclipse JDT -----
jdt.jar=${base.path}/org.eclipse.jdt.core.jar
-# ----- Commons Daemon, version 1.0-Alpha or later -----
+# ----- Commons Daemon -----
commons-daemon.jar=${base.path}/commons-daemon.jar
-# ----- JUnit Unit Test Suite, version 3.7 or later -----
+# ----- JUnit -----
junit.jar=${base.path}/junit.jar
-
-# What about following?
-# # ----- JSON Libraries (for bayeux module) -----
-# json-lib.jar=${base.path}/json.jar
-#
-# # ----- Dojo Toolkit (for bayeux module) -----
-# dojo-js.home=${base.path}/dojo-release-1.1.1
-# dojo-js.loc=http://download.dojotoolkit.org/release-1.1.1/dojo-release-1.1.1.tar.gz
-# dojo-js.jar=${dojo-js.home}/dojo/dojo.js
diff --git a/tomcat-context-ROOT.xml b/tomcat-context-ROOT.xml
index 065947b..e555380 100644
--- a/tomcat-context-ROOT.xml
+++ b/tomcat-context-ROOT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
-<Context path="/" docBase="/usr/share/tomcat/webapps/ROOT"
- privileged="true" allowLinking="true">
+<Context docBase="/usr/share/tomcat/webapps/ROOT"
+ privileged="true">
</Context>
diff --git a/tomcat-context-docs.xml b/tomcat-context-docs.xml
index e1af302..57a4e4a 100644
--- a/tomcat-context-docs.xml
+++ b/tomcat-context-docs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
-<Context path="/docs" docBase="/usr/share/tomcat/webapps/docs"
- privileged="false" allowLinking="true">
+<Context docBase="/usr/share/tomcat/webapps/docs"
+ privileged="false">
</Context>
diff --git a/tomcat-context-examples.xml b/tomcat-context-examples.xml
index c156e33..5846047 100644
--- a/tomcat-context-examples.xml
+++ b/tomcat-context-examples.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
-<Context path="/examples" docBase="/usr/share/tomcat/webapps/examples"
- privileged="false" allowLinking="true">
+<Context docBase="/usr/share/tomcat/webapps/examples"
+ privileged="false">
</Context>
diff --git a/tomcat-context-host-manager.xml b/tomcat-context-host-manager.xml
index d3d0196..764c5a6 100644
--- a/tomcat-context-host-manager.xml
+++ b/tomcat-context-host-manager.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
-<Context path="/host-manager" docBase="/usr/share/tomcat/webapps/host-manager"
- privileged="true" allowLinking="true">
+<Context docBase="/usr/share/tomcat/webapps/host-manager"
+ privileged="true">
</Context>
diff --git a/tomcat-context-manager.xml b/tomcat-context-manager.xml
index 089d970..0f58eae 100644
--- a/tomcat-context-manager.xml
+++ b/tomcat-context-manager.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
-<Context path="/manager" docBase="/usr/share/tomcat/webapps/manager"
- privileged="true" allowLinking="true">
+<Context docBase="/usr/share/tomcat/webapps/manager"
+ privileged="true">
</Context>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tomcat.git/commitdiff/9f2774187c7de7d572b7deeec456fafd04521ed4
More information about the pld-cvs-commit
mailing list