Skip to content

Commit c30530b

Browse files
jamesfwoodjamesfwood
committed
- Updated README.md
- Fixed Integration Tests - Updated web.xml
1 parent 6c6a901 commit c30530b

6 files changed

Lines changed: 78 additions & 189 deletions

File tree

‎README.md‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@ See the [wiki](https://github.com/NASA-AMMOS/common-workflow-service/wiki) for m
1717

1818
## Prerequisites
1919

20-
- [**Java 17 JDK**](https://formulae.brew.sh/formula/openjdk@17): CWS only runs on JDK 17. (NOTE: Cannot use JRE)
20+
- [**Java 17 JDK**](https://formulae.brew.sh/cask/corretto@17): CWS only runs on JDK 17. (NOTE: Cannot use JRE)
2121
- For Homebrew users:
22-
- Install OpenJDK 17 using: `brew install openjdk@17`
23-
- Check the exact version installed using `/usr/libexec/java_home -V`
24-
- Add to your Shell startup (e.g. .zprofile): `export JAVA_HOME=$(/usr/libexec/java_home -v X.X.X)`
25-
- Replace the X.X.X version above with the OpenJDK 17 output from the `/usr/libexec/java_home -V` command.
22+
- Install OpenJDK 17 using: `brew install --cask corretto@17`
23+
- Add to your Shell startup (e.g. .zprofile): `export JAVA_HOME=$(/usr/libexec/java_home -v17)`
2624
- [**Maven**](https://maven.apache.org/download.cgi): Used to dynamically download libraries and other required project dependencies.
2725
- For Home-brew users:
2826
- Install Maven using: `brew install maven`
@@ -81,7 +79,7 @@ Open new Shell terminal designated for running ElasticSearch.
8179

8280
* `cd` into `install/docker/es-only` directory and run Docker Compose:
8381
```
84-
docker-compose up
82+
docker-compose up -d
8583
```
8684

8785
#### _Updating Presets and Default Settings_

‎cws-test/src/test/java/jpl/cws/test/integration/ui/WebTestIT.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void runDeployTest() {
9999

100100

101101
// Go back to CWS
102-
WebElement cws = driver.findElement(By.xpath("//a[@href='/cws-ui']"));
102+
WebElement cws = driver.findElement(By.xpath("//a[@href='/cws-ui/home']"));
103103
cws.click();
104104
findOnPage("CWS - Deployments");
105105

@@ -149,7 +149,7 @@ public void runErrorHandlingTest() {
149149

150150

151151
// Go back to CWS
152-
WebElement cws = driver.findElement(By.xpath("//a[@href='/cws-ui']"));
152+
WebElement cws = driver.findElement(By.xpath("//a[@href='/cws-ui/home']"));
153153
cws.click();
154154
findOnPage("CWS - Deployments");
155155

@@ -195,9 +195,8 @@ public void runHelloWorldTest() {
195195
button.click();
196196
sleep(5000);
197197

198-
199198
// Go back to CWS
200-
WebElement cws = driver.findElement(By.xpath("//a[@href='/cws-ui']"));
199+
WebElement cws = driver.findElement(By.xpath("//a[@href='/cws-ui/home']"));
201200
cws.click();
202201
findOnPage("CWS - Deployments");
203202

‎cws-test/src/test/java/jpl/cws/test/ldap/ui/LdapTestIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void userInfoTest() {
4444
sleep(2000);
4545

4646
// Go back to CWS
47-
WebElement cws = driver.findElement(By.xpath("//a[@href='/cws-ui']"));
47+
WebElement cws = driver.findElement(By.xpath("//a[@href='/cws-ui/home']"));
4848
cws.click();
4949
findOnPage("CWS - Deployments");
5050
logout();

‎install/tomcat_conf/web.xml‎

Lines changed: 70 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
See the License for the specific language governing permissions and
1616
limitations under the License.
1717
-->
18-
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
18+
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
1919
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
21-
http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
22-
version="4.0">
20+
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
21+
https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd"
22+
version="6.1">
2323

2424
<!-- ======================== Introduction ============================== -->
2525
<!-- This document defines default values for *all* web applications -->
@@ -32,6 +32,11 @@
3232
<!-- They should go in the "/WEB-INF/web.xml" file in your application. -->
3333

3434

35+
<!-- Set the default request and response character encodings to UTF-8. -->
36+
<request-character-encoding>UTF-8</request-character-encoding>
37+
<response-character-encoding>UTF-8</response-character-encoding>
38+
39+
3540
<!-- ================== Built In Servlet Definitions ==================== -->
3641

3742

@@ -73,12 +78,15 @@
7378
<!-- contents. [null] -->
7479
<!-- -->
7580
<!-- sendfileSize If the connector used supports sendfile, this -->
76-
<!-- represents the minimal file size in KB for -->
81+
<!-- represents the minimal file size in KiB for -->
7782
<!-- which sendfile will be used. Use a negative -->
7883
<!-- value to always disable sendfile. [48] -->
7984
<!-- -->
8085
<!-- useAcceptRanges Should the Accept-Ranges header be included -->
8186
<!-- in responses where appropriate? [true] -->
87+
<!-- Deprecated. This option will be removed -->
88+
<!-- without replacement in Tomcat 12 onwards where -->
89+
<!-- it will effectively be hard coded to true. -->
8290
<!-- -->
8391
<!-- For directory listing customization. Checks localXsltFile, then -->
8492
<!-- globalXsltFile, then defaults to original behavior. -->
@@ -106,11 +114,16 @@
106114
<!-- listings is enabled? [true] -->
107115
<!-- -->
108116
<!-- allowPartialPut Should the server treat an HTTP PUT request -->
109-
<!-- with a Range header as a partial PUT? Note -->
110-
<!-- that while RFC 7233 clarified that Range -->
111-
<!-- headers only valid for GET requests, RFC 9110 -->
112-
<!-- (which obsoletes RFC 7233) now allows partial -->
113-
<!-- puts. [true] -->
117+
<!-- with a Content-Range header as a partial PUT? -->
118+
<!-- Note that while RFC 7231 clarified that such a -->
119+
<!-- PUT with a Content-Range header field is a bad -->
120+
<!-- request, RFC 9110 (which obsoletes RFC 7231) -->
121+
<!-- now allows partial PUT. [true] -->
122+
<!-- -->
123+
<!-- directoryRedirectStatusCode -->
124+
<!-- Status code to use for directory redirects. -->
125+
<!-- Possible values: 301, 302, 307, 308 -->
126+
<!-- [302] -->
114127

115128
<servlet>
116129
<servlet-name>default</servlet-name>
@@ -150,9 +163,9 @@
150163
<!-- pages. See the jasper documentation for more -->
151164
<!-- information. -->
152165
<!-- -->
153-
<!-- compilerSourceVM Compiler source VM. [1.8] -->
166+
<!-- compilerSourceVM Compiler source VM. [17] -->
154167
<!-- -->
155-
<!-- compilerTargetVM Compiler target VM. [1.8] -->
168+
<!-- compilerTargetVM Compiler target VM. [17] -->
156169
<!-- -->
157170
<!-- development Is Jasper used in development mode? If true, -->
158171
<!-- the frequency at which JSPs are checked for -->
@@ -175,8 +188,6 @@
175188
<!-- engineOptionsClass Allows specifying the Options class used to -->
176189
<!-- configure Jasper. If not present, the default -->
177190
<!-- EmbeddedServletOptions will be used. -->
178-
<!-- This option is ignored when running under a -->
179-
<!-- SecurityManager. -->
180191
<!-- -->
181192
<!-- errorOnUseBeanInvalidClassAttribute -->
182193
<!-- Should Jasper issue an error when the value of -->
@@ -192,11 +203,6 @@
192203
<!-- arrays, to improve performance in some cases? -->
193204
<!-- [false] -->
194205
<!-- -->
195-
<!-- ieClassId Deprecated. Will be removed in Tomcat 10.1 -->
196-
<!-- The class-id value to be sent to Internet -->
197-
<!-- Explorer when using <jsp:plugin> tags. -->
198-
<!-- [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93] -->
199-
<!-- -->
200206
<!-- javaEncoding Java file encoding to use for generating java -->
201207
<!-- source files. [UTF8] -->
202208
<!-- -->
@@ -239,8 +245,6 @@
239245
<!-- scratchdir What scratch directory should we use when -->
240246
<!-- compiling JSP pages? [default work directory -->
241247
<!-- for the current web application] -->
242-
<!-- This option is ignored when running under a -->
243-
<!-- SecurityManager. -->
244248
<!-- -->
245249
<!-- suppressSmap Should the generation of SMAP info for JSR45 -->
246250
<!-- debugging be suppressed? [false] -->
@@ -363,7 +367,7 @@
363367
<!-- the arguments to the OS. See the CGI How-To -->
364368
<!-- for more details. The default varies by -->
365369
<!-- platform. -->
366-
<!-- Windows: [[a-zA-Z0-9\Q-_.\\/:\E]+] -->
370+
<!-- Windows: [[\w\Q-.\\/:\E]+] -->
367371
<!-- Others: [.*] -->
368372
<!-- Note that internally the CGI Servlet treats -->
369373
<!-- [.*] as a special case to improve performance -->
@@ -374,7 +378,7 @@
374378
<!-- command line arguments must match else the -->
375379
<!-- request will be rejected. The default matches -->
376380
<!-- the allowed values defined by RFC3875. -->
377-
<!-- [[a-zA-Z0-9\Q%;/?:@&,$-_.!~*'()\E]+] -->
381+
<!-- [[\w\Q%;/?:@&,$-.!~*'()\E]+] -->
378382
<!-- -->
379383
<!-- enableCmdLineArguments -->
380384
<!-- Are command line parameters generated from -->
@@ -580,20 +584,6 @@
580584
</filter>
581585
-->
582586

583-
<!-- A filter that triggers request parameters parsing and rejects the -->
584-
<!-- request if some parameters were skipped because of parsing errors or -->
585-
<!-- request size limitations. -->
586-
<!--
587-
<filter>
588-
<filter-name>failedRequestFilter</filter-name>
589-
<filter-class>
590-
org.apache.catalina.filters.FailedRequestFilter
591-
</filter-class>
592-
<async-supported>true</async-supported>
593-
</filter>
594-
-->
595-
596-
597587
<!-- NOTE: An SSI Servlet is also available as an alternative SSI -->
598588
<!-- implementation. Use either the Servlet or the Filter but NOT both. -->
599589
<!-- -->
@@ -671,14 +661,6 @@
671661
</filter-mapping>
672662
-->
673663

674-
<!-- The mapping for the Failed Request Filter -->
675-
<!--
676-
<filter-mapping>
677-
<filter-name>failedRequestFilter</filter-name>
678-
<url-pattern>/*</url-pattern>
679-
</filter-mapping>
680-
-->
681-
682664
<!-- The mapping for the SSI Filter -->
683665
<!--
684666
<filter-mapping>
@@ -901,6 +883,10 @@
901883
<extension>avi</extension>
902884
<mime-type>video/x-msvideo</mime-type>
903885
</mime-mapping>
886+
<mime-mapping>
887+
<extension>avif</extension>
888+
<mime-type>image/avif</mime-type>
889+
</mime-mapping>
904890
<mime-mapping>
905891
<extension>avx</extension>
906892
<mime-type>video/x-rad-screenplay</mime-type>
@@ -1829,6 +1815,10 @@
18291815
<extension>ggb</extension>
18301816
<mime-type>application/vnd.geogebra.file</mime-type>
18311817
</mime-mapping>
1818+
<mime-mapping>
1819+
<extension>ggs</extension>
1820+
<mime-type>application/vnd.geogebra.slides</mime-type>
1821+
</mime-mapping>
18321822
<mime-mapping>
18331823
<extension>ggt</extension>
18341824
<mime-type>application/vnd.geogebra.tool</mime-type>
@@ -2183,7 +2173,7 @@
21832173
</mime-mapping>
21842174
<mime-mapping>
21852175
<extension>js</extension>
2186-
<mime-type>application/javascript</mime-type>
2176+
<mime-type>text/javascript</mime-type>
21872177
</mime-mapping>
21882178
<mime-mapping>
21892179
<extension>jsf</extension>
@@ -2201,6 +2191,10 @@
22012191
<extension>jspf</extension>
22022192
<mime-type>text/plain</mime-type>
22032193
</mime-mapping>
2194+
<mime-mapping>
2195+
<extension>jxl</extension>
2196+
<mime-type>image/jxl</mime-type>
2197+
</mime-mapping>
22042198
<mime-mapping>
22052199
<extension>kar</extension>
22062200
<mime-type>audio/midi</mime-type>
@@ -2369,6 +2363,14 @@
23692363
<extension>m2a</extension>
23702364
<mime-type>audio/mpeg</mime-type>
23712365
</mime-mapping>
2366+
<mime-mapping>
2367+
<extension>m2t</extension>
2368+
<mime-type>video/mp2t</mime-type>
2369+
</mime-mapping>
2370+
<mime-mapping>
2371+
<extension>m2ts</extension>
2372+
<mime-type>video/mp2t</mime-type>
2373+
</mime-mapping>
23722374
<mime-mapping>
23732375
<extension>m2v</extension>
23742376
<mime-type>video/mpeg</mime-type>
@@ -2533,6 +2535,10 @@
25332535
<extension>mjp2</extension>
25342536
<mime-type>video/mj2</mime-type>
25352537
</mime-mapping>
2538+
<mime-mapping>
2539+
<extension>mjs</extension>
2540+
<mime-type>text/javascript</mime-type>
2541+
</mime-mapping>
25362542
<mime-mapping>
25372543
<extension>mk3d</extension>
25382544
<mime-type>video/x-matroska</mime-type>
@@ -2735,7 +2741,7 @@
27352741
</mime-mapping>
27362742
<mime-mapping>
27372743
<extension>mts</extension>
2738-
<mime-type>model/vnd.mts</mime-type>
2744+
<mime-type>video/mp2t</mime-type>
27392745
</mime-mapping>
27402746
<mime-mapping>
27412747
<extension>mus</extension>
@@ -2971,6 +2977,10 @@
29712977
<extension>oprc</extension>
29722978
<mime-type>application/vnd.palm</mime-type>
29732979
</mime-mapping>
2980+
<mime-mapping>
2981+
<extension>opus</extension>
2982+
<mime-type>audio/ogg</mime-type>
2983+
</mime-mapping>
29742984
<mime-mapping>
29752985
<extension>org</extension>
29762986
<mime-type>application/vnd.lotus-organizer</mime-type>
@@ -3770,6 +3780,14 @@
37703780
<extension>sql</extension>
37713781
<mime-type>application/x-sql</mime-type>
37723782
</mime-mapping>
3783+
<mime-mapping>
3784+
<extension>sqlite</extension>
3785+
<mime-type>application/vnd.sqlite3</mime-type>
3786+
</mime-mapping>
3787+
<mime-mapping>
3788+
<extension>sqlite3</extension>
3789+
<mime-type>application/vnd.sqlite3</mime-type>
3790+
</mime-mapping>
37733791
<mime-mapping>
37743792
<extension>src</extension>
37753793
<mime-type>application/x-wais-source</mime-type>
@@ -4018,6 +4036,10 @@
40184036
<extension>trm</extension>
40194037
<mime-type>application/x-msterminal</mime-type>
40204038
</mime-mapping>
4039+
<mime-mapping>
4040+
<extension>ts</extension>
4041+
<mime-type>video/mp2t</mime-type>
4042+
</mime-mapping>
40214043
<mime-mapping>
40224044
<extension>tsd</extension>
40234045
<mime-type>application/timestamped-data</mime-type>
@@ -4788,13 +4810,12 @@
47884810
<!-- If you define welcome files in your own application's web.xml -->
47894811
<!-- deployment descriptor, that list *replaces* the list configured -->
47904812
<!-- here, so be sure to include any of the default values that you wish -->
4791-
<!-- to use within your application. -->
4813+
<!-- to use within your application. -->
47924814

47934815
<welcome-file-list>
47944816
<welcome-file>index.html</welcome-file>
47954817
<welcome-file>index.htm</welcome-file>
47964818
<welcome-file>index.jsp</welcome-file>
4797-
<welcome-file>redirect.html</welcome-file>
47984819
</welcome-file-list>
47994820

48004821
</web-app>

‎install/upgrade/README.md‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)