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 Wed, 15 Oct 2014 13:44:32 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/7c8b9c56
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7c8b9c56
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7c8b9c56

Branch: refs/heads/2.7.x-fixes
Commit: 7c8b9c5665fed37699e271cef06a2f7d70467aa9
Parents: c37dea3
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Oct 15 14:44:17 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Oct 15 14:44:17 2014 +0100

----------------------------------------------------------------------
 .../cxf/ws/security/SecurityConstants.java      | 45 ++++----------------
 1 file changed, 8 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/7c8b9c56/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 8c0632c..ac7b4dd 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
@@ -211,6 +211,14 @@ public final class SecurityConstants {
         "ws-security.kerberos.use.credential.delegation";
     
     /**
+     * Whether to request credential delegation or not in the KerberosClient. If this is
set to "true",
+     * then it tries to get a kerberos service ticket that can be used for delegation. The
default
+     * is "false".
+     */
+    public static final String KERBEROS_REQUEST_CREDENTIAL_DELEGATION = 
+        "ws-security.kerberos.request.credential.delegation";
+    
+    /**
      * Whether the Kerberos username is in servicename form or not. The default is "false".
      */
     public static final String KERBEROS_IS_USERNAME_IN_SERVICENAME_FORM = 
@@ -530,47 +538,10 @@ public final class SecurityConstants {
     public static final String STS_TOKEN_ON_BEHALF_OF = "ws-security.sts.token.on-behalf-of";
 
     /**
-<<<<<<< HEAD
      * Set this to "false" in order to remove the SOAP mustUnderstand header from security
headers generated based on
      * a WS-SecurityPolicy.
      *
      * The default value is "true" which included the SOAP mustUnderstand header.
-=======
-     * This is the value in seconds within which a token is considered to be expired by the
-     * client. When a cached token (from a STS) is retrieved by the client, it is considered
-     * to be expired if it will expire in a time less than the value specified by this tag.
-     * This prevents token expiry when the message is en route / being processed by the
-     * service. When the token is found to be expired then it will be renewed via the STS.
-     * 
-     * The default value is 10 (seconds). Specify 0 to avoid this check.
-     */
-    public static final String STS_TOKEN_IMMINENT_EXPIRY_VALUE =
-        "ws-security.sts.token.imminent-expiry-value";
-    
-    //
-    // Kerberos Configuration tags
-    //
-    
-    /**
-     * Whether to request credential delegation or not in the KerberosClient. If this is
set to "true",
-     * then it tries to get a kerberos service ticket that can be used for delegation. The
default
-     * is "false".
-     */
-    public static final String KERBEROS_REQUEST_CREDENTIAL_DELEGATION = 
-        "ws-security.kerberos.request.credential.delegation";
-    
-    /**
-     * 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 
-     * DELEGATED_CREDENTIAL configuration tag below, and then use this to obtain a service
ticket.
-     * The default is "false".
-     */
-    public static final String KERBEROS_USE_CREDENTIAL_DELEGATION = 
-        "ws-security.kerberos.use.credential.delegation";
-    
-    /**
-     * Whether the Kerberos username is in servicename form or not. The default is "false".
->>>>>>> 9edc70a... Adding a new JAX-RS property to control Kerberos
request delegation
      */
     public static final String MUST_UNDERSTAND = "ws-security.must-understand";
 


Mime
View raw message