You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2014/03/10 17:52:12 UTC
[6/6] git commit: Merge branch 'claims'
Merge branch 'claims'
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a6d41f6c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a6d41f6c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a6d41f6c
Branch: refs/heads/master
Commit: a6d41f6c0e83615bd887a0f80aa4000b10744d3f
Parents: 7335999 cde7fd3
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Mar 10 16:51:43 2014 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Mar 10 16:51:43 2014 +0000
----------------------------------------------------------------------
.../security/SAMLSecurityContext.java | 90 ------------
.../grants/saml/Saml2BearerGrantHandler.java | 6 +-
.../oauth2/grants/saml/SamlUserSubject.java | 8 +-
.../apache/cxf/rs/security/saml/SAMLUtils.java | 29 ----
.../cxf/rs/security/saml/assertion/Claim.java | 90 ------------
.../cxf/rs/security/saml/assertion/Claims.java | 71 ----------
.../security/saml/authorization/ClaimBean.java | 9 +-
.../ClaimsAuthorizingInterceptor.java | 36 +++--
.../authorization/JAXRSSAMLSecurityContext.java | 77 ----------
.../SecurityContextProviderImpl.java | 42 +++---
.../ClaimsAuthorizingInterceptorTest.java | 50 ++++---
.../apache/cxf/rt/security/claims/Claim.java | 99 +++++++++++++
.../cxf/rt/security/claims/ClaimCollection.java | 65 +++++++++
.../security/claims/ClaimsSecurityContext.java | 27 ++++
.../cxf/rt/security/claims/SAMLClaim.java | 66 +++++++++
.../rt/security/saml/SAMLSecurityContext.java | 104 ++++++++++++++
.../apache/cxf/rt/security/saml/SAMLUtils.java | 142 +++++++++++++++++++
.../cxf/rt/security/xacml/CXFMessageParser.java | 2 +-
rt/ws/security/pom.xml | 5 +
.../ws/security/trust/AbstractSTSClient.java | 31 ++--
.../security/trust/claims/ClaimsCallback.java | 14 +-
.../apache/cxf/ws/security/wss4j/SAMLUtils.java | 132 -----------------
.../wss4j/StaxSecurityContextInInterceptor.java | 34 ++---
.../ws/security/wss4j/WSS4JInInterceptor.java | 31 ++--
.../ws/security/wss4j/saml/SamlTokenTest.java | 1 -
.../java/org/apache/cxf/sts/claims/Claim.java | 88 ------------
.../apache/cxf/sts/claims/ClaimCollection.java | 32 -----
.../ClaimsAttributeStatementProvider.java | 6 +-
.../apache/cxf/sts/claims/ClaimsHandler.java | 4 +-
.../apache/cxf/sts/claims/ClaimsManager.java | 83 +++++------
.../org/apache/cxf/sts/claims/ClaimsMapper.java | 4 +-
.../org/apache/cxf/sts/claims/ClaimsParser.java | 6 +-
.../cxf/sts/claims/IdentityClaimsParser.java | 48 +++----
.../cxf/sts/claims/LdapClaimsHandler.java | 22 +--
.../cxf/sts/claims/LdapGroupClaimsHandler.java | 22 +--
.../apache/cxf/sts/claims/ProcessedClaim.java | 63 ++++++++
.../sts/claims/ProcessedClaimCollection.java | 32 +++++
.../org/apache/cxf/sts/claims/RequestClaim.java | 56 --------
.../cxf/sts/claims/RequestClaimCollection.java | 43 ------
.../cxf/sts/claims/StaticClaimsHandler.java | 12 +-
.../sts/claims/StaticEndpointClaimsHandler.java | 12 +-
.../apache/cxf/sts/event/map/EventMapper.java | 6 +-
.../cxf/sts/operation/AbstractOperation.java | 10 +-
.../cxf/sts/operation/TokenIssueOperation.java | 4 +-
.../sts/operation/TokenValidateOperation.java | 4 +-
.../apache/cxf/sts/request/RequestParser.java | 29 ++--
.../cxf/sts/request/TokenRequirements.java | 22 +--
.../token/provider/TokenProviderParameters.java | 14 +-
.../token/validator/DefaultSAMLRoleParser.java | 34 ++---
.../cxf/sts/common/CustomAttributeProvider.java | 12 +-
.../cxf/sts/common/CustomClaimParser.java | 13 +-
.../cxf/sts/common/CustomClaimsHandler.java | 23 +--
.../cxf/sts/common/CustomUserClaimsHandler.java | 18 +--
.../sts/common/RealmSupportClaimsHandler.java | 18 +--
.../org/apache/cxf/sts/ldap/LDAPClaimsTest.java | 36 ++---
.../cxf/sts/operation/CustomClaimsMapper.java | 14 +-
.../sts/operation/IssueSamlClaimsUnitTest.java | 8 +-
.../ValidateTokenTransformationUnitTest.java | 9 +-
.../cxf/sts/token/provider/SAMLClaimsTest.java | 45 +++---
.../cxf/sts/token/realm/RealmSupportTest.java | 32 ++---
.../token/validator/SAMLTokenValidatorTest.java | 11 +-
.../CustomAttributeStatementProvider.java | 10 +-
.../sts/deployment/CustomClaimsHandler.java | 18 +--
.../sts/deployment/CustomClaimsParser.java | 14 +-
.../security/oauth2/SamlCallbackHandler.java | 6 +-
.../security/oauth2/SamlCallbackHandler2.java | 6 +-
.../saml/CustomSecurityContextProvider.java | 4 +-
.../security/saml/SamlCallbackHandler.java | 6 +-
68 files changed, 1054 insertions(+), 1166 deletions(-)
----------------------------------------------------------------------