This is an automated email from the ASF dual-hosted git repository.
markt 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 99664dae39 Host-Manager favicon.ico and Manager JSPs
99664dae39 is described below
commit 99664dae3918ee6b0e737edb1208feae6d48d7a2
Author: sa103736 <[email protected]>
AuthorDate: Wed Jul 30 22:01:38 2025 -0400
Host-Manager favicon.ico and Manager JSPs
improving previous merged #876 (commit d6e79d4) as per Konstantin Kolinko
suggestions.
---
java/org/apache/catalina/manager/Constants.java | 2 +-
webapps/docs/changelog.xml | 9 +++++----
webapps/host-manager/WEB-INF/jsp/401.jsp | 1 +
webapps/host-manager/WEB-INF/jsp/403.jsp | 1 +
webapps/host-manager/WEB-INF/jsp/404.jsp | 1 +
webapps/{manager => host-manager/images}/favicon.ico | Bin
webapps/manager/WEB-INF/jsp/401.jsp | 1 +
webapps/manager/WEB-INF/jsp/403.jsp | 1 +
webapps/manager/WEB-INF/jsp/404.jsp | 1 +
webapps/manager/WEB-INF/jsp/connectorCerts.jsp | 1 +
webapps/manager/WEB-INF/jsp/connectorCiphers.jsp | 1 +
webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp | 1 +
webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 1 +
webapps/manager/WEB-INF/jsp/sessionsList.jsp | 1 +
webapps/manager/{ => images}/favicon.ico | Bin
15 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/manager/Constants.java
b/java/org/apache/catalina/manager/Constants.java
index 6318c0eb43..856c0db8b8 100644
--- a/java/org/apache/catalina/manager/Constants.java
+++ b/java/org/apache/catalina/manager/Constants.java
@@ -44,7 +44,7 @@ public class Constants {
HTML_HEADER_SECTION =
"<html>\n" +
"<head>\n" +
- "<link href=\"{0}/favicon.ico\" rel=\"icon\"
type=\"image/x-icon\" />\n" +
+ "<link href=\"{0}/images/favicon.ico\" rel=\"icon\"
type=\"image/x-icon\" />\n" +
"<link rel=\"stylesheet\" href=\"{0}/css/manager.css\">\n";
BODY_HEADER_SECTION =
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9d3dc20723..4257186793 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -284,10 +284,11 @@
<changelog>
<!-- Entries for backport and removal before 12.0.0-M1 below this line
-->
<fix>
- Manager. Provide the Manager web application with a dedicated favicon
- file rather than using the one from the ROOT web application which
might
- not be present or may represent something entirely different. Pull
- request <pr>876</pr> by Simon Arame.
+ Manager and Host Manager. Provide the Manager and Host Manager web
+ applications with a dedicated favicon file rather than using the one
+ from the ROOT web application which might not be present or may
+ represent something entirely different. Pull requests <pr>876</pr>
+ and <pr>878</pr> by Simon Arame.
</fix>
</changelog>
</subsection>
diff --git a/webapps/host-manager/WEB-INF/jsp/401.jsp
b/webapps/host-manager/WEB-INF/jsp/401.jsp
index 047766bbf9..9286bb127c 100644
--- a/webapps/host-manager/WEB-INF/jsp/401.jsp
+++ b/webapps/host-manager/WEB-INF/jsp/401.jsp
@@ -27,6 +27,7 @@
A {color : black;}A.name {color : black;}
-->
</style>
+ <link href="<%=request.getContextPath()%>/images/favicon.ico" rel="icon"
type="image/x-icon" />
</head>
<body>
<h1>401 Unauthorized</h1>
diff --git a/webapps/host-manager/WEB-INF/jsp/403.jsp
b/webapps/host-manager/WEB-INF/jsp/403.jsp
index 74e1e2da93..a8c31bfae6 100644
--- a/webapps/host-manager/WEB-INF/jsp/403.jsp
+++ b/webapps/host-manager/WEB-INF/jsp/403.jsp
@@ -27,6 +27,7 @@
A {color : black;}A.name {color : black;}
-->
</style>
+ <link href="<%=request.getContextPath()%>/images/favicon.ico" rel="icon"
type="image/x-icon" />
</head>
<body>
<h1>403 Access Denied</h1>
diff --git a/webapps/host-manager/WEB-INF/jsp/404.jsp
b/webapps/host-manager/WEB-INF/jsp/404.jsp
index 956b9a9741..a9b0401f57 100644
--- a/webapps/host-manager/WEB-INF/jsp/404.jsp
+++ b/webapps/host-manager/WEB-INF/jsp/404.jsp
@@ -28,6 +28,7 @@
A {color : black;}A.name {color : black;}
-->
</style>
+ <link href="<%=request.getContextPath()%>/images/favicon.ico" rel="icon"
type="image/x-icon" />
</head>
<body>
<h1>404 Not found</h1>
diff --git a/webapps/manager/favicon.ico
b/webapps/host-manager/images/favicon.ico
similarity index 100%
copy from webapps/manager/favicon.ico
copy to webapps/host-manager/images/favicon.ico
diff --git a/webapps/manager/WEB-INF/jsp/401.jsp
b/webapps/manager/WEB-INF/jsp/401.jsp
index 84c9a970e0..3d01599ff7 100644
--- a/webapps/manager/WEB-INF/jsp/401.jsp
+++ b/webapps/manager/WEB-INF/jsp/401.jsp
@@ -27,6 +27,7 @@
A {color : black;}A.name {color : black;}
-->
</style>
+ <link href="<%=request.getContextPath()%>/images/favicon.ico" rel="icon"
type="image/x-icon" />
</head>
<body>
<h1>401 Unauthorized</h1>
diff --git a/webapps/manager/WEB-INF/jsp/403.jsp
b/webapps/manager/WEB-INF/jsp/403.jsp
index 4baa2f4c55..d8e71162e6 100644
--- a/webapps/manager/WEB-INF/jsp/403.jsp
+++ b/webapps/manager/WEB-INF/jsp/403.jsp
@@ -27,6 +27,7 @@
A {color : black;}A.name {color : black;}
-->
</style>
+ <link href="<%=request.getContextPath()%>/images/favicon.ico" rel="icon"
type="image/x-icon" />
</head>
<body>
<h1>403 Access Denied</h1>
diff --git a/webapps/manager/WEB-INF/jsp/404.jsp
b/webapps/manager/WEB-INF/jsp/404.jsp
index d08b659469..fc7f5b7445 100644
--- a/webapps/manager/WEB-INF/jsp/404.jsp
+++ b/webapps/manager/WEB-INF/jsp/404.jsp
@@ -28,6 +28,7 @@
A {color : black;}A.name {color : black;}
-->
</style>
+ <link href="<%=request.getContextPath()%>/images/favicon.ico" rel="icon"
type="image/x-icon" />
</head>
<body>
<h1>404 Not found</h1>
diff --git a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
index 8dd6af7ceb..cb1d5389dd 100644
--- a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
@@ -36,6 +36,7 @@
<meta name="copyright" content="<%= Constants.COPYRIGHT_NOTICE %>"/>
<meta name="robots" content="noindex,nofollow,noarchive"/>
<title>Configured certificate chains per Connector</title>
+ <link href="<%=request.getContextPath()%>/images/favicon.ico" rel="icon"
type="image/x-icon" />
</head>
<body>
<h1>Configured certificate chains per Connector</h1>
diff --git a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
index 2677a36b6a..b60fdb83ac 100644
--- a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
@@ -36,6 +36,7 @@
<meta name="copyright" content="<%= Constants.COPYRIGHT_NOTICE %>"/>
<meta name="robots" content="noindex,nofollow,noarchive"/>
<title>Configured ciphers per Connector</title>
+ <link href="<%=request.getContextPath()%>/images/favicon.ico" rel="icon"
type="image/x-icon" />
</head>
<body>
<h1>Configured ciphers per Connector</h1>
diff --git a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
index 295cfe8fb3..51afeb6fc9 100644
--- a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
@@ -36,6 +36,7 @@
<meta name="copyright" content="<%= Constants.COPYRIGHT_NOTICE %>"/>
<meta name="robots" content="noindex,nofollow,noarchive"/>
<title>Trusted certificates per Connector</title>
+ <link href="<%=request.getContextPath()%>/images/favicon.ico" rel="icon"
type="image/x-icon" />
</head>
<body>
<h1>Trusted certificates per Connector</h1>
diff --git a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
index 75f732b216..90b2998ddd 100644
--- a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
@@ -55,6 +55,7 @@
<meta name="copyright" content="<%= Constants.COPYRIGHT_NOTICE %>"/>
<meta name="robots" content="noindex,nofollow,noarchive"/>
<title>Sessions Administration: details for <%= currentSessionId %></title>
+ <link href="<%=request.getContextPath()%>/images/favicon.ico" rel="icon"
type="image/x-icon" />
</head>
<body>
<% if (currentHttpSession == null) { %>
diff --git a/webapps/manager/WEB-INF/jsp/sessionsList.jsp
b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
index f44e6e7b0b..d9ad55be2c 100644
--- a/webapps/manager/WEB-INF/jsp/sessionsList.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
@@ -46,6 +46,7 @@
<meta name="copyright" content="<%= Constants.COPYRIGHT_NOTICE %>" />
<meta name="robots" content="noindex,nofollow,noarchive"/>
<title>Sessions Administration for <%=
JspHelper.escapeXml(cn.getDisplayName()) %></title>
+ <link href="<%=request.getContextPath()%>/images/favicon.ico" rel="icon"
type="image/x-icon" />
</head>
<body>
<h1>Sessions Administration for <%= JspHelper.escapeXml(cn.getDisplayName())
%></h1>
diff --git a/webapps/manager/favicon.ico b/webapps/manager/images/favicon.ico
similarity index 100%
rename from webapps/manager/favicon.ico
rename to webapps/manager/images/favicon.ico
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
