From 2bb5b25c7abba1248b63c4f60b95c07ce783a6e4 Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 27 Sep 2011 14:52:38 +0000 Subject: [PATCH] NIHVIVO-336 Show the name of the app (context path) in the raw startup-status display. --- .../webapp/filters/StartupStatusDisplayFilter.java | 12 +++++++++++- .../body/admin/startupStatus-displayRaw.ftl | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java index da332272c..347e14088 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java @@ -68,8 +68,9 @@ public class StartupStatusDisplayFilter implements Filter { try { Map bodyMap = new HashMap(); - bodyMap.put("status", StartupStatus.getBean(ctx)); + bodyMap.put("status", ss); bodyMap.put("showLink", !isFatal()); + bodyMap.put("contextPath", getContextPath()); hResp.setStatus(SC_INTERNAL_SERVER_ERROR); Template tpl = loadFreemarkerTemplate(); @@ -79,6 +80,15 @@ public class StartupStatusDisplayFilter implements Filter { } } + private String getContextPath() { + String cp = ctx.getContextPath(); + if ((cp == null) || cp.isEmpty()) { + return "The application"; + } else { + return cp; + } + } + private Template loadFreemarkerTemplate() throws IOException { Configuration cfg = new Configuration(); cfg.setTemplateLoader(new WebappTemplateLoader(ctx)); diff --git a/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl b/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl index 9918816d2..649d0582d 100644 --- a/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl +++ b/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl @@ -79,7 +79,7 @@ <#if status.errorItems?has_content>

Fatal error

-

VIVO detected a fatal error during startup.

+

${contextPath} detected a fatal error during startup.

<#if showLink>

Continue

@@ -90,7 +90,7 @@ <#if status.warningItems?has_content>

Warning

-

VIVO issued warnings during startup.

+

${contextPath} found problems during startup.

<#if showLink>

Continue