From cd27528bb524b763dc7be4582102ada7329cec37 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 16 Jul 2010 09:09:44 +0000 Subject: [PATCH] As suggested on the users list, add redirects to the HTML interface to the root of the host-manager and manager applications git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@964722 13f79535-47bb-0310-9956-ffa450edef68 --- webapps/docs/changelog.xml | 5 +++++ webapps/host-manager/WEB-INF/web.xml | 2 +- webapps/host-manager/index.jsp | 18 ++++++++++++++++++ webapps/manager/WEB-INF/web.xml | 2 +- webapps/manager/index.jsp | 18 ++++++++++++++++++ 5 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 webapps/host-manager/index.jsp create mode 100644 webapps/manager/index.jsp diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index f83c31d00..ee5b96079 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -254,6 +254,11 @@ 49570: When using the example compression filter, set the Vary header on compressed responses. (markt) + + Add redirects for the root of the manager and host-manager web + applications that redirect users to the html interface rather than + returning a 404. (markt) + diff --git a/webapps/host-manager/WEB-INF/web.xml b/webapps/host-manager/WEB-INF/web.xml index 48d752f3c..39cff0599 100644 --- a/webapps/host-manager/WEB-INF/web.xml +++ b/webapps/host-manager/WEB-INF/web.xml @@ -51,7 +51,7 @@ org.apache.catalina.filters.CsrfPreventionFilter entryPoints - /html,/html/,/html/list + /html,/html/,/html/list,/index.jsp diff --git a/webapps/host-manager/index.jsp b/webapps/host-manager/index.jsp new file mode 100644 index 000000000..d4816e5a2 --- /dev/null +++ b/webapps/host-manager/index.jsp @@ -0,0 +1,18 @@ +<%-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + 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. +--%> +<% response.sendRedirect(response.encodeRedirectURL(request.getContextPath() + + "/html")); %> \ No newline at end of file diff --git a/webapps/manager/WEB-INF/web.xml b/webapps/manager/WEB-INF/web.xml index 29864abb0..548760468 100644 --- a/webapps/manager/WEB-INF/web.xml +++ b/webapps/manager/WEB-INF/web.xml @@ -88,7 +88,7 @@ org.apache.catalina.filters.CsrfPreventionFilter entryPoints - /html,/html/,/html/list + /html,/html/,/html/list,/index.jsp diff --git a/webapps/manager/index.jsp b/webapps/manager/index.jsp new file mode 100644 index 000000000..d4816e5a2 --- /dev/null +++ b/webapps/manager/index.jsp @@ -0,0 +1,18 @@ +<%-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + 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. +--%> +<% response.sendRedirect(response.encodeRedirectURL(request.getContextPath() + + "/html")); %> \ No newline at end of file -- 2.11.0