Permalink
Browse files

Updated to Lift 2.3 and updated copyright notices

  • Loading branch information...
1 parent 09ae6d6 commit 68e7db117ea7bf21b1064112b8c3178cf94d3834 @dpp dpp committed Apr 6, 2011
@@ -2,7 +2,7 @@
#Fri Apr 23 11:24:20 PDT 2010
project.organization=Lift
project.name=Lift SBT Template
-sbt.version=0.7.4
+sbt.version=0.7.5
project.version=0.1
def.scala.version=2.7.7
build.scala.versions=2.8.1
@@ -1,7 +1,7 @@
import sbt._
class LiftProject(info: ProjectInfo) extends DefaultWebProject(info) {
- val liftVersion = "2.3-RC1"
+ val liftVersion = "2.3"
// uncomment the following if you want to use the snapshot repo
// val scalatoolsSnapshot = ScalaToolsSnapshots
@@ -72,6 +72,9 @@ class Boot {
LiftRules.htmlProperties.default.set((r: Req) =>
new Html5Properties(r.userAgent))
+ // Use jQuery 1.4
+ LiftRules.jsArtifacts = net.liftweb.http.js.jquery.JQuery14Artifacts
+
// Make a transaction span the whole HTTP request
S.addAround(DB.buildLoanWrapper)
}
@@ -2,7 +2,7 @@
#Fri Apr 23 11:24:20 PDT 2010
project.organization=Lift
project.name=Lift SBT Template
-sbt.version=0.7.4
+sbt.version=0.7.5
project.version=0.1
def.scala.version=2.7.7
build.scala.versions=2.8.1
@@ -1,7 +1,7 @@
import sbt._
class LiftProject(info: ProjectInfo) extends DefaultWebProject(info) {
- val liftVersion = "2.3-RC1"
+ val liftVersion = "2.3"
// uncomment the following if you want to use the snapshot repo
// val scalatoolsSnapshot = ScalaToolsSnapshots
@@ -40,6 +40,9 @@ class Boot {
LiftRules.ajaxEnd =
Full(() => LiftRules.jsArtifacts.hide("ajax-loader").cmd)
+ // Use jQuery 1.4
+ LiftRules.jsArtifacts = net.liftweb.http.js.jquery.JQuery14Artifacts
+
// Force the request to be UTF-8
LiftRules.early.append(_.setCharacterEncoding("UTF-8"))
@@ -15,7 +15,7 @@
<hr />
<h4>
<a href="http://www.liftweb.net"><i>Lift</i></a>
- is Copyright 2007-2010 WorldWide Conferencing, LLC.
+ is Copyright 2007-2011 WorldWide Conferencing, LLC.
Distributed under an Apache 2.0 License.
</h4>
</body>
@@ -2,7 +2,7 @@
#Fri Apr 23 11:24:20 PDT 2010
project.organization=Lift
project.name=Lift SBT Template
-sbt.version=0.7.4
+sbt.version=0.7.5
project.version=0.1
def.scala.version=2.7.7
build.scala.versions=2.8.1
@@ -1,7 +1,7 @@
import sbt._
class LiftProject(info: ProjectInfo) extends DefaultWebProject(info) {
- val liftVersion = "2.3-RC1"
+ val liftVersion = "2.3"
// uncomment the following if you want to use the snapshot repo
// val scalatoolsSnapshot = ScalaToolsSnapshots
@@ -30,6 +30,9 @@ class Boot {
// Force the request to be UTF-8
LiftRules.early.append(_.setCharacterEncoding("UTF-8"))
+ // Use jQuery 1.4
+ LiftRules.jsArtifacts = net.liftweb.http.js.jquery.JQuery14Artifacts
+
LiftRules.dispatch.append(RootController)
}
}
@@ -67,7 +67,7 @@ <h1 class="alt">app<img alt="" id="ajax-loader" style="display:none; margin-bott
<div class="column span-23 last" style="text-align: center">
<h4 class="alt">
<a href="http://www.liftweb.net"><i>Lift</i></a>
- is Copyright 2007-2010 WorldWide Conferencing, LLC.
+ is Copyright 2007-2011 WorldWide Conferencing, LLC.
Distributed under an Apache 2.0 License.</h4>
</div>
</div>
@@ -2,7 +2,7 @@
#Fri Apr 23 11:24:20 PDT 2010
project.organization=Lift
project.name=Lift SBT Template
-sbt.version=0.7.4
+sbt.version=0.7.5
project.version=0.1
def.scala.version=2.7.7
build.scala.versions=2.8.1
@@ -1,7 +1,7 @@
import sbt._
class LiftProject(info: ProjectInfo) extends DefaultWebProject(info) {
- val liftVersion = "2.3-RC1"
+ val liftVersion = "2.3"
// uncomment the following if you want to use the snapshot repo
// val scalatoolsSnapshot = ScalaToolsSnapshots
@@ -68,6 +68,9 @@ class Boot {
// What is the function to test if a user is logged in?
LiftRules.loggedInTest = Full(() => User.loggedIn_?)
+ // Use jQuery 1.4
+ LiftRules.jsArtifacts = net.liftweb.http.js.jquery.JQuery14Artifacts
+
// Make a transaction span the whole HTTP request
S.addAround(DB.buildLoanWrapper)
}
@@ -77,7 +77,7 @@ <h1 class="alt">app<img alt="" id="ajax-loader" style="display:none; margin-bott
<div class="column span-23 last" style="text-align: center">
<h4 class="alt">
<a href="http://www.liftweb.net"><i>Lift</i></a>
- is Copyright 2007-2010 WorldWide Conferencing, LLC.
+ is Copyright 2007-2011 WorldWide Conferencing, LLC.
Distributed under an Apache 2.0 License.</h4>
</div>
</div>

0 comments on commit 68e7db1

Please sign in to comment.