You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/08/15 20:08:36 UTC
[tomcat] 02/03: Align root web application with 8.5.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1abfc3cb9190a5119249fbc6116e2e9b7e040cca
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Aug 15 20:46:16 2019 +0100
Align root web application with 8.5.x
---
webapps/ROOT/WEB-INF/web.xml | 3 +--
webapps/ROOT/bg-nav-item.png | Bin 1392 -> 0 bytes
webapps/ROOT/index.jsp | 23 ++++++++++++-----------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/webapps/ROOT/WEB-INF/web.xml b/webapps/ROOT/WEB-INF/web.xml
index f2bd243..a3505e7 100644
--- a/webapps/ROOT/WEB-INF/web.xml
+++ b/webapps/ROOT/WEB-INF/web.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,7 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
diff --git a/webapps/ROOT/bg-nav-item.png b/webapps/ROOT/bg-nav-item.png
deleted file mode 100644
index ece86a1..0000000
Binary files a/webapps/ROOT/bg-nav-item.png and /dev/null differ
diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp
index d1b6637..6de0008 100644
--- a/webapps/ROOT/index.jsp
+++ b/webapps/ROOT/index.jsp
@@ -14,8 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<!DOCTYPE html>
-<%@ page session="false" %>
+<%@ page session="false" pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %>
<%
java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy");
request.setAttribute("year", sdf.format(new java.util.Date()));
@@ -23,8 +22,10 @@ request.setAttribute("tomcatUrl", "https://tomcat.apache.org/");
request.setAttribute("tomcatDocUrl", "/docs/");
request.setAttribute("tomcatExamplesUrl", "/examples/");
%>
+<!DOCTYPE html>
<html lang="en">
<head>
+ <meta charset="UTF-8" />
<title><%=request.getServletContext().getServerInfo() %></title>
<link href="favicon.ico" rel="icon" type="image/x-icon" />
<link href="favicon.ico" rel="shortcut icon" type="image/x-icon" />
@@ -54,9 +55,9 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
<img src="tomcat.png" alt="[tomcat logo]" />
<div id="tasks">
<h3>Recommended Reading:</h3>
- <h4><a href="${tomcatDocUrl}security-howto.html">Security Considerations HOW-TO</a></h4>
- <h4><a href="${tomcatDocUrl}manager-howto.html">Manager Application HOW-TO</a></h4>
- <h4><a href="${tomcatDocUrl}cluster-howto.html">Clustering/Session Replication HOW-TO</a></h4>
+ <h4><a href="${tomcatDocUrl}security-howto.html">Security Considerations How-To</a></h4>
+ <h4><a href="${tomcatDocUrl}manager-howto.html">Manager Application How-To</a></h4>
+ <h4><a href="${tomcatDocUrl}cluster-howto.html">Clustering/Session Replication How-To</a></h4>
</div>
</div>
<div id="actions">
@@ -106,7 +107,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
<p>For security, access to the <a href="/manager/html">manager webapp</a> is restricted.
Users are defined in:</p>
<pre>$CATALINA_HOME/conf/tomcat-users.xml</pre>
- <p>In Tomcat 7.0 access to the manager application is split between
+ <p>In Tomcat @VERSION_MAJOR_MINOR@ access to the manager application is split between
different users. <a href="${tomcatDocUrl}manager-howto.html">Read more...</a></p>
<br />
<h4><a href="${tomcatDocUrl}RELEASE-NOTES.txt">Release Notes</a></h4>
@@ -118,16 +119,16 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
<div id="low-docs" class="">
<div class="curved container">
<h3>Documentation</h3>
- <h4><a href="${tomcatDocUrl}">Tomcat 7.0 Documentation</a></h4>
- <h4><a href="${tomcatDocUrl}config/">Tomcat 7.0 Configuration</a></h4>
+ <h4><a href="${tomcatDocUrl}">Tomcat @VERSION_MAJOR_MINOR@ Documentation</a></h4>
+ <h4><a href="${tomcatDocUrl}config/">Tomcat @VERSION_MAJOR_MINOR@ Configuration</a></h4>
<h4><a href="https://wiki.apache.org/tomcat/FrontPage">Tomcat Wiki</a></h4>
<p>Find additional important configuration information in:</p>
<pre>$CATALINA_HOME/RUNNING.txt</pre>
<p>Developers may be interested in:</p>
<ul>
- <li><a href="https://tomcat.apache.org/bugreport.html">Tomcat 7.0 Bug Database</a></li>
- <li><a href="${tomcatDocUrl}api/index.html">Tomcat 7.0 JavaDocs</a></li>
- <li><a href="https://svn.apache.org/repos/asf/tomcat/tc7.0.x/">Tomcat 7.0 SVN Repository</a></li>
+ <li><a href="https://tomcat.apache.org/bugreport.html">Tomcat @VERSION_MAJOR_MINOR@ Bug Database</a></li>
+ <li><a href="${tomcatDocUrl}api/index.html">Tomcat @VERSION_MAJOR_MINOR@ JavaDocs</a></li>
+ <li><a href="https://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/">Tomcat @VERSION_MAJOR_MINOR@ SVN Repository</a></li>
</ul>
</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org