From 11dd3a9397c12ff7f02a444e9d7d6628d2d4217b Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Wed, 30 Aug 2023 10:58:15 -0400 Subject: [PATCH 1/3] A static 404 page to replace the dynamic 404.xhtml page that's been throwing errors under p6 on account of some conflict with prettyfaces rewrite. (#9770) --- .../iq/dataverse/NavigationWrapper.java | 3 +- src/main/webapp/404static.xhtml | 110 ++++++++++++++++++ src/main/webapp/WEB-INF/web.xml | 2 +- 3 files changed, 113 insertions(+), 2 deletions(-) create mode 100644 src/main/webapp/404static.xhtml diff --git a/src/main/java/edu/harvard/iq/dataverse/NavigationWrapper.java b/src/main/java/edu/harvard/iq/dataverse/NavigationWrapper.java index d2c522b5c89..832d7ec19ef 100644 --- a/src/main/java/edu/harvard/iq/dataverse/NavigationWrapper.java +++ b/src/main/java/edu/harvard/iq/dataverse/NavigationWrapper.java @@ -96,7 +96,8 @@ private String sendError(int errorCode) { try { context.getExternalContext().responseSendError(errorCode,null); } catch (IOException ex) { - Logger.getLogger(PermissionsWrapper.class.getName()).log(Level.SEVERE, null, ex); + //Logger.getLogger(PermissionsWrapper.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(NavigationWrapper.class.getName()).fine("Caught exception in sendError(): "+ex.getMessage()); } context.responseComplete(); return ""; diff --git a/src/main/webapp/404static.xhtml b/src/main/webapp/404static.xhtml new file mode 100644 index 00000000000..7abf2feb49a --- /dev/null +++ b/src/main/webapp/404static.xhtml @@ -0,0 +1,110 @@ + + + + + Dataverse - Not Found + + + + + + + + + + + + + + + + + + + +
+ + +
+
+ + +
+ + + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index f16da2c8e5b..427615f2f0b 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -7,7 +7,7 @@ 404 - /404.xhtml + /404static.xhtml 500 From b60c258c4ca8d935ddb2e1747e0f768d4a2affed Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Wed, 30 Aug 2023 11:38:49 -0400 Subject: [PATCH 2/3] (Realized that I had the words "Harvard Dataverse" in that static page. Replaced them with the more neutral "Dataverse Project") #9770 --- src/main/webapp/404static.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/404static.xhtml b/src/main/webapp/404static.xhtml index 7abf2feb49a..f1b24116ebc 100644 --- a/src/main/webapp/404static.xhtml +++ b/src/main/webapp/404static.xhtml @@ -72,7 +72,7 @@