Return-Path: Delivered-To: apmail-incubator-esme-commits-archive@minotaur.apache.org Received: (qmail 62124 invoked from network); 27 Jul 2010 13:42:18 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 27 Jul 2010 13:42:18 -0000 Received: (qmail 57480 invoked by uid 500); 27 Jul 2010 13:42:18 -0000 Delivered-To: apmail-incubator-esme-commits-archive@incubator.apache.org Received: (qmail 57442 invoked by uid 500); 27 Jul 2010 13:42:17 -0000 Mailing-List: contact esme-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: esme-dev@incubator.apache.org Delivered-To: mailing list esme-commits@incubator.apache.org Received: (qmail 57432 invoked by uid 99); 27 Jul 2010 13:42:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Jul 2010 13:42:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Jul 2010 13:42:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B70732388A39; Tue, 27 Jul 2010 13:41:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r979695 - in /incubator/esme/branches/metadata/src/main/scala/org/apache/esme: actor/Distributor.scala actor/UserActor.scala api/API2.scala api/XMLHelper.scala model/Message.scala Date: Tue, 27 Jul 2010 13:41:20 -0000 To: esme-commits@incubator.apache.org From: esjewett@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100727134120.B70732388A39@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: esjewett Date: Tue Jul 27 13:41:20 2010 New Revision: 979695 URL: http://svn.apache.org/viewvc?rev=979695&view=rev Log: [ESME-242] Fix for remaining metadata issues with API Patch by Imtiaz Ahmed Hajee Esmail Modified: incubator/esme/branches/metadata/src/main/scala/org/apache/esme/actor/Distributor.scala incubator/esme/branches/metadata/src/main/scala/org/apache/esme/actor/UserActor.scala incubator/esme/branches/metadata/src/main/scala/org/apache/esme/api/API2.scala incubator/esme/branches/metadata/src/main/scala/org/apache/esme/api/XMLHelper.scala incubator/esme/branches/metadata/src/main/scala/org/apache/esme/model/Message.scala Modified: incubator/esme/branches/metadata/src/main/scala/org/apache/esme/actor/Distributor.scala URL: http://svn.apache.org/viewvc/incubator/esme/branches/metadata/src/main/scala/org/apache/esme/actor/Distributor.scala?rev=979695&r1=979694&r2=979695&view=diff ============================================================================== --- incubator/esme/branches/metadata/src/main/scala/org/apache/esme/actor/Distributor.scala (original) +++ incubator/esme/branches/metadata/src/main/scala/org/apache/esme/actor/Distributor.scala Tue Jul 27 13:41:20 2010 @@ -33,7 +33,7 @@ import common._ import org.apache.esme._ import model._ -import scala.xml.{Elem} +import scala.xml.{Node, Elem} /** * The Distributor actor forwards messages to the appropriate user actor @@ -100,8 +100,8 @@ object Distributor extends LiftActor { } case class UserCreatedMessage(user: Long, text: String, tags: List[String], - when: Long, - metaData: Box[Elem], + when: Long, + metaData: Box[Node], source: String, replyTo: Box[Long], pool: Box[Long]) Modified: incubator/esme/branches/metadata/src/main/scala/org/apache/esme/actor/UserActor.scala URL: http://svn.apache.org/viewvc/incubator/esme/branches/metadata/src/main/scala/org/apache/esme/actor/UserActor.scala?rev=979695&r1=979694&r2=979695&view=diff ============================================================================== --- incubator/esme/branches/metadata/src/main/scala/org/apache/esme/actor/UserActor.scala (original) +++ incubator/esme/branches/metadata/src/main/scala/org/apache/esme/actor/UserActor.scala Tue Jul 27 13:41:20 2010 @@ -31,15 +31,15 @@ import model._ import lib._ import java.util.{TimeZone, Calendar} -import scala.xml.{Elem} +import scala.xml.{Node, Elem} //import com.twitter.stats.Stats import com.twitter.ostrich.Stats object UserActor { private[actor] case class StartMeUp(user: Long) private[actor] case class RefreshMe(user: Long) - private[actor] case class CreateMessage(text: String, tags: List[String], - when: Long, metaData: Box[Elem], + private[actor] case class CreateMessage(text: String, tags: List[String], + when: Long, metaData: Box[Node], source: String, replyTo: Box[Long], pool: Box[Long]) Modified: incubator/esme/branches/metadata/src/main/scala/org/apache/esme/api/API2.scala URL: http://svn.apache.org/viewvc/incubator/esme/branches/metadata/src/main/scala/org/apache/esme/api/API2.scala?rev=979695&r1=979694&r2=979695&view=diff ============================================================================== --- incubator/esme/branches/metadata/src/main/scala/org/apache/esme/api/API2.scala (original) +++ incubator/esme/branches/metadata/src/main/scala/org/apache/esme/api/API2.scala Tue Jul 27 13:41:20 2010 @@ -56,7 +56,7 @@ import org.apache.esme._ import model._ import org.apache.esme.actor._ -import scala.xml.{NodeSeq, Text, Elem, XML, Node} +import scala.xml._ import scala.collection.mutable.ListBuffer @@ -339,7 +339,10 @@ object API2 extends ApiHelper with XmlHe Tag.split(S.param("tags") openOr ""), millis, - xml, + xml match { + case Full(x) => xml + case _ => Box({new Atom(S.param("metadata") openOr "")}) + }, from, S.param("replyto").map(toLong), pool) match { Modified: incubator/esme/branches/metadata/src/main/scala/org/apache/esme/api/XMLHelper.scala URL: http://svn.apache.org/viewvc/incubator/esme/branches/metadata/src/main/scala/org/apache/esme/api/XMLHelper.scala?rev=979695&r1=979694&r2=979695&view=diff ============================================================================== --- incubator/esme/branches/metadata/src/main/scala/org/apache/esme/api/XMLHelper.scala (original) +++ incubator/esme/branches/metadata/src/main/scala/org/apache/esme/api/XMLHelper.scala Tue Jul 27 13:41:20 2010 @@ -35,7 +35,7 @@ import Helpers._ import org.apache.esme._ import model._ -import scala.xml.{NodeSeq, Text, Elem, UnprefixedAttribute, Null, Node} +import scala.xml.{NodeSeq, Text, Elem, UnprefixedAttribute, Null, Node, XML} trait XmlHelper { protected def userToXml(user: User): Elem = @@ -60,7 +60,9 @@ trait XmlHelper { {toInternetDate(msg.when.is)} {msg.source.sourceAttr.getOrElse(Text(""))} {msg.body} - {msg.metadata} + { if ( msg.metadata != null && msg.metadata.length != 0 ) + XML.loadString(msg.metadata) + else } { msg.author.obj.map(u => {u.niceName}{u.id.toString} Modified: incubator/esme/branches/metadata/src/main/scala/org/apache/esme/model/Message.scala URL: http://svn.apache.org/viewvc/incubator/esme/branches/metadata/src/main/scala/org/apache/esme/model/Message.scala?rev=979695&r1=979694&r2=979695&view=diff ============================================================================== --- incubator/esme/branches/metadata/src/main/scala/org/apache/esme/model/Message.scala (original) +++ incubator/esme/branches/metadata/src/main/scala/org/apache/esme/model/Message.scala Tue Jul 27 13:41:20 2010 @@ -497,8 +497,9 @@ class Message extends LongKeyedMapper[Me * Note that the text representation of the XML must be readable * for clients that don't support markup formatting * and is recommended to result in the same XML when parsed - */ - def setTextAndTags(in: String, tags: List[Tag], metaData: Box[Elem]): Box[Message] = { + */ + + def setTextAndTags(in: String, tags: List[Tag], metaData: Box[Node]): Box[Message] = { MsgParser.parseMessage(in).map{ lst => val xml = {