All,
This plus the following commit are intended to make it easier to
celebrate the new year by changing copyright date ranges.
If there are no objections, I'll back-port these to the other branches.
-chris
On 1/3/25 12:08 PM, schu...@apache.org wrote:
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 1fe43f77dc Use a single copyright date range.
1fe43f77dc is described below
commit 1fe43f77dc82049e350b721c8593762729818eb5
Author: Christopher Schultz <ch...@christopherschultz.net>
AuthorDate: Fri Jan 3 12:07:52 2025 -0500
Use a single copyright date range.
---
java/org/apache/catalina/manager/Constants.java | 10 +++++++++-
java/org/apache/catalina/manager/HTMLManagerServlet.java | 2 +-
java/org/apache/catalina/manager/host/Constants.java | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/manager/Constants.java
b/java/org/apache/catalina/manager/Constants.java
index 97b7b759ef..3e47f70b56 100644
--- a/java/org/apache/catalina/manager/Constants.java
+++ b/java/org/apache/catalina/manager/Constants.java
@@ -23,6 +23,9 @@ public class Constants {
public static final String REL_EXTERNAL = "rel=\"noopener noreferrer\"";
+ public static final String COPYRIGHT_DATE_RANGE;
+ public static final String COPYRIGHT_NOTICE;
+ public static final String HTML_COPYRIGHT_NOTICE;
public static final String HTML_HEADER_SECTION;
public static final String BODY_HEADER_SECTION;
public static final String MESSAGE_SECTION;
@@ -33,6 +36,11 @@ public class Constants {
static {
//@formatter:off
+ COPYRIGHT_DATE_RANGE = "1999-2025";
+
+ COPYRIGHT_NOTICE = "Copyright (c) " + COPYRIGHT_DATE_RANGE + ", Apache
Software Foundation";
+ HTML_COPYRIGHT_NOTICE = "Copyright © " + COPYRIGHT_DATE_RANGE + ",
Apache Software Foundation";
+
HTML_HEADER_SECTION =
"<html>\n" +
"<head>\n" +
@@ -130,7 +138,7 @@ public class Constants {
HTML_TAIL_SECTION =
"<hr size=\"1\" noshade=\"noshade\">\n" +
"<center><font size=\"-1\" color=\"#525D76\">\n" +
- " <em>Copyright © 1999-2025, Apache Software
Foundation</em>" +
+ " <em>" + HTML_COPYRIGHT_NOTICE + "</em>" +
"</font></center>\n" +
"\n" +
"</body>\n" +
diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java
b/java/org/apache/catalina/manager/HTMLManagerServlet.java
index 484311f3dd..ff8f66a270 100644
--- a/java/org/apache/catalina/manager/HTMLManagerServlet.java
+++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java
@@ -730,7 +730,7 @@ public final class HTMLManagerServlet extends
ManagerServlet {
@Override
public String getServletInfo() {
- return "HTMLManagerServlet, Copyright (c) 1999-2025, The Apache Software
Foundation";
+ return "HTMLManagerServlet, " + Constants.COPYRIGHT_NOTICE;
}
@Override
diff --git a/java/org/apache/catalina/manager/host/Constants.java
b/java/org/apache/catalina/manager/host/Constants.java
index 68f8c228a5..30e1dbf2da 100644
--- a/java/org/apache/catalina/manager/host/Constants.java
+++ b/java/org/apache/catalina/manager/host/Constants.java
@@ -80,7 +80,7 @@ public class Constants {
public static final String HTML_TAIL_SECTION =
"<hr size=\"1\" noshade=\"noshade\">\n" +
"<center><font size=\"-1\" color=\"#525D76\">\n" +
- " <em>Copyright © 1999-2025, Apache Software Foundation</em>" +
+ " <em>" + org.apache.catalina.manager.Constants.HTML_COPYRIGHT_NOTICE +
"</em>" +
"</font></center>\n" +
"\n" +
"</body>\n" +
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
