You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by es...@apache.org on 2011/01/05 23:00:11 UTC
svn commit: r1055662 - in /esme/branches/lift-2.2/trunk/server: ./
src/main/scala/bootstrap/liftweb/ src/main/scala/org/apache/esme/actor/
src/main/scala/org/apache/esme/api/ src/main/scala/org/apache/esme/comet/
src/main/scala/org/apache/esme/external...
Author: esjewett
Date: Wed Jan 5 22:00:10 2011
New Revision: 1055662
URL: http://svn.apache.org/viewvc?rev=1055662&view=rev
Log:
[ESME-321] Remove deprecated methods (without PopStatsActor changes that caused test failure)
Patch by Vladimir Ivanov
Modified:
esme/branches/lift-2.2/trunk/server/ (props changed)
esme/branches/lift-2.2/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/MessagePullActor.scala
esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala
esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala
esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/API2.scala
esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/RestAPI.scala
esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/comet/ConversationTimeline.scala
esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/external/Feed.scala
esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala
esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/liftwebext/SHtml.scala
esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Action.scala
esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Mailbox.scala
esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Tag.scala
esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Tracking.scala
esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala
Propchange: esme/branches/lift-2.2/trunk/server/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jan 5 22:00:10 2011
@@ -3,3 +3,4 @@ esme_db
esme_test_db
derby.log
compass-index
+lib_managed
Modified: esme/branches/lift-2.2/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.2/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=1055662&r1=1055661&r2=1055662&view=diff
==============================================================================
--- esme/branches/lift-2.2/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ esme/branches/lift-2.2/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Wed Jan 5 22:00:10 2011
@@ -82,7 +82,7 @@ class Boot {
LiftRules.addToPackages("org.apache.esme")
if (Props.mode == Props.RunModes.Test) {
- Schemifier.destroyTables_!!(Log.infoF _, User, ExtSession,
+ Schemifier.destroyTables_!!(Schemifier.infoF _, User, ExtSession,
Message, Mailbox, Tag, UserTagFollow, UserConvFollow,
Relationship, MessageTag,
AuthToken, UrlStore, Tracking,
@@ -90,7 +90,7 @@ class Boot {
Privilege, UserAuth, UserCryptoSig)
}
- Schemifier.schemify(true, Log.infoF _, User, ExtSession, Message,
+ Schemifier.schemify(true, Schemifier.infoF _, User, ExtSession, Message,
Mailbox, Tag, UserTagFollow, UserConvFollow,
Relationship, MessageTag, AuthToken,
UrlStore, Tracking, Action,
@@ -140,7 +140,7 @@ class Boot {
//Dealing with URL-based request parameters
- LiftRules.rewrite.prepend {
+ LiftRules.statelessRewrite.prepend {
case RewriteRequest(ParsePath("user" :: user :: Nil, "", _, _), _, _) =>
RewriteResponse(List("info_view", "user"), Map("uid" -> user))
case RewriteRequest(ParsePath("tag" :: tag :: Nil, "", _, _), _, _) =>
Modified: esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/MessagePullActor.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/MessagePullActor.scala?rev=1055662&r1=1055661&r2=1055662&view=diff
==============================================================================
--- esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/MessagePullActor.scala (original)
+++ esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/MessagePullActor.scala Wed Jan 5 22:00:10 2011
@@ -98,5 +98,5 @@ trait UniqueMessageSource extends (() =>
case Some(message: Msg) => msgs.filter{messageSorter(message, _)}
case None => msgs
}
- }.sort(messageSorter)
+ }.sortWith(messageSorter)
}
Modified: esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala?rev=1055662&r1=1055661&r2=1055662&view=diff
==============================================================================
--- esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala (original)
+++ esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala Wed Jan 5 22:00:10 2011
@@ -40,7 +40,7 @@ object SchedulerActor extends LiftActor{
if (!regularsPerAction.contains(id)) {
regularsPerAction += (id -> List(regularActor))
} else {
- regularsPerAction(id) ::= regularActor
+ regularsPerAction.updated(id, regularActor :: regularsPerAction(id))
}
}
Modified: esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala?rev=1055662&r1=1055661&r2=1055662&view=diff
==============================================================================
--- esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala (original)
+++ esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala Wed Jan 5 22:00:10 2011
@@ -110,7 +110,7 @@ class UserActor extends LiftActor {
pools = Privilege.findViewablePools(user)
case CreateMessage(text, tags, when, metaData, source, replyTo, pool) =>
- val tagLst = tags.removeDuplicates.map(Tag.findOrCreate)
+ val tagLst = tags.distinct.map(Tag.findOrCreate)
Message.create.author(userId).when(when).
source(source).
@@ -144,12 +144,12 @@ class UserActor extends LiftActor {
Distributor ! Distributor.AddMessageToMailbox(id, msg,
DirectReason(userId))
- for (convId <- msg.conversation.can ;
+ for (convId <- msg.conversation.box ;
val msgId = Message.findMap(By(Message.conversation, convId))
(m => Full(m.id.is));
userId <- (Mailbox.findMap(InRaw(Mailbox.message, msgId.mkString(", "),
IHaveValidatedThisSQL("dpp", "Aug 27. 2008")))
- (mb => Full(mb.user.is))).removeDuplicates)
+ (mb => Full(mb.user.is))).distinct)
Distributor ! Distributor.AddMessageToMailbox(userId, msg, ConversationReason(convId))
Distributor ! Distributor.NewMessage(msg)
Modified: esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/API2.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/API2.scala?rev=1055662&r1=1055661&r2=1055662&view=diff
==============================================================================
--- esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/API2.scala (original)
+++ esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/API2.scala Wed Jan 5 22:00:10 2011
@@ -576,7 +576,7 @@ object API2 extends ApiHelper with XmlHe
userName <- S.param("userId");
user <- User.findFromWeb(userName);
permissionName <- (S.param("permission") or Full("Write"));
- permission <- Box(Permission.valueOf(permissionName)))
+ permission <- Box(Permission.values.find(_.toString == permissionName)))
yield
if(Privilege.hasPermission(adminUser.id.is, pool.id.is, Permission.Admin)) {
val result = try {
@@ -845,4 +845,4 @@ object API2 extends ApiHelper with XmlHe
private case class ListenFor(who: LAFuture[List[(Message, MailboxReason)]],
howLong: TimeSpan)
private case object ReleaseListener
-}
\ No newline at end of file
+}
Modified: esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/RestAPI.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/RestAPI.scala?rev=1055662&r1=1055661&r2=1055662&view=diff
==============================================================================
--- esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/RestAPI.scala (original)
+++ esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/RestAPI.scala Wed Jan 5 22:00:10 2011
@@ -288,7 +288,7 @@ object RestAPI extends XMLApiHelper {
def sendMsgWithToken(req: Req): Box[LiftResponse] = {
for (token <- req.param("token");
auth <- AuthToken.find(By(AuthToken.uniqueId, token));
- userId <- auth.user.can;
+ userId <- auth.user.box;
ret <- sendMsg(Full(userId), req)) yield ret
}
@@ -384,7 +384,7 @@ object RestAPI extends XMLApiHelper {
userName <- S.param("user") ?~ S.?("base_rest_api_err_missing_param", "user");
user <- User.findFromWeb(userName) ?~ S.?("base_rest_api_err_param_not_found", "User");
permissionName <- (S.param("permission") or Full("Write"));
- permission <- Box(Permission.valueOf(permissionName)) ?~ S.?("base_rest_api_err_param_not_found", "Permission")
+ permission <- Box(Permission.values.find(_.toString == permissionName)) ?~ S.?("base_rest_api_err_param_not_found", "Permission")
) yield if(Privilege.hasPermission(adminUser.id.is, pool.id.is, Permission.Admin)) {
val result = try {
Privilege.create.user(user).pool(pool).permission(permission).save
Modified: esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala?rev=1055662&r1=1055661&r2=1055662&view=diff
==============================================================================
--- esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala (original)
+++ esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala Wed Jan 5 22:00:10 2011
@@ -168,7 +168,7 @@ abstract class TwitterAPI {
OrderBy(Message.id, Descending),
MaxRows(1))
userAttributes(user) +
- (("status", lastMsg.map(msgAttributes _).firstOption.getOrElse("")))
+ (("status", lastMsg.map(msgAttributes _).headOption.getOrElse("")))
}
def extendedUserData(user: User) =
@@ -423,7 +423,7 @@ object TwitterXmlAPI extends TwitterAPI
)
}
- def createTag(in: NodeSeq) = in.first match {
+ def createTag(in: NodeSeq) = in.head match {
case e: Elem => e
case _ => <error/>
}
Modified: esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/comet/ConversationTimeline.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/comet/ConversationTimeline.scala?rev=1055662&r1=1055661&r2=1055662&view=diff
==============================================================================
--- esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/comet/ConversationTimeline.scala (original)
+++ esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/comet/ConversationTimeline.scala Wed Jan 5 22:00:10 2011
@@ -32,7 +32,7 @@ class ConversationTimeline extends Timel
val jsId = "conversation_timeline_messages"
var convId:Long = S.param("cid").map(_.toLong).openOr(-1L)
- var convMess:Message = Message.findMessages(List(convId)).values.toList.first
+ var convMess:Message = Message.findMessages(List(convId)).values.toList.head
override def localSetup() {
super.localSetup()
@@ -56,4 +56,4 @@ class ConversationTimeline extends Timel
reRender(false)
}
-}
\ No newline at end of file
+}
Modified: esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/external/Feed.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/external/Feed.scala?rev=1055662&r1=1055661&r2=1055662&view=diff
==============================================================================
--- esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/external/Feed.scala (original)
+++ esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/external/Feed.scala Wed Jan 5 22:00:10 2011
@@ -82,7 +82,7 @@ abstract class Feed(val user: User, val
protected def parseInternetDate(dateString: String): Option[Date] = {
val fixedDateString = fixDateString(dateString)
- dateFormats.projection.flatMap(df => Helpers.tryo {
+ dateFormats.view.flatMap(df => Helpers.tryo {
df.parse(fixedDateString)
}).headOption
}
Modified: esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala?rev=1055662&r1=1055661&r2=1055662&view=diff
==============================================================================
--- esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala (original)
+++ esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala Wed Jan 5 22:00:10 2011
@@ -120,7 +120,7 @@ object AccessPoolMgr {
case Full(u)=> Privilege.findViewablePools(u.id).map(
p => (p.toString, AccessPool.find(p).get.getName)).toList
case _ => Nil
- }).sort(_._2 < _._2)
+ }).sortWith(_._2 < _._2)
SetValById(theInput, "") &
ReplaceOptions("edit_pool", selectPools, Full(p.id.is.toString)) &
FireOnchangeById("edit_pool") &
Modified: esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala?rev=1055662&r1=1055661&r2=1055662&view=diff
==============================================================================
--- esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala (original)
+++ esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala Wed Jan 5 22:00:10 2011
@@ -62,7 +62,7 @@ object ConversationMgr {
def followOrUnfollow: NodeSeq = {
val ret: Box[NodeSeq] = for {
u <- user
- m = messages.values.toList.first
+ m = messages.values.toList.head
} yield {
if (!m.followers.contains(u)) {
ajaxButton("Follow conversation", () => {
@@ -88,7 +88,7 @@ object ConversationMgr {
bind("conv", in,
"conversationId" -> cid,
- "messagePool" -> messages.values.toList.first.pool.is,
+ "messagePool" -> messages.values.toList.head.pool.is,
"cometTimeline" -> cometTimeline,
"followButton" -> followOrUnfollow )
}
Modified: esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/liftwebext/SHtml.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/liftwebext/SHtml.scala?rev=1055662&r1=1055661&r2=1055662&view=diff
==============================================================================
--- esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/liftwebext/SHtml.scala (original)
+++ esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/liftwebext/SHtml.scala Wed Jan 5 22:00:10 2011
@@ -103,7 +103,7 @@ object SHtml {
private def getSortedOpts(opts: Seq[(String, String)], excludeFirstOpt: Boolean): Seq[(String, String)] =
if ( excludeFirstOpt )
opts match {
- case first :: rest => first :: rest.toList.sort( (first: (String, String), second: (String, String)) => first._2.toUpperCase < second._2.toUpperCase)
+ case first :: rest => first :: rest.toList.sortWith( (first: (String, String), second: (String, String)) => first._2.toUpperCase < second._2.toUpperCase)
case _ => opts
}
else
Modified: esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Action.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Action.scala?rev=1055662&r1=1055661&r2=1055662&view=diff
==============================================================================
--- esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Action.scala (original)
+++ esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Action.scala Wed Jan 5 22:00:10 2011
@@ -203,7 +203,7 @@ class Action extends LongKeyedMapper[Act
MaxRows(1))
val lastMsg = if (msgList.isEmpty) None
else {
- val m = msgList.first
+ val m = msgList.head
Some(Distributor.UserCreatedMessage(user, m.body, m.tags, m.when, Empty, m.source, Full(m.replyTo), None))
}
Modified: esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Mailbox.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Mailbox.scala?rev=1055662&r1=1055661&r2=1055662&view=diff
==============================================================================
--- esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Mailbox.scala (original)
+++ esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Mailbox.scala Wed Jan 5 22:00:10 2011
@@ -72,8 +72,8 @@ class Mailbox extends LongKeyedMapper[Ma
object resent extends MappedBoolean(this)
lazy val reason: MailboxReason =
- viaTrack.can.map(TrackReason) or directlyFrom.can.map(DirectReason) or
- conversation.can.map(ConversationReason) openOr NoReason
+ viaTrack.box.map(TrackReason) or directlyFrom.box.map(DirectReason) or
+ conversation.box.map(ConversationReason) openOr NoReason
}
sealed trait MailboxReason {
Modified: esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=1055662&r1=1055661&r2=1055662&view=diff
==============================================================================
--- esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Message.scala Wed Jan 5 22:00:10 2011
@@ -134,8 +134,8 @@ object Message extends Message with Long
val ret: List[Message] = this.findAll(params :_*)
- val userIds: List[Long] = (ret.flatMap(_.author.can) :::
- ret.flatMap(_.sentToIds)).removeDuplicates
+ val userIds: List[Long] = (ret.flatMap(_.author.box) :::
+ ret.flatMap(_.sentToIds)).distinct
val users:Map[Long, User] = Map(User.findAll(InRaw(User.id, userIds.mkString(","),
IHaveValidatedThisSQL("dpp", "Aug 23, 2008"))).map(u => (u.id.is, u)) :_*)
@@ -252,7 +252,7 @@ object Message extends Message with Long
val weights = compoundStem(messages.flatMap(_.wordFrequencies))
// Start with the top N tags
- val sortedWeights = weights.sort(_._2 > _._2).take(n)
+ val sortedWeights = weights.sortWith(_._2 > _._2).take(n)
// And create a normalized cente-weighted list, e.g. smallest, small, Larger, BIG, *HUGE*, BIG, Larger, small, smallest
TagUtils.normalize(TagUtils.everyEven(sortedWeights).reverse ::: TagUtils.everyOdd(sortedWeights))
@@ -274,7 +274,7 @@ object Message extends Message with Long
case e: Elem if "body" == e.label => <body>{ns}</body>
case _ => n
}
- })).first
+ })).head
}
}
@@ -319,7 +319,7 @@ class Message extends LongKeyedMapper[Me
lazy val metaData: String = {
val org = originalXml
- (org \ "metadata").map(_.text).first
+ (org \ "metadata").map(_.text).head
}
@@ -335,7 +335,7 @@ class Message extends LongKeyedMapper[Me
}
private[model] def preload(users: Map[Long, User]) {
- author.can.foreach{
+ author.box.foreach{
id =>
this.author.primeObj(users.get(id))
}
@@ -345,12 +345,12 @@ class Message extends LongKeyedMapper[Me
private def replyToTag: MetaData =
new UnprefixedAttribute("reply_to",
- replyTo.can.map(i => Text(i.toString)).toOption,
+ replyTo.box.map(i => Text(i.toString)).toOption,
Null)
private def conversationTag: MetaData =
new UnprefixedAttribute("conversation",
- conversation.can.map(i => Text(i.toString)).toOption,
+ conversation.box.map(i => Text(i.toString)).toOption,
Null)
override lazy val toXml: Elem = {
@@ -532,7 +532,7 @@ class Message extends LongKeyedMapper[Me
}</body>
<tags>{
((lst.flatMap{case HashTag(t) => Full(t) case _ => Empty})
- ::: tags).removeDuplicates.map(_.toXml)
+ ::: tags).distinct.map(_.toXml)
}</tags>{
metaData match {
case Full(xs) => <metadata>{xs}</metadata>
Modified: esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Tag.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Tag.scala?rev=1055662&r1=1055661&r2=1055662&view=diff
==============================================================================
--- esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Tag.scala (original)
+++ esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Tag.scala Wed Jan 5 22:00:10 2011
@@ -53,7 +53,7 @@ object Tag extends Tag with MetaProtoTag
val weights = compound(messages.flatMap(_.tagFrequencies))
// Start with the top 20 tags, sorted by frequency
- val sortedWeights = weights.sort(_._2 > _._2).take(n)
+ val sortedWeights = weights.sortWith(_._2 > _._2).take(n)
// And create a normalized cente-weighted list, e.g. smallest, small, Larger, BIG, *HUGE*, BIG, Larger, small, smallest
TagUtils.normalize(TagUtils.everyEven(sortedWeights).reverse ::: TagUtils.everyOdd(sortedWeights))
Modified: esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Tracking.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Tracking.scala?rev=1055662&r1=1055661&r2=1055662&view=diff
==============================================================================
--- esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Tracking.scala (original)
+++ esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Tracking.scala Wed Jan 5 22:00:10 2011
@@ -48,7 +48,7 @@ class Tracking extends LongKeyedMapper[T
override def toXml: Elem =
<tracking id={id.toString}
- user={user.can.map(l => Text(l.toString)).toOption}
+ user={user.box.map(l => Text(l.toString)).toOption}
pattern={pattern}
removed={removed.toString}
createdAt={createdAt.toString}></tracking>
@@ -93,7 +93,7 @@ object uniqueId extends MappedUniqueId(t
}
def matcher: Box[TrackingMatcher] = {
- who.can match {
+ who.box match {
case Full(whoId) =>
Full(new PersonTrackingMatcher(id, whoId))
Modified: esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala?rev=1055662&r1=1055661&r2=1055662&view=diff
==============================================================================
--- esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala (original)
+++ esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala Wed Jan 5 22:00:10 2011
@@ -114,7 +114,7 @@ class UserSnip extends DispatchSnippet {
(<foo>{in}</foo> \ lookFor).toList.
filter(_.prefix == "logged").
- map(_.child).firstOption.getOrElse(NodeSeq.Empty)
+ map(_.child).headOption.getOrElse(NodeSeq.Empty)
}
def userFmt(u: User): Node =
@@ -179,7 +179,7 @@ class UserSnip extends DispatchSnippet {
yield p)
.map( p => {val pool = AccessPool.find(p); (pool.get.id.is.toString, pool.get.getName)} )
.toList
- .sort( ( first: (String, String), second: (String, String)) => first._2.toUpperCase < second._2.toUpperCase)
+ .sortWith( ( first: (String, String), second: (String, String)) => first._2.toUpperCase < second._2.toUpperCase)
.map(p => <option value={p._1}>{p._2}</option>)
}