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/07/29 14:40:44 UTC
svn commit: r1152185 - in /esme/branches/lift-2.4: ./ server/
server/src/main/resources/props/compass.filesystem.cfg.xml
server/src/main/scala/org/apache/esme/model/Message.scala
Author: lester
Date: Fri Jul 29 12:40:44 2011
New Revision: 1152185
URL: http://svn.apache.org/viewvc?rev=1152185&view=rev
Log:
Merged latest changes from trunk.
Modified:
esme/branches/lift-2.4/ (props changed)
esme/branches/lift-2.4/server/ (props changed)
esme/branches/lift-2.4/server/src/main/resources/props/compass.filesystem.cfg.xml (props changed)
esme/branches/lift-2.4/server/src/main/scala/org/apache/esme/model/Message.scala
Propchange: esme/branches/lift-2.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 29 12:40:44 2011
@@ -1,2 +1,3 @@
/esme/branches/lift-2.2/trunk:1051384-1055974
+/esme/trunk:1150805-1152180
/incubator/esme/branches/lift-2.2/trunk:1043371-1051383
Propchange: esme/branches/lift-2.4/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 29 12:40:44 2011
@@ -1,5 +1,6 @@
/esme/branches/esme-328_comet_timeline_rewrite:1088273-1090390
/esme/branches/lift-2.2/trunk/server:1051384-1055974
+/esme/trunk/server:1150805-1152180
/incubator/esme/branches/lift-2.0/server:928728-939625
/incubator/esme/branches/lift-2.2/trunk/server:1043371-1051383
/incubator/esme/branches/lift-2.2/trunk/server/src/main/webapp/info_view:1043380-1044792
Propchange: esme/branches/lift-2.4/server/src/main/resources/props/compass.filesystem.cfg.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 29 12:40:44 2011
@@ -1,5 +1,6 @@
/esme/branches/esme-328_comet_timeline_rewrite/src/main/resources/props/compass.filesystem.cfg.xml:1088273-1090390
/esme/branches/lift-2.2/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml:1051384-1055974
+/esme/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml:1150805-1152180
/incubator/esme/branches/lift-2.2/trunk/server/src/main/resources/props/compass.filesystem.cfg.xml:1043371-1051383
/incubator/esme/branches/metadata/src/main/resources/props/compass.filesystem.cfg.xml:966215-979767
/incubator/esme/branches/tagandconversationfollow/src/main/resources/props/compass.filesystem.cfg.xml:966215-1006324
Modified: esme/branches/lift-2.4/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/esme/branches/lift-2.4/server/src/main/scala/org/apache/esme/model/Message.scala?rev=1152185&r1=1152184&r2=1152185&view=diff
==============================================================================
--- esme/branches/lift-2.4/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ esme/branches/lift-2.4/server/src/main/scala/org/apache/esme/model/Message.scala Fri Jul 29 12:40:44 2011
@@ -43,7 +43,7 @@ import org.tartarus.snowball.ext.PorterS
import org.apache.esme._
import lib._
-object Message extends Message with LongKeyedMetaMapper[Message] {
+object Message extends Message with LongKeyedMetaMapper[Message] with Logger {
val logger: Logger = Logger ("org.apache.esme.model.Message")
private def fixConversation(msg: Message) {
@@ -522,7 +522,7 @@ class Message extends LongKeyedMapper[Me
}
}</body>
<tags>{
- ((lst.flatMap{case HashTag(t) => Full(t) case _ => Empty})
+ ((lst.flatMap{case Paragraph(elems, _) => {elems.flatMap { case HashTag(t) => Full(t) case _ => Empty} } case _ => Empty})
::: tags).distinct.map(_.toXml)
}</tags>{
metaData match {
@@ -531,6 +531,7 @@ class Message extends LongKeyedMapper[Me
}
}</message>
+ debug("Message.setTextAndTags(), generated XML: %s".format(xml.toString))
this.text(xml.toString)
this
}