Author: vdichev
Date: Sun Aug 9 20:55:28 2009
New Revision: 802596
URL: http://svn.apache.org/viewvc?rev=802596&view=rev
Log:
Update to latest Lift changes
Modified:
incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
Modified:
incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=802596&r1=802595&r2=802596&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
(original)
+++ incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Sun
Aug 9 20:55:28 2009
@@ -40,7 +40,7 @@
import api._
import net.liftweb._
import mapper._
-import javax.servlet.http.{HttpServlet, HttpServletRequest ,
HttpServletResponse, HttpSession}
+import provider.HTTPRequest
import org.compass.core._
import org.compass.core.config.CompassConfiguration
import scala.actors.Actor
@@ -171,7 +171,7 @@
// Dump information about session every 10 minutes
SessionMaster.sessionWatchers = SessionInfoDumper ::
SessionMaster.sessionWatchers
}
- private def makeUtf8(req: HttpServletRequest): Unit =
{req.setCharacterEncoding("UTF-8")}
+ private def makeUtf8(req: HTTPRequest) = {req.setCharacterEncoding("UTF-8")}
}
object Compass {
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala?rev=802596&r1=802595&r2=802596&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
(original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
Sun Aug 9 20:55:28 2009
@@ -390,7 +390,7 @@
onLogOut.foreach(_(curUser))
curUserId.remove()
curUser.remove()
- S.request.foreach(_.request.getSession.invalidate)
+ S.request.foreach(_.request.session.terminate)
}
private object curUserId extends SessionVar[Box[String]](Empty)
