Updated to Lift 2.3-SNAPSHOT

lift · Mar 15, 2011 · 427d273 · 427d273
1 parent 22a67aa
commit 427d273
Show file tree

Hide file tree

Showing 33 changed files with 130 additions and 160 deletions.
diff --git a/lift_basic/project/build/LiftProject.scala b/lift_basic/project/build/LiftProject.scala
@@ -1,7 +1,7 @@
 import sbt._
 
 class LiftProject(info: ProjectInfo) extends DefaultWebProject(info) {
-  val liftVersion = "2.2"
+  val liftVersion = "2.3-SNAPSHOT"
 
   // uncomment the following if you want to use the snapshot repo
   // val scalatoolsSnapshot = ScalaToolsSnapshots
@@ -11,12 +11,12 @@ class LiftProject(info: ProjectInfo) extends DefaultWebProject(info) {
   // override def scanDirectories = Nil
 
   override def libraryDependencies = Set(
-    "net.liftweb" %% "lift-webkit" % liftVersion % "compile->default",
-    "net.liftweb" %% "lift-mapper" % liftVersion % "compile->default",
-    "org.mortbay.jetty" % "jetty" % "6.1.22" % "test->default",
-    "junit" % "junit" % "4.5" % "test->default",
+    "net.liftweb" %% "lift-webkit" % liftVersion % "compile",
+    "net.liftweb" %% "lift-mapper" % liftVersion % "compile",
+    "org.mortbay.jetty" % "jetty" % "6.1.22" % "test",
+    "junit" % "junit" % "4.5" % "test",
     "ch.qos.logback" % "logback-classic" % "0.9.26",
-    "org.scala-tools.testing" %% "specs" % "1.6.6" % "test->default",
+    "org.scala-tools.testing" %% "specs" % "1.6.6" % "test",
     "com.h2database" % "h2" % "1.2.138"
   ) ++ super.libraryDependencies
 }
diff --git a/lift_basic/src/main/scala/code/lib/DependencyFactory.scala b/lift_basic/src/main/scala/code/lib/DependencyFactory.scala
@@ -1,11 +1,11 @@
-package code {
-package lib {
+package code
+package lib
 
 import net.liftweb._
 import http._
 import util._
 import common._
-import _root_.java.util.Date
+import java.util.Date
 
 /**
  * A factory for generating new instances of Date.  You can create
@@ -53,5 +53,3 @@ sealed abstract class Changer {
   }
 }
 */
-}
-}
diff --git a/lift_basic/src/main/scala/code/model/User.scala b/lift_basic/src/main/scala/code/model/User.scala
@@ -1,9 +1,9 @@
-package code {
-package model {
+package code
+package model
 
-import _root_.net.liftweb.mapper._
-import _root_.net.liftweb.util._
-import _root_.net.liftweb.common._
+import net.liftweb.mapper._
+import net.liftweb.util._
+import net.liftweb.common._
 
 /**
  * The singleton that has methods for accessing the database
@@ -34,5 +34,3 @@ class User extends MegaProtoUser[User] {
   }
 }
 
-}
-}
diff --git a/lift_basic/src/main/scala/code/snippet/HelloWorld.scala b/lift_basic/src/main/scala/code/snippet/HelloWorld.scala
@@ -1,10 +1,10 @@
-package code {
-package snippet {
+package code 
+package snippet 
 
-import _root_.scala.xml.{NodeSeq, Text}
-import _root_.net.liftweb.util._
-import _root_.net.liftweb.common._
-import _root_.java.util.Date
+import scala.xml.{NodeSeq, Text}
+import net.liftweb.util._
+import net.liftweb.common._
+import java.util.Date
 import code.lib._
 import Helpers._
 
@@ -21,5 +21,3 @@ class HelloWorld {
    */
 }
 
-}
-}
diff --git a/lift_basic/src/test/scala/LiftConsole.scala b/lift_basic/src/test/scala/LiftConsole.scala
@@ -1,5 +1,5 @@
-import _root_.bootstrap.liftweb.Boot
-import _root_.scala.tools.nsc.MainGenericRunner
+import bootstrap.liftweb.Boot
+import scala.tools.nsc.MainGenericRunner
 
 object LiftConsole {
   def main(args : Array[String]) {

diff --git a/lift_basic/src/test/scala/RunWebApp.scala b/lift_basic/src/test/scala/RunWebApp.scala
@@ -1,6 +1,6 @@
-import _root_.org.mortbay.jetty.Connector
-import _root_.org.mortbay.jetty.Server
-import _root_.org.mortbay.jetty.webapp.WebAppContext
+import org.mortbay.jetty.Connector
+import org.mortbay.jetty.Server
+import org.mortbay.jetty.webapp.WebAppContext
 import org.mortbay.jetty.nio._
 
 object RunWebApp extends Application {

diff --git a/lift_basic/src/test/scala/code/AppTest.scala b/lift_basic/src/test/scala/code/AppTest.scala
@@ -1,11 +1,11 @@
 package code
 
-import _root_.java.io.File
-import _root_.junit.framework._
+import java.io.File
+import junit.framework._
 import Assert._
-import _root_.scala.xml.XML
-import _root_.net.liftweb.util._
-import _root_.net.liftweb.common._
+import scala.xml.XML
+import net.liftweb.util._
+import net.liftweb.common._
 
 object AppTest {
   def suite: Test = {
@@ -14,7 +14,7 @@ object AppTest {
   }
 
   def main(args : Array[String]) {
-    _root_.junit.textui.TestRunner.run(suite)
+    junit.textui.TestRunner.run(suite)
   }
 }
 
@@ -52,11 +52,11 @@ class AppTest extends TestCase("app") {
         try {
           XML.loadFile(file)
         } catch {
-          case e: _root_.org.xml.sax.SAXParseException => failed = file :: failed
+          case e: org.xml.sax.SAXParseException => failed = file :: failed
         }
       }
       if (file.isFile && handledXHtml(file.getName)) {
-        PCDataXmlParser(new _root_.java.io.FileInputStream(file.getAbsolutePath)) match {
+        PCDataXmlParser(new java.io.FileInputStream(file.getAbsolutePath)) match {
           case Full(_) => // file is ok
           case _ => failed = file :: failed
         }

diff --git a/lift_basic/src/test/scala/code/XmlSourceSpecs.scala b/lift_basic/src/test/scala/code/XmlSourceSpecs.scala
@@ -38,7 +38,7 @@ object XmlSourceSpecs extends Specification {
 	  try {
 	    XML.loadFile(file)
 	  } catch {
-	    case e: _root_.org.xml.sax.SAXParseException => failed = file :: failed
+	    case e: org.xml.sax.SAXParseException => failed = file :: failed
 	  }
 	}
 	if (file.isFile && handledXHtml(file.getName)) {

diff --git a/lift_basic/src/test/scala/code/snippet/HelloWorldTest.scala b/lift_basic/src/test/scala/code/snippet/HelloWorldTest.scala
@@ -1,5 +1,5 @@
-package code {
-package snippet {
+package code
+package snippet
 
 import org.specs._
 import org.specs.runner.JUnit4
@@ -41,6 +41,3 @@ object HelloWorldTestSpecs extends Specification {
     }
   }
 }
-
-}
-}
diff --git a/lift_blank/project/build/LiftProject.scala b/lift_blank/project/build/LiftProject.scala
@@ -1,7 +1,7 @@
 import sbt._
 
 class LiftProject(info: ProjectInfo) extends DefaultWebProject(info) {
-  val liftVersion = "2.2"
+  val liftVersion = "2.3-SNAPSHOT"
 
   // uncomment the following if you want to use the snapshot repo
   // val scalatoolsSnapshot = ScalaToolsSnapshots
@@ -11,10 +11,10 @@ class LiftProject(info: ProjectInfo) extends DefaultWebProject(info) {
   // override def scanDirectories = Nil
 
   override def libraryDependencies = Set(
-    "net.liftweb" %% "lift-webkit" % liftVersion % "compile->default",
-    "org.mortbay.jetty" % "jetty" % "6.1.22" % "test->default",
-    "junit" % "junit" % "4.5" % "test->default",
+    "net.liftweb" %% "lift-webkit" % liftVersion % "compile",
+    "org.mortbay.jetty" % "jetty" % "6.1.22" % "test",
+    "junit" % "junit" % "4.5" % "test",
     "ch.qos.logback" % "logback-classic" % "0.9.26",
-    "org.scala-tools.testing" %% "specs" % "1.6.6" % "test->default"
+    "org.scala-tools.testing" %% "specs" % "1.6.6" % "test"
   ) ++ super.libraryDependencies
 }
diff --git a/lift_blank/src/main/scala/code/lib/DependencyFactory.scala b/lift_blank/src/main/scala/code/lib/DependencyFactory.scala
@@ -1,11 +1,11 @@
-package code {
-package lib {
+package code
+package lib
 
 import net.liftweb._
 import http._
 import util._
 import common._
-import _root_.java.util.Date
+import java.util.Date
 
 /**
  * A factory for generating new instances of Date.  You can create
@@ -53,5 +53,3 @@ sealed abstract class Changer {
   }
 }
 */
-}
-}
diff --git a/lift_blank/src/main/scala/code/snippet/HelloWorld.scala b/lift_blank/src/main/scala/code/snippet/HelloWorld.scala
@@ -1,10 +1,10 @@
-package code {
-package snippet {
+package code
+package snippet
 
-import _root_.scala.xml.{NodeSeq, Text}
-import _root_.net.liftweb.util._
-import _root_.net.liftweb.common._
-import _root_.java.util.Date
+import scala.xml.{NodeSeq, Text}
+import net.liftweb.util._
+import net.liftweb.common._
+import java.util.Date
 import code.lib._
 import Helpers._
 
@@ -21,5 +21,3 @@ class HelloWorld {
    */
 }
 
-}
-}
diff --git a/lift_blank/src/test/scala/LiftConsole.scala b/lift_blank/src/test/scala/LiftConsole.scala
@@ -1,5 +1,5 @@
-import _root_.bootstrap.liftweb.Boot
-import _root_.scala.tools.nsc.MainGenericRunner
+import bootstrap.liftweb.Boot
+import scala.tools.nsc.MainGenericRunner
 
 object LiftConsole {
   def main(args : Array[String]) {

diff --git a/lift_blank/src/test/scala/RunWebApp.scala b/lift_blank/src/test/scala/RunWebApp.scala
@@ -1,6 +1,6 @@
-import _root_.org.mortbay.jetty.Connector
-import _root_.org.mortbay.jetty.Server
-import _root_.org.mortbay.jetty.webapp.WebAppContext
+import org.mortbay.jetty.Connector
+import org.mortbay.jetty.Server
+import org.mortbay.jetty.webapp.WebAppContext
 import org.mortbay.jetty.nio._
 
 object RunWebApp extends Application {

diff --git a/lift_blank/src/test/scala/code/AppTest.scala b/lift_blank/src/test/scala/code/AppTest.scala
@@ -1,11 +1,11 @@
 package code
 
-import _root_.java.io.File
-import _root_.junit.framework._
+import java.io.File
+import junit.framework._
 import Assert._
-import _root_.scala.xml.XML
-import _root_.net.liftweb.util._
-import _root_.net.liftweb.common._
+import scala.xml.XML
+import net.liftweb.util._
+import net.liftweb.common._
 
 object AppTest {
   def suite: Test = {
@@ -14,7 +14,7 @@ object AppTest {
   }
 
   def main(args : Array[String]) {
-    _root_.junit.textui.TestRunner.run(suite)
+    junit.textui.TestRunner.run(suite)
   }
 }
 
@@ -52,11 +52,11 @@ class AppTest extends TestCase("app") {
         try {
           XML.loadFile(file)
         } catch {
-          case e: _root_.org.xml.sax.SAXParseException => failed = file :: failed
+          case e: org.xml.sax.SAXParseException => failed = file :: failed
         }
       }
       if (file.isFile && handledXHtml(file.getName)) {
-        PCDataXmlParser(new _root_.java.io.FileInputStream(file.getAbsolutePath)) match {
+        PCDataXmlParser(new java.io.FileInputStream(file.getAbsolutePath)) match {
           case Full(_) => // file is ok
           case _ => failed = file :: failed
         }

diff --git a/lift_blank/src/test/scala/code/XmlSourceSpecs.scala b/lift_blank/src/test/scala/code/XmlSourceSpecs.scala
@@ -38,7 +38,7 @@ object XmlSourceSpecs extends Specification {
 	  try {
 	    XML.loadFile(file)
 	  } catch {
-	    case e: _root_.org.xml.sax.SAXParseException => failed = file :: failed
+	    case e: org.xml.sax.SAXParseException => failed = file :: failed
 	  }
 	}
 	if (file.isFile && handledXHtml(file.getName)) {

diff --git a/lift_blank/src/test/scala/code/snippet/HelloWorldTest.scala b/lift_blank/src/test/scala/code/snippet/HelloWorldTest.scala
@@ -1,5 +1,5 @@
-package code {
-package snippet {
+package code
+package snippet
 
 import org.specs._
 import org.specs.runner.JUnit4
@@ -41,6 +41,3 @@ object HelloWorldTestSpecs extends Specification {
     }
   }
 }
-
-}
-}
diff --git a/lift_mvc/project/build/LiftProject.scala b/lift_mvc/project/build/LiftProject.scala
@@ -1,7 +1,7 @@
 import sbt._
 
 class LiftProject(info: ProjectInfo) extends DefaultWebProject(info) {
-  val liftVersion = "2.2"
+  val liftVersion = "2.3-SNAPSHOT"
 
   // uncomment the following if you want to use the snapshot repo
   // val scalatoolsSnapshot = ScalaToolsSnapshots
@@ -11,12 +11,12 @@ class LiftProject(info: ProjectInfo) extends DefaultWebProject(info) {
   // override def scanDirectories = Nil
 
   override def libraryDependencies = Set(
-    "net.liftweb" %% "lift-webkit" % liftVersion % "compile->default",
-    "net.liftweb" %% "lift-mapper" % liftVersion % "compile->default",
-    "org.mortbay.jetty" % "jetty" % "6.1.22" % "test->default",
-    "junit" % "junit" % "4.5" % "test->default",
+    "net.liftweb" %% "lift-webkit" % liftVersion % "compile",
+    "net.liftweb" %% "lift-mapper" % liftVersion % "compile",
+    "org.mortbay.jetty" % "jetty" % "6.1.22" % "test",
+    "junit" % "junit" % "4.5" % "test",
     "ch.qos.logback" % "logback-classic" % "0.9.26",
-    "org.scala-tools.testing" %% "specs" % "1.6.6" % "test->default",
+    "org.scala-tools.testing" %% "specs" % "1.6.6" % "test",
     "com.h2database" % "h2" % "1.2.138"
   ) ++ super.libraryDependencies
 }
diff --git a/lift_mvc/src/main/scala/code/controller/RootController.scala b/lift_mvc/src/main/scala/code/controller/RootController.scala
@@ -1,9 +1,9 @@
-package code {
-package controller {
+package code 
+package controller 
 
-import _root_.net.liftweb.http._
-import _root_.net.liftweb.util._
-import _root_.java.util.Date
+import net.liftweb.http._
+import net.liftweb.util._
+import java.util.Date
 import code.lib._
 import Helpers._
 
@@ -29,6 +29,3 @@ object RootController extends MVCHelper {
       "#int_value" #> param
   }
 }
-
-}
-}
diff --git a/lift_mvc/src/main/scala/code/lib/DependencyFactory.scala b/lift_mvc/src/main/scala/code/lib/DependencyFactory.scala
@@ -1,11 +1,11 @@
-package code {
-package lib {
+package code
+package lib
 
 import net.liftweb._
 import http._
 import util._
 import common._
-import _root_.java.util.Date
+import java.util.Date
 
 /**
  * A factory for generating new instances of Date.  You can create
@@ -53,5 +53,3 @@ sealed abstract class Changer {
   }
 }
 */
-}
-}