Fixing build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1f6e85bc Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1f6e85bc Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1f6e85bc Branch: refs/heads/2.7.x-fixes Commit: 1f6e85bc7c11b445612993b6105d28fdb92f8bfd Parents: af7157e Author: Colm O hEigeartaigh <[email protected]> Authored: Tue May 27 15:06:09 2014 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue May 27 15:06:09 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/cxf/ws/security/SecurityConstants.java | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/1f6e85bc/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java index 00d38eb..35d5698 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java @@ -546,14 +546,8 @@ public final class SecurityConstants { DISABLE_STS_CLIENT_WSMEX_CALL_USING_EPR_ADDRESS, STS_TOKEN_CRYPTO, STS_TOKEN_PROPERTIES, STS_TOKEN_USERNAME, STS_TOKEN_ACT_AS, STS_TOKEN_ON_BEHALF_OF, TOKEN, TOKEN_ID, SUBJECT_ROLE_CLASSIFIER, SUBJECT_ROLE_CLASSIFIER_TYPE, MUST_UNDERSTAND, -<<<<<<< HEAD ASYMMETRIC_SIGNATURE_ALGORITHM, ENABLE_SAML_ONE_TIME_USE_CACHE, SAML_ONE_TIME_USE_CACHE_INSTANCE, - CACHE_IDENTIFIER -======= - ASYMMETRIC_SIGNATURE_ALGORITHM, PASSWORD_ENCRYPTOR_INSTANCE, ENABLE_SAML_ONE_TIME_USE_CACHE, - SAML_ONE_TIME_USE_CACHE_INSTANCE, ENABLE_STREAMING_SECURITY, RETURN_SECURITY_ERROR, CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT ->>>>>>> 1e62c4c... Missing change from last commit })); ALL_PROPERTIES = Collections.unmodifiableSet(s); }
