svn commit: r930781 - in /cxf/branches/2.2.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java

[dkulp]

Author: dkulp
Date: Mon Apr  5 02:14:11 2010
New Revision: 930781

URL: http://svn.apache.org/viewvc?rev=930781&view=rev
Log:
Merged revisions 930245 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r930245 | dkulp | 2010-04-02 07:28:21 -0400 (Fri, 02 Apr 2010) | 1 line
  
  [CXF-2745] Add ability to set timestamp ttl
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
    
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java?rev=930781&r1=930780&r2=930781&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
 Mon Apr  5 02:14:11 2010
@@ -46,6 +46,8 @@ public final class SecurityConstants {
 
     public static final String STS_CLIENT = "ws-security.sts.client";
     
+    public static final String TIMESTAMP_TTL = 
"ws-security.timestamp.timeToLive";
+    
     /**
      * WCF's trust server sometimes will encrypt the token in the response IN 
ADDITION TO
      * the full security on the message. These properties control the way the 
STS client

Modified: 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=930781&r1=930780&r2=930781&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
 Mon Apr  5 02:14:11 2010
@@ -347,6 +347,17 @@ public abstract class AbstractBindingBui
         if (ais != null) {
             for (AssertionInfo ai : ais) {
                 timestampEl = new WSSecTimestamp();
+                Object o = 
message.getContextualProperty(SecurityConstants.TIMESTAMP_TTL);
+                int ttl = 300;  //default is 300 seconds
+                if (o instanceof Number) {
+                    ttl = ((Number)o).intValue();
+                } else if (o instanceof String) {
+                    ttl = Integer.parseInt((String)o);
+                }
+                if (ttl <= 0) {
+                    ttl = 300;
+                }
+                timestampEl.setTimeToLive(ttl);
                 timestampEl.prepare(saaj.getSOAPPart());
                 ai.setAsserted(true);
             }