luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix webapp tests to use different ports

This commit is contained in:
Mark Harrah 2010-05-13 19:00:29 -04:00
parent 344eed8156
commit 019ce4e535
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sbt/src/sbt-test/web/jsp/project/build/JSP.scala
View File

@ -5,7 +5,8 @@ class JSP(info: ProjectInfo) extends DefaultWebProject(info)
val j6 = "org.mortbay.jetty" % "jetty" % "6.1.17" % "test->default" val j6 = "org.mortbay.jetty" % "jetty" % "6.1.17" % "test->default"
val j = "org.mortbay.jetty" % "jsp-2.0" % "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") def indexFile = new java.io.File("index.html")
import Process._ import Process._
lazy val getPage = execTask { indexURL #> indexFile } lazy val getPage = execTask { indexURL #> indexFile }

3
sbt/src/sbt-test/web/servlet-direct/project/build/src/WebappBuild.scala
View File

@ -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-server" % "7.0.1.v20091125" % "test",
"org.eclipse.jetty" % "jetty-webapp" % "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") def indexFile = new java.io.File("index.html")
import Process._ import Process._
lazy val getPage = execTask { indexURL #> indexFile } lazy val getPage = execTask { indexURL #> indexFile }

3
sbt/src/sbt-test/web/servlet-nodup/project/build/src/WebappBuild.scala
View File

@ -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-server" % "7.0.1.v20091125" % "test",
"org.eclipse.jetty" % "jetty-webapp" % "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") def indexFile = new java.io.File("index.html")
import Process._ import Process._
lazy val getPage = execTask { indexURL #> indexFile } lazy val getPage = execTask { indexURL #> indexFile }

3
sbt/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala
View File

@ -10,8 +10,9 @@ class WebappBuild(info: ProjectInfo) extends DefaultWebProject(info) {
Set("javax.servlet" % "servlet-api" % "2.5" % "provided", Set("javax.servlet" % "servlet-api" % "2.5" % "provided",
"org.eclipse.jetty" % "jetty-webapp" % "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)
def indexFile = new java.io.File("index.html") def indexFile = new java.io.File("index.html")
override def jettyPort = 7123
import Process._ import Process._
lazy val getPage = execTask { indexURL #> indexFile } lazy val getPage = execTask { indexURL #> indexFile }
lazy val checkPage = task { args => task { checkHelloWorld(args.mkString(" ")) } dependsOn getPage } lazy val checkPage = task { args => task { checkHelloWorld(args.mkString(" ")) } dependsOn getPage }