Page loads

This commit is contained in:
iadgovuser29 2023-06-26 09:15:54 -04:00
parent e133b5040b
commit 7b6ef6b751
4 changed files with 36 additions and 29 deletions

View File

@ -46,6 +46,7 @@ dependencies {
implementation 'commons-fileupload:commons-fileupload:1.5' implementation 'commons-fileupload:commons-fileupload:1.5'
implementation 'org.junit.jupiter:junit-jupiter:5.4.2' implementation 'org.junit.jupiter:junit-jupiter:5.4.2'
implementation 'org.junit.jupiter:junit-jupiter:5.4.2' implementation 'org.junit.jupiter:junit-jupiter:5.4.2'
implementation 'org.apache.tomcat.embed:tomcat-embed-jasper:10.1.5'
compileOnly 'org.projectlombok:lombok' compileOnly 'org.projectlombok:lombok'
runtimeOnly 'org.mariadb.jdbc:mariadb-java-client' runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'
@ -56,13 +57,13 @@ dependencies {
testImplementation libs.testng testImplementation libs.testng
} }
war { //war {
from(buildDir) { // from(buildDir) {
include 'VERSION' // include 'VERSION'
into 'WEB-INF/classes' // into 'WEB-INF/classes'
} // }
archiveFileName = 'HIRS_AttestationCAPortal.war' // archiveFileName = 'HIRS_AttestationCAPortal.war'
} //}
ospackage { ospackage {
packageName = 'HIRS_AttestationCA' packageName = 'HIRS_AttestationCA'

View File

@ -15,26 +15,27 @@ import org.springframework.web.servlet.DispatcherServlet;
import java.util.Collections; import java.util.Collections;
@SpringBootApplication @SpringBootApplication
@EnableAutoConfiguration //@EnableAutoConfiguration
@Log4j2 //@Log4j2
public class HIRSApplication extends SpringBootServletInitializer { public class HIRSApplication {//extends SpringBootServletInitializer {
@Override // @Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { // protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(HIRSApplication.class); // return application.sources(HIRSApplication.class);
} // }
@Override // @Override
public void onStartup(ServletContext servletContext) throws ServletException { // public void onStartup(ServletContext servletContext) throws ServletException {
ServletRegistration.Dynamic appServlet = servletContext.addServlet("mvc", new DispatcherServlet( // ServletRegistration.Dynamic appServlet = servletContext.addServlet("mvc", new DispatcherServlet(
new GenericWebApplicationContext())); // new GenericWebApplicationContext()));
appServlet.setLoadOnStartup(1); // appServlet.setLoadOnStartup(1);
} // }
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication springApplication = new SpringApplication(HIRSApplication.class); // SpringApplication springApplication = new SpringApplication(HIRSApplication.class);
springApplication.setDefaultProperties(Collections.singletonMap("server.servlet.context-path", "/portal")); // springApplication.setDefaultProperties(Collections.singletonMap("server.servlet.context-path", "/portal"));
springApplication.run(args); // springApplication.run(args);
SpringApplication.run(HIRSApplication.class, args);
} }
} }

View File

@ -1,9 +1,10 @@
server.error.path=/error #server.error.path=/error
spring.mvc.view.prefix=/WEB-INF/jsp/ #spring.mvc.view.prefix=/WEB-INF/jsp/
spring.mvc.view.suffix=.jsp #spring.mvc.view.suffix=.jsp
logging.level.org.springframework=INFO logging.level.org.springframework=INFO
logging.level.org.apache.catalina=DEBUG
spring.jpa.hibernate.ddl-auto=update spring.jpa.hibernate.ddl-auto=update
spring.datasource.url=jdbc:mariadb://localhost:3306/hirs_db?autoReconnect=true&useSSL=false spring.datasource.url=jdbc:mariadb://localhost:3306/hirs_db?autoReconnect=true&useSSL=false
spring.datasource.username=hirs_db spring.datasource.username=hirs_db
@ -21,6 +22,10 @@ server.tomcat.accesslog.prefix=access_log
server.tomcat.accesslog.suffix=.log server.tomcat.accesslog.suffix=.log
server.tomcat.accesslog.rotate=true server.tomcat.accesslog.rotate=true
server.tomcat.basedir=/opt/embeddedtomcat
server.servlet.register-default-servlet=true
server.servlet.context-path=/HIRS_AttestationCAPortal/portal
#jdbc.driverClassName = com.mysql.cj.jdbc.Driver #jdbc.driverClassName = com.mysql.cj.jdbc.Driver
#jdbc.url = jdbc:mysql://localhost:3306/hirs_db?autoReconnect=true&useSSL=false #jdbc.url = jdbc:mysql://localhost:3306/hirs_db?autoReconnect=true&useSSL=false
#jdbc.username = root #jdbc.username = root

View File

@ -13,7 +13,7 @@
<c:set var="icons" value="${images}/icons" scope="session" /> <c:set var="icons" value="${images}/icons" scope="session" />
<c:set var="common" value="${baseURL}/common" scope="session" /> <c:set var="common" value="${baseURL}/common" scope="session" />
<c:set var="lib" value="${baseURL}/lib" scope="session" /> <c:set var="lib" value="${baseURL}/lib" scope="session" />
<c:set var="portal" value="${baseURL}/portal" scope="session" /> <c:set var="portal" value="${baseURL}" scope="session" />
<c:set var="pagePath" value="${portal}/${page.prefixPath}${page.viewName}" scope="session" /> <c:set var="pagePath" value="${portal}/${page.prefixPath}${page.viewName}" scope="session" />
<c:set var="certificateRequest" value="${portal}/certificate-request" scope="session" /> <c:set var="certificateRequest" value="${portal}/certificate-request" scope="session" />