svn commit: r934269 - in /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security: SecurityConstants.java policy/interceptors/IssuedTokenInterceptorProvider.java

[dkulp]

Author: dkulp
Date: Thu Apr 15 03:03:46 2010
New Revision: 934269

URL: http://svn.apache.org/viewvc?rev=934269&view=rev
Log:
Add property to control the value of AppliesTo that the sts client sends

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/policy/interceptors/IssuedTokenInterceptorProvider.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=934269&r1=934268&r2=934269&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 Apr 15 03:03:46 2010
@@ -45,6 +45,7 @@ public final class SecurityConstants {
     public static final String TOKEN_ID = "ws-security.token.id";
 
     public static final String STS_CLIENT = "ws-security.sts.client";
+    public static final String STS_APPLIES_TO = "ws-security.sts.applies-to";
     
     public static final String TIMESTAMP_TTL = 
"ws-security.timestamp.timeToLive";
     

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java?rev=934269&r1=934268&r2=934269&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
 Thu Apr 15 03:03:46 2010
@@ -122,7 +122,10 @@ public class IssuedTokenInterceptorProvi
                                     tok = client.requestSecurityToken();
                                 } else {
                                     String s = message
-                                        
.getContextualProperty(Message.ENDPOINT_ADDRESS).toString();
+                                        
.getContextualProperty(SecurityConstants.STS_APPLIES_TO).toString();
+                                    s = s == null 
+                                        ? 
message.getContextualProperty(Message.ENDPOINT_ADDRESS).toString()
+                                            : s;
                                     
client.setAddressingNamespace(maps.getNamespaceURI());
                                     tok = client.requestSecurityToken(s);
                                 }