svn commit: r1089404 - in /esme/trunk/server: pom.xml project/build/EsmeProject.scala src/main/scala/bootstrap/liftweb/Boot.scala src/main/scala/org/apache/esme/model/ExtSession.scala src/main/scala/org/apache/esme/model/Mailbox.scala

[le...@apache.org]

Author: lester
Date: Wed Apr  6 11:23:38 2011
New Revision: 1089404

URL: http://svn.apache.org/viewvc?rev=1089404&view=rev
Log:
Completed ESME-341: Upgrade to Lift 2.3 version.

Modified:
    esme/trunk/server/pom.xml
    esme/trunk/server/project/build/EsmeProject.scala
    esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
    esme/trunk/server/src/main/scala/org/apache/esme/model/ExtSession.scala
    esme/trunk/server/src/main/scala/org/apache/esme/model/Mailbox.scala

Modified: esme/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/esme/trunk/server/pom.xml?rev=1089404&r1=1089403&r2=1089404&view=diff
==============================================================================
--- esme/trunk/server/pom.xml (original)
+++ esme/trunk/server/pom.xml Wed Apr  6 11:23:38 2011
@@ -75,7 +75,7 @@
     </developer>
     </developers>
     <properties>
-        <lift.version>2.2</lift.version>
+        <lift.version>2.3</lift.version>
         <scala.version>2.8.1</scala.version>
         <compass.version>2.1.1</compass.version>
         <lucene.version>2.4.0</lucene.version>

Modified: esme/trunk/server/project/build/EsmeProject.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/project/build/EsmeProject.scala?rev=1089404&r1=1089403&r2=1089404&view=diff
==============================================================================
--- esme/trunk/server/project/build/EsmeProject.scala (original)
+++ esme/trunk/server/project/build/EsmeProject.scala Wed Apr  6 11:23:38 2011
@@ -1,7 +1,7 @@
 import sbt._
 
 class EsmeProject(info: ProjectInfo) extends DefaultWebProject(info) {
-  val liftVersion = "2.2"
+  val liftVersion = "2.3"
   val compassVersion = "2.1.1"
   val luceneVersion = "2.4.0"
 

Modified: esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=1089404&r1=1089403&r2=1089404&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Wed Apr  6 11:23:38 2011
@@ -197,7 +197,7 @@ class Boot extends Loggable {
 
     LiftRules.setSiteMap(SiteMap(entries: _*))
 
-    S.addAround(ExtSession.requestLoans)          
+    LiftRules.earlyInStateful.append(ExtSession.testCookieEarlyInStateful)
 
     // API security rules
     LiftRules.dispatch.append(API2.authorizationRules)

Modified: esme/trunk/server/src/main/scala/org/apache/esme/model/ExtSession.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/model/ExtSession.scala?rev=1089404&r1=1089403&r2=1089404&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/model/ExtSession.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/model/ExtSession.scala Wed Apr  6 11:23:38 2011
@@ -24,7 +24,7 @@ import mapper._
 import util._
 import common._
 
-object ExtSession extends ExtSession with MetaProtoExtendedSession[ExtSession] {
+object ExtSession extends ExtSession with LongKeyedMetaMapper[ExtSession] with MetaProtoExtendedSession[ExtSession] {
   override def dbTableName = "ext_session" // define the DB table name
 
   def logUserIdIn(uid: String): Unit = User.logUserIdIn(uid)
@@ -34,7 +34,7 @@ object ExtSession extends ExtSession wit
   type UserType = User
 }
 
-class ExtSession extends ProtoExtendedSession[ExtSession] {
+class ExtSession extends LongKeyedMapper[ExtSession] with ProtoExtendedSession[ExtSession] {
   def getSingleton = ExtSession // what's the "meta" server
 
 }

Modified: esme/trunk/server/src/main/scala/org/apache/esme/model/Mailbox.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/model/Mailbox.scala?rev=1089404&r1=1089403&r2=1089404&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/model/Mailbox.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/model/Mailbox.scala Wed Apr  6 11:23:38 2011
@@ -107,7 +107,7 @@ case class TagFollowReason(tagName: Stri
   def attr = new UnprefixedAttribute("tag", tagName, Null)
 }            
 case class ConvFollowReason(convId: Long) extends MailboxReason {
-  def attr = new UnprefixedAttribute("conversation", convId, Null)
+  def attr = new UnprefixedAttribute("conversation", convId.toString, Null)
 }
 case class LoginReason(userId: Long) extends MailboxReason {
   def attr = new UnprefixedAttribute("login", userId.toString, Null)