From 1954977c98337217f38f7286a0f31bd1891607ea Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 9 Oct 2010 14:06:48 -0400
Subject: [PATCH] make jetty-env test runnable

---
 .../web/jetty-env/project/build.properties         |  5 -----
 .../project/build/JettyEnvTestProject.scala        | 14 ++++++++++++++
 sbt/src/sbt-test/web/jetty-env/test                |  9 +++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 sbt/src/sbt-test/web/jetty-env/test

diff --git a/sbt/src/sbt-test/web/jetty-env/project/build.properties b/sbt/src/sbt-test/web/jetty-env/project/build.properties
index 3b137cf79..b6dadadbe 100755
--- a/sbt/src/sbt-test/web/jetty-env/project/build.properties
+++ b/sbt/src/sbt-test/web/jetty-env/project/build.properties
@@ -1,8 +1,3 @@
-#Project properties
-#Thu Aug 12 11:18:54 CEST 2010
 project.organization=sbt
 project.name=JettyEnvTest
-sbt.version=0.7.5-SNAPSHOT
 project.version=1.0
-build.scala.versions=2.7.7
-project.initialize=false
diff --git a/sbt/src/sbt-test/web/jetty-env/project/build/JettyEnvTestProject.scala b/sbt/src/sbt-test/web/jetty-env/project/build/JettyEnvTestProject.scala
index d4f340918..ef5bebffb 100755
--- a/sbt/src/sbt-test/web/jetty-env/project/build/JettyEnvTestProject.scala
+++ b/sbt/src/sbt-test/web/jetty-env/project/build/JettyEnvTestProject.scala
@@ -1,10 +1,24 @@
 import sbt._
 import java.io.File
 import java.lang.System
+import Process._
 
 class JettyEnvTestProject(info: ProjectInfo) extends DefaultWebProject(info){
 	override def jettyEnvXml = Some( (info.projectPath / "conf" / "jetty" / "jetty-env.xml").asFile)
 	val jetty7WebApp = "org.eclipse.jetty" % "jetty-webapp" % "7.0.2.RC0" % "test"
 	val jetty7Plus = "org.eclipse.jetty" % "jetty-plus" % "7.0.2.RC0" % "test"
 	val servletApiDep = "javax.servlet" % "servlet-api" % "2.5" % "provided"
+
+	def indexURL = new java.net.URL("http://localhost:" + jettyPort)
+	def indexFile = new java.io.File("index.html")
+	override def jettyPort = 7127
+	lazy val getPage = execTask { indexURL #> indexFile }
+	
+	lazy val checkPage = task { args => task { checkHelloWorld(args.mkString(" ")) } dependsOn getPage }
+	
+	private def checkHelloWorld(checkString: String) =
+	{
+		val value = xsbt.FileUtilities.read(indexFile)
+		if(value.contains(checkString)) None else Some("index.html did not contain '" + checkString + "' :\n" +value)
+	}
 }
diff --git a/sbt/src/sbt-test/web/jetty-env/test b/sbt/src/sbt-test/web/jetty-env/test
new file mode 100644
index 000000000..a1dd0c12c
--- /dev/null
+++ b/sbt/src/sbt-test/web/jetty-env/test
@@ -0,0 +1,9 @@
+> ++2.7.7
+> update
+# verify that it fails without Jetty running
+-> check-page It works
+
+> jetty-run
+# verify it now works with our servlet running
+> check-page It works
+> jetty-stop