This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 502a306ef7 Host-Manager favicon.ico and Manager JSPs
502a306ef7 is described below
commit 502a306ef7634c6a7c74ba9868d5f1351031d96b
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 b15a63fa60..78c9517f88 100644
--- a/java/org/apache/catalina/manager/Constants.java
+++ b/java/org/apache/catalina/manager/Constants.java
@@ -36,7 +36,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 902b0f23d2..4803b62d1f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -148,10 +148,11 @@
<subsection name="Web applications">
<changelog>
<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 796f35a1bd..44a4e63d48 100644
--- a/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorCerts.jsp
@@ -35,6 +35,7 @@
<meta name="copyright" content="copyright 2005-2025 the Apache Software
Foundation"/>
<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 f353c18663..c01ed93852 100644
--- a/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
@@ -35,6 +35,7 @@
<meta name="copyright" content="copyright 2005-2025 the Apache Software
Foundation"/>
<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 c5d524705e..e1c1699358 100644
--- a/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
+++ b/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
@@ -35,6 +35,7 @@
<meta name="copyright" content="copyright 2005-2025 the Apache Software
Foundation"/>
<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 7e71c53507..2341fa58bb 100644
--- a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
@@ -54,6 +54,7 @@
<meta name="copyright" content="copyright 2005-2025 the Apache Software
Foundation"/>
<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 e93c92e062..45ce17c320 100644
--- a/webapps/manager/WEB-INF/jsp/sessionsList.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionsList.jsp
@@ -45,6 +45,7 @@
<meta name="copyright" content="copyright 2005-2025 the Apache Software
Foundation"/>
<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]
