cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/4.5 to 112cecc
Date Mon, 18 May 2015 22:11:28 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 bc636de12 -> 112cecc2d


ui: add custom error handling page

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

This closes #256


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/112cecc2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/112cecc2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/112cecc2

Branch: refs/heads/4.5
Commit: 112cecc2d4e44d032fb57d9794b02fe694122447
Parents: bc636de
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Mon May 18 22:09:11 2015 +0100
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Mon May 18 23:11:11 2015 +0100

----------------------------------------------------------------------
 client/WEB-INF/web.xml |  6 ++++++
 ui/error.jsp           | 12 ++++++++++++
 2 files changed, 18 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/112cecc2/client/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/client/WEB-INF/web.xml b/client/WEB-INF/web.xml
index 7ccfc31..a384f06 100644
--- a/client/WEB-INF/web.xml
+++ b/client/WEB-INF/web.xml
@@ -77,4 +77,10 @@
         <url-pattern>*.html</url-pattern>
         <url-pattern>*.js</url-pattern>
     </servlet-mapping>
+
+    <error-page>
+      <exception-type>java.lang.Exception</exception-type>
+      <location>/error.jsp</location>
+    </error-page>
+
 </web-app>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/112cecc2/ui/error.jsp
----------------------------------------------------------------------
diff --git a/ui/error.jsp b/ui/error.jsp
new file mode 100644
index 0000000..88fdfa1
--- /dev/null
+++ b/ui/error.jsp
@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>Apache CloudStack</title>
+        <link rel="shortcut icon" href="images/cloud.ico" />
+    </head>
+    <body>
+        <p>Oops, looks like CloudStack hit an error. Ask your CloudStack Administrator
to look into it.</p>
+    </body>
+</html>


Mime
View raw message