cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1535467 - /cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
Date Thu, 24 Oct 2013 18:09:01 GMT
Author: dkulp
Date: Thu Oct 24 18:09:01 2013
New Revision: 1535467

URL: http://svn.apache.org/r1535467
Log:
Merged revisions 1533121 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1533121 | dkulp | 2013-10-17 11:37:13 -0400 (Thu, 17 Oct 2013) | 10 lines

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

  ........
    r1533120 | dkulp | 2013-10-17 11:34:26 -0400 (Thu, 17 Oct 2013) | 2 lines

    Make sure the STS endpoint has the correct action and structure for the Cancel

  ........

........

Modified:
    cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java

Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java?rev=1535467&r1=1535466&r2=1535467&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
Thu Oct 24 18:09:01 2013
@@ -189,7 +189,7 @@ public final class STSUtils {
             soi = new SoapOperationInfo();
             boi.addExtensor(soi);
         }
-        soi.setAction(namespace + "/RST/Cancel");
+        soi.setAction(namespace + (sc ? "/RST/SCT/Cancel" : "/RST/Cancel"));
         service.setDataBinding(new SourceDataBinding());
         return new EndpointImpl(bus, service, ei);
     }
@@ -225,14 +225,14 @@ public final class STSUtils {
                                            MessageInfo.Type.INPUT);
         oi.setInput("CancelSecurityTokenMsg", mii);
         MessagePartInfo mpi = mii.addMessagePart("request");
-        mpi.setElementQName(new QName(namespace, "CancelSecurityToken"));
+        mpi.setElementQName(new QName(namespace, "RequestSecurityToken"));
         
         MessageInfo mio = oi.createMessage(new QName(servNamespace, 
                                                      "CancelSecurityTokenResponseMsg"), 
                                            MessageInfo.Type.OUTPUT);
         oi.setOutput("CancelSecurityTokenResponseMsg", mio);
         mpi = mio.addMessagePart("response");
-        mpi.setElementQName(new QName(namespace, "CancelSecurityTokenResponse"));
+        mpi.setElementQName(new QName(namespace, "RequestSecurityToken"));
         return oi;
     }
 }



Mime
View raw message