You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by rh...@apache.org on 2010/07/07 09:57:37 UTC
svn commit: r961281 - in
/incubator/esme/trunk/server/src/main/scala/org/apache/esme:
api/XMLHelper.scala model/Message.scala
Author: rhirsch
Date: Wed Jul 7 07:57:37 2010
New Revision: 961281
URL: http://svn.apache.org/viewvc?rev=961281&view=rev
Log:
[ESME-242] The use of metadata in the api2 currently doesn't work
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/XMLHelper.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/XMLHelper.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/XMLHelper.scala?rev=961281&r1=961280&r2=961281&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/XMLHelper.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/api/XMLHelper.scala Wed Jul 7 07:57:37 2010
@@ -59,7 +59,8 @@ trait XmlHelper {
<id>{msg.id.toString}</id>
<date>{toInternetDate(msg.when.is)}</date>
<source>{msg.source.sourceAttr.getOrElse(Text(""))}</source>
- <body>{msg.body}</body>
+ <body>{msg.body}</body>
+ <metadata>{msg.metadata}</metadata>
{
msg.author.obj.map(u =>
<author><nickname>{u.niceName}</nickname><id>{u.id.toString}</id></author>
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=961281&r1=961280&r2=961281&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala Wed Jul 7 07:57:37 2010
@@ -276,6 +276,7 @@ object Message extends Message with Long
}
}
+
@Searchable
class Message extends LongKeyedMapper[Message] {
import Message._
@@ -309,6 +310,8 @@ class Message extends LongKeyedMapper[Me
}
lazy val body: String = originalXml \ "body" text
+
+ lazy val metadata: String = originalXml \ "metadata" text
lazy val metaData: String = {
val org = originalXml
@@ -514,7 +517,7 @@ class Message extends LongKeyedMapper[Me
::: tags).removeDuplicates.map(_.toXml)
}</tags>{
metaData match {
- case Full(xs) => <metadata>xs</metadata>
+ case Full(xs) => <metadata>{xs}</metadata>
case _ => NodeSeq.Empty
}