Permalink
Browse files

Merge pull request #2 from tvaughan77/master

Removed deprecation warnings and fixed broken tests in lift_24_sbt/scala_29 examples
  • Loading branch information...
2 parents 1c78c1b + 1f759a3 commit 2f0f4ca917db33bd82c0481127c354ce6c72c311 @indrajitr indrajitr committed Feb 29, 2012
@@ -10,6 +10,6 @@ object LiftConsole {
// Now run the MainGenericRunner to get your repl
MainGenericRunner.main(args)
// After the repl exits, then exit the scala script
- exit(0)
+ sys.exit(0)
}
}
@@ -3,7 +3,7 @@ import org.mortbay.jetty.Server
import org.mortbay.jetty.webapp.WebAppContext
import org.mortbay.jetty.nio._
-object RunWebApp extends Application {
+object RunWebApp extends App {
val server = new Server
val scc = new SelectChannelConnector
scc.setPort(8080)
@@ -37,7 +37,7 @@ object HelloWorldTestSpecs extends Specification {
val str = hello.howdy(<span>Welcome to your Lift app at <span id="time">Time goes here</span></span>).toString
str.indexOf(stableTime.toString) must be >= 0
- str.indexOf("Hello at") must be >= 0
+ str.indexOf("Welcome to") must be >= 0
}
}
}
@@ -10,6 +10,6 @@ object LiftConsole {
// Now run the MainGenericRunner to get your repl
MainGenericRunner.main(args)
// After the repl exits, then exit the scala script
- exit(0)
+ sys.exit(0)
}
}
@@ -3,7 +3,7 @@ import org.mortbay.jetty.Server
import org.mortbay.jetty.webapp.WebAppContext
import org.mortbay.jetty.nio._
-object RunWebApp extends Application {
+object RunWebApp extends App {
val server = new Server
val scc = new SelectChannelConnector
scc.setPort(8080)
@@ -37,7 +37,7 @@ object HelloWorldTestSpecs extends Specification {
val str = hello.howdy(<span>Welcome to your Lift app at <span id="time">Time goes here</span></span>).toString
str.indexOf(stableTime.toString) must be >= 0
- str.indexOf("Hello at") must be >= 0
+ str.indexOf("Welcome to") must be >= 0
}
}
}
@@ -10,6 +10,6 @@ object LiftConsole {
// Now run the MainGenericRunner to get your repl
MainGenericRunner.main(args)
// After the repl exits, then exit the scala script
- exit(0)
+ sys.exit(0)
}
}
@@ -3,7 +3,7 @@ import org.mortbay.jetty.Server
import org.mortbay.jetty.webapp.WebAppContext
import org.mortbay.jetty.nio._
-object RunWebApp extends Application {
+object RunWebApp extends App {
val server = new Server
val scc = new SelectChannelConnector
scc.setPort(8080)
@@ -10,6 +10,6 @@ object LiftConsole {
// Now run the MainGenericRunner to get your repl
MainGenericRunner.main(args)
// After the repl exits, then exit the scala script
- exit(0)
+ sys.exit(0)
}
}
@@ -3,7 +3,7 @@ import org.mortbay.jetty.Server
import org.mortbay.jetty.webapp.WebAppContext
import org.mortbay.jetty.nio._
-object RunWebApp extends Application {
+object RunWebApp extends App {
val server = new Server
val scc = new SelectChannelConnector
scc.setPort(8080)
@@ -37,7 +37,7 @@ object HelloWorldTestSpecs extends Specification {
val str = hello.howdy(<span>Welcome to your Lift app at <span id="time">Time goes here</span></span>).toString
str.indexOf(stableTime.toString) must be >= 0
- str.indexOf("Hello at") must be >= 0
+ str.indexOf("Welcome to") must be >= 0
}
}
}

0 comments on commit 2f0f4ca

Please sign in to comment.