svn commit: r1044668 - in /incubator/esme/branches/lift-2.2/trunk/server: ./ src/main/scala/bootstrap/liftweb/ src/main/scala/org/apache/esme/actor/ src/main/scala/org/apache/esme/api/ src/main/scala/org/apache/esme/lib/ src/main/scala/org/apache/esme/...

[es...@apache.org]

Author: esjewett
Date: Sat Dec 11 15:39:40 2010
New Revision: 1044668

URL: http://svn.apache.org/viewvc?rev=1044668&view=rev
Log:
[ESME-313] Updates to fix compile-time issues. Runtime issues with "mvn test" and "mvn jetty:run" still exist.
Patch by Vladimir Ivanov

Modified:
    incubator/esme/branches/lift-2.2/trunk/server/pom.xml
    incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
    incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala
    incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala
    incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/API2.scala
    incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
    incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
    incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/AccessPool.scala
    incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
    incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/User.scala

Modified: incubator/esme/branches/lift-2.2/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.2/trunk/server/pom.xml?rev=1044668&r1=1044667&r2=1044668&view=diff
==============================================================================
--- incubator/esme/branches/lift-2.2/trunk/server/pom.xml (original)
+++ incubator/esme/branches/lift-2.2/trunk/server/pom.xml Sat Dec 11 15:39:40 2010
@@ -177,7 +177,7 @@
             <groupId>net.liftweb</groupId>
             <artifactId>lift-testkit_${scala.version}</artifactId>
             <version>${lift.version}</version>
-            <scope>test</scope>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.liftweb</groupId>

Modified: incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=1044668&r1=1044667&r2=1044668&view=diff
==============================================================================
--- incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Sat Dec 11 15:39:40 2010
@@ -46,8 +46,8 @@ import org.compass.core.config.CompassCo
 
 import net.liftweb.widgets.tablesorter._
 //import com.twitter.stats._
-import com.twitter.ostrich.{ServiceTracker, Stats, StatsMBean}
-import net.lag.configgy.{RuntimeEnvironment, Config}
+import com.twitter.ostrich.{ServiceTracker, Stats, StatsMBean, RuntimeEnvironment}
+import net.lag.configgy.Config
 
 import _root_.net.liftweb.widgets.logchanger._
 

Modified: incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala?rev=1044668&r1=1044667&r2=1044668&view=diff
==============================================================================
--- incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala (original)
+++ incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/SchedulerActor.scala Sat Dec 11 15:39:40 2010
@@ -40,7 +40,7 @@ object SchedulerActor extends LiftActor{
       if (!regularsPerAction.contains(id)) {
         regularsPerAction += (id -> List(regularActor))
       } else {
-        regularsPerAction(id) += regularActor
+        regularsPerAction(id) :+ regularActor
       }
     }
     

Modified: incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala?rev=1044668&r1=1044667&r2=1044668&view=diff
==============================================================================
--- incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala (original)
+++ incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/actor/UserActor.scala Sat Dec 11 15:39:40 2010
@@ -190,7 +190,7 @@ class UserActor extends LiftActor {
       case LatestMessages(cnt) =>
         reply(_mailbox.take(cnt).toList)
       
-      case AllowPool(poolId) => pools += poolId
+      case AllowPool(poolId) => pools :+ poolId
       
       case Resend(msgId) =>
         for (msg <- Message.find(msgId)) {

Modified: incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/API2.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/API2.scala?rev=1044668&r1=1044667&r2=1044668&view=diff
==============================================================================
--- incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/API2.scala (original)
+++ incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/API2.scala Sat Dec 11 15:39:40 2010
@@ -723,7 +723,7 @@ object API2 extends ApiHelper with XmlHe
   }
 
   def unAuthorized(): LiftResponse = {
-    Full((403,Map(),Empty))
+    Full((403,Map.empty[String, String],Empty))
   }
 
   private def findAction(actionId: Box[String]): Box[Action] =

Modified: incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala?rev=1044668&r1=1044667&r2=1044668&view=diff
==============================================================================
--- incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala (original)
+++ incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala Sat Dec 11 15:39:40 2010
@@ -419,7 +419,7 @@ object TwitterXmlAPI extends TwitterAPI 
   override def dispatch: LiftRules.DispatchPF = {
     // modify the returned function to one which converts the result to XML
     dispatchMethod.andThen(x =>
-      {() => Full(nodeSeqToResponse(toXml(unbox(x)))) }
+      {() => Full(listElemToResponse(toXml(unbox(x)))) }
     )
   }
 
@@ -441,7 +441,7 @@ object TwitterJsonAPI extends TwitterAPI
   }
   
   def jsonAttributes(o: Any): JsExp = { o match {
-    case m: Map[String, Any] => toJson(m.values.next)
+    case m: Map[String, Any] => toJson(m.values.iterator.next)
     case o => toJson(o)}
   }
 

Modified: incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala?rev=1044668&r1=1044667&r2=1044668&view=diff
==============================================================================
--- incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala (original)
+++ incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala Sat Dec 11 15:39:40 2010
@@ -182,7 +182,7 @@ object AccessPoolMgr {
       case _ => Nil
     })
 
-    val permissions = Permission.map(perm => (perm.id.toString, perm.toString)).collect
+    val permissions = Permission.values.map(perm => (perm.id.toString, perm.toString)).toSeq
 
 
       /*

Modified: incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/AccessPool.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/AccessPool.scala?rev=1044668&r1=1044667&r2=1044668&view=diff
==============================================================================
--- incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/AccessPool.scala (original)
+++ incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/AccessPool.scala Sat Dec 11 15:39:40 2010
@@ -44,9 +44,9 @@ object AccessPool extends AccessPool wit
     ap
   }
 
-  def getPoolName(poolId: long) = {
+  def getPoolName(poolId: Long) = {
     AccessPool.find(poolId) match {
-      case Full(p) => p.getName
+      case Full(p : AccessPool) => p.getName
       case _ => "ERROR"
     }
   }

Modified: incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=1044668&r1=1044667&r2=1044668&view=diff
==============================================================================
--- incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/Message.scala Sat Dec 11 15:39:40 2010
@@ -145,7 +145,7 @@ object Message extends Message with Long
   }
 
   def search(searchTerm: String, following: List[User], numHits: Int): List[Message] = {
-    val users:List[String] = following.map(user => user.nickname)
+    val users:List[String] = following.map(user => user.nickname.is)
 
     logger.debug("Inside Message.search() with user list "+(users.mkString(", ")))
 

Modified: incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/User.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/User.scala?rev=1044668&r1=1044667&r2=1044668&view=diff
==============================================================================
--- incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/User.scala (original)
+++ incubator/esme/branches/lift-2.2/trunk/server/src/main/scala/org/apache/esme/model/User.scala Sat Dec 11 15:39:40 2010
@@ -187,9 +187,9 @@ object User extends User with KeyedMetaM
 
   def currentUser: Box[User] = curUser.is
 
-  def getNickname(userId: long) = {
+  def getNickname(userId: Long) = {
     User.find(userId) match {
-      case Full(u) => u.nickname.is
+      case Full(u : User) => u.nickname.is
       case _ => "ERROR"
     }
   }