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 E786210494 for ; Wed, 11 Sep 2013 15:01:41 +0000 (UTC) Received: (qmail 79729 invoked by uid 500); 11 Sep 2013 15:01:41 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 79681 invoked by uid 500); 11 Sep 2013 15:01:41 -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 79674 invoked by uid 99); 11 Sep 2013 15:01:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Sep 2013 15:01:41 +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; Wed, 11 Sep 2013 15:01:38 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BA60423889F1; Wed, 11 Sep 2013 15:01:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1521891 - in /cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator: DefaultSAMLRoleParser.java SAMLRoleParser.java Date: Wed, 11 Sep 2013 15:01:16 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130911150116.BA60423889F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Wed Sep 11 15:01:16 2013 New Revision: 1521891 URL: http://svn.apache.org/r1521891 Log: Fixing build Modified: cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/DefaultSAMLRoleParser.java cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLRoleParser.java Modified: cxf/branches/2.7.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.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/DefaultSAMLRoleParser.java?rev=1521891&r1=1521890&r2=1521891&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/DefaultSAMLRoleParser.java (original) +++ cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/DefaultSAMLRoleParser.java Wed Sep 11 15:01:16 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 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.7.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.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLRoleParser.java?rev=1521891&r1=1521890&r2=1521891&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLRoleParser.java (original) +++ cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLRoleParser.java Wed Sep 11 15:01:16 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 parseRolesFromAssertion( - Principal principal, Subject subject, SamlAssertionWrapper assertion + Principal principal, Subject subject, AssertionWrapper assertion ); }