Return-Path: Delivered-To: apmail-incubator-esme-commits-archive@minotaur.apache.org Received: (qmail 68315 invoked from network); 30 Apr 2010 10:32:18 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 30 Apr 2010 10:32:18 -0000 Received: (qmail 75730 invoked by uid 500); 30 Apr 2010 10:32:18 -0000 Delivered-To: apmail-incubator-esme-commits-archive@incubator.apache.org Received: (qmail 75697 invoked by uid 500); 30 Apr 2010 10:32: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 75689 invoked by uid 99); 30 Apr 2010 10:32:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Apr 2010 10:32:16 +0000 X-ASF-Spam-Status: No, hits=-1474.4 required=10.0 tests=ALL_TRUSTED,AWL 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; Fri, 30 Apr 2010 10:32:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3B91F23889B3; Fri, 30 Apr 2010 10:31:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r939623 - /incubator/esme/branches/lift-2.0/server/src/main/scala/bootstrap/liftweb/Boot.scala Date: Fri, 30 Apr 2010 10:31:26 -0000 To: esme-commits@incubator.apache.org From: rhirsch@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100430103126.3B91F23889B3@eris.apache.org> Author: rhirsch Date: Fri Apr 30 10:31:25 2010 New Revision: 939623 URL: http://svn.apache.org/viewvc?rev=939623&view=rev Log: [ESME-160] Move to Lift 2.0 Modified: incubator/esme/branches/lift-2.0/server/src/main/scala/bootstrap/liftweb/Boot.scala Modified: incubator/esme/branches/lift-2.0/server/src/main/scala/bootstrap/liftweb/Boot.scala URL: http://svn.apache.org/viewvc/incubator/esme/branches/lift-2.0/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=939623&r1=939622&r2=939623&view=diff ============================================================================== --- incubator/esme/branches/lift-2.0/server/src/main/scala/bootstrap/liftweb/Boot.scala (original) +++ incubator/esme/branches/lift-2.0/server/src/main/scala/bootstrap/liftweb/Boot.scala Fri Apr 30 10:31:25 2010 @@ -159,8 +159,15 @@ class Boot { LiftRules.dispatch.prepend(RestAPI.dispatch) LiftRules.dispatch.append(API2.dispatch) - LiftRules.httpAuthProtectedResource.prepend { + /*LiftRules.httpAuthProtectedResource.prepend { case ParsePath(l, _, _, _) if l startsWith TwitterAPI.ApiPath => Full(AuthRole("user")) + }*/ + + LiftRules.httpAuthProtectedResource.prepend { + case req : Req => req.path match { + case ParsePath(l, _, _, _) if l startsWith TwitterAPI.ApiPath => Full(AuthRole("user")) + case _ => Empty + } } LiftRules.authentication = TwitterAPI.twitterAuth