Skip to content

Commit 2797324

Browse files
yzlucasyzlucas
authored
re-structure the client folder (#14)
1 parent 56ff754 commit 2797324

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+24133
-68
lines changed

‎client/wfprev/.gitignore‎ renamed to ‎client/.gitignore‎

File renamed without changes.

‎client/wfprev/Dockerfile‎ renamed to ‎client/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Use Tomcat 10 instead of Tomcat 9
2-
FROM tomcat:10.1.12-jdk17-openjdk
2+
FROM tomcat:10.1-jdk17-corretto
33

4-
COPY /wfnews-war/target/wfnews-war-1.0.0.war .
4+
COPY /wfprev/target/wfprev-1.0.0-SNAPSHOT.war .
55

66
ENV TOMCAT_HOME=/usr/local/tomcat \
77
CATALINA_HOME=/usr/local/tomcat \

‎client/wfprev/README.md‎ renamed to ‎client/README.md‎

File renamed without changes.

‎client/pom.xml‎

Lines changed: 186 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>ca.bc.gov.nrs.wfprev</groupId>
6+
<artifactId>wfprev-parent</artifactId>
7+
<version>1.0.0-SNAPSHOT</version>
8+
<packaging>pom</packaging>
9+
<name>wfprev-parent</name>
10+
<modules>
11+
<module>wfprev-ear</module>
12+
<module>wfprev-war</module>
13+
</modules>
14+
<properties>
15+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16+
<java-source-version>17</java-source-version>
17+
<java-target-version>17</java-target-version>
18+
</properties>
19+
20+
<dependencyManagement>
21+
<dependencies>
22+
23+
<!-- Webade OAUTH2 -->
24+
<dependency>
25+
<groupId>ca.bc.gov.nrs.wfone.common</groupId>
26+
<artifactId>wfone-common-webade-oauth2</artifactId>
27+
<version>1.3.0</version>
28+
</dependency>
29+
<dependency>
30+
<groupId>ca.bc.gov.nrs.wfone.common</groupId>
31+
<artifactId>wfone-common-webade-oauth2-test</artifactId>
32+
<version>1.3.0</version>
33+
</dependency>
34+
<!-- Spring -->
35+
<dependency>
36+
<groupId>org.springframework</groupId>
37+
<artifactId>spring-core</artifactId>
38+
<version>5.3.20</version>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.springframework</groupId>
42+
<artifactId>spring-expression</artifactId>
43+
<version>5.3.20</version>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.springframework</groupId>
47+
<artifactId>spring-beans</artifactId>
48+
<version>5.3.20</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.springframework</groupId>
52+
<artifactId>spring-aop</artifactId>
53+
<version>5.3.20</version>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.springframework</groupId>
57+
<artifactId>spring-context</artifactId>
58+
<version>5.3.20</version>
59+
</dependency>
60+
<dependency>
61+
<groupId>org.springframework</groupId>
62+
<artifactId>spring-web</artifactId>
63+
<version>5.3.20</version>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.springframework</groupId>
67+
<artifactId>spring-webmvc</artifactId>
68+
<version>5.3.20</version>
69+
</dependency>
70+
<!-- Spring Security -->
71+
<dependency>
72+
<groupId>org.springframework.security</groupId>
73+
<artifactId>spring-security-core</artifactId>
74+
<version>5.5.7</version>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.springframework.security</groupId>
78+
<artifactId>spring-security-web</artifactId>
79+
<version>5.5.7</version>
80+
</dependency>
81+
<dependency>
82+
<groupId>org.springframework.security</groupId>
83+
<artifactId>spring-security-config</artifactId>
84+
<version>5.5.7</version>
85+
</dependency>
86+
87+
<!-- Spring Security OAuth -->
88+
<dependency>
89+
<groupId>org.springframework.security.oauth</groupId>
90+
<artifactId>spring-security-oauth2</artifactId>
91+
<version>2.5.2.RELEASE</version>
92+
</dependency>
93+
94+
<dependency>
95+
<groupId>org.tuckey</groupId>
96+
<artifactId>urlrewritefilter</artifactId>
97+
<version>4.0.4</version>
98+
</dependency>
99+
100+
<dependency>
101+
<groupId>javax.servlet</groupId>
102+
<artifactId>javax.servlet-api</artifactId>
103+
<version>4.0.1</version>
104+
</dependency>
105+
106+
<!-- Logging -->
107+
<dependency>
108+
<groupId>org.slf4j</groupId>
109+
<artifactId>slf4j-api</artifactId>
110+
<version>1.7.36</version>
111+
</dependency>
112+
<dependency>
113+
<groupId>org.slf4j</groupId>
114+
<artifactId>jcl-over-slf4j</artifactId>
115+
<version>1.7.36</version>
116+
</dependency>
117+
<dependency>
118+
<groupId>org.apache.logging.log4j</groupId>
119+
<artifactId>log4j-slf4j-impl</artifactId>
120+
<version>2.17.2</version>
121+
</dependency>
122+
<dependency>
123+
<groupId>org.apache.logging.log4j</groupId>
124+
<artifactId>log4j-api</artifactId>
125+
<version>2.17.2</version>
126+
</dependency>
127+
<dependency>
128+
<groupId>org.apache.logging.log4j</groupId>
129+
<artifactId>log4j-core</artifactId>
130+
<version>2.17.2</version>
131+
</dependency>
132+
133+
</dependencies>
134+
</dependencyManagement>
135+
136+
<build>
137+
<pluginManagement>
138+
<plugins>
139+
<plugin>
140+
<artifactId>maven-war-plugin</artifactId>
141+
<version>3.2.2</version>
142+
</plugin>
143+
<plugin>
144+
<groupId>org.apache.maven.plugins</groupId>
145+
<artifactId>maven-javadoc-plugin</artifactId>
146+
<version>2.9.1</version>
147+
</plugin>
148+
<plugin>
149+
<groupId>org.apache.maven.plugins</groupId>
150+
<artifactId>maven-source-plugin</artifactId>
151+
<version>2.2.1</version>
152+
</plugin>
153+
<plugin>
154+
<groupId>org.apache.maven.plugins</groupId>
155+
<artifactId>maven-compiler-plugin</artifactId>
156+
<version>2.1</version>
157+
</plugin>
158+
<plugin>
159+
<groupId>org.apache.maven.plugins</groupId>
160+
<artifactId>maven-assembly-plugin</artifactId>
161+
<version>2.5.5</version>
162+
</plugin>
163+
<plugin>
164+
<groupId>com.github.eirslett</groupId>
165+
<artifactId>frontend-maven-plugin</artifactId>
166+
<version>1.6</version>
167+
</plugin>
168+
<plugin>
169+
<groupId>org.apache.maven.plugins</groupId>
170+
<artifactId>maven-ear-plugin</artifactId>
171+
<version>2.8</version>
172+
</plugin>
173+
<plugin>
174+
<groupId>org.eclipse.m2e</groupId>
175+
<artifactId>lifecycle-mapping</artifactId>
176+
<version>1.0.0</version>
177+
</plugin>
178+
<plugin>
179+
<groupId>org.apache.maven.plugins</groupId>
180+
<artifactId>maven-help-plugin</artifactId>
181+
<version>2.2</version>
182+
</plugin>
183+
</plugins>
184+
</pluginManagement>
185+
</build>
186+
</project>

‎client/wfprev-ear/pom.xml‎

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
<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">
2+
<modelVersion>4.0.0</modelVersion>
3+
<parent>
4+
<groupId>ca.bc.gov.nrs.wfprev</groupId>
5+
<artifactId>wfprev-parent</artifactId>
6+
<version>1.0.0-SNAPSHOT</version>
7+
</parent>
8+
<artifactId>wfprev-ear</artifactId>
9+
<packaging>ear</packaging>
10+
<name>wfprev-ear</name>
11+
<url>http://maven.apache.org</url>
12+
<dependencies>
13+
14+
<dependency>
15+
<groupId>ca.bc.gov.nrs.wfprev</groupId>
16+
<artifactId>wfprev-war</artifactId>
17+
<version>${project.parent.version}</version>
18+
<type>war</type>
19+
</dependency>
20+
21+
</dependencies>
22+
<build>
23+
<plugins>
24+
<plugin>
25+
<groupId>org.apache.maven.plugins</groupId>
26+
<artifactId>maven-ear-plugin</artifactId>
27+
<configuration>
28+
<version>1.4</version>
29+
<applicationName>wfprev-ear</applicationName>
30+
<fileNameMapping>no-version</fileNameMapping>
31+
<modules>
32+
<webModule>
33+
<groupId>ca.bc.gov.nrs.wfprev</groupId>
34+
<artifactId>wfprev-war</artifactId>
35+
<contextRoot>wfprev</contextRoot>
36+
</webModule>
37+
</modules>
38+
</configuration>
39+
</plugin>
40+
<plugin>
41+
<groupId>org.apache.maven.plugins</groupId>
42+
<artifactId>maven-javadoc-plugin</artifactId>
43+
<executions>
44+
<execution>
45+
<id>attach-javadocs</id>
46+
<goals>
47+
<goal>jar</goal>
48+
</goals>
49+
</execution>
50+
</executions>
51+
</plugin>
52+
<plugin>
53+
<groupId>org.apache.maven.plugins</groupId>
54+
<artifactId>maven-source-plugin</artifactId>
55+
<executions>
56+
<execution>
57+
<id>attach-sources</id>
58+
<goals>
59+
<goal>jar</goal>
60+
</goals>
61+
</execution>
62+
</executions>
63+
</plugin>
64+
<plugin>
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-compiler-plugin</artifactId>
67+
<configuration>
68+
<source>${java-source-version}</source>
69+
<target>${java-target-version}</target>
70+
</configuration>
71+
</plugin>
72+
<plugin>
73+
<groupId>org.apache.maven.plugins</groupId>
74+
<artifactId>maven-help-plugin</artifactId>
75+
<executions>
76+
<execution>
77+
<phase>generate-resources</phase>
78+
<goals>
79+
<goal>effective-pom</goal>
80+
</goals>
81+
<configuration>
82+
<output>${project.build.directory}/effective-pom.xml</output>
83+
</configuration>
84+
</execution>
85+
</executions>
86+
</plugin>
87+
<plugin>
88+
<groupId>org.apache.maven.plugins</groupId>
89+
<artifactId>maven-assembly-plugin</artifactId>
90+
<version>2.2-beta-5</version>
91+
<executions>
92+
<execution>
93+
<id>create-distribution</id>
94+
<phase>prepare-package</phase>
95+
<goals>
96+
<goal>single</goal>
97+
</goals>
98+
<configuration>
99+
<descriptorSourceDirectory>src/cd/assemblies</descriptorSourceDirectory>
100+
</configuration>
101+
</execution>
102+
</executions>
103+
</plugin>
104+
</plugins>
105+
<pluginManagement>
106+
<plugins>
107+
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
108+
<plugin>
109+
<groupId>org.eclipse.m2e</groupId>
110+
<artifactId>lifecycle-mapping</artifactId>
111+
<configuration>
112+
<lifecycleMappingMetadata>
113+
<pluginExecutions>
114+
<pluginExecution>
115+
<pluginExecutionFilter>
116+
<groupId>
117+
org.apache.maven.plugins
118+
</groupId>
119+
<artifactId>
120+
maven-help-plugin
121+
</artifactId>
122+
<versionRange>
123+
[2.2,)
124+
</versionRange>
125+
<goals>
126+
<goal>effective-pom</goal>
127+
</goals>
128+
</pluginExecutionFilter>
129+
<action>
130+
<ignore></ignore>
131+
</action>
132+
</pluginExecution>
133+
<pluginExecution>
134+
<pluginExecutionFilter>
135+
<groupId>
136+
org.apache.maven.plugins
137+
</groupId>
138+
<artifactId>
139+
maven-ear-plugin
140+
</artifactId>
141+
<versionRange>
142+
[2.8,)
143+
</versionRange>
144+
<goals>
145+
<goal>
146+
generate-application-xml
147+
</goal>
148+
</goals>
149+
</pluginExecutionFilter>
150+
<action>
151+
<ignore></ignore>
152+
</action>
153+
</pluginExecution>
154+
</pluginExecutions>
155+
</lifecycleMappingMetadata>
156+
</configuration>
157+
</plugin>
158+
</plugins>
159+
</pluginManagement>
160+
</build>
161+
</project>

‎client/wfprev-ear/src/cd/assemblies/configure.xml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<assembly
3+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="
6+
http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
7+
http://maven.apache.org/xsd/assembly-1.1.2.xsd" >
8+
<id>configure</id>
9+
<includeBaseDirectory>false</includeBaseDirectory>
10+
<formats>
11+
<format>zip</format>
12+
</formats>
13+
<fileSets>
14+
<fileSet>
15+
<includes>
16+
<include>pom.xml</include>
17+
<include>build*</include>
18+
<include>configure*</include>
19+
</includes>
20+
</fileSet>
21+
<fileSet>
22+
<directory>${basedir}/config</directory>
23+
<includes>
24+
<include>*.xml</include>
25+
<include>*/*.properties</include>
26+
</includes>
27+
</fileSet>
28+
</fileSets>
29+
</assembly>

0 commit comments

Comments
 (0)