Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C7F648E5F for ; Fri, 9 Sep 2011 13:44:12 +0000 (UTC) Received: (qmail 82816 invoked by uid 500); 9 Sep 2011 13:44:12 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 82722 invoked by uid 500); 9 Sep 2011 13:44:11 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 82715 invoked by uid 99); 9 Sep 2011 13:44:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Sep 2011 13:44:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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, 09 Sep 2011 13:44:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4570523889EB for ; Fri, 9 Sep 2011 13:43:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1167164 - in /cxf/branches/2.3.x-fixes: ./ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JettyJAASLoginInterceptor.java systests/jaxrs/src/test/resources/jaxrs_jaas_security/WEB-INF/beans.xml Date: Fri, 09 Sep 2011 13:43:48 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110909134348.4570523889EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Sep 9 13:43:47 2011 New Revision: 1167164 URL: http://svn.apache.org/viewvc?rev=1167164&view=rev Log: Merged revisions 1165342 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes ................ r1165342 | ay | 2011-09-05 11:50:57 -0400 (Mon, 05 Sep 2011) | 9 lines Merged revisions 1165308 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1165308 | ay | 2011-09-05 17:03:39 +0200 (Mon, 05 Sep 2011) | 1 line remove the jetty specific jaas login interceptor from systests ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JettyJAASLoginInterceptor.java cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/resources/jaxrs_jaas_security/WEB-INF/beans.xml Propchange: cxf/branches/2.3.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/resources/jaxrs_jaas_security/WEB-INF/beans.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/resources/jaxrs_jaas_security/WEB-INF/beans.xml?rev=1167164&r1=1167163&r2=1167164&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/resources/jaxrs_jaas_security/WEB-INF/beans.xml (original) +++ cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/resources/jaxrs_jaas_security/WEB-INF/beans.xml Fri Sep 9 13:43:47 2011 @@ -59,7 +59,7 @@ http://cxf.apache.org/schemas/jaxrs.xsd" - +