cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] git commit: Fixing merge
Date Fri, 08 Aug 2014 10:22:25 GMT
Fixing merge


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

Branch: refs/heads/2.7.x-fixes
Commit: 1d6ee7f4fbfbb736e3d3439b61bda90193d91920
Parents: bde3734
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Aug 8 11:22:11 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Aug 8 11:22:11 2014 +0100

----------------------------------------------------------------------
 .../apache/cxf/ws/security/SecurityConstants.java   | 16 ----------------
 1 file changed, 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/1d6ee7f4/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 b563c5d..a9daac2 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
@@ -201,21 +201,6 @@ public final class SecurityConstants {
     public static final String VALIDATE_SAML_SUBJECT_CONFIRMATION = 
         "ws-security.validate.saml.subject.conf";
     
-<<<<<<< HEAD
-=======
-    /**
-     * Whether to enable streaming WS-Security. If set to false (the default), the old DOM
-     * implementation is used. If set to true, the new streaming (StAX) implementation is
used.
-     */
-    public static final String ENABLE_STREAMING_SECURITY = 
-        "ws-security.enable.streaming";
-    
-    /**
-     * Whether to return the security error message to the client, and not one of the default
error
-     * QNames. The default is false.
-     */
-    public static final String RETURN_SECURITY_ERROR = "ws-security.return.security.error";
-    
     /**
      * Whether to use credential delegation or not in the KerberosClient. If this is set
to "true",
      * then it tries to get a GSSCredential Object from the Message Context using the 
@@ -225,7 +210,6 @@ public final class SecurityConstants {
     public static final String KERBEROS_USE_CREDENTIAL_DELEGATION = 
         "ws-security.kerberos.use.credential.delegation";
     
->>>>>>> e86ad8d... Add a way to enable credential delegation via a property
     //
     // Non-boolean WS-Security Configuration parameters
     //


Mime
View raw message