cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r934276 - 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/policy/interceptors/IssuedTokenInterceptorProvider.java
Date Thu, 15 Apr 2010 03:24:02 GMT
Author: dkulp
Date: Thu Apr 15 03:24:01 2010
New Revision: 934276

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

........
  r934269 | dkulp | 2010-04-14 23:03:46 -0400 (Wed, 14 Apr 2010) | 1 line
  
  Add property to control the value of AppliesTo that the sts client sends
........

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/policy/interceptors/IssuedTokenInterceptorProvider.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=934276&r1=934275&r2=934276&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
Thu Apr 15 03:24:01 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/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java?rev=934276&r1=934275&r2=934276&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
Thu Apr 15 03:24:01 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);
                                 }



Mime
View raw message