You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2014/01/08 10:13:06 UTC

svn commit: r1556471 - in /cxf/branches/2.6.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java

Author: ffang
Date: Wed Jan  8 09:13:05 2014
New Revision: 1556471

URL: http://svn.apache.org/r1556471
Log:
Merged revisions 1556468 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

................
  r1556468 | ffang | 2014-01-08 16:54:42 +0800 (三, 08  1 2014) | 9 lines
  
  Merged revisions 1556465 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1556465 | ffang | 2014-01-08 16:40:19 +0800 (三, 08  1 2014) | 1 line
    
    [CXF-5484]JAASAuthenticationFilter cannot separate 3rdParty java.security.Principals based on user/role
  ........
................

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/branches/2.7.x-fixes:r1556468
  Merged /cxf/trunk:r1556465

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java?rev=1556471&r1=1556470&r2=1556471&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java (original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java Wed Jan  8 09:13:05 2014
@@ -68,6 +68,15 @@ public class JAASAuthenticationFilter im
     public void setLoginConfig(Configuration config) {
         interceptor.setLoginConfig(config);
     }
+
+    public void setRoleClassifier(String rc) {
+        interceptor.setRoleClassifier(rc);
+    }
+
+    public void setRoleClassifierType(String rct) {
+        interceptor.setRoleClassifierType(rct);
+    }
+
     
     @Deprecated
     public void setRolePrefix(String name) {