Attachment 253785 Details for Bug 281671 – update to 8.0.16

[patch] update to 8.0.16

0001-www-tomee-Update-1.7.4-8.0.16.patch (text/plain), 19.45 KB, created by Lars Herschke on 2024-09-23 19:40:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lars Herschke

Created: 2024-09-23 19:40:35 UTC

Size: 19.45 KB

patch

obsolete

>From d63b3e2f2f9dcb6dc3928f31ec23410cef812628 Mon Sep 17 00:00:00 2001
>From: lhersch <lhersch@nbsdlhersch.fritz.box>
>Date: Mon, 23 Sep 2024 21:33:38 +0200
>Subject: [PATCH] www/tomee: Update 1.7.4 -> 8.0.16
>
>---
> www/tomee/Makefile       |   7 +-
> www/tomee/distinfo       |   6 +-
> www/tomee/files/tomee.in |  31 +++--
> www/tomee/pkg-plist      | 248 ++++++++++++++++++++++-----------------
> 4 files changed, 172 insertions(+), 120 deletions(-)
>
>diff --git a/www/tomee/Makefile b/www/tomee/Makefile
>index 371c3476be86..1f2a761105e5 100644
>--- a/www/tomee/Makefile
>+++ b/www/tomee/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	tomee
>-PORTVERSION=	1.7.4
>+PORTVERSION=	8.0.16
> CATEGORIES=	www java
> MASTER_SITES=	https://archive.apache.org/dist/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
> DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-webprofile
>@@ -24,8 +24,9 @@ USE_RC_SUBR=	${PKGBASE}
> TOMEE_SUBDIR?=	${DISTNAME:R}
> TOMEE_HOME=	${PREFIX}/${TOMEE_SUBDIR}
> TOMEE_CONF_FILES=	\
>-		catalina.policy catalina.properties context.xml logging.properties \
>-		server.xml tomcat-users.xml web.xml tomee.xml system.properties
>+		catalina.policy catalina.properties context.xml jaspic-providers.xml \
>+		logging.properties server.xml tomcat-users.xml web.xml tomee.xml \
>+		system.properties
> PLIST_SUB=	T=${TOMEE_SUBDIR} \
> 		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
> 
>diff --git a/www/tomee/distinfo b/www/tomee/distinfo
>index f346c0a78ea5..5070d491ca0b 100644
>--- a/www/tomee/distinfo
>+++ b/www/tomee/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1467580250
>-SHA256 (apache-tomee-1.7.4-webprofile.tar.gz) = 4a1c13e60fcf1289980b0c14f8e67daf31b1c91f4e208fbc7aeec0a252655897
>-SIZE (apache-tomee-1.7.4-webprofile.tar.gz) = 31185154
>+TIMESTAMP = 1726082848
>+SHA256 (apache-tomee-8.0.16-webprofile.tar.gz) = f223bd9a6a3b7119a8b7f65c98de22f6db10fad5451f869eeb7ee34d2125adb2
>+SIZE (apache-tomee-8.0.16-webprofile.tar.gz) = 49791450
>diff --git a/www/tomee/files/tomee.in b/www/tomee/files/tomee.in
>index 1c10b2585da5..425b8f56e974 100644
>--- a/www/tomee/files/tomee.in
>+++ b/www/tomee/files/tomee.in
>@@ -11,8 +11,12 @@
> #   Set to "NO" by default.
> #   Set it to "YES" to enable TomEE
> #
>-# tomee_catalina_base (str)
>+# tomee_catalina_home (str)
> #   Set to "%%TOMEE_HOME%%" by default.
>+#   Set the CATALINA_HOME variable for the TomEE process
>+#
>+# tomee_catalina_base (str)
>+#   Set to "${catalina.home}" by default.
> #   Set the CATALINA_BASE variable for the TomEE process
> #
> # tomee_catalina_tmpdir (str)
>@@ -37,7 +41,7 @@
> #
> # tomee_logging_config (str):
> #   Set to "${catalina.base}/conf/logging.properties" by default.
>-#   Set the JUL config file 
>+#   Set the JUL config file
> #
> # tomee_java_home (str):
> #   Set to "%%JAVA_HOME%%" by default.
>@@ -80,8 +84,8 @@ load_rc_config "${name}"
> eval "${rcvar}=\${${rcvar}:-'NO'}"
> eval "_tomee_java_home=\${${name}_java_home:-'%%JAVA_HOME%%'}"
> eval "_tomee_catalina_user=\${${name}_catalina_user:-'%%TOMEE_USER%%'}"
>-eval "_tomee_catalina_home='%%TOMEE_HOME%%'"
>-eval "_tomee_catalina_base=\${${name}_catalina_base:-'%%TOMEE_HOME%%'}"
>+eval "_tomee_catalina_home=\${${name}_catalina_home:-'%%TOMEE_HOME%%'}"
>+eval "_tomee_catalina_base=\${${name}_catalina_base:-'${_tomcat_catalina_home}'}"
> eval "_tomee_catalina_tmpdir=\${${name}_catalina_tmpdir:-'${_tomee_catalina_base}/temp'}"
> eval "_tomee_stdout=\${${name}_stdout:-'${_tomee_catalina_base}/logs/catalina.out'}"
> eval "_tomee_stderr=\${${name}_stderr:-'&1'}"
>@@ -99,6 +103,17 @@ required_dirs="${_tomee_catalina_tmpdir}"
> 
> extra_commands="reload"
> 
>+_tomee_java_version=`${_tomee_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
>+
>+case "${_tomee_java_version}" in
>+    9* | [1-2][0-9]* )
>+		_tomee_endorsed_dirs_option=
>+		;;
>+	*)
>+		_tomee_endorsed_dirs_option="-Djava.endorsed.dirs='${_tomee_catalina_home}/endorsed'"
>+		;;
>+esac
>+
> command="%%LOCALBASE%%/bin/jsvc"
> command_args="-java-home '${_tomee_java_home}' \
> 	-server \
>@@ -107,11 +122,11 @@ command_args="-java-home '${_tomee_java_home}' \
> 	-wait ${_tomee_wait} \
> 	-outfile '${_tomee_stdout}' \
> 	-errfile '${_tomee_stderr}' \
>-	-classpath '%%TOMEE_HOME%%/bin/bootstrap.jar:%%LOCALBASE%%/share/java/classes/commons-daemon.jar:%%TOMEE_HOME%%/bin/tomcat-juli.jar${_tomee_classpath}' \
>+    -classpath '${_tomee_catalina_home}/bin/bootstrap.jar:%%LOCALBASE%%/share/java/classes/commons-daemon.jar:${_tomee_catalina_home}/bin/tomcat-juli.jar${_tomee_classpath}' \
> 	-Djava.util.logging.manager=${_tomee_logging_manager} \
> 	-Djava.util.logging.config.file='${_tomee_logging_config}' \
> 	${_tomee_java_opts} \
>-	-Djava.endorsed.dirs='%%TOMEE_HOME%%/endorsed' \
>+	${_tomee_endorsed_dirs_option} \
> 	-Dcatalina.home='${_tomee_catalina_home}' \
> 	-Dcatalina.base='${_tomee_catalina_base}' \
> 	-Djava.io.tmpdir='${_tomee_catalina_tmpdir}' \
>@@ -124,8 +139,8 @@ tomee_prestart()
> {
> 	if [ -r "${_tomee_catalina_base}/bin/setenv.sh" ]; then
> 		. "${_tomee_catalina_base}/bin/setenv.sh"
>-	elif [ -r "%%TOMEE_HOME%%/bin/setenv.sh" ]; then
>-		. "%%TOMEE_HOME%%/bin/setenv.sh"
>+    elif [ -r "${_tomee_catalina_home}/bin/setenv.sh" ]; then
>+		. "${_tomee_catalina_home}/bin/setenv.sh"
> 	fi
> }
> 
>diff --git a/www/tomee/pkg-plist b/www/tomee/pkg-plist
>index 5d66a210e6e5..2db101757204 100644
>--- a/www/tomee/pkg-plist
>+++ b/www/tomee/pkg-plist
>@@ -1,16 +1,21 @@
>+%%T%%/BUILDING.txt
>+%%T%%/CONTRIBUTING.md
> %%T%%/LICENSE
> %%T%%/NOTICE
>+%%T%%/README.md
> %%T%%/RELEASE-NOTES
> %%T%%/RUNNING.txt
> %%T%%/bin/bootstrap.jar
> %%T%%/bin/catalina-tasks.xml
> %%T%%/bin/catalina.sh
> %%T%%/bin/catalina.sh.original
>+%%T%%/bin/ciphers.sh
> %%T%%/bin/commons-daemon-native.tar.gz
> %%T%%/bin/commons-daemon.jar
> %%T%%/bin/configtest.sh
> %%T%%/bin/daemon.sh
> %%T%%/bin/digest.sh
>+%%T%%/bin/makebase.sh
> %%T%%/bin/service.readme.txt
> %%T%%/bin/setclasspath.sh
> %%T%%/bin/shutdown.sh
>@@ -20,129 +25,160 @@
> %%T%%/bin/tomee.sh
> %%T%%/bin/tool-wrapper.sh
> %%T%%/bin/version.sh
>+%%T%%/conf/catalina.policy.original
> @sample %%T%%/conf/catalina.policy.sample
> @sample %%T%%/conf/catalina.properties.sample
> @sample %%T%%/conf/context.xml.sample
>+@sample %%T%%/conf/jaspic-providers.xml.sample
>+%%T%%/conf/jaspic-providers.xsd
> @sample %%T%%/conf/logging.properties.sample
> %%T%%/conf/server.xml.original
> @sample %%T%%/conf/server.xml.sample
> @sample %%T%%/conf/system.properties.sample
> %%T%%/conf/tomcat-users.xml.original
> @sample %%T%%/conf/tomcat-users.xml.sample
>+%%T%%/conf/tomcat-users.xsd
> @sample %%T%%/conf/tomee.xml.sample
> @sample %%T%%/conf/web.xml.sample
>-%%T%%/endorsed/annotation-api.jar
>-%%T%%/endorsed/jaxb-api.jar
>-%%T%%/lib/FastInfoset-1.2.12.jar
>-%%T%%/lib/bval-core-0.5.jar
>-%%T%%/lib/bval-jsr303-0.5.jar
>+%%T%%/lib/bval-jsr-2.0.5.jar
> %%T%%/lib/catalina-ant.jar
> %%T%%/lib/catalina-ha.jar
>+%%T%%/lib/catalina-ssi.jar
>+%%T%%/lib/catalina-storeconfig.jar
> %%T%%/lib/catalina-tribes.jar
> %%T%%/lib/catalina.jar
>-%%T%%/lib/commons-beanutils-core-1.8.3.jar
>-%%T%%/lib/commons-cli-1.2.jar
>-%%T%%/lib/commons-codec-1.9.jar
>+%%T%%/lib/commons-beanutils-1.9.4.jar
>+%%T%%/lib/commons-cli-1.5.0.jar
> %%T%%/lib/commons-collections-3.2.2.jar
>-%%T%%/lib/commons-dbcp-1.4.jar
>+%%T%%/lib/commons-dbcp2-2.9.0.jar
> %%T%%/lib/commons-digester-1.8.jar
>-%%T%%/lib/commons-io-2.4.jar
>-%%T%%/lib/commons-lang-2.6.jar
>-%%T%%/lib/commons-lang3-3.3.2.jar
>-%%T%%/lib/commons-logging-1.1.1.jar
>-%%T%%/lib/commons-pool-1.5.7.jar
>-%%T%%/lib/ecj-4.4.2.jar
>+%%T%%/lib/commons-lang3-3.12.0.jar
>+%%T%%/lib/commons-logging-1.2.jar
>+%%T%%/lib/commons-pool2-2.11.1.jar
>+%%T%%/lib/cxf-shade-8.0.16.jar
>+%%T%%/lib/ecj-4.20.jar
> %%T%%/lib/el-api.jar
>-%%T%%/lib/geronimo-javamail_1.4_mail-1.9.0-alpha-2.jar
>-%%T%%/lib/geronimo-transaction-3.1.1.jar
>+%%T%%/lib/geronimo-javamail_1.6_mail-1.0.1.jar
>+%%T%%/lib/geronimo-transaction-3.1.5.jar
> %%T%%/lib/howl-1.0.1-1.jar
>-%%T%%/lib/hsqldb-2.3.2.jar
>-%%T%%/lib/istack-commons-runtime-2.16.jar
>-%%T%%/lib/jansi-1.8.jar
>+%%T%%/lib/hsqldb-2.7.2-jdk8.jar
>+%%T%%/lib/istack-commons-runtime-3.0.11.jar
>+%%T%%/lib/jakarta.activation-1.2.1.jar
>+%%T%%/lib/jakarta.xml.bind-api-2.3.3.jar
> %%T%%/lib/jasper-el.jar
> %%T%%/lib/jasper.jar
>-%%T%%/lib/javaee-api-6.0-6.jar
>-%%T%%/lib/jaxb-core-2.2.7.jar
>-%%T%%/lib/jaxb-impl.jar
>+%%T%%/lib/jaspic-api.jar
>+%%T%%/lib/javaee-api-8.0-6-tomcat.jar
>+%%T%%/lib/jaxb-runtime-2.3.3.jar
>+%%T%%/lib/johnzon-core-1.2.21.jar
>+%%T%%/lib/johnzon-jaxrs-1.2.21.jar
>+%%T%%/lib/johnzon-jsonb-1.2.21.jar
>+%%T%%/lib/johnzon-jsonp-strict-1.2.21.jar
>+%%T%%/lib/johnzon-mapper-1.2.21.jar
> %%T%%/lib/jsp-api.jar
>-%%T%%/lib/mbean-annotation-api-4.7.4.jar
>-%%T%%/lib/myfaces-api-2.1.17.jar
>-%%T%%/lib/myfaces-impl-2.1.17.jar
>-%%T%%/lib/openejb-api-4.7.4.jar
>-%%T%%/lib/openejb-client-4.7.4.jar
>-%%T%%/lib/openejb-core-4.7.4.jar
>-%%T%%/lib/openejb-ejbd-4.7.4.jar
>-%%T%%/lib/openejb-hsql-4.7.4.jar
>-%%T%%/lib/openejb-http-4.7.4.jar
>+%%T%%/lib/mbean-annotation-api-8.0.16.jar
>+%%T%%/lib/myfaces-api-2.3.10.jar
>+%%T%%/lib/myfaces-impl-2.3.10.jar
>+%%T%%/lib/neethi-3.0.3.jar
>+%%T%%/lib/openejb-api-8.0.16.jar
>+%%T%%/lib/openejb-client-8.0.16.jar
>+%%T%%/lib/openejb-core-8.0.16.jar
>+%%T%%/lib/openejb-cxf-rs-8.0.16.jar
>+%%T%%/lib/openejb-cxf-transport-8.0.16.jar
>+%%T%%/lib/openejb-ejbd-8.0.16.jar
>+%%T%%/lib/openejb-hsql-8.0.16.jar
>+%%T%%/lib/openejb-http-8.0.16.jar
> %%T%%/lib/openejb-javaagent.jar
>-%%T%%/lib/openejb-jee-4.7.4.jar
>-%%T%%/lib/openejb-jee-accessors-4.7.4.jar
>-%%T%%/lib/openejb-jpa-integration-4.7.4.jar
>-%%T%%/lib/openejb-jstl-1.2.jar
>-%%T%%/lib/openejb-loader-4.7.4.jar
>-%%T%%/lib/openejb-server-4.7.4.jar
>-%%T%%/lib/openjpa-2.4.0.jar
>-%%T%%/lib/openwebbeans-ee-1.2.7.jar
>-%%T%%/lib/openwebbeans-ee-common-1.2.7.jar
>-%%T%%/lib/openwebbeans-ejb-1.2.7.jar
>-%%T%%/lib/openwebbeans-el22-1.2.7.jar
>-%%T%%/lib/openwebbeans-impl-1.2.7.jar
>-%%T%%/lib/openwebbeans-jsf-1.2.7.jar
>-%%T%%/lib/openwebbeans-spi-1.2.7.jar
>-%%T%%/lib/openwebbeans-web-1.2.7.jar
>-%%T%%/lib/quartz-openejb-shade-2.2.1.jar
>-%%T%%/lib/serp-1.14.1.jar
>+%%T%%/lib/openejb-jee-8.0.16.jar
>+%%T%%/lib/openejb-jee-accessors-8.0.16.jar
>+%%T%%/lib/openejb-jpa-integration-8.0.16.jar
>+%%T%%/lib/openejb-loader-8.0.16.jar
>+%%T%%/lib/openejb-rest-8.0.16.jar
>+%%T%%/lib/openejb-server-8.0.16.jar
>+%%T%%/lib/openjpa-3.2.2.jar
>+%%T%%/lib/openwebbeans-ee-2.0.27.jar
>+%%T%%/lib/openwebbeans-ee-common-2.0.27.jar
>+%%T%%/lib/openwebbeans-ejb-2.0.27.jar
>+%%T%%/lib/openwebbeans-el22-2.0.27.jar
>+%%T%%/lib/openwebbeans-impl-2.0.27.jar
>+%%T%%/lib/openwebbeans-jsf-2.0.27.jar
>+%%T%%/lib/openwebbeans-spi-2.0.27.jar
>+%%T%%/lib/openwebbeans-web-2.0.27.jar
>+%%T%%/lib/quartz-openejb-shade-2.2.4.jar
>+%%T%%/lib/reactive-streams-1.0.3.jar
>+%%T%%/lib/saaj-impl-1.5.3.jar
>+%%T%%/lib/serp-1.15.1.jar
>+%%T%%/lib/servicemix-bcel-shade-8.0.16.jar
> %%T%%/lib/servlet-api.jar
>-%%T%%/lib/slf4j-api-1.7.14.jar
>-%%T%%/lib/slf4j-jdk14-1.7.14.jar
>+%%T%%/lib/slf4j-api-1.7.36.jar
>+%%T%%/lib/slf4j-jdk14-1.7.36.jar
>+%%T%%/lib/stax-ex-1.8.3.jar
>+%%T%%/lib/stax2-api-4.2.1.jar
> %%T%%/lib/swizzle-stream-1.6.2.jar
> %%T%%/lib/sxc-jaxb-core-0.8.jar
> %%T%%/lib/sxc-runtime-0.8.jar
>+%%T%%/lib/taglibs-shade-8.0.16.jar
> %%T%%/lib/tomcat-api.jar
> %%T%%/lib/tomcat-coyote.jar
> %%T%%/lib/tomcat-dbcp.jar
>+%%T%%/lib/tomcat-i18n-cs.jar
>+%%T%%/lib/tomcat-i18n-de.jar
> %%T%%/lib/tomcat-i18n-es.jar
> %%T%%/lib/tomcat-i18n-fr.jar
> %%T%%/lib/tomcat-i18n-ja.jar
>+%%T%%/lib/tomcat-i18n-ko.jar
>+%%T%%/lib/tomcat-i18n-pt-BR.jar
>+%%T%%/lib/tomcat-i18n-ru.jar
>+%%T%%/lib/tomcat-i18n-zh-CN.jar
> %%T%%/lib/tomcat-jdbc.jar
>+%%T%%/lib/tomcat-jni.jar
>+%%T%%/lib/tomcat-util-scan.jar
> %%T%%/lib/tomcat-util.jar
>-%%T%%/lib/tomcat7-websocket.jar
>-%%T%%/lib/tomee-catalina-1.7.4.jar
>-%%T%%/lib/tomee-common-1.7.4.jar
>-%%T%%/lib/tomee-jdbc-1.7.4.jar
>-%%T%%/lib/tomee-loader-1.7.4.jar
>-%%T%%/lib/tomee-mojarra-1.7.4.jar
>-%%T%%/lib/tomee-myfaces-1.7.4.jar
>-%%T%%/lib/tomee-webapp-1.7.4.jar
>+%%T%%/lib/tomcat-websocket.jar
>+%%T%%/lib/tomee-catalina-8.0.16.jar
>+%%T%%/lib/tomee-common-8.0.16.jar
>+%%T%%/lib/tomee-config-8.0.16.jar
>+%%T%%/lib/tomee-jaxrs-8.0.16.jar
>+%%T%%/lib/tomee-jdbc-8.0.16.jar
>+%%T%%/lib/tomee-loader-8.0.16.jar
>+%%T%%/lib/tomee-mojarra-8.0.16.jar
>+%%T%%/lib/tomee-myfaces-8.0.16.jar
>+%%T%%/lib/tomee-security-8.0.16.jar
>+%%T%%/lib/tomee-webapp-8.0.16.jar
>+%%T%%/lib/txw2-2.3.3.jar
> %%T%%/lib/websocket-api.jar
>-%%T%%/lib/xbean-asm5-shaded-4.2.jar
>-%%T%%/lib/xbean-bundleutils-4.2.jar
>-%%T%%/lib/xbean-finder-shaded-4.2.jar
>-%%T%%/lib/xbean-naming-4.2.jar
>-%%T%%/lib/xbean-reflect-4.2.jar
>+%%T%%/lib/woodstox-core-6.4.0.jar
>+%%T%%/lib/wsdl4j-1.6.3.jar
>+%%T%%/lib/xbean-asm9-shaded-4.23.jar
>+%%T%%/lib/xbean-bundleutils-4.23.jar
>+%%T%%/lib/xbean-finder-shaded-4.23.jar
>+%%T%%/lib/xbean-naming-4.23.jar
>+%%T%%/lib/xbean-reflect-4.23.jar
>+%%T%%/lib/xmlschema-core-2.2.5.jar
>+%%T%%/lib/yoko-osgi-1.4.jar
>+%%T%%/lib/yoko-rmi-impl-1.4.jar
>+%%T%%/lib/yoko-rmi-spec-1.4.jar
>+%%T%%/lib/yoko-spec-corba-1.4.jar
> %%T%%/temp/safeToDelete.tmp
> %%T%%/webapps/ROOT/RELEASE-NOTES.txt
> %%T%%/webapps/ROOT/WEB-INF/web.xml
>-%%T%%/webapps/ROOT/asf-logo-wide.gif
>-%%T%%/webapps/ROOT/asf-logo.png
>+%%T%%/webapps/ROOT/asf-logo-wide.svg
> %%T%%/webapps/ROOT/bg-button.png
> %%T%%/webapps/ROOT/bg-middle.png
>-%%T%%/webapps/ROOT/bg-nav-item.png
> %%T%%/webapps/ROOT/bg-nav.png
> %%T%%/webapps/ROOT/bg-upper.png
>-%%T%%/webapps/ROOT/build.xml
> %%T%%/webapps/ROOT/favicon.ico
> %%T%%/webapps/ROOT/index.jsp
>-%%T%%/webapps/ROOT/tomcat-power.gif
> %%T%%/webapps/ROOT/tomcat.css
>-%%T%%/webapps/ROOT/tomcat.gif
>-%%T%%/webapps/ROOT/tomcat.png
> %%T%%/webapps/ROOT/tomcat.svg
> %%T%%/webapps/docs/BUILDING.txt
>+%%T%%/webapps/docs/META-INF/context.xml
> %%T%%/webapps/docs/RELEASE-NOTES.txt
> %%T%%/webapps/docs/RUNNING.txt
>+%%T%%/webapps/docs/WEB-INF/jsp/403.jsp
> %%T%%/webapps/docs/WEB-INF/web.xml
> %%T%%/webapps/docs/aio.html
>+%%T%%/webapps/docs/annotationapi/index.html
> %%T%%/webapps/docs/api/index.html
> %%T%%/webapps/docs/appdev/build.xml.txt
> %%T%%/webapps/docs/appdev/deployment.html
>@@ -172,6 +208,7 @@
> %%T%%/webapps/docs/architecture/startup/serverStartup.txt
> %%T%%/webapps/docs/balancer-howto.html
> %%T%%/webapps/docs/building.html
>+%%T%%/webapps/docs/cdi.html
> %%T%%/webapps/docs/cgi-howto.html
> %%T%%/webapps/docs/changelog.html
> %%T%%/webapps/docs/class-loader-howto.html
>@@ -190,14 +227,19 @@
> %%T%%/webapps/docs/config/cluster-valve.html
> %%T%%/webapps/docs/config/cluster.html
> %%T%%/webapps/docs/config/context.html
>+%%T%%/webapps/docs/config/cookie-processor.html
>+%%T%%/webapps/docs/config/credentialhandler.html
> %%T%%/webapps/docs/config/engine.html
> %%T%%/webapps/docs/config/executor.html
> %%T%%/webapps/docs/config/filter.html
> %%T%%/webapps/docs/config/globalresources.html
> %%T%%/webapps/docs/config/host.html
> %%T%%/webapps/docs/config/http.html
>+%%T%%/webapps/docs/config/http2.html
> %%T%%/webapps/docs/config/index.html
>+%%T%%/webapps/docs/config/jar-scan-filter.html
> %%T%%/webapps/docs/config/jar-scanner.html
>+%%T%%/webapps/docs/config/jaspic.html
> %%T%%/webapps/docs/config/listeners.html
> %%T%%/webapps/docs/config/loader.html
> %%T%%/webapps/docs/config/manager.html
>@@ -213,32 +255,33 @@
> %%T%%/webapps/docs/deployer-howto.html
> %%T%%/webapps/docs/developers.html
> %%T%%/webapps/docs/elapi/index.html
>-%%T%%/webapps/docs/extras.html
>-%%T%%/webapps/docs/funcspecs/fs-admin-apps.html
>-%%T%%/webapps/docs/funcspecs/fs-admin-objects.html
>-%%T%%/webapps/docs/funcspecs/fs-admin-opers.html
>-%%T%%/webapps/docs/funcspecs/fs-default.html
>-%%T%%/webapps/docs/funcspecs/fs-jdbc-realm.html
>-%%T%%/webapps/docs/funcspecs/fs-jndi-realm.html
>-%%T%%/webapps/docs/funcspecs/fs-memory-realm.html
>-%%T%%/webapps/docs/funcspecs/index.html
>-%%T%%/webapps/docs/funcspecs/mbean-names.html
>+%%T%%/webapps/docs/graal.html
>+%%T%%/webapps/docs/host-manager-howto.html
>+%%T%%/webapps/docs/html-host-manager-howto.html
> %%T%%/webapps/docs/html-manager-howto.html
> %%T%%/webapps/docs/images/add.gif
>-%%T%%/webapps/docs/images/asf-logo.gif
>+%%T%%/webapps/docs/images/asf-logo.svg
> %%T%%/webapps/docs/images/code.gif
> %%T%%/webapps/docs/images/cors-flowchart.png
> %%T%%/webapps/docs/images/design.gif
>+%%T%%/webapps/docs/images/docs-stylesheet.css
> %%T%%/webapps/docs/images/docs.gif
> %%T%%/webapps/docs/images/fix.gif
>-%%T%%/webapps/docs/images/printer.gif
>+%%T%%/webapps/docs/images/fonts/OpenSans400.woff
>+%%T%%/webapps/docs/images/fonts/OpenSans400italic.woff
>+%%T%%/webapps/docs/images/fonts/OpenSans600.woff
>+%%T%%/webapps/docs/images/fonts/OpenSans600italic.woff
>+%%T%%/webapps/docs/images/fonts/OpenSans700.woff
>+%%T%%/webapps/docs/images/fonts/OpenSans700italic.woff
>+%%T%%/webapps/docs/images/fonts/fonts.css
> %%T%%/webapps/docs/images/tomcat.gif
>-%%T%%/webapps/docs/images/tomcat.svg
>+%%T%%/webapps/docs/images/tomcat.png
> %%T%%/webapps/docs/images/update.gif
> %%T%%/webapps/docs/images/void.gif
> %%T%%/webapps/docs/index.html
> %%T%%/webapps/docs/introduction.html
> %%T%%/webapps/docs/jasper-howto.html
>+%%T%%/webapps/docs/jaspicapi/index.html
> %%T%%/webapps/docs/jdbc-pool.html
> %%T%%/webapps/docs/jndi-datasource-examples-howto.html
> %%T%%/webapps/docs/jndi-resources-howto.html
>@@ -246,10 +289,12 @@
> %%T%%/webapps/docs/logging.html
> %%T%%/webapps/docs/manager-howto.html
> %%T%%/webapps/docs/maven-jars.html
>-%%T%%/webapps/docs/mbeans-descriptor-howto.html
>+%%T%%/webapps/docs/mbeans-descriptors-howto.html
>+%%T%%/webapps/docs/mbeans-descriptors.dtd
> %%T%%/webapps/docs/monitoring.html
> %%T%%/webapps/docs/proxy-howto.html
> %%T%%/webapps/docs/realm-howto.html
>+%%T%%/webapps/docs/rewrite.html
> %%T%%/webapps/docs/security-howto.html
> %%T%%/webapps/docs/security-manager-howto.html
> %%T%%/webapps/docs/servletapi/index.html
>@@ -273,38 +318,29 @@
> %%T%%/webapps/host-manager/WEB-INF/jsp/401.jsp
> %%T%%/webapps/host-manager/WEB-INF/jsp/403.jsp
> %%T%%/webapps/host-manager/WEB-INF/jsp/404.jsp
>+%%T%%/webapps/host-manager/WEB-INF/manager.xml
> %%T%%/webapps/host-manager/WEB-INF/web.xml
>-%%T%%/webapps/host-manager/images/add.gif
>-%%T%%/webapps/host-manager/images/asf-logo.gif
>-%%T%%/webapps/host-manager/images/code.gif
>-%%T%%/webapps/host-manager/images/design.gif
>-%%T%%/webapps/host-manager/images/docs.gif
>-%%T%%/webapps/host-manager/images/fix.gif
>-%%T%%/webapps/host-manager/images/tomcat.gif
>-%%T%%/webapps/host-manager/images/update.gif
>-%%T%%/webapps/host-manager/images/void.gif
>+%%T%%/webapps/host-manager/css/manager.css
>+%%T%%/webapps/host-manager/images/asf-logo.svg
>+%%T%%/webapps/host-manager/images/tomcat.svg
> %%T%%/webapps/host-manager/index.jsp
>-%%T%%/webapps/host-manager/manager.xml
> %%T%%/webapps/manager/META-INF/context.xml
> %%T%%/webapps/manager/WEB-INF/jsp/401.jsp
> %%T%%/webapps/manager/WEB-INF/jsp/403.jsp
> %%T%%/webapps/manager/WEB-INF/jsp/404.jsp
>+%%T%%/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
>+%%T%%/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
>+%%T%%/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
> %%T%%/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
> %%T%%/webapps/manager/WEB-INF/jsp/sessionsList.jsp
> %%T%%/webapps/manager/WEB-INF/web.xml
>-%%T%%/webapps/manager/images/add.gif
>-%%T%%/webapps/manager/images/asf-logo.gif
>-%%T%%/webapps/manager/images/code.gif
>-%%T%%/webapps/manager/images/design.gif
>-%%T%%/webapps/manager/images/docs.gif
>-%%T%%/webapps/manager/images/fix.gif
>-%%T%%/webapps/manager/images/tomcat.gif
>-%%T%%/webapps/manager/images/update.gif
>-%%T%%/webapps/manager/images/void.gif
>+%%T%%/webapps/manager/css/manager.css
>+%%T%%/webapps/manager/images/asf-logo.svg
>+%%T%%/webapps/manager/images/tomcat.svg
> %%T%%/webapps/manager/index.jsp
> %%T%%/webapps/manager/status.xsd
> %%T%%/webapps/manager/xform.xsl
> @dir %%T%%/logs
> @dir %%T%%/work
>-@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/conf %D/%%T%%/logs %D/%%T%%/temp %D/%%T%%/webapps %D/%%T%%/work
>-@unexec [ ! -d %D/%%T%% ] || echo If permanently deleting this package, %D/%%T%% must be removed manually
>+@postexec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/conf %D/%%T%%/logs %D/%%T%%/temp %D/%%T%%/webapps %D/%%T%%/work
>+@postunexec [ ! -d %D/%%T%% ] || echo If permanently deleting this package, %D/%%T%% must be removed manually
>-- 
>2.45.2
>

Actions: View | Diff

Attachments on bug 281671: 253785 | 254334 | 254335