This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new fd98117763 Use copyright notice from Constants
fd98117763 is described below
commit fd981177637b6ac8b89646c33ef0d95da134f2c9
Author: Christopher Schultz <[email protected]>
AuthorDate: Fri Jan 3 12:26:42 2025 -0500
Use copyright notice from Constants
---
webapps/manager/WEB-INF/jsp/connectorCerts.jsp | 3 ++-
webapps/manager/WEB-INF/jsp/connectorCiphers.jsp | 3 ++-
webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp | 3 ++-
webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 3 ++-
webapps/manager/WEB-INF/jsp/sessionsList.jsp | 5 +++--
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
index 796f35a1bd..8dd6af7ceb 100644
--- a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
@@ -19,6 +19,7 @@
<%@page import="java.util.Map" %>
<%@page import="java.util.Map.Entry" %>
<%@page import="java.util.List" %>
+<%@page import="org.apache.catalina.manager.Constants" %>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
@@ -32,7 +33,7 @@
<meta http-equiv="cache-control" content="no-cache,must-revalidate"/><!--
HTTP 1.1 -->
<meta http-equiv="expires" content="0"/><!-- 0 is an invalid value and
should be treated as 'now' -->
<meta http-equiv="content-language" content="en"/>
- <meta name="copyright" content="copyright 2005-2025 the Apache Software
Foundation"/>
+ <meta name="copyright" content="<%= Constants.COPYRIGHT_NOTICE %>"/>
<meta name="robots" content="noindex,nofollow,noarchive"/>
<title>Configured certificate chains per Connector</title>
</head>
diff --git a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
index f353c18663..2677a36b6a 100644
--- a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
@@ -19,6 +19,7 @@
<%@page import="java.util.Map" %>
<%@page import="java.util.Map.Entry" %>
<%@page import="java.util.List" %>
+<%@page import="org.apache.catalina.manager.Constants" %>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
@@ -32,7 +33,7 @@
<meta http-equiv="cache-control" content="no-cache,must-revalidate"/><!--
HTTP 1.1 -->
<meta http-equiv="expires" content="0"/><!-- 0 is an invalid value and
should be treated as 'now' -->
<meta http-equiv="content-language" content="en"/>
- <meta name="copyright" content="copyright 2005-2025 the Apache Software
Foundation"/>
+ <meta name="copyright" content="<%= Constants.COPYRIGHT_NOTICE %>"/>
<meta name="robots" content="noindex,nofollow,noarchive"/>
<title>Configured ciphers per Connector</title>
</head>
diff --git a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
index c5d524705e..295cfe8fb3 100644
--- a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
@@ -19,6 +19,7 @@
<%@page import="java.util.Map" %>
<%@page import="java.util.Map.Entry" %>
<%@page import="java.util.List" %>
+<%@page import="org.apache.catalina.manager.Constants" %>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
@@ -32,7 +33,7 @@
<meta http-equiv="cache-control" content="no-cache,must-revalidate"/><!--
HTTP 1.1 -->
<meta http-equiv="expires" content="0"/><!-- 0 is an invalid value and
should be treated as 'now' -->
<meta http-equiv="content-language" content="en"/>
- <meta name="copyright" content="copyright 2005-2025 the Apache Software
Foundation"/>
+ <meta name="copyright" content="<%= Constants.COPYRIGHT_NOTICE %>"/>
<meta name="robots" content="noindex,nofollow,noarchive"/>
<title>Trusted certificates per Connector</title>
</head>
diff --git a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
index 7e71c53507..75f732b216 100644
--- a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
@@ -19,6 +19,7 @@
<%@page import="java.util.Enumeration" %>
<%@page import="jakarta.servlet.http.HttpSession" %>
<%@page import="org.apache.catalina.Session" %>
+<%@page import="org.apache.catalina.manager.Constants" %>
<%@page import="org.apache.catalina.manager.JspHelper" %>
<%@page import="org.apache.catalina.util.ContextName" %>
<!DOCTYPE html
@@ -51,7 +52,7 @@
<meta http-equiv="expires" content="0"/><!-- 0 is an invalid value and
should be treated as 'now' -->
<meta http-equiv="content-language" content="en"/>
<meta name="author" content="Cedrik LIME"/>
- <meta name="copyright" content="copyright 2005-2025 the Apache Software
Foundation"/>
+ <meta name="copyright" content="<%= Constants.COPYRIGHT_NOTICE %>"/>
<meta name="robots" content="noindex,nofollow,noarchive"/>
<title>Sessions Administration: details for <%= currentSessionId %></title>
</head>
diff --git a/webapps/manager/WEB-INF/jsp/sessionsList.jsp
b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
index e93c92e062..f44e6e7b0b 100644
--- a/webapps/manager/WEB-INF/jsp/sessionsList.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
@@ -17,9 +17,10 @@
--%>
<%@page session="false" contentType="text/html; charset=UTF-8" %>
<%@page import="java.util.Collection" %>
-<%@page import="org.apache.catalina.manager.JspHelper" %>
<%@page import="org.apache.catalina.Session" %>
<%@page import="org.apache.catalina.ha.session.DeltaSession" %>
+<%@page import="org.apache.catalina.manager.Constants" %>
+<%@page import="org.apache.catalina.manager.JspHelper" %>
<%@page import="org.apache.catalina.util.ContextName" %>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -42,7 +43,7 @@
<meta http-equiv="expires" content="0"/><!-- 0 is an invalid value and
should be treated as 'now' -->
<meta http-equiv="content-language" content="en"/>
<meta name="author" content="Cedrik LIME"/>
- <meta name="copyright" content="copyright 2005-2025 the Apache Software
Foundation"/>
+ <meta name="copyright" content="<%= Constants.COPYRIGHT_NOTICE %>" />
<meta name="robots" content="noindex,nofollow,noarchive"/>
<title>Sessions Administration for <%=
JspHelper.escapeXml(cn.getDisplayName()) %></title>
</head>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
