You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by le...@apache.org on 2011/05/08 02:28:51 UTC
svn commit: r1100664 - in /esme/trunk/server/src/main/scala/org/apache/esme:
actor/ api/ comet/ liftwebext/ model/
Author: lester
Date: Sun May 8 00:28:50 2011
New Revision: 1100664
URL: http://svn.apache.org/viewvc?rev=1100664&view=rev
Log:
Finished with ESME-321: Get rid of deprecated methods
Modified:
esme/trunk/server/src/main/scala/org/apache/esme/actor/PopStatsActor.scala
esme/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala
esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala
esme/trunk/server/src/main/scala/org/apache/esme/api/RestAPI.scala
esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
esme/trunk/server/src/main/scala/org/apache/esme/comet/PublicTimeline.scala
esme/trunk/server/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala
esme/trunk/server/src/main/scala/org/apache/esme/comet/StreamTimeline.scala
esme/trunk/server/src/main/scala/org/apache/esme/liftwebext/SHtml.scala
esme/trunk/server/src/main/scala/org/apache/esme/model/Action.scala
Modified: esme/trunk/server/src/main/scala/org/apache/esme/actor/PopStatsActor.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/actor/PopStatsActor.scala?rev=1100664&r1=1100663&r2=1100664&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/actor/PopStatsActor.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/actor/PopStatsActor.scala Sun May 8 00:28:50 2011
@@ -82,7 +82,7 @@ object PopStatsActor extends LiftActor {
private var running = true
protected def messageHandler = {
- case StartUp => ActorPing.schedule(this, Expire, refreshInterval)
+ case StartUp => Schedule.schedule(this, Expire, refreshInterval)
case ByeBye =>
running = false
@@ -92,7 +92,7 @@ object PopStatsActor extends LiftActor {
stats += (id -> (stats.getOrElse(id,0) + 1))
case Top(n) =>
- val topList = stats.toList.sort{
+ val topList = stats.toList.sortWith{
case ((_,freq1),(_,freq2)) =>
freq2 < freq1
}.take(n)
@@ -101,7 +101,7 @@ object PopStatsActor extends LiftActor {
case Expire => {
val (live, expired) = queue.partition(_.when + period > now)
expired.foreach(stats -= _.id)
- ActorPing.schedule(this, Expire, refreshInterval)
+ Schedule.schedule(this, Expire, refreshInterval)
live
}
}
Modified: esme/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala?rev=1100664&r1=1100663&r2=1100664&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala Sun May 8 00:28:50 2011
@@ -62,7 +62,7 @@ object SchedulerActor extends LiftActor{
private def setupPing() {
if (running)
- ActorPing.schedule(this, DoItDude, everySeconds * 1000L)
+ Schedule.schedule(this, DoItDude, everySeconds * 1000L)
}
sendMessage()
Modified: esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala?rev=1100664&r1=1100663&r2=1100664&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/api/API2.scala Sun May 8 00:28:50 2011
@@ -827,7 +827,7 @@ object API2 extends ApiHelper with XmlHe
case Nil =>
listener.foreach(_.satisfy(Nil))
listener = Full(who)
- ActorPing.schedule(this, ReleaseListener, len)
+ Schedule.schedule(this, ReleaseListener, len)
case xs =>
who.satisfy(xs)
Modified: esme/trunk/server/src/main/scala/org/apache/esme/api/RestAPI.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/api/RestAPI.scala?rev=1100664&r1=1100663&r2=1100664&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/api/RestAPI.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/api/RestAPI.scala Sun May 8 00:28:50 2011
@@ -453,7 +453,7 @@ object RestAPI extends XMLApiHelper {
case Nil =>
listener.foreach(_.satisfy(Nil))
listener = Full(who)
- ActorPing.schedule(this, ReleaseListener, len)
+ Schedule.schedule(this, ReleaseListener, len)
case xs =>
who.satisfy(xs)
Modified: esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala?rev=1100664&r1=1100663&r2=1100664&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala Sun May 8 00:28:50 2011
@@ -387,7 +387,7 @@ abstract class TwitterAPI {
}
protected def unbox(x: () => Box[TwitterResponse]) = {
- Either.merge(
+ new Either.MergeableEither(
x() match {
case Full(res) => res
case Empty =>
@@ -395,7 +395,7 @@ abstract class TwitterAPI {
case failMsg: Failure =>
Right(Map("hash" -> Map("error" -> failMsg.messageChain)))
}
- )
+ ).merge
}
}
Modified: esme/trunk/server/src/main/scala/org/apache/esme/comet/PublicTimeline.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/comet/PublicTimeline.scala?rev=1100664&r1=1100663&r2=1100664&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/comet/PublicTimeline.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/comet/PublicTimeline.scala Sun May 8 00:28:50 2011
@@ -74,7 +74,7 @@ class PublicTimeline extends Timeline {
if ((millis - lastRender) < 30000L) {
if (!scheduled) {
scheduled = true
- ActorPing.schedule(this, ForceRender, 30000L)
+ Schedule.schedule(this, ForceRender, 30000L)
}
}
else reRender(true)
Modified: esme/trunk/server/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala?rev=1100664&r1=1100663&r2=1100664&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala Sun May 8 00:28:50 2011
@@ -74,7 +74,7 @@ class SinglePublicTimeline extends Timel
if ((millis - lastRender) < 30000L) {
if (!scheduled) {
scheduled = true
- ActorPing.schedule(this, SingleForceRender, 30000L)
+ Schedule.schedule(this, SingleForceRender, 30000L)
}
}
else reRender(true)
Modified: esme/trunk/server/src/main/scala/org/apache/esme/comet/StreamTimeline.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/comet/StreamTimeline.scala?rev=1100664&r1=1100663&r2=1100664&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/comet/StreamTimeline.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/comet/StreamTimeline.scala Sun May 8 00:28:50 2011
@@ -22,8 +22,7 @@ package org.apache.esme.comet
import net.liftweb.common._
import net.liftweb.mapper._
import net.liftweb.http._
-import net.liftweb.util.ActorPing
-import net.liftweb.util.Helpers._
+import net.liftweb.util.Helpers._
import scala.xml._
import js._
@@ -32,7 +31,8 @@ import JE._
import org.apache.esme._
import actor.{Distributor}
-import model._
+import model._
+import net.liftweb.util.{Schedule, ActorPing}
class StreamTimeline extends PublicTimeline {
@@ -115,7 +115,7 @@ class StreamTimeline extends PublicTimel
if ((millis - lastRender) < 30000L) {
if (!scheduled) {
scheduled = true
- ActorPing.schedule(this, ForceRender, 30000L)
+ Schedule.schedule(this, ForceRender, 30000L)
}
}
else reRender(true)
Modified: esme/trunk/server/src/main/scala/org/apache/esme/liftwebext/SHtml.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/liftwebext/SHtml.scala?rev=1100664&r1=1100663&r2=1100664&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/liftwebext/SHtml.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/liftwebext/SHtml.scala Sun May 8 00:28:50 2011
@@ -107,5 +107,5 @@ object SHtml {
case _ => opts
}
else
- opts.toList.sort( (first: (String, String), second: (String, String)) => first._2.toUpperCase < second._2.toUpperCase)
+ opts.toList.sortWith( (first: (String, String), second: (String, String)) => first._2.toUpperCase < second._2.toUpperCase)
}
Modified: esme/trunk/server/src/main/scala/org/apache/esme/model/Action.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/model/Action.scala?rev=1100664&r1=1100663&r2=1100664&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/model/Action.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/model/Action.scala Sun May 8 00:28:50 2011
@@ -568,9 +568,25 @@ case object MinuteDateType extends DateT
sealed trait Performances
case class MailTo(who: String, text: Option[String]) extends Performances
case class HttpTo(url: String, user: String, password: String, headers: List[(String, String)], data: Option[String]) extends Performances
-case class FetchFeed(url: UrlStore, tags: List[String]) extends Performances
case class FetchAtom(override val url: UrlStore, override val tags: List[String]) extends FetchFeed(url, tags)
case class FetchRss(override val url: UrlStore, override val tags: List[String]) extends FetchFeed(url, tags)
case object PerformResend extends Performances
case object PerformFilter extends Performances
case object ScalaInterpret extends Performances
+
+object FetchFeed extends ((UrlStore, List[String]) => FetchFeed) {
+ def unapply(f: FetchFeed): Option[(UrlStore, List[String])] = {
+ Some(f.url, f.tags)
+ }
+ def apply(url: UrlStore, tags: List[String]) = new FetchFeed(url, tags)
+}
+
+class FetchFeed(val url: UrlStore, val tags: List[String]) extends Performances {
+ override def hashCode = 41 * (41 + url.hashCode) + tags.hashCode
+ override def equals(other: Any) = other match {
+ case that: FetchFeed => (that canEqual this) && super.equals(that) && this.url == that.url && this.tags == that.tags
+ case _ => false
+ }
+ def canEqual(other: Any) = other.isInstanceOf[FetchFeed]
+ def copy(url1: UrlStore = url, tags1: List[String] = tags) = new FetchFeed(url1, tags1)
+}
\ No newline at end of file