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: Some changes for 2.7
Date Wed, 24 Sep 2014 15:04:21 GMT
Some changes for 2.7


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

Branch: refs/heads/2.7.x-fixes
Commit: 85f6e306234827a44a18435ce78e75a0e8e6f5a8
Parents: b04378e
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Sep 24 16:04:05 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Sep 24 16:04:05 2014 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/cxf/ws/security/SecurityConstants.java    | 2 +-
 .../policy/interceptors/IssuedTokenInterceptorProvider.java        | 2 +-
 .../test/java/org/apache/cxf/systest/sts/caching/CachingTest.java  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/85f6e306/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 ee4df9f..5291158 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
@@ -558,7 +558,7 @@ public final class SecurityConstants {
      * 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.
+     * The default value is 0 (seconds), meaning that this functionality is disabled by default.
      */
     public static final String STS_TOKEN_IMMINENT_EXPIRY_VALUE =
         "ws-security.sts.token.imminent-expiry-value";

http://git-wip-us.apache.org/repos/asf/cxf/blob/85f6e306/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
index 4e34915..83ab164 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
@@ -390,7 +390,7 @@ public class IssuedTokenInterceptorProvider extends AbstractPolicyInterceptorPro
         ) {
             String imminentExpiryValue = 
                 (String)message.getContextualProperty(SecurityConstants.STS_TOKEN_IMMINENT_EXPIRY_VALUE);
-            long imminentExpiry = 10L;
+            long imminentExpiry = 0L;
             if (imminentExpiryValue != null) {
                 imminentExpiry = Long.parseLong(imminentExpiryValue);
             }

http://git-wip-us.apache.org/repos/asf/cxf/blob/85f6e306/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
index 93e77ee..b0b18f3 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
@@ -182,6 +182,7 @@ public class CachingTest extends AbstractBusClientServerTestBase {
         DoubleItPortType port = 
             service.getPort(portQName, DoubleItPortType.class);
         ((BindingProvider)port).getRequestContext().put("thread.local.request.context", "true");
+        ((BindingProvider)port).getRequestContext().put("ws-security.sts.token.imminent-expiry-value",
"10");
         updateAddressPort(port, PORT);
         
         // Make a successful invocation


Mime
View raw message