Skip to content
This repository was archived by the owner on Jul 21, 2023. It is now read-only.

Commit a978454

Browse files
committed
Merge branch 'master' of github.com:UniconLabs/cas-sample-java-webapp
* 'master' of github.com:UniconLabs/cas-sample-java-webapp: updated Reset jetty plugin back to 9.3.6 to avoid tld scanning "URI not hierarchical" issue Update README.md with location of the application (#6) # Conflicts: # README.md # etc/jetty/jetty.xml # src/main/webapp/WEB-INF/web.xml
2 parents ff2f6d1 + 8a9ff27 commit a978454

File tree

3 files changed

+10
-40
lines changed

3 files changed

+10
-40
lines changed

README.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,16 @@ the application server in the [`web.xml`](https://github.com/UniconLabs/cas-samp
1717
mvn clean package jetty:run-forked
1818
```
1919

20-
The application will be available on ports 9080 (http) and 9446 (https).
20+
The application will be available on:
21+
22+
```bash
23+
http://localhost:9080/sample
24+
```
25+
and
26+
```bash
27+
https://localhost:9446/sample
28+
```
29+
2130

2231
## Testing High Availability
2332

etc/jetty/jetty-https.xml

-20
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,4 @@
11
<?xml version="1.0"?>
2-
<!--
3-
4-
Licensed to Apereo under one or more contributor license
5-
agreements. See the NOTICE file distributed with this work
6-
for additional information regarding copyright ownership.
7-
Apereo licenses this file to you under the Apache License,
8-
Version 2.0 (the "License"); you may not use this file
9-
except in compliance with the License. You may obtain a
10-
copy of the License at the following location:
11-
12-
http://www.apache.org/licenses/LICENSE-2.0
13-
14-
Unless required by applicable law or agreed to in writing,
15-
software distributed under the License is distributed on an
16-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17-
KIND, either express or implied. See the License for the
18-
specific language governing permissions and limitations
19-
under the License.
20-
21-
-->
222
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
233

244
<!-- ============================================================= -->

etc/jetty/jetty-ssl.xml

-19
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,4 @@
11
<?xml version="1.0"?>
2-
<!--
3-
~ Licensed to Apereo under one or more contributor license
4-
~ agreements. See the NOTICE file distributed with this work
5-
~ for additional information regarding copyright ownership.
6-
~ Apereo licenses this file to you under the Apache License,
7-
~ Version 2.0 (the "License"); you may not use this file
8-
~ except in compliance with the License. You may obtain a
9-
~ copy of the License at the following location:
10-
~
11-
~ http://www.apache.org/licenses/LICENSE-2.0
12-
~
13-
~ Unless required by applicable law or agreed to in writing,
14-
~ software distributed under the License is distributed on an
15-
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16-
~ KIND, either express or implied. See the License for the
17-
~ specific language governing permissions and limitations
18-
~ under the License.
19-
-->
20-
212
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
223

234
<!-- ============================================================= -->

0 commit comments

Comments
 (0)