[java-idp-plugin-jetty] 50/186: IDP-1081 - Use system properties in idp.xml

[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=323f8cdd40fdf4b902ad26b5e75a3c659eb3b655

commit 323f8cdd40fdf4b902ad26b5e75a3c659eb3b655
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Mon Aug 27 12:16:01 2018 -0500

    IDP-1081 - Use system properties in idp.xml
    
    Use system properties for jetty.war.path and jetty.context.path in the
    IdP deployment descriptor as non-system properties are not available by
    default by jetty-deploy.xml.
    
    https://issues.shibboleth.net/jira/browse/IDP-1081
---
 src/main/resources/jetty-base/webapps/idp.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/jetty-base/webapps/idp.xml b/src/main/resources/jetty-base/webapps/idp.xml
index 373fbc1..6267408 100644
--- a/src/main/resources/jetty-base/webapps/idp.xml
+++ b/src/main/resources/jetty-base/webapps/idp.xml
@@ -4,8 +4,8 @@
 <!-- Configure the Shibboleth IdP webapp                             -->
 <!-- =============================================================== -->
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
-  <Set name="war"><Property name="jetty.war.path" default="../war/idp.war" /></Set>
-  <Set name="contextPath">/idp</Set>
+  <Set name="war"><SystemProperty name="jetty.war.path" default="../war/idp.war" /></Set>
+  <Set name="contextPath"><SystemProperty name="jetty.context.path" default="/idp" /></Set>
   <Set name="extractWAR">false</Set>
   <Set name="copyWebDir">false</Set>
   <Set name="copyWebInf">true</Set>

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