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
apereo · Jul 13, 2021 · a978454 · a978454
2 parents ff2f6d1 + 8a9ff27
commit a978454
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,16 @@ the application server in the [`web.xml`](https://github.com/UniconLabs/cas-samp
 mvn clean package jetty:run-forked
 ```
 
-The application will be available on ports 9080 (http) and 9446 (https).
+The application will be available on:
+
+```bash
+http://localhost:9080/sample
+```
+and
+```bash
+https://localhost:9446/sample
+```
+
 
 ## Testing High Availability
 

diff --git a/etc/jetty/jetty-https.xml b/etc/jetty/jetty-https.xml
@@ -1,24 +1,4 @@
 <?xml version="1.0"?>
-<!--
-
-    Licensed to Apereo under one or more contributor license
-    agreements. See the NOTICE file distributed with this work
-    for additional information regarding copyright ownership.
-    Apereo licenses this file to you under the Apache License,
-    Version 2.0 (the "License"); you may not use this file
-    except in compliance with the License.  You may obtain a
-    copy of the License at the following location:
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
 <!-- ============================================================= -->

diff --git a/etc/jetty/jetty-ssl.xml b/etc/jetty/jetty-ssl.xml
@@ -1,23 +1,4 @@
 <?xml version="1.0"?>
-<!--
-  ~ Licensed to Apereo under one or more contributor license
-  ~ agreements. See the NOTICE file distributed with this work
-  ~ for additional information regarding copyright ownership.
-  ~ Apereo licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file
-  ~ except in compliance with the License.  You may obtain a
-  ~ copy of the License at the following location:
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
 <!-- ============================================================= -->