Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fe94c7fa Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fe94c7fa Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fe94c7fa Branch: refs/heads/master Commit: fe94c7fa10b7e0321a88f3fcb278fea856e9edac Parents: 29e1dd1 494ff76 Author: Sergey Beryozkin <[email protected]> Authored: Tue Mar 24 12:42:42 2015 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Tue Mar 24 12:42:42 2015 +0000 ---------------------------------------------------------------------- .../policy/interceptors/STSTokenHelper.java | 19 ++- .../SecureConversationInInterceptor.java | 6 +- .../ws/security/tokenstore/SecurityToken.java | 8 +- .../org/apache/cxf/sts/SignatureProperties.java | 4 +- .../org/apache/cxf/sts/StaticSTSProperties.java | 30 ++--- .../org/apache/cxf/sts/cache/CacheUtils.java | 12 +- .../cxf/sts/cache/EHCacheIdentityCache.java | 2 +- .../cxf/sts/cache/MemoryIdentityCache.java | 2 +- .../ClaimsAttributeStatementProvider.java | 2 +- .../apache/cxf/sts/claims/ClaimsManager.java | 2 +- .../cxf/sts/claims/LdapClaimsHandler.java | 7 +- .../cxf/sts/claims/LdapGroupClaimsHandler.java | 8 +- .../org/apache/cxf/sts/claims/LdapUtils.java | 2 +- .../cxf/sts/claims/StaticClaimsHandler.java | 2 +- .../cxf/sts/claims/mapper/ClaimUtils.java | 12 +- .../cxf/sts/claims/mapper/JexlClaimsMapper.java | 2 +- .../apache/cxf/sts/event/map/EventMapper.java | 6 +- .../cxf/sts/event/map/MapEventLogger.java | 2 +- .../cxf/sts/operation/AbstractOperation.java | 27 ++--- .../cxf/sts/operation/TokenCancelOperation.java | 8 +- .../cxf/sts/operation/TokenIssueOperation.java | 21 ++-- .../cxf/sts/operation/TokenRenewOperation.java | 14 +-- .../sts/operation/TokenValidateOperation.java | 8 +- .../DefaultSecurityTokenServiceProvider.java | 6 +- .../apache/cxf/sts/request/RequestParser.java | 33 +++--- .../cxf/sts/request/RequestRequirements.java | 44 +++++++ .../cxf/sts/service/EncryptionProperties.java | 4 +- .../apache/cxf/sts/service/StaticService.java | 2 +- .../token/delegation/SAMLDelegationHandler.java | 2 +- .../provider/AbstractSAMLTokenProvider.java | 118 +++++++++++++++++++ .../DefaultAttributeStatementProvider.java | 20 ++-- .../provider/DefaultConditionsProvider.java | 2 +- .../token/provider/DefaultSubjectProvider.java | 12 +- .../sts/token/provider/SAMLTokenProvider.java | 111 ++++------------- .../cxf/sts/token/provider/SCTProvider.java | 13 +- .../sts/token/provider/SamlCallbackHandler.java | 32 ++--- .../sts/token/realm/CertConstraintsParser.java | 4 +- .../sts/token/realm/RelationshipResolver.java | 2 +- .../apache/cxf/sts/token/realm/SAMLRealm.java | 31 ++--- .../cxf/sts/token/renewer/SAMLTokenRenewer.java | 82 ++----------- .../sts/token/validator/SAMLTokenValidator.java | 7 +- .../cxf/sts/token/validator/SCTValidator.java | 7 +- .../token/validator/UsernameTokenValidator.java | 8 +- .../cxf/sts/request/RequestParserUnitTest.java | 12 +- 44 files changed, 376 insertions(+), 382 deletions(-) ----------------------------------------------------------------------
