Repository: atlas Updated Branches: refs/heads/master 8931d4758 -> d8b868339
ATLAS-1998: Default error page for 404, 500 and Throwable from Jetty Signed-off-by: Madhan Neethiraj <mad...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/d8b86833 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/d8b86833 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/d8b86833 Branch: refs/heads/master Commit: d8b868339ef2233620db3318f8667f0653873ee1 Parents: 8931d47 Author: apoorvnaik <apoorvn...@apache.org> Authored: Thu Jul 27 10:16:27 2017 -0700 Committer: Madhan Neethiraj <mad...@apache.org> Committed: Fri Jul 28 17:15:30 2017 -0700 ---------------------------------------------------------------------- webapp/src/main/webapp/WEB-INF/web.xml | 12 ++++++ webapp/src/main/webapp/error.jsp | 58 +++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/d8b86833/webapp/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml index 9b5c3b1..23dc063 100755 --- a/webapp/src/main/webapp/WEB-INF/web.xml +++ b/webapp/src/main/webapp/WEB-INF/web.xml @@ -83,5 +83,17 @@ </cookie-config> </session-config> + <error-page> + <exception-type>java.lang.Throwable</exception-type> + <location>/error.jsp</location> + </error-page> + <error-page> + <error-code>404</error-code> + <location>/error.jsp</location> + </error-page> + <error-page> + <error-code>500</error-code> + <location>/error.jsp</location> + </error-page> </web-app> http://git-wip-us.apache.org/repos/asf/atlas/blob/d8b86833/webapp/src/main/webapp/error.jsp ---------------------------------------------------------------------- diff --git a/webapp/src/main/webapp/error.jsp b/webapp/src/main/webapp/error.jsp new file mode 100644 index 0000000..3683025 --- /dev/null +++ b/webapp/src/main/webapp/error.jsp @@ -0,0 +1,58 @@ +<!doctype html> +<!-- +* 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. +--> +<!--[if gt IE 8]> +<script type="text/javascript"> +function Redirect() { +window.location.assign("login.jsp"); +} +Redirect(); +</script> +<![endif]--> +<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> +<!--[if gt IE 7]> +<script src="js/external_lib/es5-shim.min.js"></script> +<script src="js/external_lib/respond.min.js"></script> +<![endif]--> +<html lang="en"> + +<head> + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <title>Atlas</title> + <link href='https://fonts.googleapis.com/css?family=Raleway:400,400italic,700,700italic' rel='stylesheet' type='text/css'> + <link href="js/libs/font-awesome/css/font-awesome.min.css" rel="stylesheet"> + <link rel="stylesheet" href="js/libs/bootstrap/css/bootstrap.min.css"> + <link rel="stylesheet" type="text/css" href="css/bootstrap-sidebar.css" /> + <link rel="stylesheet" type="text/css" href="css/style.css"> +</head> + +<body> +<div id="wrapper"> + <!-- Page Content Begin --> + <div id="page-content-wrapper"> + <div class="page-title clearfix"> + <h3>Looking for something?</h3> + <p>We're sorry. The web address you're looking for is not a functioning page in Apache Atlas. Please try navigating from <a href="index.html">Apache Atlas Home</a></p> + </div> + </div> + <!-- Page Content End --> +</div> +</body> + +</html>