Author: rhirsch
Date: Fri Apr 30 10:10:22 2010
New Revision: 939614
URL: http://svn.apache.org/viewvc?rev=939614&view=rev
Log:
[ESME-160] Move to Lift 2.0
Modified:
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/actor/UserActor.scala
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/api/API2.scala
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/api/RestAPI.scala
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/model/Message.scala
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/model/Tag.scala
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/model/UserAuth.scala
Modified:
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/actor/UserActor.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/actor/UserActor.scala?rev=939614&r1=939613&r2=939614&view=diff
==============================================================================
---
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/actor/UserActor.scala
(original)
+++
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/actor/UserActor.scala
Fri Apr 30 10:10:22 2010
@@ -53,7 +53,7 @@ object UserActor {
case class Resend(msgId: Long)
case class MessageReceived(msg: Message, reason: MailboxReason)
- val logger: Logger = Logger.getLogger("org.apache.esme.actor")
+ val logger: Logger = Logger("org.apache.esme.actor")
}
Modified:
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/api/API2.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/api/API2.scala?rev=939614&r1=939613&r2=939614&view=diff
==============================================================================
---
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/api/API2.scala
(original)
+++
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/api/API2.scala
Fri Apr 30 10:10:22 2010
@@ -69,7 +69,7 @@ import org.apache.lucene.index.TermFreqV
import org.tartarus.snowball.ext.PorterStemmer
object API2 extends ApiHelper with XmlHelper {
- val logger: Logger = Logger.getLogger("org.apache.esme.api")
+ val logger: Logger = Logger("org.apache.esme.api2")
def authorizationRules: LiftRules.DispatchPF = {
case Req("api2" :: "users" :: Nil, _, PostRequest)
Modified:
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/api/RestAPI.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/api/RestAPI.scala?rev=939614&r1=939613&r2=939614&view=diff
==============================================================================
---
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/api/RestAPI.scala
(original)
+++
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/api/RestAPI.scala
Fri Apr 30 10:10:22 2010
@@ -44,8 +44,7 @@ import scala.xml.{NodeSeq, Text, Elem, N
import scala.collection.mutable.ListBuffer
object RestAPI extends XMLApiHelper {
- val logger: Logger = Logger.getLogger("org.apache.esme.api")
- logger.setLevel(Level.INFO)
+ val logger: Logger = Logger("org.apache.esme.api")
private val fakeSession = new LiftSession("/", "fakeSession", Empty)
Modified:
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala?rev=939614&r1=939613&r2=939614&view=diff
==============================================================================
---
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
(original)
+++
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/api/TwitterAPI.scala
Fri Apr 30 10:10:22 2010
@@ -74,7 +74,7 @@ abstract class TwitterAPI {
import TwitterAPI._
val tf = new java.text.SimpleDateFormat("EEE MMM dd HH:mm:ss Z yyyy",
java.util.Locale.US)
- val logger: Logger = Logger.getLogger("org.apache.esme.twitterapi")
+ val logger: Logger = Logger("org.apache.esme.twitterapi")
val method: String
// TODO: twitter struct could be stronger typed- if recursive types are
enabled
type TwitterResponse = Either[(String,List[Any]),Map[String,Any]]
Modified:
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala?rev=939614&r1=939613&r2=939614&view=diff
==============================================================================
---
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
(original)
+++
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/lib/AccessPoolMgr.scala
Fri Apr 30 10:10:22 2010
@@ -50,8 +50,7 @@ import java.text.{DateFormat,SimpleDateF
* Manage the sitemap and related snippets for Access Pools
*/
object AccessPoolMgr {
- val logger: Logger = Logger.getLogger("org.apache.esme.lib.AccessPoolMgr")
- logger.setLevel(Level.INFO)
+ val logger: Logger = Logger("org.apache.esme.lib.AccessPoolMgr")
def loggedIn_? = User.loggedIn_?
val ifIsLoggedIn = If(loggedIn_? _, strFuncToFailMsg(() =>
S.?("base_error_not_logged_in")))
Modified:
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/model/Message.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/model/Message.scala?rev=939614&r1=939613&r2=939614&view=diff
==============================================================================
---
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/model/Message.scala
(original)
+++
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/model/Message.scala
Fri Apr 30 10:10:22 2010
@@ -41,8 +41,7 @@ import org.apache.esme._
import lib._
object Message extends Message with LongKeyedMetaMapper[Message] {
- val logger: Logger = Logger.getLogger("org.apache.esme.model.Message")
- logger.setLevel(Level.INFO)
+ val logger: Logger = Logger ("org.apache.esme.model.Message")
private def fixConversation(msg: Message) {
if (!msg.conversation.defined_? && msg.replyTo.defined_?) {
@@ -211,7 +210,7 @@ object Message extends Message with Long
case _ => Nil
}
val modifiedQueryParams = by ++ newQueryParams
- logger.fine("Modified query: " + modifiedQueryParams)
+ logger.info("Modified query: " + modifiedQueryParams)
super.findMapDb(dbId, modifiedQueryParams:_*)(f)
}
Modified:
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/model/Tag.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/model/Tag.scala?rev=939614&r1=939613&r2=939614&view=diff
==============================================================================
---
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/model/Tag.scala
(original)
+++
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/model/Tag.scala
Fri Apr 30 10:10:22 2010
@@ -36,8 +36,7 @@ object Tag extends Tag with MetaProtoTag
def cacheSize = 500
- val logger: Logger = Logger.getLogger("org.apache.esme.model")
- logger.setLevel(Level.WARNING);
+ val logger: Logger = Logger("org.apache.esme.model")
private var listeners: List[LiftActor] = Nil
private var cloud: List[(String, Float)] = Nil
Modified:
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/model/UserAuth.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/model/UserAuth.scala?rev=939614&r1=939613&r2=939614&view=diff
==============================================================================
---
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/model/UserAuth.scala
(original)
+++
incubator/esme/branches/lift-2.0/server/src/main/scala/org/apache/esme/model/UserAuth.scala
Fri Apr 30 10:10:22 2010
@@ -37,6 +37,8 @@ import JsCmds._
import SHtml._
import JE._
+import net.liftweb.openid._
+
import scala.xml._
import org.apache.esme.actor._
@@ -272,7 +274,7 @@ object OpenIDAuthModule extends AuthModu
}
-object ESMEOpenIDVendor extends OpenIdVendor {
+object ESMEOpenIDVendor extends OpenIDVendor {
type UserType = User
type ConsumerType = ESMEOpenIDConsumer
@@ -302,7 +304,7 @@ object ESMEOpenIDVendor extends OpenIdVe
def createAConsumer = new ESMEOpenIDConsumer
}
-class ESMEOpenIDConsumer extends OpenIdConsumer[User]
+class ESMEOpenIDConsumer extends OpenIDConsumer[User]
{
override val manager = {
