Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2013-08-30 06:10:35 +0000
committerGreg Wilkins2013-08-30 06:10:35 +0000
commit5948e8c7c22e44c5ded25db6a827c27ff96d2a81 (patch)
treee8fd6d45d6a873868541b09979fff92fc9ce838c /jetty-deploy/src
parent4d6fd407b549ca2eda4f6d1dd0346e192febb242 (diff)
downloadorg.eclipse.jetty.project-5948e8c7c22e44c5ded25db6a827c27ff96d2a81.tar.gz
org.eclipse.jetty.project-5948e8c7c22e44c5ded25db6a827c27ff96d2a81.tar.xz
org.eclipse.jetty.project-5948e8c7c22e44c5ded25db6a827c27ff96d2a81.zip
jetty-start fixed deploy of jetty.base
Set the jetty.base and jetty.home Properties for webapps/*.xml evaluation
Diffstat (limited to 'jetty-deploy/src')
-rw-r--r--jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java2
1 files changed, 2 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 fdb73aa9a8..ec94b5a390 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
@@ -267,6 +267,8 @@ public class WebAppProvider extends ScanningAppProvider
XmlConfiguration xmlc = new XmlConfiguration(resource.getURL());
xmlc.getIdMap().put("Server",getDeploymentManager().getServer());
+ xmlc.getProperties().put("jetty.home",System.getProperty("jetty.home","."));
+ xmlc.getProperties().put("jetty.base",System.getProperty("jetty.base","."));
xmlc.getProperties().put("jetty.webapp",file.getCanonicalPath());
xmlc.getProperties().put("jetty.webapps",file.getParentFile().getCanonicalPath());

Back to the top