Allow specifying webdefault.xml for jetty. Useful on windows for fixi…

…ng file locking issue.
harrah · Oct 5, 2010 · 030e2ee · 030e2ee
1 parent f913d63
commit 030e2ee
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/sbt/src/main/scala/sbt/DefaultProject.scala b/sbt/src/main/scala/sbt/DefaultProject.scala
@@ -389,6 +389,7 @@ abstract class BasicWebScalaProject extends BasicScalaProject with WebScalaProje
 			def port = jettyPort
 			def log = p.log
 			def jettyEnv = jettyEnvXml
+			def webDefaultXml = jettyWebDefaultXml
 		}
 	/** This is the classpath used to determine what classes, resources, and jars to put in the war file.*/
 	def webappClasspath = publicClasspath
@@ -422,6 +423,7 @@ abstract class BasicWebScalaProject extends BasicScalaProject with WebScalaProje
 	def jettyPort: Int = JettyRunner.DefaultPort
 
 	def jettyEnvXml : Option[File] = None
+	def jettyWebDefaultXml : Option[File] = None
 
 	lazy val jettyReload = task { jettyInstance.reload(); None } describedAs(JettyReloadDescription)
 	lazy val jettyRestart = jettyStop && jettyRun

diff --git a/sbt/src/main/scala/sbt/WebApp.scala b/sbt/src/main/scala/sbt/WebApp.scala
@@ -104,6 +104,7 @@ trait DefaultJettyConfiguration extends JettyConfiguration
 	def classpath: PathFinder
 	def parentLoader: ClassLoader
 	def jettyEnv: Option[File]
+	def webDefaultXml: Option[File]
 }
 abstract class CustomJettyConfiguration extends JettyConfiguration
 {

diff --git a/sbt/src/main/scala/sbt/jetty/LazyJettyRun.scala.templ b/sbt/src/main/scala/sbt/jetty/LazyJettyRun.scala.templ
@@ -55,6 +55,7 @@ private object LazyJettyRun${jetty.version} extends JettyRun
 					import c._
 					configureDefaultConnector(server, port)
 					val webapp = new WebAppContext(war.absolutePath, contextPath)
+					webDefaultXml.foreach{webDefaultXml:File => webapp.setDefaultsDescriptor(webDefaultXml.toString)}
 
 					def createLoader =
 					{