Author: vdichev
Date: Thu Jun 18 20:28:28 2009
New Revision: 786249
URL: http://svn.apache.org/viewvc?rev=786249&view=rev
Log:
Updated to reflect new actor changes.
Modified:
incubator/esme/branches/access-pools/server/src/main/scala/bootstrap/liftweb/Boot.scala
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/actor/Distributor.scala
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/actor/UserActor.scala
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/comet/Timeline.scala
Modified:
incubator/esme/branches/access-pools/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/branches/access-pools/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=786249&r1=786248&r2=786249&view=diff
==============================================================================
---
incubator/esme/branches/access-pools/server/src/main/scala/bootstrap/liftweb/Boot.scala
(original)
+++
incubator/esme/branches/access-pools/server/src/main/scala/bootstrap/liftweb/Boot.scala
Thu Jun 18 20:28:28 2009
@@ -47,6 +47,9 @@
*/
class Boot {
def boot {
+ // do this before any messages are sent or there's hell to pay
+ ActorSchedulerFixer.doActorSchedulerFix()
+
DefaultConnectionIdentifier.jndiName = Props.get("jndi.name") openOr "esme"
if (!DB.jndiJdbcConnAvailable_?)
DB.defineConnectionManager(DefaultConnectionIdentifier, DBVendor)
@@ -142,6 +145,7 @@
DB.addLogFunc(S.logQuery _)
S.addAnalyzer(RequestAnalyzer.analyze _)
+
}
private def makeUtf8(req: HttpServletRequest): Unit =
{req.setCharacterEncoding("UTF-8")}
}
Modified:
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/actor/Distributor.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/actor/Distributor.scala?rev=786249&r1=786248&r2=786249&view=diff
==============================================================================
---
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/actor/Distributor.scala
(original)
+++
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/actor/Distributor.scala
Thu Jun 18 20:28:28 2009
@@ -43,6 +43,9 @@
object Distributor extends Actor {
def act = loop {
react {
+ case RelinkToActorWatcher =>
+ link(ActorWatcher)
+
case StartMeUp =>
link(ActorWatcher)
User.findAll.map(_.id.is).foreach(findOrCreateUser)
Modified:
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/actor/UserActor.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/actor/UserActor.scala?rev=786249&r1=786248&r2=786249&view=diff
==============================================================================
---
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/actor/UserActor.scala
(original)
+++
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/actor/UserActor.scala
Thu Jun 18 20:28:28 2009
@@ -82,6 +82,9 @@
def act = loop {
react {
+ case RelinkToActorWatcher =>
+ link(ActorWatcher)
+
case m @ Distributor.UserUpdated(_) =>
User.find(userId).
foreach(u => userTimezone = TimeZone.getTimeZone(u.timezone))
Modified:
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/comet/Timeline.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/comet/Timeline.scala?rev=786249&r1=786248&r2=786249&view=diff
==============================================================================
---
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/comet/Timeline.scala
(original)
+++
incubator/esme/branches/access-pools/server/src/main/scala/org/apache/esme/comet/Timeline.scala
Thu Jun 18 20:28:28 2009
@@ -43,7 +43,7 @@
super.localSetup()
for (user <- User.currentUser) {
Distributor ! Distributor.Listen(user.id, this)
- Distributor !? (200, Distributor.LatestMessages(user.id, 40)) match {
+ Distributor !? (2000, Distributor.LatestMessages(user.id, 40)) match {
case Some(msg: List[Long]) => messages = msg
case x =>
}
