Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
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...
commit c98d8c10a2851b2f93a868d27f9c6aa9505357b8 1 parent 54e5451
@ldeck ldeck authored
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  ...gback.xml → lift-archetype-basic/src/main/resources/archetype-resources/src/main/resources/logback.xml
  9. +44 −30 lift-archetype-basic/src/main/resources/archetype-resources/src/main/scala/bootstrap/liftweb/Boot.scala
  10. 0  ...main/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  lift-archetype-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  ...gback.xml → lift-archetype-blank/src/main/resources/archetype-resources/src/main/resources/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  lift-archetype-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 lift-archetype-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/AUDUserType.scala
  27. +3 −5 lift-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 ...-archetype-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/CurrencyUserType.scala
  30. +6 −9 lift-archetype-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 lift-archetype-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 lift-archetype-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 ...-archetype-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 lift-archetype-jpa-basic/src/main/resources/archetype-resources/web/src/main/scala/snippet/Author.scala
  39. +27 −29 lift-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  lift-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 ...rchetype-jpa-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 ...etype-jpa-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 ...chetype-jpa-blank-single/src/main/resources/archetype-resources/src/main/scala/bootstrap/liftweb/Boot.scala
  48. +4 −7 lift-archetype-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 ...etype-jpa-blank-single/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/default.html
  51. +2 −2 lift-archetype-jpa-blank-single/src/main/resources/archetype-resources/src/test/scala/LiftConsole.scala
  52. +3 −3 lift-archetype-jpa-blank-single/src/main/resources/archetype-resources/src/test/scala/RunWebApp.scala
  53. +7 −8 ...pe-jpa-blank-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 ...-archetype-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 ...rchetype-jpa-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 ...etype-jpa-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  ...sources/src/test → 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  ...eep → lift-archetype-mvc/src/main/resources/archetype-resources/src/main/resources/props/default.props
  73. +46 −0 lift-archetype-mvc/src/main/resources/archetype-resources/src/main/scala/bootstrap/liftweb/Boot.scala
  74. 0  ...-archetype-sbt → lift-archetype-mvc}/src/main/resources/archetype-resources/src/main/scala/comet/.keep
  75. +31 −0 lift-archetype-mvc/src/main/resources/archetype-resources/src/main/scala/controller/RootController.scala
  76. +3 −5 ...→ lift-archetype-mvc/src/main/resources/archetype-resources/src/main/scala/lib/DependencyFactory.scala
  77. 0  ...main/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  ...etype-sbt → lift-archetype-mvc}/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
  81. 0  ...bt → 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 lift-archetype-mvc/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/default.html
  86. 0  ...lift-archetype-mvc}/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/wizard-all.html
  87. 0  ...hetype-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 ...rchetype-sbt → lift-archetype-mvc}/src/main/resources/archetype-resources/src/test/scala/AppTest.scala
  91. +2 −2 ...type-sbt → lift-archetype-mvc}/src/main/resources/archetype-resources/src/test/scala/LiftConsole.scala
  92. +9 −8 ...hetype-sbt → lift-archetype-mvc}/src/main/resources/archetype-resources/src/test/scala/RunWebApp.scala
  93. +42 −0 lift-archetype-mvc/src/main/resources/archetype-resources/src/test/scala/snippet/HelloWorldTest.scala
  94. 0  ...-archetype-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 lift-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 lift-archetype-sbt/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/default.html
  103. +0 −46 lift-archetype-sbt/src/main/resources/archetype-resources/src/test/scala/snippet/HelloWorldTest.scala
  104. +4 −4 pom.xml
View
3  lift-archetype-basic/src/main/resources/META-INF/maven/archetype-metadata.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>
View
32 lift-archetype-basic/src/main/resources/archetype-resources/build.sbt
@@ -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"
- )
-}
-
View
14 lift-archetype-basic/src/main/resources/archetype-resources/pom.xml
@@ -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>
View
14 lift-archetype-basic/src/main/resources/archetype-resources/project/plugins.sbt
@@ -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")
View
1  lift-archetype-basic/src/main/resources/archetype-resources/sbt
@@ -1 +0,0 @@
-java -Xmx1024M -Xss2M -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -jar `dirname $0`/sbt-launch-0.12.jar "$@"
View
BIN  lift-archetype-basic/src/main/resources/archetype-resources/sbt-launch-0.12.jar
Binary file not shown
View
2  lift-archetype-basic/src/main/resources/archetype-resources/sbt.bat
@@ -1,2 +0,0 @@
-set SCRIPT_DIR=%~dp0
-java -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx1024M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.12.jar" %*
View
0  ...rces/src/main/resources/props/default.logback.xml → ...rchetype-resources/src/main/resources/logback.xml
File renamed without changes
View
74 lift-archetype-basic/src/main/resources/archetype-resources/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -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)
}
}
View
0  ...resources/src/main/scala/lib/DepencyFactory.scala → ...ources/src/main/scala/lib/DependencyFactory.scala
File renamed without changes
View
2  lift-archetype-basic/src/main/resources/archetype-resources/src/test/scala/RunWebApp.scala
@@ -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)
View
2  lift-archetype-basic/src/main/resources/archetype-resources/src/test/scala/snippet/HelloWorldTest.scala
@@ -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
View
30 lift-archetype-blank/src/main/resources/archetype-resources/build.sbt
@@ -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"
- )
-}
-
View
12 lift-archetype-blank/src/main/resources/archetype-resources/pom.xml
@@ -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>
View
14 lift-archetype-blank/src/main/resources/archetype-resources/project/plugins.sbt
@@ -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")
View
1  lift-archetype-blank/src/main/resources/archetype-resources/sbt
@@ -1 +0,0 @@
-java -Xmx1024M -Xss2M -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -jar `dirname $0`/sbt-launch-0.12.jar "$@"
View
BIN  lift-archetype-blank/src/main/resources/archetype-resources/sbt-launch-0.12.jar
Binary file not shown
View
2  lift-archetype-blank/src/main/resources/archetype-resources/sbt.bat
@@ -1,2 +0,0 @@
-set SCRIPT_DIR=%~dp0
-java -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx1024M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.12.jar" %*
View
0  ...rces/src/main/resources/props/default.logback.xml → ...rchetype-resources/src/main/resources/logback.xml
File renamed without changes
View
12 lift-archetype-blank/src/main/resources/archetype-resources/src/test/scala/AppTest.scala
@@ -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.
View
4 lift-archetype-blank/src/main/resources/archetype-resources/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]) {
View
2  lift-archetype-blank/src/main/resources/archetype-resources/src/test/scala/snippet/HelloWorldTest.scala
@@ -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
View
9 lift-archetype-jpa-basic/src/main/resources/archetype-resources/pom.xml
@@ -70,13 +70,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.2</version>
+ <version>${slf4j.version}</version>
</dependency>
#if ($logBackend.equalsIgnoreCase("logback"))
<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>
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.2</version>
+ <version>${slf4j.version}</version>
</dependency>
#end
<dependency>
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.4.2.0</version>
+ <version>10.9.1.0</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -167,6 +167,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.14.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
View
2  lift-archetype-jpa-basic/src/main/resources/archetype-resources/spa/pom.xml
@@ -24,7 +24,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>3.4.0.GA</version>
+ <version>4.2.0.Final</version>
<exclusions>
<exclusion>
<groupId>javax.transaction</groupId>
View
12 lift-archetype-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/AU.scala
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions
* and limitations under the License.
*/
-package ${package} {
-package model {
+package ${package}
+package model
-import _root_.java.util.Currency;
-import _root_.java.util.Locale;
-import _root_.java.text.NumberFormat;
+import java.util.Currency
+import java.util.Locale
+import java.text.NumberFormat
/* Australian Money */
object AU extends CurrencyZone {
@@ -44,5 +44,3 @@ object AU extends CurrencyZone {
val Dollar = make(1)
val CurrencyUnit = Dollar
}
-}
-}
View
7 lift-archetype-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/AUDUserType.scala
@@ -13,11 +13,8 @@
* See the License for the specific language governing permissions
* and limitations under the License.
*/
-package ${package} {
-package model {
+package ${package}
+package model
/* Australian Money Hibernate Mapper */
class AUDUserType extends CurrencyUserType[AU.type](AU)
-
-}
-}
View
8 lift-archetype-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/Author.scala
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions
* and limitations under the License.
*/
-package ${package} {
-package model {
+package ${package}
+package model
-import _root_.javax.persistence._
+import javax.persistence._
/**
An author is someone who writes books.
@@ -33,5 +33,3 @@ class Author {
@OneToMany(mappedBy = "author", targetEntity = classOf[Book])
var books : _root_.java.util.Set[Book] = new _root_.java.util.HashSet[Book]()
}
-}
-}
View
12 lift-archetype-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/Book.scala
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions
* and limitations under the License.
*/
-package ${package} {
-package model {
+package ${package}
+package model
-import _root_.java.util.Date
+import java.util.Date
-import _root_.javax.persistence._
-import _root_.org.hibernate.annotations.Type
+import javax.persistence._
+import org.hibernate.annotations.Type
/**
@@ -44,5 +44,3 @@ class Book {
@ManyToOne(optional = false)
var author : Author = _
}
-}
-}
View
21 ...chetype-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/CurrencyUserType.scala
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions
* and limitations under the License.
*/
-package ${package} {
-package model {
+package ${package}
+package model
-import _root_.java.io.Serializable
-import _root_.java.sql.PreparedStatement
-import _root_.java.sql.ResultSet
-import _root_.java.sql.SQLException
-import _root_.java.sql.Types
+import java.io.Serializable
+import java.sql.PreparedStatement
+import java.sql.ResultSet
+import java.sql.SQLException
+import java.sql.Types
-import _root_.org.hibernate.HibernateException
-import _root_.org.hibernate.usertype.UserType
+import org.hibernate.HibernateException
+import org.hibernate.usertype.UserType
/**
* Helper class to translate money amount for hibernate
@@ -71,6 +71,3 @@ abstract class CurrencyUserType[CZ <: CurrencyZone](cz: CZ) extends UserType {
override def replace(original: Object, target: Object, owner: Object) = original
}
-
-}
-}
View
15 lift-archetype-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/CurrencyZone.scala
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions
* and limitations under the License.
*/
-package ${package} {
-package model {
+package ${package}
+package model
-import _root_.java.util.Currency
-import _root_.java.util.Locale
-import _root_.java.text.NumberFormat
+import java.util.Currency
+import java.util.Locale
+import java.text.NumberFormat
/* currency factory*/
abstract class CurrencyZone {
@@ -61,11 +61,8 @@ abstract class CurrencyZone {
def get: String = get(numberOfFractionDigits)
- def get(numberOfFractionDigits: Int): String = format("", numberOfFractionDigits).replaceAll(",", "");
+ def get(numberOfFractionDigits: Int): String = format("", numberOfFractionDigits).replaceAll(",", "")
}
val CurrencyUnit: Currency
}
-
-}
-}
View
6 lift-archetype-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/Enumv.scala
@@ -13,8 +13,8 @@
* See the License for the specific language governing permissions
* and limitations under the License.
*/
-package ${package} {
-package model {
+package ${package}
+package model
/* adds a valueOf function, assumes name is defined
add optional description */
@@ -42,5 +42,3 @@ trait Enumv {
/* get name description pair list for forms */
def getNameDescriptionList = this.map(v => (v.toString, getDescriptionOrName(v) ) ).toList
}
-}
-}
View
22 lift-archetype-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/EnumvType.scala
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions
* and limitations under the License.
*/
-package ${package} {
-package model {
+package ${package}
+package model
-import _root_.java.io.Serializable
-import _root_.java.sql.PreparedStatement
-import _root_.java.sql.ResultSet
-import _root_.java.sql.SQLException
-import _root_.java.sql.Types
+import java.io.Serializable
+import java.sql.PreparedStatement
+import java.sql.ResultSet
+import java.sql.SQLException
+import java.sql.Types
-import _root_.org.hibernate.HibernateException
-import _root_.org.hibernate.usertype.UserType
+import org.hibernate.HibernateException
+import org.hibernate.usertype.UserType
/**
* Helper class to translate enum for hibernate
@@ -70,7 +70,3 @@ abstract class EnumvType(val et: Enumeration with Enumv) extends UserType {
override def replace(original: Object, target: Object, owner: Object) = original
}
-
-}
-}
-
View
6 lift-archetype-jpa-basic/src/main/resources/archetype-resources/spa/src/main/scala/model/Genre.scala
@@ -13,8 +13,8 @@
* See the License for the specific language governing permissions
* and limitations under the License.
*/
-package ${package} {
-package model {
+package ${package}
+package model
object Genre extends Enumeration with Enumv {
val Mystery = Value("Mystery", "Mystery")
@@ -27,5 +27,3 @@ object Genre extends Enumeration with Enumv {
}
class GenreType extends EnumvType(Genre) {}
-}
-}
View
6 lift-archetype-jpa-basic/src/main/resources/archetype-resources/spa/src/test/scala/model/TestJPAWeb.scala
@@ -13,8 +13,8 @@
* See the License for the specific language governing permissions
* and limitations under the License.
*/
-package ${package} {
-package model {
+package ${package}
+package model
import org.junit.Test
import org.junit.Before
@@ -94,5 +94,3 @@ class TestJPAWeb {
em.close()
}
}
-}
-}
View
4 lift-archetype-jpa-basic/src/main/resources/archetype-resources/web/pom.xml
@@ -42,7 +42,7 @@
<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>
</dependencies>
@@ -52,7 +52,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>
View
31 ...chetype-jpa-basic/src/main/resources/archetype-resources/web/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -15,14 +15,14 @@
*/
package bootstrap.liftweb
-import _root_.java.util.Locale
+import java.util.Locale
-import _root_.net.liftweb.common.{Box,Empty,Full}
-import _root_.net.liftweb.util.{LoanWrapper,LogBoot}
-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.common.{Box,Empty,Full}
+import net.liftweb.util.{LoanWrapper,LogBoot}
+import net.liftweb.http._
+import net.liftweb.http.provider._
+import net.liftweb.sitemap._
+import net.liftweb.sitemap.Loc._
import ${package}.model._
import S.?
@@ -50,12 +50,13 @@ class Boot {
LiftRules.addToPackages("${package}")
// Set up a site map
- val entries = SiteMap(Menu(Loc("Home", "index" :: Nil , ?("Home"))),
- Menu(Loc("Authors", "authors" :: "list" :: Nil, ?("Author List"))),
- Menu(Loc("Add Author", "authors" :: "add" :: Nil, ?("Add Author"), Hidden)),
- Menu(Loc("Books", "books" :: "list" :: Nil, ?("Book List"))),
- Menu(Loc("Add Book", "books" :: "add" :: Nil, ?("Add Book"), Hidden)),
- Menu(Loc("BookSearch", "books" :: "search" :: Nil, ?("Book Search"))))
+ val entries = SiteMap(
+ Menu(Loc("Home", "index" :: Nil , ?("Home"))),
+ Menu(Loc("Authors", "authors" :: "list" :: Nil, ?("Author List"))),
+ Menu(Loc("Add Author", "authors" :: "add" :: Nil, ?("Add Author"), Hidden)),
+ Menu(Loc("Books", "books" :: "list" :: Nil, ?("Book List"))),
+ Menu(Loc("Add Book", "books" :: "add" :: Nil, ?("Add Book"), Hidden)),
+ Menu(Loc("BookSearch", "books" :: "search" :: Nil, ?("Book Search"))))
LiftRules.setSiteMap(entries)
@@ -66,8 +67,8 @@ class Boot {
def localeCalculator (request : Box[HTTPRequest]) : Locale =
request.flatMap(_.param("swedish") match {
- case Nil if swedishOn.is == true => Full(swedishChef)
- case Nil => Full(LiftRules.defaultLocaleCalculator(request))
+ case Nil if swedishOn.is == true => Full(swedishChef)
+ case Nil => Full(LiftRules.defaultLocaleCalculator(request))
case "true" :: _ => { swedishOn(true); Full(swedishChef) }
case "false" :: _ => { swedishOn(false); Full(LiftRules.defaultLocaleCalculator(request)) }
}).openOr(Locale.getDefault())
View
11 lift-archetype-jpa-basic/src/main/resources/archetype-resources/web/src/main/scala/model/Model.scala
@@ -13,13 +13,10 @@
* See the License for the specific language governing permissions
* and limitations under the License.
*/
-package ${package} {
-package model {
+package ${package}
+package model
-import _root_.org.scala_libs.jpa.LocalEMF
-import _root_.net.liftweb.jpa.RequestVarEM
+import org.scala_libs.jpa.LocalEMF
+import net.liftweb.jpa.RequestVarEM
object Model extends LocalEMF("jpaweb") with RequestVarEM
-
-}
-}
View
44 lift-archetype-jpa-basic/src/main/resources/archetype-resources/web/src/main/scala/snippet/Author.scala
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions
* and limitations under the License.
*/
-package ${package} {
-package snippet {
+package ${package}
+package snippet
-import _root_.scala.xml.{NodeSeq,Text}
+import scala.xml.{NodeSeq,Text}
-import _root_.net.liftweb._
+import net.liftweb._
import http._
import S._
import common._
import util._
import Helpers._
-import _root_.javax.persistence.{EntityExistsException,PersistenceException}
+import javax.persistence.{EntityExistsException,PersistenceException}
import ${package}.model._
import Model._
@@ -36,11 +36,11 @@ class AuthorOps extends Loggable {
authors.flatMap(author =>
bind("author", xhtml,
- "name" -> Text(author.name),
- "count" -> SHtml.link("/books/search.html", {() =>
- BookOps.resultVar(Model.createNamedQuery[Book]("findBooksByAuthor", "id" ->author.id).getResultList().toList)
- }, Text(author.books.size().toString)),
- "edit" -> SHtml.link("add.html", () => authorVar(author), Text(?("Edit")))))
+ "name" -> Text(author.name),
+ "count" -> SHtml.link("/books/search.html", {() =>
+ BookOps.resultVar(Model.createNamedQuery[Book]("findBooksByAuthor", "id" ->author.id).getResultList().toList)
+ }, Text(author.books.size().toString)),
+ "edit" -> SHtml.link("add.html", () => authorVar(author), Text(?("Edit")))))
}
// Set up a requestVar to track the author object for edits and adds
@@ -50,15 +50,15 @@ class AuthorOps extends Loggable {
def add (xhtml : NodeSeq) : NodeSeq = {
def doAdd () = {
if (author.name.length == 0) {
- error("emptyAuthor", "The author's name cannot be blank")
+ error("emptyAuthor", "The author's name cannot be blank")
} else {
- try {
- Model.mergeAndFlush(author)
- redirectTo("list.html")
- } catch {
- case ee : EntityExistsException => error("Author already exists")
- case pe : PersistenceException => error("Error adding author"); logger.error("Error adding author", pe)
- }
+ try {
+ Model.mergeAndFlush(author)
+ redirectTo("list.html")
+ } catch {
+ case ee : EntityExistsException => error("Author already exists")
+ case pe : PersistenceException => error("Error adding author"); logger.error("Error adding author", pe)
+ }
}
}
@@ -66,10 +66,8 @@ class AuthorOps extends Loggable {
val currentId = author.id
bind("author", xhtml,
- "id" -> SHtml.hidden(() => author.id = currentId),
- "name" -> SHtml.text(author.name, author.name = _),
- "submit" -> SHtml.submit(?("Save"), doAdd))
+ "id" -> SHtml.hidden(() => author.id = currentId),
+ "name" -> SHtml.text(author.name, author.name = _),
+ "submit" -> SHtml.submit(?("Save"), doAdd))
}
}
-}
-}
View
56 lift-archetype-jpa-basic/src/main/resources/archetype-resources/web/src/main/scala/snippet/Books.scala
@@ -13,20 +13,20 @@
* See the License for the specific language governing permissions
* and limitations under the License.
*/
-package ${package} {
-package snippet {
+package ${package}
+package snippet
-import _root_.java.text.{ParseException,SimpleDateFormat}
+import java.text.{ParseException,SimpleDateFormat}
-import _root_.scala.xml.{NodeSeq,Text}
+import scala.xml.{NodeSeq,Text}
-import _root_.net.liftweb.http.{RequestVar,S,SHtml}
-import _root_.net.liftweb.common.{Box,Empty,Full, Loggable}
-import _root_.net.liftweb.util.{Helpers}
+import net.liftweb.http.{RequestVar,S,SHtml}
+import net.liftweb.common.{Box,Empty,Full, Loggable}
+import net.liftweb.util.{Helpers}
import S._
import Helpers._
-import _root_.javax.persistence.{EntityExistsException,PersistenceException}
+import javax.persistence.{EntityExistsException,PersistenceException}
import ${package}.model._
import Model._
@@ -59,9 +59,9 @@ class BookOps extends Loggable {
// Utility methods for processing a submitted form
def is_valid_Book_? (toCheck : Book) : Boolean =
List((if (toCheck.title.length == 0) { S.error("You must provide a title"); false } else true),
- (if (toCheck.published == null) { S.error("You must provide a publish date"); false } else true),
- (if (toCheck.genre == null) { S.error("You must select a genre"); false } else true),
- (if (toCheck.author == null) { S.error("You must select an author"); false } else true)).forall(_ == true)
+ (if (toCheck.published == null) { S.error("You must provide a publish date"); false } else true),
+ (if (toCheck.genre == null) { S.error("You must select a genre"); false } else true),
+ (if (toCheck.author == null) { S.error("You must select an author"); false } else true)).forall(_ == true)
def setDate (input : String, toSet : Book) {
try {
@@ -75,16 +75,15 @@ class BookOps extends Loggable {
def add (xhtml : NodeSeq) : NodeSeq = {
def doAdd () =
if (is_valid_Book_?(book)) {
- try {
- Model.mergeAndFlush(book)
- redirectTo("list.html")
- } catch {
- case ee : EntityExistsException => error("That book already exists.")
- case pe : PersistenceException => error("Error adding book"); logger.error("Book add failed", pe)
- }
+ try {
+ Model.mergeAndFlush(book)
+ redirectTo("list.html")
+ } catch {
+ case ee : EntityExistsException => error("That book already exists.")
+ case pe : PersistenceException => error("Error adding book"); logger.error("Book add failed", pe)
+ }
}
-
// Hold a val here so that the closure holds it when we re-enter this method
val current = book
@@ -93,12 +92,13 @@ class BookOps extends Loggable {
val default = if (book.author != null) { Full(book.author.id.toString) } else { Empty }
bind("book", xhtml,
- "id" -> SHtml.hidden(() => bookVar(current)),
- "title" -> SHtml.text(book.title, book.title = _),
- "published" -> SHtml.text(formatter.format(book.published), setDate(_, book)) % ("id" -> "published"),
- "genre" -> SHtml.select(Genre.getNameDescriptionList, (Box.legacyNullTest(book.genre).map(_.toString) or Full("")), choice => book.genre = Genre.valueOf(choice).getOrElse(null)),
- "author" -> SHtml.select(choices, default, {authId : String => book.author = Model.getReference(classOf[Author], authId.toLong)}),
- "save" -> SHtml.submit(?("Save"), doAdd))
+ "id" -> SHtml.hidden(() => bookVar(current)),
+ "title" -> SHtml.text(book.title, book.title = _),
+ "published" -> SHtml.text(formatter.format(book.published), setDate(_, book)) % ("id" -> "published"),
+ "genre" -> SHtml.select(Genre.getNameDescriptionList, (Box.legacyNullTest(book.genre).map(_.toString) or Full("")), choice => book.genre = Genre.valueOf(choice).getOrElse(null)),
+ "author" -> SHtml.select(choices, default, {authId : String => book.author = Model.getReference(classOf[Author], authId.toLong)}),
+ "save" -> SHtml.submit(?("Save"), doAdd)
+ )
}
def searchResults (xhtml : NodeSeq) : NodeSeq = BookOps.resultVar.is.flatMap(result =>
@@ -112,9 +112,7 @@ class BookOps extends Loggable {
}
bind("search", xhtml,
- "title" -> SHtml.text(title, x => title = x),
- "run" -> SHtml.submit(?("Search"), doSearch _))
+ "title" -> SHtml.text(title, x => title = x),
+ "run" -> SHtml.submit(?("Search"), doSearch _))
}
}
-}
-}
View
24 lift-archetype-jpa-basic/src/main/resources/archetype-resources/web/src/main/webapp/books/add.html
@@ -11,26 +11,26 @@
<link rel="stylesheet" type="text/css" href="/css/datePicker.css" />
<style>
a.dp-choose-date {
- float: left;
- width: 16px;
- height: 16px;
- padding: 0;
- margin: 5px 3px 0;
- display: block;
- text-indent: -2000px;
- overflow: hidden;
- background: url(/scripts/calendar.png) no-repeat;
+ float: left;
+ width: 16px;
+ height: 16px;
+ padding: 0;
+ margin: 5px 3px 0;
+ display: block;
+ text-indent: -2000px;
+ overflow: hidden;
+ background: url(/scripts/calendar.png) no-repeat;
}
a.dp-choose-date.dp-disabled {
background-position: 0 -20px;
- cursor: default;
+ cursor: default;
}
/* makes the input field shorter once the date picker code
* has run (to allow space for the calendar icon
*/
input.dp-applied {
- width: 140px;
- float: left;
+ width: 140px;
+ float: left;
}
</style>
</head>
View
1  lift-archetype-jpa-basic/src/main/resources/archetype-resources/web/src/main/webapp/css/datePicker.css
@@ -1,5 +1,4 @@
-
table.jCalendar {
border: 1px solid #000;
background: #aaa;
View
7 lift-archetype-jpa-basic/src/main/resources/archetype-resources/web/src/main/webapp/index.html
@@ -1,5 +1,6 @@
<lift:surround with="default" at="content">
-<head><title><lift:loc>Super Duper Library Catalog</lift:loc></title></head>
- <h2><lift:loc locid="Welcome">Welcome to the super duper catalog!</lift:loc></h2>
+ <head>
+ <title><lift:loc>Super Duper Library Catalog</lift:loc></title>
+ </head>
+ <h2><lift:loc locid="Welcome">Welcome to the super duper catalog!</lift:loc></h2>
</lift:surround>
-
View
155 ...etype-jpa-basic/src/main/resources/archetype-resources/web/src/main/webapp/templates-hidden/default.html
@@ -1,90 +1,89 @@
-
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:lift="http://liftweb.net/">
- <head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <meta name="description" content="" />
- <meta name="keywords" content="" />
-
- <lift:CSS.blueprint />
- <lift:CSS.fancyType />
- <script id="jquery" src="/classpath/jquery.js" type="text/javascript"/>
- <script id="json" src="/classpath/json.js" type="text/javascript"/>
- <style>
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+ <meta name="description" content="" />
+ <meta name="keywords" content="" />
+
+ <lift:CSS.blueprint />
+ <lift:CSS.fancyType />
+ <script id="jquery" src="/classpath/jquery.js" type="text/javascript"/>
+ <script id="json" src="/classpath/json.js" type="text/javascript"/>
+ <style>
/* <![CDATA[ */
-.edit_error_class {
- display: block;
- color: red;
-}
-
-.lift_error {
- color: red;
-}
-
-.lift_warning {
- color: yellow;
-}
-
-.lift_notice {
-}
-
-.sidebar ul {
- margin:0;
- padding:0;
- border-bottom:1px solid #ccc;
-}
-
-
-.sidebar ul li {
- margin:0;
- padding:0;
- list-style:none;
- border:1px solid #ccc;
- border-bottom:none;
-}
-
-.sidebar ul li a {
- display:block;
- padding:3px;
- text-indent:30px;
- text-decoration:none;
-}
-
-.sidebar ul li a:hover {
- background-color: #eee;
-}
-
-
- /* ]]> */
- </style>
- </head>
- <body>
- <div class="container">
- <div class="column span-12 last" style="text-align: right">
- <h1 class="alt">Library Catalog</h1>
- </div>
+ .edit_error_class {
+ display: block;
+ color: red;
+ }
+
+ .lift_error {
+ color: red;
+ }
+
+ .lift_warning {
+ color: yellow;
+ }
+
+ .lift_notice {
+ }
+
+ .sidebar ul {
+ margin:0;
+ padding:0;
+ border-bottom:1px solid #ccc;
+ }
+
+
+ .sidebar ul li {
+ margin:0;
+ padding:0;
+ list-style:none;
+ border:1px solid #ccc;
+ border-bottom:none;
+ }
- <hr/>
+ .sidebar ul li a {
+ display:block;
+ padding:3px;
+ text-indent:30px;
+ text-decoration:none;
+ }
- <div class="column span-6 colborder sidebar">
+ .sidebar ul li a:hover {
+ background-color: #eee;
+ }
+
+
+ /* ]]> */
+ </style>
+</head>
+<body>
+ <div class="container">
+ <div class="column span-12 last" style="text-align: right">
+ <h1 class="alt">Library Catalog</h1>
+ </div>
+
+ <hr/>
+
+ <div class="column span-6 colborder sidebar">
+ <hr class="space" />
+ <lift:Menu.builder />
+ <div>
+ <lift:Msgs showAll="true"/>
<hr class="space" />
- <lift:Menu.builder />
- <div>
- <lift:Msgs showAll="true"/>
- <hr class="space" />
- </div>
</div>
+ </div>
- <div class="column span-17 last">
- <lift:bind name="content" />
- </div>
+ <div class="column span-17 last">
+ <lift:bind name="content" />
+ </div>
- <hr />
- <div class="column span-23 last" style="text-align: center">
- <h4 class="alt">
- <a href="${project.organization.url}"><i>lift</i></a>
- is Copyright 2007-2010 ${project.organization.name}. Distributed under an Apache 2.0 License.</h4>
+ <hr />
+ <div class="column span-23 last" style="text-align: center">
+ <h4 class="alt">
+ <a href="${project.organization.url}"><i>lift</i></a>
+ is Copyright 2007-2010 ${project.organization.name}. Distributed under an Apache 2.0 License.</h4>
</div>
</div>
- </body>
+</body>
</html>
View
6 lift-archetype-jpa-basic/src/main/resources/archetype-resources/web/src/test/scala/RunWebApp.scala
@@ -1,6 +1,6 @@
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Server;
-import 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 {
View
7 ...pe-jpa-basic/src/main/resources/archetype-resources/web/src/test/scala/net/liftweb/jpademo/AppTest.scala
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions
* and limitations under the License.
*/
-package net.liftweb.jpademo;
+package net.liftweb.jpademo
-import junit.framework._;
-import Assert._;
+import junit.framework._
+import Assert._
object AppTest {
def suite: Test = {
@@ -40,5 +40,4 @@ class AppTest extends TestCase("app") {
def testOK() = assertTrue(true);
//def testKO() = assertTrue(false);
-
}
View
13 lift-archetype-jpa-blank-single/src/main/resources/archetype-resources/pom.xml
@@ -69,13 +69,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.2</version>
+ <version>${slf4j.version}</version>
</dependency>
#if ($logBackend.equalsIgnoreCase("logback"))
<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>
@@ -86,7 +86,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.2</version>
+ <version>${slf4j.version}</version>
</dependency>
#end
<dependency>
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>3.4.0.GA</version>
+ <version>4.2.0.Final</version>
<exclusions>
<exclusion>
<groupId>javax.transaction</groupId>
@@ -127,7 +127,7 @@
<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>
<dependency>
@@ -202,7 +202,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>
@@ -231,6 +231,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.14.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
View
14 ...type-jpa-blank-single/src/main/resources/archetype-resources/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -15,14 +15,14 @@
*/
package bootstrap.liftweb
-import _root_.java.util.Locale
+import java.util.Locale
-import _root_.net.liftweb.common.{Box,Empty,Full}
-import _root_.net.liftweb.util.{LoanWrapper,LogBoot}
-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.common.{Box,Empty,Full}
+import net.liftweb.util.{LoanWrapper,LogBoot}
+import net.liftweb.http._
+import net.liftweb.http.provider._
+import net.liftweb.sitemap._
+import net.liftweb.sitemap.Loc._
import ${package}.model._
import S.?
View
11 lift-archetype-jpa-blank-single/src/main/resources/archetype-resources/src/main/scala/model/Model.scala
@@ -13,15 +13,12 @@
* See the License for the specific language governing permissions
* and limitations under the License.
*/
-package ${package} {
-package model {
+package ${package}
+package model
-import _root_.org.scala_libs.jpa.LocalEMF
-import _root_.net.liftweb.jpa.RequestVarEM
+import org.scala_libs.jpa.LocalEMF
+import net.liftweb.jpa.RequestVarEM
/* This object is left as a placeholder. Please modify to match your
* configuration: */
object Model extends LocalEMF("jpaweb") with RequestVarEM
-
-}
-}
View
7 lift-archetype-jpa-blank-single/src/main/resources/archetype-resources/src/main/webapp/index.html
@@ -1,5 +1,6 @@
<lift:surround with="default" at="content">
-<head><title>Put your title here</title></head>
-<h1>Welcome!</h1>
+ <head>
+ <title>Put your title here</title>
+ </head>
+ <h1>Welcome!</h1>
</lift:surround>
-
View
159 ...pe-jpa-blank-single/src/main/resources/archetype-resources/src/main/webapp/templates-hidden/default.html
@@ -1,90 +1,89 @@
-
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:lift="http://liftweb.net/">
- <head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <meta name="description" content="" />
- <meta name="keywords" content="" />
-
- <lift:CSS.blueprint />
- <lift:CSS.fancyType />
- <script id="jquery" src="/classpath/jquery.js" type="text/javascript"/>
- <script id="json" src="/classpath/json.js" type="text/javascript"/>
- <style>
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+ <meta name="description" content="" />
+ <meta name="keywords" content="" />
+
+ <lift:CSS.blueprint />
+ <lift:CSS.fancyType />
+ <script id="jquery" src="/classpath/jquery.js" type="text/javascript"/>
+ <script id="json" src="/classpath/json.js" type="text/javascript"/>
+ <style>
/* <![CDATA[ */
-.edit_error_class {
- display: block;
- color: red;
-}
-
-.lift_error {
- color: red;
-}
-
-.lift_warning {
- color: yellow;
-}
-
-.lift_notice {
-}
-
-.sidebar ul {
- margin:0;
- padding:0;
- border-bottom:1px solid #ccc;
-}
-
-
-.sidebar ul li {
- margin:0;
- padding:0;
- list-style:none;
- border:1px solid #ccc;
- border-bottom:none;
-}
-
-.sidebar ul li a {
- display:block;
- padding:3px;
- text-indent:30px;
- text-decoration:none;
-}
-
-.sidebar ul li a:hover {
- background-color: #eee;
-}
-
-
- /* ]]> */
- </style>
- </head>
- <body>
- <div class="container">
- <div class="column span-12 last" style="text-align: right">
- <h1 class="alt">Library Catalog</h1>
- </div>
+ .edit_error_class {
+ display: block;
+ color: red;
+ }
- <hr/>
+ .lift_error {
+ color: red;
+ }
- <div class="column span-6 colborder sidebar">
- <hr class="space" />
- <lift:Menu.builder />
- <div>
- <lift:Msgs showAll="true"/>
- <hr class="space" />
- </div>
- </div>
+ .lift_warning {
+ color: yellow;
+ }
- <div class="column span-17 last">
- <lift:bind name="content" />
- </div>
+ .lift_notice {
+ }
+
+ .sidebar ul {
+ margin:0;
+ padding:0;
+ border-bottom:1px solid #ccc;
+ }
+
+
+ .sidebar ul li {
+ margin:0;
+ padding:0;
+ list-style:none;
+ border:1px solid #ccc;
+ border-bottom:none;
+ }
+
+ .sidebar ul li a {
+ display:block;
+ padding:3px;
+ text-indent:30px;
+ text-decoration:none;
+ }
- <hr />
- <div class="column span-23 last" style="text-align: center">
- <h4 class="alt">
- <a href="${project.organization.url}"><i>Lift</i></a>
- is Copyright 2007-2010 ${project.organization.name}. Distributed under an Apache 2.0 License.</h4>
+ .sidebar ul li a:hover {
+ background-color: #eee;
+ }
+
+
+ /* ]]> */
+ </style>
+</head>
+<body>
+ <div class="container">
+ <div class="column span-12 last" style="text-align: right">
+ <h1 class="alt">Library Catalog</h1>
+ </div>
+
+ <hr/>
+
+ <div class="column span-6 colborder sidebar">
+ <hr class="space" />
+ <lift:Menu.builder />
+ <div>
+ <lift:Msgs showAll="true"/>
+ <hr class="space" />
</div>
+ </div>
+ <div class="column span-17 last">
+ <lift:bind name="content" />
</div>
- </body>
+
+ <hr />
+ <div class="column span-23 last" style="text-align: center">
+ <h4 class="alt">
+ <a href="${project.organization.url}"><i>Lift</i></a>
+ is Copyright 2007-2010 ${project.organization.name}. Distributed under an Apache 2.0 License.</h4>
+ </div>
+
+ </div>
+</body>
</html>
View
4 lift-archetype-jpa-blank-single/src/main/resources/archetype-resources/src/test/scala/LiftConsole.scala
@@ -4,9 +4,9 @@ import scala.tools.nsc.MainGenericRunner
object LiftConsole {
def main(args : Array[String]) {
// Instantiate your project's Boot file
- val b = new Boot();
+ val b = new Boot()
// Boot your project
- b.boot;
+ b.boot
// Now run the MainGenericRunner to get your repl
MainGenericRunner.main(args)
// After the repl exits, then exit the scala script
View
6 lift-archetype-jpa-blank-single/src/main/resources/archetype-resources/src/test/scala/RunWebApp.scala
@@ -1,7 +1,7 @@
-import org.mortbay.jetty.Connector;
+import org.mortbay.jetty.Connector
import org.mortbay.jetty.nio._
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.mortbay.jetty.Server
+import org.mortbay.jetty.webapp.WebAppContext
object RunWebApp extends Application {
val server = new Server
View
15 ...jpa-blank-single/src/main/resources/archetype-resources/src/test/scala/net/liftweb/jpademo/AppTest.scala
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions
* and limitations under the License.
*/
-package net.liftweb.jpademo;
+package net.liftweb.jpademo
-import junit.framework._;
-import Assert._;
+import junit.framework._
+import Assert._
object AppTest {
def suite: Test = {
- val suite = new TestSuite(classOf[AppTest]);
+ val suite = new TestSuite(classOf[AppTest])
suite
}
def main(args : Array[String]) {
- junit.textui.TestRunner.run(suite);
+ junit.textui.TestRunner.run(suite)
}
}
@@ -37,8 +37,7 @@ class AppTest extends TestCase("app") {
/**
* Rigourous Tests :-)
*/
- def testOK() = assertTrue(true);
- //def testKO() = assertTrue(false);
-
+ def testOK() = assertTrue(true)
+ //def testKO() = assertTrue(false)
}
View
7 lift-archetype-jpa-blank/src/main/resources/archetype-resources/pom.xml
@@ -76,13 +76,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.2</version>
+ <version>${slf4j.version}</version>
</dependency>
#if ($logBackend.equalsIgnoreCase("logback"))
<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>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.2</version>
+ <version>${slf4j.version}</version>
</dependency>
#end
<dependency>
@@ -167,6 +167,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.14.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
View
2  lift-archetype-jpa-blank/src/main/resources/archetype-resources/spa/pom.xml
@@ -24,7 +24,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>3.4.0.GA</version>
+ <version>4.2.0.Final</version>
<exclusions>
<exclusion>
<groupId>javax.transaction</groupId>
View
4 lift-archetype-jpa-blank/src/main/resources/archetype-resources/web/pom.xml
@@ -42,7 +42,7 @@
<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>
</dependencies>
@@ -52,7 +52,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>
View
14 ...chetype-jpa-blank/src/main/resources/archetype-resources/web/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -15,14 +15,14 @@
*/
package bootstrap.liftweb
-import _root_.java.util.Locale
+import java.util.Locale
-import _root_.net.liftweb.common.{Box,Empty,Full}
-import _root_.net.liftweb.util.{LoanWrapper,LogBoot}
-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.common.{Box,Empty,Full}
+import net.liftweb.util.{LoanWrapper,LogBoot}
+import net.liftweb.http._
+import net.liftweb.http.provider._
+import net.liftweb.sitemap._
+import net.liftweb.sitemap.Loc._
import ${package}.model._
import S.?
View
11 lift-archetype-jpa-blank/src/main/resources/archetype-resources/web/src/main/scala/model/Model.scala
@@ -13,15 +13,12 @@
* See the License for the specific language governing permissions
* and limitations under the License.
*/
-package ${package} {
-package model {
+package ${package}
+package model
-import _root_.org.scala_libs.jpa.LocalEMF
-import _root_.net.liftweb.jpa.RequestVarEM
+import org.scala_libs.jpa.LocalEMF
+import net.liftweb.jpa.RequestVarEM
/* This object is left as a placeholder. Please modify to match your
* configuration: */
object Model extends LocalEMF("jpaweb") with RequestVarEM
-
-}
-}
View
7 lift-archetype-jpa-blank/src/main/resources/archetype-resources/web/src/main/webapp/index.html
@@ -1,5 +1,6 @@
<lift:surround with="default" at="content">
-<head><title>Put your title here</title></head>
-<h1>Welcome!</h1>
+ <head>
+ <title>Put your title here</title>
+ </head>
+ <h1>Welcome!</h1>
</lift:surround>
-
View
159 ...etype-jpa-blank/src/main/resources/archetype-resources/web/src/main/webapp/templates-hidden/default.html
@@ -1,90 +1,89 @@
-
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:lift="http://liftweb.net/">
- <head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <meta name="description" content="" />
- <meta name="keywords" content="" />
-
- <lift:CSS.blueprint />
- <lift:CSS.fancyType />
- <script id="jquery" src="/classpath/jquery.js" type="text/javascript"/>
- <script id="json" src="/classpath/json.js" type="text/javascript"/>
- <style>
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+ <meta name="description" content="" />
+ <meta name="keywords" content="" />
+
+ <lift:CSS.blueprint />
+ <lift:CSS.fancyType />
+ <script id="jquery" src="/classpath/jquery.js" type="text/javascript"/>
+ <script id="json" src="/classpath/json.js" type="text/javascript"/>
+ <style>
/* <![CDATA[ */
-.edit_error_class {
- display: block;
- color: red;
-}
-
-.lift_error {
- color: red;
-}
-
-.lift_warning {
- color: yellow;
-}
-
-.lift_notice {
-}
-
-.sidebar ul {
- margin:0;
- padding:0;
- border-bottom:1px solid #ccc;
-}
-
-
-.sidebar ul li {
- margin:0;
- padding:0;
- list-style:none;
- border:1px solid #ccc;
- border-bottom:none;
-}
-
-.sidebar ul li a {
- display:block;
- padding:3px;
- text-indent:30px;
- text-decoration:none;
-}
-
-.sidebar ul li a:hover {
- background-color: #eee;
-}
-
-
- /* ]]> */
- </style>
- </head>
- <body>
- <div class="container">
- <div class="column span-12 last" style="text-align: right">
- <h1 class="alt">Library Catalog</h1>
- </div>
+ .edit_error_class {
+ display: block;
+ color: red;
+ }
- <hr/>
+ .lift_error {
+ color: red;
+ }
- <div class="column span-6 colborder sidebar">
- <hr class="space" />
- <lift:Menu.builder />
- <div>
- <lift:Msgs showAll="true"/>
- <hr class="space" />
- </div>
- </div>
+ .lift_warning {
+ color: yellow;
+ }
- <div class="column span-17 last">
- <lift:bind name="content" />
- </div>
+ .lift_notice {
+ }
+
+ .sidebar ul {
+ margin:0;
+ padding:0;
+ border-bottom:1px solid #ccc;
+ }
+
+
+ .sidebar ul li {
+ margin:0;
+ padding:0;
+ list-style:none;
+ border:1px solid #ccc;
+ border-bottom:none;
+ }
+
+ .sidebar ul li a {
+ display:block;
+ padding:3px;
+ text-indent:30px;
+ text-decoration:none;
+ }
- <hr />
- <div class="column span-23 last" style="text-align: center">
- <h4 class="alt">
- <a href="${project.organization.url}"><i>Lift</i></a>
- is Copyright 2007-2010 ${project.organization.name}. Distributed under an Apache 2.0 License.</h4>
+ .sidebar ul li a:hover {
+ background-color: #eee;
+ }
+