[java-idp-plugin-jetty] 116/186: Remove Eclipse bits.

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch dev/foo
in repository java-idp-plugin-jetty.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-jetty.git;a=commit;h=4d811ce41c803878351ce0e323b716c27aaab9d5

commit 4d811ce41c803878351ce0e323b716c27aaab9d5
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Mar 26 10:49:39 2024 -0400

    Remove Eclipse bits.
---
 src/main/resources/jetty-base/start.d/idp.ini     |  5 ++---
 src/main/resources/jetty-base/static/.gitkeep     |  0
 src/main/resources/jetty-base/webapps/idp.xml     |  2 +-
 src/main/resources/jetty-base/webapps/static.xml  | 16 ++++++++++++++++
 src/main/resources/jetty-base/webapps/testbed.xml |  9 ---------
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/jetty-base/start.d/idp.ini b/src/main/resources/jetty-base/start.d/idp.ini
index 012b73f..92b2b87 100644
--- a/src/main/resources/jetty-base/start.d/idp.ini
+++ b/src/main/resources/jetty-base/start.d/idp.ini
@@ -35,6 +35,5 @@ jetty.ssl.port=443
 etc/jetty-requestlog.xml
 
 # Allows use of default IdP command line tools.
-# Seems not to work under Eclipse though 443 above does.
-#jetty.http.host=127.0.0.1
-#jetty.http.port=80
+jetty.http.host=127.0.0.1
+jetty.http.port=80
diff --git a/src/main/resources/jetty-base/static/.gitkeep b/src/main/resources/jetty-base/static/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/resources/jetty-base/webapps/idp.xml b/src/main/resources/jetty-base/webapps/idp.xml
index 8d766d1..6d3866d 100644
--- a/src/main/resources/jetty-base/webapps/idp.xml
+++ b/src/main/resources/jetty-base/webapps/idp.xml
@@ -4,7 +4,7 @@
 <!-- Configure the Shibboleth IdP webapp                             -->
 <!-- =============================================================== -->
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
-  <Set name="war">../../../../../java-identity-provider/idp-war/src/main/webapp</Set>
+  <Set name="war"><SystemProperty name="idp.home" default="/opt/shibboleth-idp" />/war/idp.war</Set>
   <Set name="contextPath"><SystemProperty name="idp.context.path" default="/idp" /></Set>
   <Set name="extractWAR">false</Set>
   <Set name="copyWebDir">false</Set>
diff --git a/src/main/resources/jetty-base/webapps/static.xml b/src/main/resources/jetty-base/webapps/static.xml
new file mode 100644
index 0000000..773ad2b
--- /dev/null
+++ b/src/main/resources/jetty-base/webapps/static.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
+<!-- =============================================================== -->
+<!-- Configure static content delivery                               -->
+<!-- =============================================================== -->
+<Configure class="org.eclipse.jetty.server.handler.ContextHandler">
+  <Set name="contextPath">/</Set>
+  <Set name="handler">
+    <New class="org.eclipse.jetty.server.handler.ResourceHandler">
+      <Set name="resourceBase">
+        <Property name="jetty.base"/>/<Property name="jetty.static.data.path" default="../static"/>
+      </Set>
+      <Set name="directoriesListed">false</Set>
+    </New>
+  </Set>
+</Configure>
diff --git a/src/main/resources/jetty-base/webapps/testbed.xml b/src/main/resources/jetty-base/webapps/testbed.xml
deleted file mode 100644
index 36563ce..0000000
--- a/src/main/resources/jetty-base/webapps/testbed.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
-<Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
-  <Set name="war">../../../../../java-idp-testbed/src/main/webapp/</Set>
-  <Set name="contextPath">/</Set>
-  <Set name="extractWAR">false</Set>
-  <Set name="copyWebDir">false</Set>
-  <Set name="copyWebInf">true</Set>
-</Configure>
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.