[2/3] git commit: Missing change from last commit

[coheigea]

Missing change from last commit

Conflicts:
        
rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/94bce804
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/94bce804
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/94bce804

Branch: refs/heads/2.7.x-fixes
Commit: 94bce804163fa41f38f7e5f405110ec4e357b4e6
Parents: 6fa55c0
Author: Colm O hEigeartaigh <cohei...@apache.org>
Authored: Tue May 27 15:02:40 2014 +0100
Committer: Colm O hEigeartaigh <cohei...@apache.org>
Committed: Tue May 27 15:03:06 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/cxf/ws/security/SecurityConstants.java     | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/94bce804/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 b778766..00d38eb 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,8 +546,14 @@ 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);
     }