[java-idp-jetty-base] 02/06: IDP-1110 - Do not set path to webapp using idp.home

[Tom Zeller]

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

tzeller pushed a commit to branch 9.4
in repository java-idp-jetty-base.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=5d5dbde0ace46cd06d678738704d507c2fdf216c

commit 5d5dbde0ace46cd06d678738704d507c2fdf216c
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Apr 25 17:14:40 2018 -0500

    IDP-1110 - Do not set path to webapp using idp.home
    
    Instead, use a custom 'jetty.war.path' property like we do for Jetty 9.3
    
    https://issues.shibboleth.net/jira/browse/IDP-1110
---
 src/main/resources/jetty-base/start.d/idp.ini | 3 +++
 src/main/resources/jetty-base/webapps/idp.xml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/jetty-base/start.d/idp.ini b/src/main/resources/jetty-base/start.d/idp.ini
index 3b46104..b76699e 100644
--- a/src/main/resources/jetty-base/start.d/idp.ini
+++ b/src/main/resources/jetty-base/start.d/idp.ini
@@ -13,3 +13,6 @@ jetty.sslContext.keyStorePassword=changeit
 
 ## Connector port to listen on
 # jetty.ssl.port=8443
+
+# Path to IdP WAR (dir or file), relative to ${jetty.base} directory
+# jetty.war.path=../war/idp.war
diff --git a/src/main/resources/jetty-base/webapps/idp.xml b/src/main/resources/jetty-base/webapps/idp.xml
index d3a29a0..6dd338f 100644
--- a/src/main/resources/jetty-base/webapps/idp.xml
+++ b/src/main/resources/jetty-base/webapps/idp.xml
@@ -5,7 +5,7 @@
 <!-- Configure the Shibboleth IdP webapp                             -->
 <!-- =============================================================== -->
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
-  <Set name="war"><SystemProperty name="idp.home"/>/war/idp.war</Set>
+  <Set name="war"><Property name="jetty.war.path" default="../war/idp.war" /></Set>
   <Set name="contextPath">/idp</Set>
   <Set name="extractWAR">false</Set>
   <Set name="copyWebDir">false</Set>

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