Skip to content
Browse files

upgraded templates to scala 2.10 and specs 1.14wq

  • Loading branch information...
1 parent 07d15c4 commit c60e014a6dce130df3e87cb5dc49087bec6dda41 @fmpwizard fmpwizard committed Jun 3, 2013
Showing with 9 additions and 9 deletions.
  1. 0 {scala_29 → scala_210}/README.md
  2. +2 −2 {scala_29 → scala_210}/lift_basic/build.sbt
  3. 0 {scala_29/lift_mvc → scala_210/lift_basic}/project/build.properties
  4. 0 {scala_29/lift_mvc → scala_210/lift_basic}/project/plugins.sbt
  5. 0 {scala_29/lift_mvc → scala_210/lift_basic}/sbt
  6. 0 {scala_29/lift_mvc → scala_210/lift_basic}/sbt-launch-0.12.1.jar
  7. 0 {scala_29/lift_mvc → scala_210/lift_basic}/sbt.bat
  8. 0 {scala_29/lift_mvc/src/test → scala_210/lift_basic/src/main}/resources/.keep
  9. 0 {scala_29/lift_mvc → scala_210/lift_basic}/src/main/resources/logback.xml
  10. 0 {scala_29/lift_mvc → scala_210/lift_basic}/src/main/resources/props/default.props
  11. 0 {scala_29 → scala_210}/lift_basic/src/main/scala/bootstrap/liftweb/Boot.scala
  12. 0 {scala_29/lift_mvc/src/main/scala/code/view → scala_210/lift_basic/src/main/scala/code/comet}/.keep
  13. 0 {scala_29/lift_mvc → scala_210/lift_basic}/src/main/scala/code/lib/DependencyFactory.scala
  14. 0 {scala_29 → scala_210}/lift_basic/src/main/scala/code/model/User.scala
  15. 0 {scala_29 → scala_210}/lift_basic/src/main/scala/code/snippet/HelloWorld.scala
  16. 0 ...la_29/lift_mvc/src/main/scala/code/snippet → scala_210/lift_basic/src/main/scala/code/view}/.keep
  17. 0 {scala_29/lift_mvc → scala_210/lift_basic}/src/main/webapp/WEB-INF/web.xml
  18. 0 {scala_29/lift_mvc → scala_210/lift_basic}/src/main/webapp/images/ajax-loader.gif
  19. 0 {scala_29 → scala_210}/lift_basic/src/main/webapp/index.html
  20. 0 {scala_29 → scala_210}/lift_basic/src/main/webapp/static/index.html
  21. 0 {scala_29/lift_blank → scala_210/lift_basic}/src/main/webapp/templates-hidden/default.html
  22. 0 {scala_29 → scala_210}/lift_basic/src/main/webapp/templates-hidden/wizard-all.html
  23. 0 {scala_29/lift_mvc/src/main/scala/code/model → scala_210/lift_basic/src/test/resources}/.keep
  24. 0 {scala_29/lift_mvc → scala_210/lift_basic}/src/test/resources/logback-test.xml
  25. 0 {scala_29/lift_mvc → scala_210/lift_basic}/src/test/scala/RunWebApp.scala
  26. 0 {scala_29/lift_blank → scala_210/lift_basic}/src/test/scala/code/snippet/HelloWorldTest.scala
  27. +2 −2 {scala_29 → scala_210}/lift_blank/build.sbt
  28. 0 {scala_29/lift_json → scala_210/lift_blank}/project/build.properties
  29. 0 {scala_29/lift_json → scala_210/lift_blank}/project/plugins.sbt
  30. 0 {scala_29/lift_json → scala_210/lift_blank}/sbt
  31. 0 {scala_29/lift_json → scala_210/lift_blank}/sbt-launch-0.12.1.jar
  32. 0 {scala_29/lift_json → scala_210/lift_blank}/sbt.bat
  33. 0 {scala_29/lift_mvc/src/main/scala/code/comet → scala_210/lift_blank/src/main/resources}/.keep
  34. 0 {scala_29 → scala_210}/lift_blank/src/main/resources/logback.xml
  35. 0 {scala_29 → scala_210}/lift_blank/src/main/resources/props/default.props
  36. 0 {scala_29 → scala_210}/lift_blank/src/main/scala/bootstrap/liftweb/Boot.scala
  37. 0 {scala_29/lift_mvc/src/main/resources → scala_210/lift_blank/src/main/scala/code/comet}/.keep
  38. 0 {scala_29 → scala_210}/lift_blank/src/main/scala/code/lib/DependencyFactory.scala
  39. 0 {scala_29/lift_blank/src/test/resources → scala_210/lift_blank/src/main/scala/code/model}/.keep
  40. 0 {scala_29 → scala_210}/lift_blank/src/main/scala/code/snippet/HelloWorld.scala
  41. 0 {scala_29 → scala_210}/lift_blank/src/main/scala/code/view/.keep
  42. 0 {scala_29 → scala_210}/lift_blank/src/main/webapp/WEB-INF/web.xml
  43. 0 {scala_29 → scala_210}/lift_blank/src/main/webapp/images/ajax-loader.gif
  44. 0 {scala_29 → scala_210}/lift_blank/src/main/webapp/index.html
  45. 0 {scala_29 → scala_210}/lift_blank/src/main/webapp/static/index.html
  46. 0 {scala_29/lift_basic → scala_210/lift_blank}/src/main/webapp/templates-hidden/default.html
  47. 0 {scala_29/lift_mvc → scala_210/lift_blank}/src/main/webapp/templates-hidden/wizard-all.html
  48. 0 {scala_29/lift_blank/src/main/scala/code/model → scala_210/lift_blank/src/test/resources}/.keep
  49. 0 {scala_29/lift_json → scala_210/lift_blank}/src/test/resources/logback-test.xml
  50. 0 {scala_29 → scala_210}/lift_blank/src/test/scala/RunWebApp.scala
  51. 0 {scala_29/lift_basic → scala_210/lift_blank}/src/test/scala/code/snippet/HelloWorldTest.scala
  52. +3 −3 {scala_29 → scala_210}/lift_json/build.sbt
  53. 0 {scala_29/lift_blank → scala_210/lift_json}/project/build.properties
  54. 0 {scala_29/lift_blank → scala_210/lift_json}/project/plugins.sbt
  55. 0 {scala_29/lift_blank → scala_210/lift_json}/sbt
  56. 0 {scala_29/lift_blank → scala_210/lift_json}/sbt-launch-0.12.1.jar
  57. 0 {scala_29/lift_blank → scala_210/lift_json}/sbt.bat
  58. 0 {scala_29/lift_blank → scala_210/lift_json}/src/test/resources/logback-test.xml
  59. 0 {scala_29 → scala_210}/lift_json/src/test/scala/code/json/JsonSpecs.scala
  60. +2 −2 {scala_29 → scala_210}/lift_mvc/build.sbt
  61. 0 {scala_29/lift_basic → scala_210/lift_mvc}/project/build.properties
  62. 0 {scala_29/lift_basic → scala_210/lift_mvc}/project/plugins.sbt
  63. 0 {scala_29/lift_basic → scala_210/lift_mvc}/sbt
  64. 0 {scala_29/lift_basic → scala_210/lift_mvc}/sbt-launch-0.12.1.jar
  65. 0 {scala_29/lift_basic → scala_210/lift_mvc}/sbt.bat
  66. 0 {scala_29/lift_blank/src/main/scala/code/comet → scala_210/lift_mvc/src/main/resources}/.keep
  67. 0 {scala_29/lift_basic → scala_210/lift_mvc}/src/main/resources/logback.xml
  68. 0 {scala_29/lift_basic → scala_210/lift_mvc}/src/main/resources/props/default.props
  69. 0 {scala_29 → scala_210}/lift_mvc/src/main/scala/bootstrap/liftweb/Boot.scala
  70. 0 {scala_29/lift_blank/src/main/resources → scala_210/lift_mvc/src/main/scala/code/comet}/.keep
  71. 0 {scala_29 → scala_210}/lift_mvc/src/main/scala/code/controller/RootController.scala
  72. 0 {scala_29/lift_basic → scala_210/lift_mvc}/src/main/scala/code/lib/DependencyFactory.scala
  73. 0 {scala_29/lift_basic/src/test/resources → scala_210/lift_mvc/src/main/scala/code/model}/.keep
  74. 0 ...la_29/lift_basic/src/main/scala/code/view → scala_210/lift_mvc/src/main/scala/code/snippet}/.keep
  75. 0 {scala_29/lift_basic/src/main/scala/code/comet → scala_210/lift_mvc/src/main/scala/code/view}/.keep
  76. 0 {scala_29/lift_basic → scala_210/lift_mvc}/src/main/webapp/WEB-INF/web.xml
  77. 0 {scala_29/lift_basic → scala_210/lift_mvc}/src/main/webapp/images/ajax-loader.gif
  78. 0 {scala_29 → scala_210}/lift_mvc/src/main/webapp/index.html
  79. 0 {scala_29 → scala_210}/lift_mvc/src/main/webapp/show_int.html
  80. 0 {scala_29 → scala_210}/lift_mvc/src/main/webapp/templates-hidden/default.html
  81. 0 {scala_29/lift_blank → scala_210/lift_mvc}/src/main/webapp/templates-hidden/wizard-all.html
  82. 0 {scala_29/lift_basic/src/main → scala_210/lift_mvc/src/test}/resources/.keep
  83. 0 {scala_29/lift_basic → scala_210/lift_mvc}/src/test/resources/logback-test.xml
  84. 0 {scala_29/lift_basic → scala_210/lift_mvc}/src/test/scala/RunWebApp.scala
View
0 scala_29/README.md → scala_210/README.md
File renamed without changes.
View
4 scala_29/lift_basic/build.sbt → scala_210/lift_basic/build.sbt
@@ -4,7 +4,7 @@ version := "0.0.1"
organization := "net.liftweb"
-scalaVersion := "2.9.1"
+scalaVersion := "2.10.0"
resolvers ++= Seq("snapshots" at "http://oss.sonatype.org/content/repositories/snapshots",
"staging" at "http://oss.sonatype.org/content/repositories/staging",
@@ -26,7 +26,7 @@ libraryDependencies ++= {
"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",
+ "org.specs2" %% "specs2" % "1.14" % "test",
"com.h2database" % "h2" % "1.3.167"
)
}
View
0 scala_29/lift_mvc/project/build.properties → ...a_210/lift_basic/project/build.properties
File renamed without changes.
View
0 scala_29/lift_mvc/project/plugins.sbt → scala_210/lift_basic/project/plugins.sbt
File renamed without changes.
View
0 scala_29/lift_mvc/sbt → scala_210/lift_basic/sbt
File renamed without changes.
View
0 scala_29/lift_mvc/sbt-launch-0.12.1.jar → scala_210/lift_basic/sbt-launch-0.12.1.jar
File renamed without changes.
View
0 scala_29/lift_mvc/sbt.bat → scala_210/lift_basic/sbt.bat
File renamed without changes.
View
0 scala_29/lift_mvc/src/test/resources/.keep → ...a_210/lift_basic/src/main/resources/.keep
File renamed without changes.
View
0 ...9/lift_mvc/src/main/resources/logback.xml → ...lift_basic/src/main/resources/logback.xml
File renamed without changes.
View
0 ...vc/src/main/resources/props/default.props → ...ic/src/main/resources/props/default.props
File renamed without changes.
View
0 ...c/main/scala/bootstrap/liftweb/Boot.scala → ...c/main/scala/bootstrap/liftweb/Boot.scala
File renamed without changes.
View
0 ...9/lift_mvc/src/main/scala/code/view/.keep → ...ift_basic/src/main/scala/code/comet/.keep
File renamed without changes.
View
0 ...in/scala/code/lib/DependencyFactory.scala → ...in/scala/code/lib/DependencyFactory.scala
File renamed without changes.
View
0 ...asic/src/main/scala/code/model/User.scala → ...asic/src/main/scala/code/model/User.scala
File renamed without changes.
View
0 .../main/scala/code/snippet/HelloWorld.scala → .../main/scala/code/snippet/HelloWorld.scala
File renamed without changes.
View
0 ...ift_mvc/src/main/scala/code/snippet/.keep → ...lift_basic/src/main/scala/code/view/.keep
File renamed without changes.
View
0 .../lift_mvc/src/main/webapp/WEB-INF/web.xml → ...ift_basic/src/main/webapp/WEB-INF/web.xml
File renamed without changes.
View
0 ...vc/src/main/webapp/images/ajax-loader.gif → ...ic/src/main/webapp/images/ajax-loader.gif
File renamed without changes
View
0 ..._29/lift_basic/src/main/webapp/index.html → ...210/lift_basic/src/main/webapp/index.html
File renamed without changes.
View
0 ...t_basic/src/main/webapp/static/index.html → ...t_basic/src/main/webapp/static/index.html
File renamed without changes.
View
0 ...main/webapp/templates-hidden/default.html → ...main/webapp/templates-hidden/default.html
File renamed without changes.
View
0 ...n/webapp/templates-hidden/wizard-all.html → ...n/webapp/templates-hidden/wizard-all.html
File renamed without changes.
View
0 .../lift_mvc/src/main/scala/code/model/.keep → ...a_210/lift_basic/src/test/resources/.keep
File renamed without changes.
View
0 ...t_mvc/src/test/resources/logback-test.xml → ...basic/src/test/resources/logback-test.xml
File renamed without changes.
View
0 ...9/lift_mvc/src/test/scala/RunWebApp.scala → ...lift_basic/src/test/scala/RunWebApp.scala
File renamed without changes.
View
0 ...t/scala/code/snippet/HelloWorldTest.scala → ...t/scala/code/snippet/HelloWorldTest.scala
File renamed without changes.
View
4 scala_29/lift_blank/build.sbt → scala_210/lift_blank/build.sbt
@@ -4,7 +4,7 @@ version := "0.0.1"
organization := "net.liftweb"
-scalaVersion := "2.9.1"
+scalaVersion := "2.10.0"
resolvers ++= Seq("snapshots" at "http://oss.sonatype.org/content/repositories/snapshots",
"releases" at "http://oss.sonatype.org/content/repositories/releases"
@@ -24,7 +24,7 @@ libraryDependencies ++= {
"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"
+ "org.specs2" %% "specs2" % "1.14" % "test"
)
}
View
0 scala_29/lift_json/project/build.properties → ...a_210/lift_blank/project/build.properties
File renamed without changes.
View
0 scala_29/lift_json/project/plugins.sbt → scala_210/lift_blank/project/plugins.sbt
File renamed without changes.
View
0 scala_29/lift_json/sbt → scala_210/lift_blank/sbt
File renamed without changes.
View
0 scala_29/lift_json/sbt-launch-0.12.1.jar → scala_210/lift_blank/sbt-launch-0.12.1.jar
File renamed without changes.
View
0 scala_29/lift_json/sbt.bat → scala_210/lift_blank/sbt.bat
File renamed without changes.
View
0 .../lift_mvc/src/main/scala/code/comet/.keep → ...a_210/lift_blank/src/main/resources/.keep
File renamed without changes.
View
0 ...lift_blank/src/main/resources/logback.xml → ...lift_blank/src/main/resources/logback.xml
File renamed without changes.
View
0 ...nk/src/main/resources/props/default.props → ...nk/src/main/resources/props/default.props
File renamed without changes.
View
0 ...c/main/scala/bootstrap/liftweb/Boot.scala → ...c/main/scala/bootstrap/liftweb/Boot.scala
File renamed without changes.
View
0 scala_29/lift_mvc/src/main/resources/.keep → ...ift_blank/src/main/scala/code/comet/.keep
File renamed without changes.
View
0 ...in/scala/code/lib/DependencyFactory.scala → ...in/scala/code/lib/DependencyFactory.scala
File renamed without changes.
View
0 scala_29/lift_blank/src/test/resources/.keep → ...ift_blank/src/main/scala/code/model/.keep
File renamed without changes.
View
0 .../main/scala/code/snippet/HelloWorld.scala → .../main/scala/code/snippet/HelloWorld.scala
File renamed without changes.
View
0 ...lift_blank/src/main/scala/code/view/.keep → ...lift_blank/src/main/scala/code/view/.keep
File renamed without changes.
View
0 ...ift_blank/src/main/webapp/WEB-INF/web.xml → ...ift_blank/src/main/webapp/WEB-INF/web.xml
File renamed without changes.
View
0 ...nk/src/main/webapp/images/ajax-loader.gif → ...nk/src/main/webapp/images/ajax-loader.gif
File renamed without changes
View
0 ..._29/lift_blank/src/main/webapp/index.html → ...210/lift_blank/src/main/webapp/index.html
File renamed without changes.
View
0 ...t_blank/src/main/webapp/static/index.html → ...t_blank/src/main/webapp/static/index.html
File renamed without changes.
View
0 ...main/webapp/templates-hidden/default.html → ...main/webapp/templates-hidden/default.html
File renamed without changes.
View
0 ...n/webapp/templates-hidden/wizard-all.html → ...n/webapp/templates-hidden/wizard-all.html
File renamed without changes.
View
0 ...ift_blank/src/main/scala/code/model/.keep → ...a_210/lift_blank/src/test/resources/.keep
File renamed without changes.
View
0 ..._json/src/test/resources/logback-test.xml → ...blank/src/test/resources/logback-test.xml
File renamed without changes.
View
0 ...lift_blank/src/test/scala/RunWebApp.scala → ...lift_blank/src/test/scala/RunWebApp.scala
File renamed without changes.
View
0 ...t/scala/code/snippet/HelloWorldTest.scala → ...t/scala/code/snippet/HelloWorldTest.scala
File renamed without changes.
View
6 scala_29/lift_json/build.sbt → scala_210/lift_json/build.sbt
@@ -4,7 +4,7 @@ version := "0.0.1"
organization := "net.liftweb"
-scalaVersion := "2.9.1"
+scalaVersion := "2.10.0"
resolvers ++= Seq("snapshots" at "http://oss.sonatype.org/content/repositories/snapshots",
"releases" at "http://oss.sonatype.org/content/repositories/releases"
@@ -15,9 +15,9 @@ scalacOptions ++= Seq("-deprecation", "-unchecked")
libraryDependencies ++= {
val liftVersion = "2.5"
Seq(
- "net.liftweb" %% "lift-json" % liftVersion % "compile",
+ "net.liftweb" %% "lift-json" % liftVersion % "compile",
"ch.qos.logback" % "logback-classic" % "1.0.6",
- "org.specs2" %% "specs2" % "1.12.1" % "test"
+ "org.specs2" %% "specs2" % "1.14" % "test"
)
}
View
0 scala_29/lift_blank/project/build.properties → scala_210/lift_json/project/build.properties
File renamed without changes.
View
0 scala_29/lift_blank/project/plugins.sbt → scala_210/lift_json/project/plugins.sbt
File renamed without changes.
View
0 scala_29/lift_blank/sbt → scala_210/lift_json/sbt
File renamed without changes.
View
0 scala_29/lift_blank/sbt-launch-0.12.1.jar → scala_210/lift_json/sbt-launch-0.12.1.jar
File renamed without changes.
View
0 scala_29/lift_blank/sbt.bat → scala_210/lift_json/sbt.bat
File renamed without changes.
View
0 ...blank/src/test/resources/logback-test.xml → ..._json/src/test/resources/logback-test.xml
File renamed without changes.
View
0 .../src/test/scala/code/json/JsonSpecs.scala → .../src/test/scala/code/json/JsonSpecs.scala
File renamed without changes.
View
4 scala_29/lift_mvc/build.sbt → scala_210/lift_mvc/build.sbt
@@ -4,7 +4,7 @@ version := "0.0.1"
organization := "net.liftweb"
-scalaVersion := "2.9.1"
+scalaVersion := "2.10.0"
resolvers ++= Seq("snapshots" at "http://oss.sonatype.org/content/repositories/snapshots",
"releases" at "http://oss.sonatype.org/content/repositories/releases"
@@ -25,7 +25,7 @@ libraryDependencies ++= {
"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",
+ "org.specs2" %% "specs2" % "1.14" % "test",
"com.h2database" % "h2" % "1.3.167"
)
}
View
0 scala_29/lift_basic/project/build.properties → scala_210/lift_mvc/project/build.properties
File renamed without changes.
View
0 scala_29/lift_basic/project/plugins.sbt → scala_210/lift_mvc/project/plugins.sbt
File renamed without changes.
View
0 scala_29/lift_basic/sbt → scala_210/lift_mvc/sbt
File renamed without changes.
View
0 scala_29/lift_basic/sbt-launch-0.12.1.jar → scala_210/lift_mvc/sbt-launch-0.12.1.jar
File renamed without changes.
View
0 scala_29/lift_basic/sbt.bat → scala_210/lift_mvc/sbt.bat
File renamed without changes.
View
0 ...ift_blank/src/main/scala/code/comet/.keep → scala_210/lift_mvc/src/main/resources/.keep
File renamed without changes.
View
0 ...lift_basic/src/main/resources/logback.xml → ...0/lift_mvc/src/main/resources/logback.xml
File renamed without changes.
View
0 ...ic/src/main/resources/props/default.props → ...vc/src/main/resources/props/default.props
File renamed without changes.
View
0 ...c/main/scala/bootstrap/liftweb/Boot.scala → ...c/main/scala/bootstrap/liftweb/Boot.scala
File renamed without changes.
View
0 scala_29/lift_blank/src/main/resources/.keep → .../lift_mvc/src/main/scala/code/comet/.keep
File renamed without changes.
View
0 ...cala/code/controller/RootController.scala → ...cala/code/controller/RootController.scala
File renamed without changes.
View
0 ...in/scala/code/lib/DependencyFactory.scala → ...in/scala/code/lib/DependencyFactory.scala
File renamed without changes.
View
0 scala_29/lift_basic/src/test/resources/.keep → .../lift_mvc/src/main/scala/code/model/.keep
File renamed without changes.
View
0 ...lift_basic/src/main/scala/code/view/.keep → ...ift_mvc/src/main/scala/code/snippet/.keep
File renamed without changes.
View
0 ...ift_basic/src/main/scala/code/comet/.keep → ...0/lift_mvc/src/main/scala/code/view/.keep
File renamed without changes.
View
0 ...ift_basic/src/main/webapp/WEB-INF/web.xml → .../lift_mvc/src/main/webapp/WEB-INF/web.xml
File renamed without changes.
View
0 ...ic/src/main/webapp/images/ajax-loader.gif → ...vc/src/main/webapp/images/ajax-loader.gif
File renamed without changes
View
0 scala_29/lift_mvc/src/main/webapp/index.html → ...a_210/lift_mvc/src/main/webapp/index.html
File renamed without changes.
View
0 ...29/lift_mvc/src/main/webapp/show_int.html → ...10/lift_mvc/src/main/webapp/show_int.html
File renamed without changes.
View
0 ...main/webapp/templates-hidden/default.html → ...main/webapp/templates-hidden/default.html
File renamed without changes.
View
0 ...n/webapp/templates-hidden/wizard-all.html → ...n/webapp/templates-hidden/wizard-all.html
File renamed without changes.
View
0 scala_29/lift_basic/src/main/resources/.keep → scala_210/lift_mvc/src/test/resources/.keep
File renamed without changes.
View
0 ...basic/src/test/resources/logback-test.xml → ...t_mvc/src/test/resources/logback-test.xml
File renamed without changes.
View
0 ...lift_basic/src/test/scala/RunWebApp.scala → ...0/lift_mvc/src/test/scala/RunWebApp.scala
File renamed without changes.

0 comments on commit c60e014

Please sign in to comment.
Something went wrong with that request. Please try again.