cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1521932 - in /cxf/branches/2.6.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator: DefaultSAMLRoleParser.java SAMLRoleParser.java
Date Wed, 11 Sep 2013 16:50:30 GMT
Author: coheigea
Date: Wed Sep 11 16:50:29 2013
New Revision: 1521932

URL: http://svn.apache.org/r1521932
Log:
Merged revisions 1521891 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1521891 | coheigea | 2013-09-11 16:01:16 +0100 (Wed, 11 Sep 2013) | 2 lines

  Fixing build

........

Modified:
    cxf/branches/2.6.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/DefaultSAMLRoleParser.java
    cxf/branches/2.6.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLRoleParser.java

Modified: cxf/branches/2.6.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/DefaultSAMLRoleParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/DefaultSAMLRoleParser.java?rev=1521932&r1=1521931&r2=1521932&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/DefaultSAMLRoleParser.java
(original)
+++ cxf/branches/2.6.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/DefaultSAMLRoleParser.java
Wed Sep 11 16:50:29 2013
@@ -30,7 +30,7 @@ import org.apache.cxf.interceptor.securi
 import org.apache.cxf.interceptor.security.RolePrefixSecurityContextImpl;
 import org.apache.cxf.interceptor.security.SAMLSecurityContext;
 import org.apache.cxf.ws.security.wss4j.SAMLUtils;
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.ws.security.saml.ext.AssertionWrapper;
 
 /**
  * A default implementation to extract roles from a SAML Assertion
@@ -57,7 +57,7 @@ public class DefaultSAMLRoleParser imple
      * @return the set of User/Principal roles from the Assertion.
      */
     public Set<Principal> parseRolesFromAssertion(
-        Principal principal, Subject subject, SamlAssertionWrapper assertion
+        Principal principal, Subject subject, AssertionWrapper assertion
     ) {
         if (subject != null && useJaasSubject) {
             if (roleClassifier != null && !"".equals(roleClassifier)) {
@@ -145,4 +145,4 @@ public class DefaultSAMLRoleParser imple
         this.roleAttributeName = roleAttributeName;
     }
 
-}
\ No newline at end of file
+}

Modified: cxf/branches/2.6.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLRoleParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLRoleParser.java?rev=1521932&r1=1521931&r2=1521932&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLRoleParser.java
(original)
+++ cxf/branches/2.6.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLRoleParser.java
Wed Sep 11 16:50:29 2013
@@ -23,7 +23,7 @@ import java.util.Set;
 
 import javax.security.auth.Subject;
 
-import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.ws.security.saml.ext.AssertionWrapper;
 
 
 /**
@@ -39,6 +39,6 @@ public interface SAMLRoleParser {
      * @return the set of User/Principal roles from the Assertion.
      */
     Set<Principal> parseRolesFromAssertion(
-        Principal principal, Subject subject, SamlAssertionWrapper assertion
+        Principal principal, Subject subject, AssertionWrapper assertion
     );
 }



Mime
View raw message