Fixes #668 - Introduce optional `jetty.deploy.defaultsDescriptorPath` for jetty-deploy defaults descriptor outside of ${jetty.home}

This commit is contained in:
Joakim Erdfelt 2016-06-28 13:44:36 -07:00
parent 1ac1673396
commit bba1c19875
2 changed files with 11 additions and 1 deletions

View File

@ -47,7 +47,14 @@
</Default> </Default>
</Property> </Property>
</Set> </Set>
<Set name="defaultsDescriptor"><Property name="jetty.home" default="." />/etc/webdefault.xml</Set> <Set name="defaultsDescriptor">
<Property>
<Name>jetty.deploy.defaultsDescriptorPath</Name>
<Default>
<Property name="jetty.home" default="." />/etc/webdefault.xml
</Default>
</Property>
</Set>
<Set name="scanInterval"><Property name="jetty.deploy.scanInterval" default="1"/></Set> <Set name="scanInterval"><Property name="jetty.deploy.scanInterval" default="1"/></Set>
<Set name="extractWars"><Property name="jetty.deploy.extractWars" default="true"/></Set> <Set name="extractWars"><Property name="jetty.deploy.extractWars" default="true"/></Set>
<Set name="configurationManager"> <Set name="configurationManager">

View File

@ -21,6 +21,9 @@ etc/jetty-deploy.xml
# Monitored directory path (fully qualified) # Monitored directory path (fully qualified)
# jetty.deploy.monitoredPath=/var/www/webapps # jetty.deploy.monitoredPath=/var/www/webapps
# Defaults Descriptor for all deployed webapps
# jetty.deploy.defaultsDescriptorPath=${jetty.base}/etc/webdefault.xml
# Monitored directory scan period (seconds) # Monitored directory scan period (seconds)
# jetty.deploy.scanInterval=1 # jetty.deploy.scanInterval=1