From 4c6367e20fcfed6f9e8d74ea8de6b13b2cf84b4b Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Tue, 8 Sep 2020 18:49:13 -0500
Subject: [PATCH] CLDR-14145 add redirect and icon

- add a ROOT directory which will go in the server root
- add the favicon.ico from unicode.org/favicon.ico

Fixes: https://github.com/unicode-org/unicodetools/issues/19
Fixes: https://github.com/unicode-org/unicodetools/issues/18
---
 UnicodeJsps/.gitignore               |   3 +++
 UnicodeJsps/Dockerfile               |   1 +
 UnicodeJsps/jetty.d/ROOT/favicon.ico | Bin 0 -> 15406 bytes
 UnicodeJsps/jetty.d/ROOT/index.html  |  14 ++++++++++++++
 4 files changed, 18 insertions(+)
 create mode 100644 UnicodeJsps/.gitignore
 create mode 100644 UnicodeJsps/jetty.d/ROOT/favicon.ico
 create mode 100644 UnicodeJsps/jetty.d/ROOT/index.html

diff --git a/UnicodeJsps/.gitignore b/UnicodeJsps/.gitignore
new file mode 100644
index 000000000..ee0425f34
--- /dev/null
+++ b/UnicodeJsps/.gitignore
@@ -0,0 +1,3 @@
+# parent ignores *.d files.
+
+!/jetty.d
\ No newline at end of file
diff --git a/UnicodeJsps/Dockerfile b/UnicodeJsps/Dockerfile
index 678ff6291..0d2fbd5bb 100644
--- a/UnicodeJsps/Dockerfile
+++ b/UnicodeJsps/Dockerfile
@@ -19,6 +19,7 @@ RUN ant -DCATALINA_HOME=${CATALINA_HOME} war
 FROM jetty:9-jre11-slim AS run
 # FROM tomcat:9-jdk14-openjdk-slim-buster AS run
 ADD port-entrypoint.sh /port-entrypoint.sh
+ADD ./jetty.d/ROOT /var/lib/jetty/webapps/ROOT/
 ENTRYPOINT [ "/port-entrypoint.sh" ]
 COPY --from=build /home/UnicodeJsps.war /var/lib/jetty/webapps/
 # This is the default PORT. Override by setting PORT.
diff --git a/UnicodeJsps/jetty.d/ROOT/favicon.ico b/UnicodeJsps/jetty.d/ROOT/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..2a6172d0c81f4def310d0da8a5bb2d7c6a0a6f72
GIT binary patch
literal 15406
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

literal 0
HcmV?d00001

diff --git a/UnicodeJsps/jetty.d/ROOT/index.html b/UnicodeJsps/jetty.d/ROOT/index.html
new file mode 100644
index 000000000..82202437d
--- /dev/null
+++ b/UnicodeJsps/jetty.d/ROOT/index.html
@@ -0,0 +1,14 @@
+<html>
+
+<head>
+    <title>Unicode Utilities | Redirect</title>
+    <meta http-equiv="refresh" content="0;URL='/UnicodeJsps'" />
+</head>
+
+<body>
+    <h1><a href="https://www.unicode.org"><img alt="icon" src="/favicon.ico" />Unicode Utilities</a></h1>
+    <h2>Redirecting...</h2>
+    You should have been redirected here: <a href="/UnicodeJsps">/UnicodeJsps</a>
+</body>
+
+</html>
\ No newline at end of file