Permalink
Browse files

Updates for #1385: remove sbt configs, update jpa dependencies to hib…

…ernate 4.2.0, re-sync with sbt templates
  • Loading branch information...
1 parent 54e5451 commit c98d8c10a2851b2f93a868d27f9c6aa9505357b8 @ldeck ldeck committed Apr 23, 2013
Showing with 871 additions and 1,001 deletions.
  1. +0 −3 lift-archetype-basic/src/main/resources/META-INF/maven/archetype-metadata.xml
  2. +0 −32 lift-archetype-basic/src/main/resources/archetype-resources/build.sbt
  3. +7 −7 lift-archetype-basic/src/main/resources/archetype-resources/pom.xml
  4. +0 −14 lift-archetype-basic/src/main/resources/archetype-resources/project/plugins.sbt
  5. +0 −1 lift-archetype-basic/src/main/resources/archetype-resources/sbt
  6. BIN lift-archetype-basic/src/main/resources/archetype-resources/sbt-launch-0.12.jar
  7. +0 −2 lift-archetype-basic/src/main/resources/archetype-resources/sbt.bat
  8. 0 ...c/main/resources/archetype-resources/src/main/resources/{props/default.logback.xml → logback.xml}
  9. +44 −30 ...rchetype-basic/src/main/resources/archetype-resources/src/main/scala/bootstrap/liftweb/Boot.scala
  10. 0 ...resources/archetype-resources/src/main/scala/lib/{DepencyFactory.scala → DependencyFactory.scala}
  11. +1 −1 lift-archetype-basic/src/main/resources/archetype-resources/src/test/scala/RunWebApp.scala
  12. +1 −1 ...rchetype-basic/src/main/resources/archetype-resources/src/test/scala/snippet/HelloWorldTest.scala
  13. +0 −30 lift-archetype-blank/src/main/resources/archetype-resources/build.sbt
  14. +6 −6 lift-archetype-blank/src/main/resources/archetype-resources/pom.xml
  15. +0 −14 lift-archetype-blank/src/main/resources/archetype-resources/project/plugins.sbt
  16. +0 −1 lift-archetype-blank/src/main/resources/archetype-resources/sbt
  17. BIN lift-archetype-blank/src/main/resources/archetype-resources/sbt-launch-0.12.jar
  18. +0 −2 lift-archetype-blank/src/main/resources/archetype-resources/sbt.bat
  19. 0 ...c/main/resources/archetype-resources/src/main/resources/{props/default.logback.xml → logback.xml}
  20. +6 −6 lift-archetype-blank/src/main/resources/archetype-resources/src/test/scala/AppTest.scala
  21. +2 −2 lift-archetype-blank/src/main/resources/archetype-resources/src/test/scala/LiftConsole.scala
  22. +1 −1 ...rchetype-blank/src/main/resources/archetype-resources/src/test/scala/snippet/HelloWorldTest.scala
  23. +5 −4 lift-archetype-jpa-basic/src/main/resources/archetype-resources/pom.xml
  24. +1 −1 lift-archetype-jpa-basic/src/main/resources/archetype-resources/spa/pom.xml
  25. +5 −7 lift-archetype-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/AU.scala
  26. +2 −5 ...etype-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/AUDUserType.scala
  27. +3 −5 ...-archetype-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/Author.scala
  28. +5 −7 lift-archetype-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/Book.scala
  29. +9 −12 ...-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/CurrencyUserType.scala
  30. +6 −9 ...type-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/CurrencyZone.scala
  31. +2 −4 lift-archetype-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/Enumv.scala
  32. +9 −13 ...chetype-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/EnumvType.scala
  33. +2 −4 lift-archetype-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/Genre.scala
  34. +2 −4 ...hetype-jpa-basic/src/main/resources/archetype-resources/spa/src/test/scala/model/TestJPAWeb.scala
  35. +2 −2 lift-archetype-jpa-basic/src/main/resources/archetype-resources/web/pom.xml
  36. +16 −15 ...-jpa-basic/src/main/resources/archetype-resources/web/src/main/scala/bootstrap/liftweb/Boot.scala
  37. +4 −7 lift-archetype-jpa-basic/src/main/resources/archetype-resources/web/src/main/scala/model/Model.scala
  38. +21 −23 ...rchetype-jpa-basic/src/main/resources/archetype-resources/web/src/main/scala/snippet/Author.scala
  39. +27 −29 ...archetype-jpa-basic/src/main/resources/archetype-resources/web/src/main/scala/snippet/Books.scala
  40. +12 −12 lift-archetype-jpa-basic/src/main/resources/archetype-resources/web/src/main/webapp/books/add.html
  41. +0 −1 ...archetype-jpa-basic/src/main/resources/archetype-resources/web/src/main/webapp/css/datePicker.css
  42. +4 −3 lift-archetype-jpa-basic/src/main/resources/archetype-resources/web/src/main/webapp/index.html
  43. +77 −78 ...pa-basic/src/main/resources/archetype-resources/web/src/main/webapp/templates-hidden/default.html
  44. +3 −3 lift-archetype-jpa-basic/src/main/resources/archetype-resources/web/src/test/scala/RunWebApp.scala
  45. +3 −4 ...basic/src/main/resources/archetype-resources/web/src/test/scala/net/liftweb/jpademo/AppTest.scala
  46. +7 −6 lift-archetype-jpa-blank-single/src/main/resources/archetype-resources/pom.xml
  47. +7 −7 ...a-blank-single/src/main/resources/archetype-resources/src/main/scala/bootstrap/liftweb/Boot.scala
  48. +4 −7 ...rchetype-jpa-blank-single/src/main/resources/archetype-resources/src/main/scala/model/Model.scala
  49. +4 −3 lift-archetype-jpa-blank-single/src/main/resources/archetype-resources/src/main/webapp/index.html
  50. +79 −80 ...blank-single/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/default.html
  51. +2 −2 ...rchetype-jpa-blank-single/src/main/resources/archetype-resources/src/test/scala/LiftConsole.scala
  52. +3 −3 ...-archetype-jpa-blank-single/src/main/resources/archetype-resources/src/test/scala/RunWebApp.scala
  53. +7 −8 ...nk-single/src/main/resources/archetype-resources/src/test/scala/net/liftweb/jpademo/AppTest.scala
  54. +4 −3 lift-archetype-jpa-blank/src/main/resources/archetype-resources/pom.xml
  55. +1 −1 lift-archetype-jpa-blank/src/main/resources/archetype-resources/spa/pom.xml
  56. +2 −2 lift-archetype-jpa-blank/src/main/resources/archetype-resources/web/pom.xml
  57. +7 −7 ...-jpa-blank/src/main/resources/archetype-resources/web/src/main/scala/bootstrap/liftweb/Boot.scala
  58. +4 −7 lift-archetype-jpa-blank/src/main/resources/archetype-resources/web/src/main/scala/model/Model.scala
  59. +4 −3 lift-archetype-jpa-blank/src/main/resources/archetype-resources/web/src/main/webapp/index.html
  60. +79 −80 ...pa-blank/src/main/resources/archetype-resources/web/src/main/webapp/templates-hidden/default.html
  61. +1 −1 lift-archetype-jpa-blank/src/main/resources/archetype-resources/web/src/test/scala/LiftConsole.scala
  62. +3 −3 lift-archetype-jpa-blank/src/main/resources/archetype-resources/web/src/test/scala/RunWebApp.scala
  63. +7 −8 ...blank/src/main/resources/archetype-resources/web/src/test/scala/net/liftweb/jpademo/AppTest.scala
  64. +5 −7 {lift-archetype-sbt → lift-archetype-mvc}/pom.xml
  65. 0 {lift-archetype-sbt → lift-archetype-mvc}/src/it/sample/invoker.properties
  66. 0 {lift-archetype-sbt → lift-archetype-mvc}/src/it/sample/postbuild.groovy
  67. +1 −11 {lift-archetype-sbt → lift-archetype-mvc}/src/main/resources/META-INF/maven/archetype-metadata.xml
  68. +1 −1 {lift-archetype-sbt → lift-archetype-mvc}/src/main/resources/META-INF/maven/archetype.xml
  69. +20 −20 {lift-archetype-sbt → lift-archetype-mvc}/src/main/resources/archetype-resources/pom.xml
  70. 0 ...chetype-sbt → lift-archetype-mvc}/src/main/resources/archetype-resources/src/main/resources/.keep
  71. +23 −0 lift-archetype-mvc/src/main/resources/archetype-resources/src/main/resources/logback.xml
  72. 0 ... lift-archetype-mvc/src/main/resources/archetype-resources/src/main/resources/props/default.props
  73. +46 −0 ...-archetype-mvc/src/main/resources/archetype-resources/src/main/scala/bootstrap/liftweb/Boot.scala
  74. 0 ...cala/view → lift-archetype-mvc/src/main/resources/archetype-resources/src/main/scala/comet}/.keep
  75. +31 −0 ...chetype-mvc/src/main/resources/archetype-resources/src/main/scala/controller/RootController.scala
  76. +3 −5 ...t-archetype-mvc/src/main/resources/archetype-resources/src/main/scala/lib/DependencyFactory.scala
  77. 0 ...resources → lift-archetype-mvc/src/main/resources/archetype-resources/src/main/scala/model}/.keep
  78. 0 lift-archetype-mvc/src/main/resources/archetype-resources/src/main/scala/snippet/.keep
  79. 0 lift-archetype-mvc/src/main/resources/archetype-resources/src/main/scala/view/.keep
  80. 0 ...-sbt → lift-archetype-mvc}/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
  81. BIN ...lift-archetype-mvc}/src/main/resources/archetype-resources/src/main/webapp/images/ajax-loader.gif
  82. +36 −0 lift-archetype-mvc/src/main/resources/archetype-resources/src/main/webapp/index.html
  83. +29 −0 lift-archetype-mvc/src/main/resources/archetype-resources/src/main/webapp/show_int.html
  84. 0 lift-archetype-mvc/src/main/resources/archetype-resources/src/main/webapp/static/.keep
  85. +76 −0 ...rchetype-mvc/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/default.html
  86. 0 ...type-mvc}/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/wizard-all.html
  87. 0 ...e-sbt → lift-archetype-mvc}/src/main/resources/archetype-resources/src/packageLinkDefs.properties
  88. 0 lift-archetype-mvc/src/main/resources/archetype-resources/src/test/resources/.keep
  89. +23 −0 lift-archetype-mvc/src/main/resources/archetype-resources/src/test/resources/logback-test.xml
  90. +7 −6 ...ype-sbt → lift-archetype-mvc}/src/main/resources/archetype-resources/src/test/scala/AppTest.scala
  91. +2 −2 ...sbt → lift-archetype-mvc}/src/main/resources/archetype-resources/src/test/scala/LiftConsole.scala
  92. +9 −8 ...e-sbt → lift-archetype-mvc}/src/main/resources/archetype-resources/src/test/scala/RunWebApp.scala
  93. +42 −0 ...-archetype-mvc/src/main/resources/archetype-resources/src/test/scala/snippet/HelloWorldTest.scala
  94. 0 ...etype-sbt → lift-archetype-mvc}/src/main/resources/archetype-resources/use-archetype-generate.txt
  95. +0 −7 lift-archetype-sbt/src/main/resources/archetype-resources/project/build.properties
  96. +0 −1 lift-archetype-sbt/src/main/resources/archetype-resources/src/main/resources/props/default.props
  97. +0 −73 ...-archetype-sbt/src/main/resources/archetype-resources/src/main/scala/bootstrap/liftweb/Boot.scala
  98. +0 −38 lift-archetype-sbt/src/main/resources/archetype-resources/src/main/scala/model/User.scala
  99. +0 −25 lift-archetype-sbt/src/main/resources/archetype-resources/src/main/scala/snippet/HelloWorld.scala
  100. +0 −9 lift-archetype-sbt/src/main/resources/archetype-resources/src/main/webapp/index.html
  101. +0 −5 lift-archetype-sbt/src/main/resources/archetype-resources/src/main/webapp/static/index.html
  102. +0 −97 ...rchetype-sbt/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/default.html
  103. +0 −46 ...-archetype-sbt/src/main/resources/archetype-resources/src/test/scala/snippet/HelloWorldTest.scala
  104. +4 −4 pom.xml
@@ -12,9 +12,6 @@
</requiredProperty>
</requiredProperties>
<fileSets>
- <fileSet encoding="UTF-8" filtered="true">
- <directory>project</directory>
- </fileSet>
<fileSet encoding="UTF-8" filtered="false">
<directory>src</directory>
<includes>
@@ -1,32 +0,0 @@
-name := "Lift 2.5 starter template"
-
-version := "0.0.1"
-
-organization := "net.liftweb"
-
-scalaVersion := "2.9.1"
-
-resolvers ++= Seq("snapshots" at "http://oss.sonatype.org/content/repositories/snapshots",
- "releases" at "http://oss.sonatype.org/content/repositories/releases"
- )
-
-seq(com.github.siasia.WebPlugin.webSettings :_*)
-
-unmanagedResourceDirectories in Test <+= (baseDirectory) { _ / "src/main/webapp" }
-
-scalacOptions ++= Seq("-deprecation", "-unchecked")
-
-libraryDependencies ++= {
- val liftVersion = "2.5-M4"
- Seq(
- "net.liftweb" %% "lift-webkit" % liftVersion % "compile",
- "net.liftweb" %% "lift-mapper" % liftVersion % "compile",
- "net.liftmodules" %% "lift-jquery-module" % (liftVersion + "-2.0"),
- "org.eclipse.jetty" % "jetty-webapp" % "8.1.7.v20120910" % "container,test",
- "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container,test" artifacts Artifact("javax.servlet", "jar", "jar"),
- "ch.qos.logback" % "logback-classic" % "1.0.6",
- "org.specs2" %% "specs2" % "1.12.1" % "test",
- "com.h2database" % "h2" % "1.3.170"
- )
-}
-
@@ -69,7 +69,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.0.6</version>
+ <version>1.0.11</version>
</dependency>
#elseif ($logBackend.equalsIgnoreCase("log4j"))
<dependency>
@@ -80,13 +80,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.2</version>
+ <version>${slf4j.version}</version>
</dependency>
#end
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.3.170</version>
+ <version>1.3.171</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -102,15 +102,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.scala-tools.testing</groupId>
- <artifactId>specs_${scala.version}</artifactId>
+ <groupId>org.specs2</groupId>
+ <artifactId>specs2_${scala.version}</artifactId>
<version>${specs.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>8.1.8.v20121106</version>
+ <version>9.0.1.v20130408</version>
<scope>test</scope>
</dependency>
<!-- for LiftConsole -->
@@ -176,7 +176,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.0.0.M4</version>
+ <version>9.0.1.v20130408</version>
<configuration>
<contextPath>/</contextPath>
<scanIntervalSeconds>5</scanIntervalSeconds>
@@ -1,14 +0,0 @@
-libraryDependencies <+= sbtVersion(v => v match {
- case "0.11.0" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.0-0.2.8"
- case "0.11.1" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.1-0.2.10"
- case "0.11.2" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.2-0.2.10"
- case "0.11.3" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.3-0.2.11.1"
- case "0.12.0" => "com.github.siasia" %% "xsbt-web-plugin" % "0.12.0-0.2.11.1"
- case "0.12.1" => "com.github.siasia" %% "xsbt-web-plugin" % "0.12.0-0.2.11.1"
-})
-
-//Uncoment this line to enable the sbt idea plugin
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.1.0")
-
-//Uncoment this line to enable the sbt eclipse plugin
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.0")
@@ -1 +0,0 @@
-java -Xmx1024M -Xss2M -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -jar `dirname $0`/sbt-launch-0.12.jar "$@"
@@ -1,2 +0,0 @@
-set SCRIPT_DIR=%~dp0
-java -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx1024M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.12.jar" %*
@@ -1,15 +1,18 @@
package bootstrap.liftweb
-import _root_.net.liftweb.util._
-import _root_.net.liftweb.common._
-import _root_.net.liftweb.http._
-import _root_.net.liftweb.http.provider._
-import _root_.net.liftweb.sitemap._
-import _root_.net.liftweb.sitemap.Loc._
+import net.liftweb._
+import util._
import Helpers._
-import _root_.net.liftweb.mapper.{DB, ConnectionManager, Schemifier, DefaultConnectionIdentifier, StandardDBVendor}
-import _root_.java.sql.{Connection, DriverManager}
-import _root_.${package}.model._
+
+import common._
+import http._
+import js.jquery.JQueryArtifacts
+import sitemap._
+import Loc._
+import mapper._
+
+import ${package}.model._
+import net.liftmodules.JQueryModule
/**
@@ -30,42 +33,53 @@ class Boot {
DB.defineConnectionManager(DefaultConnectionIdentifier, vendor)
}
- // where to search snippet
- LiftRules.addToPackages("${package}")
+ // Use Lift's Mapper ORM to populate the database
+ // you don't need to use Mapper to use Lift... use
+ // any ORM you want
Schemifier.schemify(true, Schemifier.infoF _, User)
+ // where to search snippet
+ LiftRules.addToPackages("code")
+
// Build SiteMap
- def sitemap() = SiteMap(
- Menu("Home") / "index" >> User.AddUserMenusAfter, // Simple menu form
- // Menu with special Link
+ def sitemap = SiteMap(
+ Menu.i("Home") / "index" >> User.AddUserMenusAfter, // the simple way to declare a menu
+
+ // more complex because this menu allows anything in the
+ // /static path to be visible
Menu(Loc("Static", Link(List("static"), true, "/static/index"),
"Static Content")))
- LiftRules.setSiteMapFunc(() => User.sitemapMutator(sitemap()))
+ def sitemapMutators = User.sitemapMutator
- /*
- * Show the spinny image when an Ajax call starts
- */
+ // set the sitemap. Note if you don't want access control for
+ // each page, just comment this line out.
+ LiftRules.setSiteMapFunc(() => sitemapMutators(sitemap))
+
+ //Init the jQuery module, see http://liftweb.net/jquery for more information.
+ LiftRules.jsArtifacts = JQueryArtifacts
+ JQueryModule.InitParam.JQuery=JQueryModule.JQuery172
+ JQueryModule.init()
+
+ //Show the spinny image when an Ajax call starts
LiftRules.ajaxStart =
Full(() => LiftRules.jsArtifacts.show("ajax-loader").cmd)
-
- /*
- * Make the spinny image go away when it ends
- */
+
+ // Make the spinny image go away when it ends
LiftRules.ajaxEnd =
Full(() => LiftRules.jsArtifacts.hide("ajax-loader").cmd)
- LiftRules.early.append(makeUtf8)
+ // Force the request to be UTF-8
+ LiftRules.early.append(_.setCharacterEncoding("UTF-8"))
+ // What is the function to test if a user is logged in?
LiftRules.loggedInTest = Full(() => User.loggedIn_?)
- S.addAround(DB.buildLoanWrapper)
- }
+ // Use HTML5 for rendering
+ LiftRules.htmlProperties.default.set((r: Req) =>
+ new Html5Properties(r.userAgent))
- /**
- * Force the request to be UTF-8
- */
- private def makeUtf8(req: HTTPRequest) {
- req.setCharacterEncoding("UTF-8")
+ // Make a transaction span the whole HTTP request
+ S.addAround(DB.buildLoanWrapper)
}
}
@@ -13,7 +13,7 @@ object RunWebApp extends App {
context.setServer(server)
context.setWar("src/main/webapp")
- val context0: ContextHandler = new ContextHandler();
+ val context0: ContextHandler = new ContextHandler()
context0.setHandler(context)
server.setHandler(context0)
@@ -12,7 +12,7 @@ import org.specs2.specification.AroundExample
import org.specs2.execute.Result
-object HelloWorldTestSpecs extends Specification with AroundExample{
+object HelloWorldTestSpecs extends Specification with AroundExample {
val session = new LiftSession("", randomString(20), Empty)
val stableTime = now
@@ -1,30 +0,0 @@
-name := "Lift 2.5 starter template"
-
-version := "0.0.1"
-
-organization := "net.liftweb"
-
-scalaVersion := "2.9.1"
-
-resolvers ++= Seq("snapshots" at "http://oss.sonatype.org/content/repositories/snapshots",
- "releases" at "http://oss.sonatype.org/content/repositories/releases"
- )
-
-seq(com.github.siasia.WebPlugin.webSettings :_*)
-
-unmanagedResourceDirectories in Test <+= (baseDirectory) { _ / "src/main/webapp" }
-
-scalacOptions ++= Seq("-deprecation", "-unchecked")
-
-libraryDependencies ++= {
- val liftVersion = "2.5-M4"
- Seq(
- "net.liftweb" %% "lift-webkit" % liftVersion % "compile",
- "net.liftmodules" %% "lift-jquery-module" % (liftVersion + "-2.0"),
- "org.eclipse.jetty" % "jetty-webapp" % "8.1.7.v20120910" % "container,test",
- "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container,test" artifacts Artifact("javax.servlet", "jar", "jar"),
- "ch.qos.logback" % "logback-classic" % "1.0.6",
- "org.specs2" %% "specs2" % "1.12.1" % "test"
- )
-}
-
@@ -69,7 +69,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.0.6</version>
+ <version>1.0.11</version>
</dependency>
#elseif ($logBackend.equalsIgnoreCase("log4j"))
<dependency>
@@ -80,7 +80,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.2</version>
+ <version>${slf4j.version}</version>
</dependency>
#end
<dependency>
@@ -96,15 +96,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.scala-tools.testing</groupId>
- <artifactId>specs_${scala.version}</artifactId>
+ <groupId>org.specs2</groupId>
+ <artifactId>specs2_${scala.version}</artifactId>
<version>${specs.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>8.1.8.v20121106</version>
+ <version>9.0.1.v20130408</version>
<scope>test</scope>
</dependency>
<!-- for LiftConsole -->
@@ -170,7 +170,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.0.0.M4</version>
+ <version>9.0.1.v20130408</version>
<configuration>
<contextPath>/</contextPath>
<scanIntervalSeconds>5</scanIntervalSeconds>
@@ -1,14 +0,0 @@
-libraryDependencies <+= sbtVersion(v => v match {
- case "0.11.0" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.0-0.2.8"
- case "0.11.1" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.1-0.2.10"
- case "0.11.2" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.2-0.2.10"
- case "0.11.3" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.3-0.2.11.1"
- case "0.12.0" => "com.github.siasia" %% "xsbt-web-plugin" % "0.12.0-0.2.11.1"
- case "0.12.1" => "com.github.siasia" %% "xsbt-web-plugin" % "0.12.0-0.2.11.1"
-})
-
-//Uncoment this line to enable the sbt idea plugin
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.1.0")
-
-//Uncoment this line to enable the sbt eclipse plugin
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.0")
@@ -1 +0,0 @@
-java -Xmx1024M -Xss2M -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -jar `dirname $0`/sbt-launch-0.12.jar "$@"
@@ -1,2 +0,0 @@
-set SCRIPT_DIR=%~dp0
-java -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx1024M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.12.jar" %*
@@ -1,11 +1,11 @@
package ${package}
-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 = {
@@ -27,7 +27,7 @@ class AppTest extends TestCase("app") {
* Rigourous Tests :-)
*/
def testOK() = assertTrue(true)
- // def testKO() = assertTrue(false);
+ // def testKO() = assertTrue(false)
/**
* Tests to make sure the project's XML files are well-formed.
@@ -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]) {
@@ -12,7 +12,7 @@ import org.specs2.specification.AroundExample
import org.specs2.execute.Result
-object HelloWorldTestSpecs extends Specification with AroundExample{
+object HelloWorldTestSpecs extends Specification with AroundExample {
val session = new LiftSession("", randomString(20), Empty)
val stableTime = now
Oops, something went wrong.

0 comments on commit c98d8c1

Please sign in to comment.