From 14d9e8897f5cd00e98c6c90eeab69015bc89816d Mon Sep 17 00:00:00 2001
From: iadgovuser29 <33426478+iadgovuser29@users.noreply.github.com>
Date: Tue, 27 Jun 2023 14:05:25 -0400
Subject: [PATCH] Reverted page tag value

---
 .../src/main/resources/application.properties                  | 3 ++-
 HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/tags/page.tag | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/HIRS_AttestationCAPortal/src/main/resources/application.properties b/HIRS_AttestationCAPortal/src/main/resources/application.properties
index 959a978d..c1ffcf6a 100644
--- a/HIRS_AttestationCAPortal/src/main/resources/application.properties
+++ b/HIRS_AttestationCAPortal/src/main/resources/application.properties
@@ -24,7 +24,8 @@ server.tomcat.accesslog.rotate=true
 
 server.tomcat.basedir=/opt/embeddedtomcat
 server.servlet.register-default-servlet=true
-server.servlet.context-path=/HIRS_AttestationCAPortal/portal
+server.servlet.context-path=/HIRS_AttestationCAPortal
+spring.mvc.servlet.path=/portal
 
 #jdbc.driverClassName = com.mysql.cj.jdbc.Driver
 #jdbc.url = jdbc:mysql://localhost:3306/hirs_db?autoReconnect=true&useSSL=false
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/tags/page.tag b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/tags/page.tag
index 6e090d44..bacdde8e 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/tags/page.tag
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/tags/page.tag
@@ -13,7 +13,7 @@
 <c:set var="icons" value="${images}/icons" scope="session" />
 <c:set var="common" value="${baseURL}/common" scope="session" />
 <c:set var="lib" value="${baseURL}/lib" scope="session" />
-<c:set var="portal" value="${baseURL}" scope="session" />
+<c:set var="portal" value="${baseURL}/portal" scope="session" />
 <c:set var="pagePath" value="${portal}/${page.prefixPath}${page.viewName}" scope="session" />
 <c:set var="certificateRequest" value="${portal}/certificate-request" scope="session" />