diff --git a/sbt/src/sbt-test/web/jsp/project/build/JSP.scala b/sbt/src/sbt-test/web/jsp/project/build/JSP.scala index b248512f8..df9fe4bfc 100644 --- a/sbt/src/sbt-test/web/jsp/project/build/JSP.scala +++ b/sbt/src/sbt-test/web/jsp/project/build/JSP.scala @@ -5,7 +5,8 @@ class JSP(info: ProjectInfo) extends DefaultWebProject(info) val j6 = "org.mortbay.jetty" % "jetty" % "6.1.17" % "test->default" val j = "org.mortbay.jetty" % "jsp-2.0" % "6.1.17" % "test->default" - def indexURL = new java.net.URL("http://localhost:8080") + def indexURL = new java.net.URL("http://localhost:" + jettyPort) + override def jettyPort = 7126 def indexFile = new java.io.File("index.html") import Process._ lazy val getPage = execTask { indexURL #> indexFile } diff --git a/sbt/src/sbt-test/web/servlet-direct/project/build/src/WebappBuild.scala b/sbt/src/sbt-test/web/servlet-direct/project/build/src/WebappBuild.scala index c420a8227..b09e42b24 100644 --- a/sbt/src/sbt-test/web/servlet-direct/project/build/src/WebappBuild.scala +++ b/sbt/src/sbt-test/web/servlet-direct/project/build/src/WebappBuild.scala @@ -11,7 +11,8 @@ class WebappBuild(info: ProjectInfo) extends DefaultWebProject(info) { "org.eclipse.jetty" % "jetty-server" % "7.0.1.v20091125" % "test", "org.eclipse.jetty" % "jetty-webapp" % "7.0.1.v20091125" % "test") - def indexURL = new java.net.URL("http://localhost:8080") + def indexURL = new java.net.URL("http://localhost:" + jettyPort) + override def jettyPort = 7125 def indexFile = new java.io.File("index.html") import Process._ lazy val getPage = execTask { indexURL #> indexFile } diff --git a/sbt/src/sbt-test/web/servlet-nodup/project/build/src/WebappBuild.scala b/sbt/src/sbt-test/web/servlet-nodup/project/build/src/WebappBuild.scala index 4b0028732..0b4e0d1ca 100644 --- a/sbt/src/sbt-test/web/servlet-nodup/project/build/src/WebappBuild.scala +++ b/sbt/src/sbt-test/web/servlet-nodup/project/build/src/WebappBuild.scala @@ -11,7 +11,8 @@ class WebappBuild(info: ProjectInfo) extends DefaultWebProject(info) { "org.eclipse.jetty" % "jetty-server" % "7.0.1.v20091125" % "test", "org.eclipse.jetty" % "jetty-webapp" % "7.0.1.v20091125" % "test") - def indexURL = new java.net.URL("http://localhost:8080") + def indexURL = new java.net.URL("http://localhost:" + jettyPort) + override def jettyPort = 7124 def indexFile = new java.io.File("index.html") import Process._ lazy val getPage = execTask { indexURL #> indexFile } diff --git a/sbt/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala b/sbt/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala index 5f2906449..68a3ae53b 100644 --- a/sbt/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala +++ b/sbt/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala @@ -10,8 +10,9 @@ class WebappBuild(info: ProjectInfo) extends DefaultWebProject(info) { Set("javax.servlet" % "servlet-api" % "2.5" % "provided", "org.eclipse.jetty" % "jetty-webapp" % "7.0.1.v20091125" % "test") - def indexURL = new java.net.URL("http://localhost:8080") + def indexURL = new java.net.URL("http://localhost:" + jettyPort) def indexFile = new java.io.File("index.html") + override def jettyPort = 7123 import Process._ lazy val getPage = execTask { indexURL #> indexFile } lazy val checkPage = task { args => task { checkHelloWorld(args.mkString(" ")) } dependsOn getPage }