Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse McConnell2012-11-19 16:33:45 +0000
committerJesse McConnell2012-11-19 16:33:45 +0000
commitebd807b904a7bb644630df754f626fec20c8d12e (patch)
treebc771d4a894ca58a93291aff2332dc770efce530 /jetty-deploy/src
parenta99a3ae254385bee64ebdc8a2627c3bc26ed9bf6 (diff)
downloadorg.eclipse.jetty.project-ebd807b904a7bb644630df754f626fec20c8d12e.tar.gz
org.eclipse.jetty.project-ebd807b904a7bb644630df754f626fec20c8d12e.tar.xz
org.eclipse.jetty.project-ebd807b904a7bb644630df754f626fec20c8d12e.zip
Revert "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, 0 insertions, 5 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 4a37c47896..8b301d8035 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,9 +58,6 @@ 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
@@ -268,8 +265,6 @@ 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