Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2012-11-19 07:35:32 +0000
committerGreg Wilkins2012-11-19 07:35:32 +0000
commit4bd36e3d38acbaab4db6202da27e00aad36b98ad (patch)
tree4138daba984ea2ab2b9143fb82de1c99ca35e5b5 /jetty-deploy/src
parent67b5caadbb59851fe2d5292bf5a38b846de9b29c (diff)
downloadorg.eclipse.jetty.project-4bd36e3d38acbaab4db6202da27e00aad36b98ad.tar.gz
org.eclipse.jetty.project-4bd36e3d38acbaab4db6202da27e00aad36b98ad.tar.xz
org.eclipse.jetty.project-4bd36e3d38acbaab4db6202da27e00aad36b98ad.zip
jetty-9 moved the jetty demos to webapps-demos controlled by start.d/demos.ini
Diffstat (limited to 'jetty-deploy/src')
-rw-r--r--jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
index 8b301d8035..4a37c47896 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
@@ -58,6 +58,9 @@ import org.eclipse.jetty.xml.XmlConfiguration;
* be configured by the XML and only the XML is deployed.
* </ul>
*
+ * <p>When deploying XML files, the property deployer.file is set to the file itself and
+ * deployer.dir is set to the directory of the XML file</p>
+ *
*/
@ManagedObject("Provider for start-up deployement of webapps based on presence in directory")
public class WebAppProvider extends ScanningAppProvider
@@ -265,6 +268,8 @@ public class WebAppProvider extends ScanningAppProvider
if (resource.exists() && FileID.isXmlFile(file))
{
XmlConfiguration xmlc = new XmlConfiguration(resource.getURL());
+ xmlc.getProperties().put("deployer.file",file.getCanonicalPath());
+ xmlc.getProperties().put("deployer.dir",file.getParent());
xmlc.getIdMap().put("Server",getDeploymentManager().getServer());
if (getConfigurationManager() != null)

Back to the top