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"; </jaxrs:providers> </jaxrs:server> - <bean id="authenticationInterceptor" class="org.apache.cxf.systest.jaxrs.security.JettyJAASLoginInterceptor"> + <bean id="authenticationInterceptor" class="org.apache.cxf.interceptor.security.JAASLoginInterceptor"> <property name="contextName" value="BookLogin"/> <property name="rolePrefix" value="ROLE_"/> </bean>
