svn commit: r1363334 - in /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security: SecurityConstants.java wss4j/AbstractWSS4JInterceptor.java

[coheigea]

Author: coheigea
Date: Thu Jul 19 13:50:36 2012
New Revision: 1363334

URL: http://svn.apache.org/viewvc?rev=1363334&view=rev
Log:
[CXF-4434] - SecurityConstants.TIMESTAMP_TTL property is not parsed

Modified:
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java?rev=1363334&r1=1363333&r2=1363334&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
 Thu Jul 19 13:50:36 2012
@@ -59,6 +59,10 @@ public final class SecurityConstants {
     public static final String STS_CLIENT = "ws-security.sts.client";
     public static final String STS_APPLIES_TO = "ws-security.sts.applies-to";
     
+    /**
+     * This configuration tag specifies the time in seconds after Creation 
that an incoming 
+     * Timestamp is valid for. The default value is 300 seconds (5 minutes).
+     */
     public static final String TIMESTAMP_TTL = 
"ws-security.timestamp.timeToLive";
     
     public static final String ENABLE_REVOCATION = 
"ws-security.enableRevocation";

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java?rev=1363334&r1=1363333&r2=1363334&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
 Thu Jul 19 13:50:36 2012
@@ -168,6 +168,11 @@ public abstract class AbstractWSS4JInter
         if (futureTTL != null) {
             msg.setContextualProperty(WSHandlerConstants.TTL_FUTURE_TIMESTAMP, 
futureTTL);
         }
+        String ttl = 
+                
(String)msg.getContextualProperty(SecurityConstants.TIMESTAMP_TTL);
+        if (ttl != null) {
+            msg.setContextualProperty(WSHandlerConstants.TTL_TIMESTAMP, ttl);
+        }
         String certConstraints = 
             
(String)msg.getContextualProperty(SecurityConstants.SUBJECT_CERT_CONSTRAINTS);
         if (certConstraints != null) {