Updated to Lift 2.3 and updated copyright notices

lift · Apr 6, 2011 · 68e7db1 · 68e7db1
1 parent 09ae6d6
commit 68e7db1
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 11 deletions.
diff --git a/lift_basic/project/build.properties b/lift_basic/project/build.properties
@@ -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

diff --git a/lift_basic/project/build/LiftProject.scala b/lift_basic/project/build/LiftProject.scala
@@ -1,7 +1,7 @@
 import sbt._
 
 class LiftProject(info: ProjectInfo) extends DefaultWebProject(info) {
-  val liftVersion = "2.3-RC1"
+  val liftVersion = "2.3"
 
   // uncomment the following if you want to use the snapshot repo
   //  val scalatoolsSnapshot = ScalaToolsSnapshots

diff --git a/lift_basic/src/main/scala/bootstrap/liftweb/Boot.scala b/lift_basic/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -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)
   }

diff --git a/lift_blank/project/build.properties b/lift_blank/project/build.properties
@@ -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

diff --git a/lift_blank/project/build/LiftProject.scala b/lift_blank/project/build/LiftProject.scala
@@ -1,7 +1,7 @@
 import sbt._
 
 class LiftProject(info: ProjectInfo) extends DefaultWebProject(info) {
-  val liftVersion = "2.3-RC1"
+  val liftVersion = "2.3"
 
   // uncomment the following if you want to use the snapshot repo
   //  val scalatoolsSnapshot = ScalaToolsSnapshots

diff --git a/lift_blank/src/main/scala/bootstrap/liftweb/Boot.scala b/lift_blank/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -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"))
 

diff --git a/lift_blank/src/main/webapp/templates-hidden/default.html b/lift_blank/src/main/webapp/templates-hidden/default.html
@@ -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>

diff --git a/lift_mvc/project/build.properties b/lift_mvc/project/build.properties
@@ -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

diff --git a/lift_mvc/project/build/LiftProject.scala b/lift_mvc/project/build/LiftProject.scala
@@ -1,7 +1,7 @@
 import sbt._
 
 class LiftProject(info: ProjectInfo) extends DefaultWebProject(info) {
-  val liftVersion = "2.3-RC1"
+  val liftVersion = "2.3"
 
   // uncomment the following if you want to use the snapshot repo
   //  val scalatoolsSnapshot = ScalaToolsSnapshots

diff --git a/lift_mvc/src/main/scala/bootstrap/liftweb/Boot.scala b/lift_mvc/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -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)
   }
 }
diff --git a/lift_mvc/src/main/webapp/templates-hidden/default.html b/lift_mvc/src/main/webapp/templates-hidden/default.html
@@ -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>

diff --git a/lift_xhtml/project/build.properties b/lift_xhtml/project/build.properties
@@ -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

diff --git a/lift_xhtml/project/build/LiftProject.scala b/lift_xhtml/project/build/LiftProject.scala
@@ -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

diff --git a/lift_xhtml/src/main/scala/bootstrap/liftweb/Boot.scala b/lift_xhtml/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -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)
   }

diff --git a/lift_xhtml/src/main/webapp/templates-hidden/default.html b/lift_xhtml/src/main/webapp/templates-hidden/default.html
@@ -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>