From 96de75288d952adb072d0a7560dfe84ba5652356 Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Wed, 22 Apr 2015 16:14:32 +0000
Subject: [PATCH] Added users_last_update table, changed script to add record,
added pagenotfound web page and modified web.xml configuration to display
this page when resources are not found
---
sbin/create_dm_db.sh | 3 ++-
src/java/DmWebPortal/web/WEB-INF/web.xml | 6 +++++-
src/java/DmWebPortal/web/views/pagenotfound.xhtml | 12 ++++++++++++
3 files changed, 19 insertions(+), 2 deletions(-)
create mode 100644 src/java/DmWebPortal/web/views/pagenotfound.xhtml
diff --git a/sbin/create_dm_db.sh b/sbin/create_dm_db.sh
index cb57e75f..b29eb7b8 100755
--- a/sbin/create_dm_db.sh
+++ b/sbin/create_dm_db.sh
@@ -182,7 +182,8 @@ DM_DB_TABLES="\
user_system_role \
policy_type \
policy_property \
- allowed_policy_value
+ allowed_policy_value \
+ users_last_update
"
for dbTable in $DM_DB_TABLES; do
dbFile=populate_$dbTable.sql
diff --git a/src/java/DmWebPortal/web/WEB-INF/web.xml b/src/java/DmWebPortal/web/WEB-INF/web.xml
index aeb3a011..4045e75a 100644
--- a/src/java/DmWebPortal/web/WEB-INF/web.xml
+++ b/src/java/DmWebPortal/web/WEB-INF/web.xml
@@ -23,8 +23,12 @@
</welcome-file-list>
<error-page>
<exception-type>javax.faces.application.ViewExpiredException</exception-type>
- <location>/login.xhtml</location>
+ <location>/views/login.xhtml</location>
</error-page>
+ <error-page>
+ <exception-type>com.sun.faces.context.FacesFileNotFoundException</exception-type>
+ <location>/views/pagenotfound.xhtml</location>
+ </error-page>
<security-constraint>
<display-name>Restrict Private Files</display-name>
<web-resource-collection>
diff --git a/src/java/DmWebPortal/web/views/pagenotfound.xhtml b/src/java/DmWebPortal/web/views/pagenotfound.xhtml
new file mode 100644
index 00000000..057c70b1
--- /dev/null
+++ b/src/java/DmWebPortal/web/views/pagenotfound.xhtml
@@ -0,0 +1,12 @@
+<!--<?xml version='1.0' encoding='UTF-8' ?>-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <h:body>
+ <h1>Page not found</h1>
+ </h:body>
+
+</html>
--
GitLab