Sure. It was just easier.. ;-) On Thu, Dec 18, 2008 at 3:14 PM, Darren Hague <[email protected]> wrote:
> Thanks, David - much appreciated. Build is clean now. > > Cheers, > Darren > > > [email protected] wrote: > >> Author: dpp >> Date: Thu Dec 18 14:54:03 2008 >> New Revision: 727848 >> >> URL: http://svn.apache.org/viewvc?rev=727848&view=rev >> Log: >> Updated to work with Lift >> >> Modified: >> incubator/esme/trunk/server/ (props changed) >> incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala >> incubator/esme/trunk/server/src/main/scala/us/esme/api/RestAPI.scala >> >> Propchange: incubator/esme/trunk/server/ >> >> ------------------------------------------------------------------------------ >> --- svn:ignore (added) >> +++ svn:ignore Thu Dec 18 14:54:03 2008 >> @@ -0,0 +1 @@ >> +target >> >> 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=727848&r1=727847&r2=727848&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 Thu >> Dec 18 14:54:03 2008 >> @@ -60,19 +60,17 @@ >> Group, Relationship, MessageTag, AuthToken, >> UrlStore, Tracking, Action, DidPerform) >> - LiftRules.prependTemplate(User.templates) >> - - LiftRules.appendStatelessDispatch { >> + LiftRules.statelessDispatchTable.append { >> case r @ Req("api" :: "send_msg" :: Nil, "", PostRequest) if >> r.param("token").isDefined => () => RestAPI.sendMsgWithToken(r) >> } >> - LiftRules.appendDispatch(ESMEOpenIDVendor.dispatchPF) >> + LiftRules.dispatch.append(ESMEOpenIDVendor.dispatchPF) >> LiftRules.siteMapFailRedirectLocation = List("static", "about") >> - LiftRules.prependRewrite { >> + LiftRules.rewrite.prepend { >> case RewriteRequest(ParsePath("user" :: user :: Nil,"", _,_), _, _) >> => >> RewriteResponse( List("user_view", "index"), Map("uid" -> user)) >> case RewriteRequest(ParsePath("tag" :: tag :: Nil,"", _,_), _, _) => >> @@ -86,7 +84,7 @@ >> RewriteResponse( List("user_view", "search"), Map("term" -> term)) >> } >> - LiftRules.appendDispatch(UrlStore.redirectizer) >> + LiftRules.dispatch.append(UrlStore.redirectizer) >> LiftRules.siteMapFailRedirectLocation = List("static", "about") >> @@ -105,16 +103,16 @@ >> ActionView.menuItems >> LiftRules.setSiteMap(SiteMap(entries:_*)) >> - S.addAround(User.requestLoans) >> + S.addAround(ExtSession.requestLoans) >> - LiftRules.appendViewDispatch { >> - case "user_view" :: _ => UserView >> + LiftRules.viewDispatch.append { >> + case "user_view" :: _ => Right(UserView) >> } >> - LiftRules.prependDispatch(RestAPI.dispatch) >> + LiftRules.dispatch.prepend(RestAPI.dispatch) >> - LiftRules.appendEarly(makeUtf8) >> + LiftRules.early.append(makeUtf8) >> Distributor.touch >> >> Modified: >> incubator/esme/trunk/server/src/main/scala/us/esme/api/RestAPI.scala >> URL: >> http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/us/esme/api/RestAPI.scala?rev=727848&r1=727847&r2=727848&view=diff >> >> ============================================================================== >> --- incubator/esme/trunk/server/src/main/scala/us/esme/api/RestAPI.scala >> (original) >> +++ incubator/esme/trunk/server/src/main/scala/us/esme/api/RestAPI.scala >> Thu Dec 18 14:54:03 2008 >> @@ -249,7 +249,7 @@ >> } >> def waitForMsgs(): LiftResponse = { >> - val seq: Long = CometActor.next >> + val seq: Long = Helpers.nextNum >> def waitForAnswer: Can[List[(Message, MailboxReason)]] = >> receiveWithin(6L * 60L * 1000L) { >> >> >> >> > > -- Lift, the simply functional web framework http://liftweb.net Collaborative Task Management http://much4.us Follow me: http://twitter.com/dpp Git some: http://github.com/dpp
