cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1434052 - /cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
Date Wed, 16 Jan 2013 17:21:05 GMT
Author: coheigea
Date: Wed Jan 16 17:21:05 2013
New Revision: 1434052

URL: http://svn.apache.org/viewvc?rev=1434052&view=rev
Log:
Merged revisions 1434048 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1434048 | coheigea | 2013-01-16 17:16:06 +0000 (Wed, 16 Jan 2013) | 18 lines

  Merged revisions 1434046 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

  ........
    r1434046 | coheigea | 2013-01-16 17:14:24 +0000 (Wed, 16 Jan 2013) | 10 lines

    Merged revisions 1434042 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk

    ........
      r1434042 | coheigea | 2013-01-16 17:11:40 +0000 (Wed, 16 Jan 2013) | 2 lines

      [CXF-4758] - Handle a SpnegoContextToken policy properly in the TransportBinding as
an EndorsingSupportingToken

    ........

  ........

........

Modified:
    cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java?rev=1434052&r1=1434051&r2=1434052&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
Wed Jan 16 17:21:05 2013
@@ -50,6 +50,7 @@ import org.apache.cxf.ws.security.policy
 import org.apache.cxf.ws.security.policy.model.SecurityContextToken;
 import org.apache.cxf.ws.security.policy.model.SignedEncryptedElements;
 import org.apache.cxf.ws.security.policy.model.SignedEncryptedParts;
+import org.apache.cxf.ws.security.policy.model.SpnegoContextToken;
 import org.apache.cxf.ws.security.policy.model.SupportingToken;
 import org.apache.cxf.ws.security.policy.model.Token;
 import org.apache.cxf.ws.security.policy.model.TokenWrapper;
@@ -280,7 +281,8 @@ public class TransportBindingHandler ext
         if (token instanceof IssuedToken
             || token instanceof SecureConversationToken
             || token instanceof SecurityContextToken
-            || token instanceof KerberosToken) {
+            || token instanceof KerberosToken
+            || token instanceof SpnegoContextToken) {
             addSig(doIssuedTokenSignature(token, wrapper));
         } else if (token instanceof X509Token
             || token instanceof KeyValueToken) {



Mime
View raw message