You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by vd...@apache.org on 2011/02/25 06:26:20 UTC

svn commit: r1074400 - /esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala

Author: vdichev
Date: Fri Feb 25 05:26:19 2011
New Revision: 1074400

URL: http://svn.apache.org/viewvc?rev=1074400&view=rev
Log:
ESME-327 Prepend context root to URLs

Modified:
    esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala

Modified: esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=1074400&r1=1074399&r2=1074400&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala Fri Feb 25 05:26:19 2011
@@ -23,7 +23,8 @@ import net.liftweb._
 import mapper._
 import util._
 import common._
-import http.js._
+import http._
+import js._
 import Helpers._
 
 import scala.xml._
@@ -43,6 +44,8 @@ import lib._
 object Message extends Message with LongKeyedMetaMapper[Message] {
   val logger: Logger = Logger ("org.apache.esme.model.Message")
 
+  val root = LiftRules.context.path
+
   private def fixConversation(msg: Message) {
     if (!msg.conversation.defined_? && msg.replyTo.defined_?) {
       for (replyTo <- msg.replyTo.obj) {
@@ -385,12 +388,12 @@ class Message extends LongKeyedMapper[Me
         case e: Elem if e.label == "at_name" =>
           e.attribute("nickname").
           map(nickname =>
-            <xml:group> @<a href={"/user/"+urlEncode(nickname.text)}>{nickname}</a> </xml:group>).
+            <xml:group> @<a href={root+"/user/"+urlEncode(nickname.text)}>{nickname}</a> </xml:group>).
           getOrElse(Text(""))
 
         case e: Elem if e.label == "tag" =>
           e.attribute("name").map(tag =>
-            <xml:group> #<a href={"/tag/"+urlEncode(tag.text)}>{tag}</a> </xml:group>).
+            <xml:group> #<a href={root+"/tag/"+urlEncode(tag.text)}>{tag}</a> </xml:group>).
           getOrElse(Text(""))
 
         case e: Elem if e.label == "url" =>
@@ -407,7 +410,7 @@ class Message extends LongKeyedMapper[Me
                   urlString
                 else
                   urlString.substring(0, len - 3) + "..."
-              <xml:group> <a class="tiplelement" href={href} target="_blank" title={url}>{truncateUrl(url.toString, 20)}</a> </xml:group>
+              <xml:group> <a class="tiplelement" href={root+href} target="_blank" title={url}>{truncateUrl(url.toString, 20)}</a> </xml:group>
             }
           ).getOrElse(Text("") )
 
@@ -529,7 +532,8 @@ class Message extends LongKeyedMapper[Me
               case Emph(text) => <xml:group> <em text={text}>_{text}_</em></xml:group>
               case Strong(text) => <xml:group> <strong text={text}>*{text}*</strong></xml:group>
             }
-          }</body><tags>{
+          }</body>
+        <tags>{
             ((lst.flatMap{case HashTag(t) => Full(t) case _ => Empty})
              ::: tags).distinct.map(_.toXml)
           }</tags>{