From 1ac16733961fb16a2bf23c40552d9c8bb338d47b Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Tue, 28 Jun 2016 13:39:28 -0700
Subject: [PATCH] Fixes #667 - Alternate `jetty.deploy.monitoredDirPath` for
 jetty-deploy outside of ${jetty.base}

---
 jetty-deploy/src/main/config/etc/jetty-deploy.xml | 9 ++++++++-
 jetty-deploy/src/main/config/modules/deploy.mod   | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/jetty-deploy/src/main/config/etc/jetty-deploy.xml b/jetty-deploy/src/main/config/etc/jetty-deploy.xml
index 4544362f2ae..bd0925348aa 100644
--- a/jetty-deploy/src/main/config/etc/jetty-deploy.xml
+++ b/jetty-deploy/src/main/config/etc/jetty-deploy.xml
@@ -39,7 +39,14 @@
         <Call id="webappprovider" name="addAppProvider">
           <Arg>
             <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
-              <Set name="monitoredDirName"><Property name="jetty.base" default="." />/<Property name="jetty.deploy.monitoredDir" deprecated="jetty.deploy.monitoredDirName" default="webapps"/></Set>
+              <Set name="monitoredDirName">
+                <Property>
+                  <Name>jetty.deploy.monitoredPath</Name>
+                  <Default>
+                    <Property name="jetty.base" default="." />/<Property name="jetty.deploy.monitoredDir" deprecated="jetty.deploy.monitoredDirName" default="webapps"/>
+                  </Default>
+                </Property>
+              </Set>
               <Set name="defaultsDescriptor"><Property name="jetty.home" default="." />/etc/webdefault.xml</Set>
               <Set name="scanInterval"><Property name="jetty.deploy.scanInterval" default="1"/></Set>
               <Set name="extractWars"><Property name="jetty.deploy.extractWars" default="true"/></Set>
diff --git a/jetty-deploy/src/main/config/modules/deploy.mod b/jetty-deploy/src/main/config/modules/deploy.mod
index f567a2090f0..5dcaaf13071 100644
--- a/jetty-deploy/src/main/config/modules/deploy.mod
+++ b/jetty-deploy/src/main/config/modules/deploy.mod
@@ -17,6 +17,9 @@ etc/jetty-deploy.xml
 [ini-template]
 # Monitored directory name (relative to $jetty.base)
 # jetty.deploy.monitoredDir=webapps
+# - OR -
+# Monitored directory path (fully qualified)
+# jetty.deploy.monitoredPath=/var/www/webapps
 
 # Monitored directory scan period (seconds)
 # jetty.deploy.scanInterval=1