svn commit: r1067655 - in /esme/trunk/server/src: main/scala/bootstrap/liftweb/ main/scala/org/apache/esme/actor/ main/scala/org/apache/esme/model/ test/scala/org/apache/esme/api/

[es...@apache.org]

Author: esjewett
Date: Sun Feb  6 13:02:12 2011
New Revision: 1067655

URL: http://svn.apache.org/viewvc?rev=1067655&view=rev
Log:
[ESME-321] Fixes Log deprecation warnings by moving to the Loggable mixin trait, and fixes .first deprecation warnings in the API2Test.scala code

Modified:
    esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
    esme/trunk/server/src/main/scala/org/apache/esme/actor/HttpSender.scala
    esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
    esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala
    esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala

Modified: esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=1067655&r1=1067654&r2=1067655&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Sun Feb  6 13:02:12 2011
@@ -57,7 +57,7 @@ import _root_.net.liftweb.widgets.logcha
  * A class that's instantiated early and run.  It allows the application
  * to modify lift's environment
  */
-class Boot {
+class Boot extends Loggable {
   def boot {
 
     // Get DB from container if available
@@ -107,7 +107,7 @@ class Boot {
     //Added exceptions to the log
     LiftRules.exceptionHandler.prepend {
       case (_, _, exception) => {
-        Log.error(exception.getStackTrace.toString)
+        logger.error(exception.getStackTrace.toString)
         RedirectResponse("/")
       }
     } 
@@ -302,11 +302,11 @@ object Compass {
 * Logger to track request times
 */
 
-object RequestAnalyzer {
+object RequestAnalyzer extends Loggable {
   def analyze(req: Box[Req], time: Long, queries: List[(String, Long)]): Unit = {
     val longQueries = (queries.filter(_._2 > 30))
     if (time > 50 || longQueries.?) {
-      Log.debug("Request " + req.map(_.uri).openOr("No Request") +
+      logger.debug("Request " + req.map(_.uri).openOr("No Request") +
           " took " + time + " query " + longQueries.comma)
     }
   }
@@ -315,7 +315,7 @@ object RequestAnalyzer {
 /*
 * Logger to dump session info
 */
-object SessionInfoDumper extends LiftActor {
+object SessionInfoDumper extends LiftActor with Loggable {
   private var lastTime = millis
 
   val tenMinutes: Long = 10 minutes
@@ -329,9 +329,9 @@ object SessionInfoDumper extends LiftAct
         rt.gc
 
         val dateStr: String = timeNow.toString
-        Log.debug("[MEMDEBUG] At " + dateStr + " Number of open sessions: " + sessions.size)
-        Log.debug("[MEMDEBUG] Free Memory: " + pretty(rt.freeMemory))
-        Log.debug("[MEMDEBUG] Total Memory: " + pretty(rt.totalMemory))
+        logger.debug("[MEMDEBUG] At " + dateStr + " Number of open sessions: " + sessions.size)
+        logger.debug("[MEMDEBUG] Free Memory: " + pretty(rt.freeMemory))
+        logger.debug("[MEMDEBUG] Total Memory: " + pretty(rt.totalMemory))
       }
 
   }

Modified: esme/trunk/server/src/main/scala/org/apache/esme/actor/HttpSender.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/actor/HttpSender.scala?rev=1067655&r1=1067654&r2=1067655&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/actor/HttpSender.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/actor/HttpSender.scala Sun Feb  6 13:02:12 2011
@@ -35,7 +35,7 @@ import org.apache.commons.httpclient.aut
 import methods._
 import java.io.OutputStream
 
-object HttpSender extends LiftActor with GetPoster {
+object HttpSender extends LiftActor with GetPoster with Loggable {
   protected def messageHandler = {
       case SendAMessage(action, msg, user, reason, token) =>
         send(action, msg, user, reason, token)
@@ -117,8 +117,8 @@ object HttpSender extends LiftActor with
 
     try {
       httpClient.executeMethod(poster)
-      Log.debug(poster.getStatusText)
-      Log.debug(poster.getResponseBodyAsString)
+      logger.debug(poster.getStatusText)
+      logger.debug(poster.getResponseBodyAsString)
     } finally {
       poster.releaseConnection
     }

Modified: esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala?rev=1067655&r1=1067654&r2=1067655&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala Sun Feb  6 13:02:12 2011
@@ -45,7 +45,7 @@ import java.util.logging._
 //import com.twitter.stats.Stats
 import com.twitter.ostrich.Stats
 
-object User extends User with KeyedMetaMapper[Long, User] {
+object User extends User with KeyedMetaMapper[Long, User] with Loggable {
   override def afterSave = profileChanged _ :: notifyActors _ :: super.afterSave
 
   override def afterCreate = createCryptoRecord _ :: super.afterCreate
@@ -85,7 +85,7 @@ object User extends User with KeyedMetaM
 
 
     def processEntryAdd() {
-        Log.debug("processEntryAdd: " + firstName + ", " + lastName)
+        logger.debug("processEntryAdd: " + firstName + ", " + lastName)
     }
 
 

Modified: esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala?rev=1067655&r1=1067654&r2=1067655&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala Sun Feb  6 13:02:12 2011
@@ -294,11 +294,11 @@ object ESMEOpenIDVendor extends OpenIDVe
   def createAConsumer = new ESMEOpenIDConsumer
 }
 
-class ESMEOpenIDConsumer extends OpenIDConsumer[User]
+class ESMEOpenIDConsumer extends OpenIDConsumer[User] with Loggable
 {
   override val manager = {
 
-    Log.info("Proxy settings: " + Props.get("http.proxyHost", "[no host]")
+    logger.info("Proxy settings: " + Props.get("http.proxyHost", "[no host]")
              + ":" + Props.get("http.proxyPort", "[no port]"))
 
     for (host <- Props.get("http.proxyHost")){

Modified: esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala?rev=1067655&r1=1067654&r2=1067655&view=diff
==============================================================================
--- esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala (original)
+++ esme/trunk/server/src/test/scala/org/apache/esme/api/API2Test.scala Sun Feb  6 13:02:12 2011
@@ -605,8 +605,8 @@ object Api2Specs extends Specification w
           res.code must be equalTo 200
           ( res.xml.openOr(Text("")) \\ "message" ).last must \\(<conversation>{conv_id}</conversation>)
           ( res.xml.openOr(Text("")) \\ "message" ).last must \\(<replyto>{conv_id}</replyto>)
-          ( res.xml.openOr(Text("")) \\ "message" ).first must \\(<conversation>{conv_id}</conversation>)
-          ( res.xml.openOr(Text("")) \\ "message" ).first must \\(<replyto></replyto>)
+          ( res.xml.openOr(Text("")) \\ "message" ).head must \\(<conversation>{conv_id}</conversation>)
+          ( res.xml.openOr(Text("")) \\ "message" ).head must \\(<replyto></replyto>)
         }
       }