From 9ccf6082a81e990c30a575cb16ee57a8d1d050bd Mon Sep 17 00:00:00 2001
From: Lucas Li <yzlucas@outlook.com>
Date: Wed, 2 Oct 2024 13:02:47 -0700
Subject: [PATCH 1/2] update the pom file and adding webapp folder

---
 client/wfprev-war/pom.xml                     | 427 ++++++++++++------
 .../src/main/webapp/WEB-INF/urlrewrite.xml    |   9 +
 client/wfprev-war/src/main/webapp/config.jsp  |  39 ++
 client/wfprev-war/src/main/webapp/index.html  |  12 +
 4 files changed, 337 insertions(+), 150 deletions(-)
 create mode 100644 client/wfprev-war/src/main/webapp/WEB-INF/urlrewrite.xml
 create mode 100644 client/wfprev-war/src/main/webapp/config.jsp
 create mode 100644 client/wfprev-war/src/main/webapp/index.html

diff --git a/client/wfprev-war/pom.xml b/client/wfprev-war/pom.xml
index 60933e4c8..7d580d999 100644
--- a/client/wfprev-war/pom.xml
+++ b/client/wfprev-war/pom.xml
@@ -1,69 +1,250 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>ca.bc.gov.nrs.wfprev</groupId>
 		<artifactId>wfprev-parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.3.0</version>
 	</parent>
 	<artifactId>wfprev-war</artifactId>
 	<packaging>war</packaging>
 	<name>wfprev-war</name>
 	<url>http://maven.apache.org</url>
 	<properties>
-		<build.number>${env.BUILD_NUMBER}</build.number>
+		<build.number>#{BUILD_NUMBER}#</build.number>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<dollar>$</dollar>
-	    <node.version>v18.10.0</node.version>
-        <npm.version>8.19.4</npm.version>
+    <node.version>v18.10.0</node.version>
+    <npm.version>8.19.4</npm.version>
 		<node.path>${user.home}/.node</node.path>
 		<typescript.path>src/main/angular</typescript.path>
 		<npm.url>https://bwa.nrs.gov.bc.ca/int/artifactory/api/npm/nrs-virtual-npm/</npm.url>
-		<sonar.skip>true</sonar.skip>
 	</properties>
+	<profiles>
+		<profile>
+			<id>ci</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>com.github.eirslett</groupId>
+						<artifactId>frontend-maven-plugin</artifactId>
+						<version>1.11.3</version>
+						<configuration>
+							<nodeVersion>${node.version}</nodeVersion>
+							<npmVersion>${npm.version}</npmVersion>
+							<workingDirectory>${typescript.path}</workingDirectory>
+							<installDirectory>${node.path}</installDirectory>
+						</configuration>						
+						<executions>
+							<execution>
+								<id>install node and npm for ci</id>
+								<phase>initialize</phase>
+								<goals>
+									<goal>install-node-and-npm</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>npm install for ci</id>
+								<phase>initialize</phase>
+								<goals>
+									<goal>npm</goal>
+								</goals>
+								<configuration>
+									<arguments>install -no-package-lock --registry=${npm.url}</arguments>
+								</configuration>
+							</execution>
+							<execution>
+								<id>npm run-script test-and-coverage</id>
+								<phase>test</phase>
+								<goals>
+									<goal>npm</goal>
+								</goals>
+								<configuration>
+									<arguments>run-script test-and-coverage</arguments>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>package</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-war-plugin</artifactId>
+						<version>3.3.1</version>
+						<configuration>
+							<failOnMissingWebXml>false</failOnMissingWebXml>
+							<packagingExcludes>WEB-INF/web.xml</packagingExcludes>
+							<webResources>
+								<resource>
+									<directory>${basedir}/target/angular</directory>
+									<includes>
+										<include>assets/**/*.*</include>
+										<include>*.*</include>
+									</includes>
+								</resource>
+								<resource>
+									<directory>src/main/webapp</directory>
+								</resource>
+							</webResources>
+
+						</configuration>
+
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>3.4.1</version>
+						<configuration>
+							<source>${java-target-version}</source>
+						</configuration>
+						<executions>
+							<execution>
+								<id>attach-javadocs</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-source-plugin</artifactId>
+						<version>2.2.1</version>
+						<executions>
+							<execution>
+								<id>attach-sources</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<version>2.1</version>
+						<configuration>
+							<source>${java-source-version}</source>
+							<target>${java-target-version}</target>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<version>2.5.5</version>
+						<executions>
+							<execution>
+								<id>create-distribution</id>
+								<phase>prepare-package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptorSourceDirectory>src/cd/assemblies</descriptorSourceDirectory>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>com.github.eirslett</groupId>
+						<artifactId>frontend-maven-plugin</artifactId>
+						<version>1.11.3</version>
+						<configuration>
+							<nodeVersion>${node.version}</nodeVersion>
+							<npmVersion>${npm.version}</npmVersion>
+							<workingDirectory>${typescript.path}</workingDirectory>
+							<installDirectory>${node.path}</installDirectory>
+						</configuration>
+						<executions>
+							<execution>
+								<id>install node and npm</id>
+								<phase>initialize</phase>
+								<goals>
+									<goal>install-node-and-npm</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>npm install</id>
+								<phase>initialize</phase>
+								<goals>
+									<goal>npm</goal>
+								</goals>
+								<configuration>
+									<arguments>install -no-package-lock --puppeteer_skip_chromium_download=true --registry=${npm.url}</arguments>
+								</configuration>
+							</execution>
+							<execution>
+								<id>npm run-script mavenbuild</id>
+								<phase>compile</phase>
+								<goals>
+									<goal>npm</goal>
+								</goals>
+								<configuration>
+									<arguments>run-script mavenbuild</arguments>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
 	<dependencies>
 
-		<!-- Webade OAUTH2 -->
 		<dependency>
-			<groupId>ca.bc.gov.nrs.wfone.common</groupId>
-			<artifactId>wfone-common-webade-oauth2</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>ca.bc.gov.nrs.wfone.common</groupId>
-			<artifactId>wfone-common-webade-oauth2-test</artifactId>
+			<groupId>javax.ws.rs</groupId>
+			<artifactId>javax.ws.rs-api</artifactId>
 		</dependency>
 
-		<!-- Spring -->
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
+			<groupId>org.glassfish.jersey.core</groupId>
+			<artifactId>jersey-common</artifactId>
 		</dependency>
+		
+		<!-- API, java.xml.bind module -->
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>2.3.2</version>
 		</dependency>
+		<!-- Runtime, com.sun.xml.bind module -->
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-aop</artifactId>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+			<version>2.3.2</version>
 		</dependency>
+
+		<!-- Webade OAUTH2 -->
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
+			<groupId>ca.bc.gov.nrs.wfone.common</groupId>
+			<artifactId>wfone-common-webade-oauth2</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
+			<groupId>ca.bc.gov.nrs.wfone.common</groupId>
+			<artifactId>wfone-common-webade-oauth2-test</artifactId>
 		</dependency>
+
+		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-		</dependency> 
+		</dependency>
 
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<scope>provided</scope>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-jdbc</artifactId>
 		</dependency>
 
 		<!-- Spring Security -->
@@ -71,24 +252,32 @@
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-core</artifactId>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-web</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-web</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-config</artifactId>
 		</dependency>
 
-		<!-- Spring Security OAuth -->
 		<dependency>
-			<groupId>org.springframework.security.oauth</groupId>
-			<artifactId>spring-security-oauth2</artifactId>
+			<groupId>org.tuckey</groupId>
+			<artifactId>urlrewritefilter</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.tuckey</groupId>
-			<artifactId>urlrewritefilter</artifactId>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<scope>provided</scope>
 		</dependency>
 
 		<!-- Logging -->
@@ -101,21 +290,66 @@
 			<artifactId>jcl-over-slf4j</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-api</artifactId>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
+			<groupId>log4j</groupId>
+			<artifactId>apache-log4j-extras</artifactId>
 		</dependency>
 
-		</dependencies>
+		<!-- ORACLE database driver -->
+		<dependency>
+			<groupId>com.oracle.weblogic</groupId>
+			<artifactId>ojdbc7</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- Jetty -->
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-server</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-annotations</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-webapp</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-jndi</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-plus</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-jsp</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
 	<build>
-		<!-- Configure the resources to be filtered for property replacement -->
+		<!-- Configure the resources to be filtered for componentId replacement -->
 		<resources>
 			<resource>
 				<directory>src/main/resources</directory>
@@ -123,114 +357,7 @@
 			</resource>
 		</resources>
 		<plugins>
-			<!-- <plugin>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-				  <failOnMissingWebXml>false</failOnMissingWebXml>
-					<packagingExcludes>WEB-INF/web.xml</packagingExcludes>
-					<webResources>
-					  <resource>
-						<directory>${basedir}/target/angular</directory>
-						<includes>
-						  <include>assets/**/*.*</include>
-						  <include>*.*</include>
-						</includes>
-					  </resource>
-					  <resource>
-						<directory>src/main/webapp</directory>
-					  </resource>
-					</webResources>
-
-				</configuration>
-
-			</plugin> -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>${java-source-version}</source>
-					<target>${java-target-version}</target>
-				</configuration>
-			</plugin>
-			<!-- <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>create-distribution</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-						<descriptorSourceDirectory>src/cd/assemblies</descriptorSourceDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin> -->
-            <plugin>
-				<groupId>com.github.eirslett</groupId>
-				<artifactId>frontend-maven-plugin</artifactId>
-				<configuration>
-					<nodeVersion>${node.version}</nodeVersion>
-					<npmVersion>${npm.version}</npmVersion>
-					<workingDirectory>${typescript.path}</workingDirectory>
-					<installDirectory>${node.path}</installDirectory>
-				</configuration>
-				<executions>
-					<execution>
-						<id>install node and npm</id>
-						<phase>initialize</phase>
-						<goals>
-							<goal>install-node-and-npm</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>npm install</id>
-						<phase>initialize</phase>
-						<goals>
-							<goal>npm</goal>
-						</goals>
-						<configuration>
-							<arguments>install --legacy-peer-deps --no-package-lock --registry=${npm.url}</arguments>
-						</configuration>
-					</execution>
-					<execution>
-						<id>npm run-script mavenbuild</id>
-						<phase>compile</phase>
-						<goals>
-							<goal>npm</goal>
-						</goals>
-						<configuration>
-							<arguments>run-script mavenbuild</arguments>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+
 		</plugins>
 	</build>
 </project>
diff --git a/client/wfprev-war/src/main/webapp/WEB-INF/urlrewrite.xml b/client/wfprev-war/src/main/webapp/WEB-INF/urlrewrite.xml
new file mode 100644
index 000000000..d0e5ee200
--- /dev/null
+++ b/client/wfprev-war/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -0,0 +1,9 @@
+<urlrewrite>
+	<rule match-type="regex" enabled="true">
+		<condition type="request-filename" operator="notfile" />
+		<condition type="request-filename" operator="notdir" />
+		<condition type="request-uri" operator="notequal">(\.html|\.js|\.png|\.gif|\.jpg|\.css|\.svg|\.ico|\.pdf)</condition>
+		<from>^/(.*)$</from>
+		<to last="true">/index.html</to>
+	</rule>
+</urlrewrite>
\ No newline at end of file
diff --git a/client/wfprev-war/src/main/webapp/config.jsp b/client/wfprev-war/src/main/webapp/config.jsp
new file mode 100644
index 000000000..8ec4fa3f7
--- /dev/null
+++ b/client/wfprev-war/src/main/webapp/config.jsp
@@ -0,0 +1,39 @@
+<%@ page import="org.springframework.context.ApplicationContext" %>
+<%@ page import="org.springframework.web.context.support.WebApplicationContextUtils" %>
+<%@ page import="java.util.Properties" %>
+
+<%
+  ApplicationContext context = WebApplicationContextUtils.getWebApplicationContext(application);
+  Properties properties = (Properties) context.getBean("applicationProperties");
+
+  if (properties != null) {
+    String baseUrl = properties.getProperty("base.url", "");
+
+    String json = "{";
+
+    // General Application Section
+    json = json.concat("\"application\":{");
+    json = json.concat("\"acronym\":\"").concat(properties.getProperty("project.acronym", "")).concat("\"").concat(",");
+    json = json.concat("\"version\":\"").concat(properties.getProperty("application.version", "")).concat("\"").concat(",");
+    json = json.concat("\"buildNumber\":\"").concat(properties.getProperty("build.number", "")).concat("\"").concat(",");
+    json = json.concat("\"environment\":\"").concat(properties.getProperty("default.application.environment", "")).concat("\"").concat(",");
+    json = json.concat("\"baseUrl\":\"").concat(baseUrl).concat("\"");
+    json = json.concat("},");
+
+    // REST API Section (assuming you still want to keep the REST API properties)
+    json = json.concat("\"rest\":{");
+    json = json.concat("},");
+
+    // WebADE OAuth Section (if still needed)
+    json = json.concat("\"webade\":{");
+    json = json.concat("\"oauth2Url\":\"").concat(properties.getProperty("webade-oauth2.authorize.url", "")).concat("\"").concat(",");
+    json = json.concat("\"clientId\":\"").concat("WFPREV_UI").concat("\"");
+    json = json.concat("}");
+
+    json = json.concat("}");
+
+    out.write(json);
+  } else {
+    out.write("{}");
+  }
+%>
diff --git a/client/wfprev-war/src/main/webapp/index.html b/client/wfprev-war/src/main/webapp/index.html
new file mode 100644
index 000000000..672c1a9df
--- /dev/null
+++ b/client/wfprev-war/src/main/webapp/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="ISO-8859-1">
+<title>Wildfire Resources</title>
+</head>
+<body>
+
+	<b>This is the index.</b>
+
+</body>
+</html>
\ No newline at end of file

From e8d83e80c562d2f11c1ebb7eb661816234cf5dc1 Mon Sep 17 00:00:00 2001
From: Lucas Li <yzlucas@outlook.com>
Date: Wed, 2 Oct 2024 13:04:54 -0700
Subject: [PATCH 2/2] update the pom file and adding webapp folder

---
 client/wfprev-war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/wfprev-war/pom.xml b/client/wfprev-war/pom.xml
index 7d580d999..e907d54ef 100644
--- a/client/wfprev-war/pom.xml
+++ b/client/wfprev-war/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.bc.gov.nrs.wfprev</groupId>
 		<artifactId>wfprev-parent</artifactId>
-		<version>1.3.0</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>wfprev-war</artifactId>
 	<packaging>war</packaging>