From c136314ed52d4c482df64bbaa989d849991bb899 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Sat, 6 Apr 2013 09:40:44 -0700 Subject: [PATCH] Branding support for the newly added error page. Change-Id: I49f0a4641bc7f6522006fa0794f6448997d0f9bd Signed-off-by: Madhu Venugopal --- .../main/resources/WEB-INF/jsp/customerror.jsp | 3 +++ .../src/main/resources/WEB-INF/jsp/error.jsp | 17 +++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 opendaylight/web/brandfragment/src/main/resources/WEB-INF/jsp/customerror.jsp diff --git a/opendaylight/web/brandfragment/src/main/resources/WEB-INF/jsp/customerror.jsp b/opendaylight/web/brandfragment/src/main/resources/WEB-INF/jsp/customerror.jsp new file mode 100644 index 0000000000..47de972a87 --- /dev/null +++ b/opendaylight/web/brandfragment/src/main/resources/WEB-INF/jsp/customerror.jsp @@ -0,0 +1,3 @@ +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + + diff --git a/opendaylight/web/root/src/main/resources/WEB-INF/jsp/error.jsp b/opendaylight/web/root/src/main/resources/WEB-INF/jsp/error.jsp index 86625854d1..7b0915ae1d 100644 --- a/opendaylight/web/root/src/main/resources/WEB-INF/jsp/error.jsp +++ b/opendaylight/web/root/src/main/resources/WEB-INF/jsp/error.jsp @@ -1,18 +1,27 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ page import="java.net.URL" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> - OpenDaylight - Error - + + +<% + String filePath = "/WEB-INF/jsp/customerror.jsp"; + URL fileURL = pageContext.getServletContext().getResource(filePath); + if(fileURL!=null) { +%> + +<% } %> + ${title} @@ -32,7 +41,7 @@ - \ No newline at end of file + -- 2.36.6