You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/10/31 14:25:42 UTC
svn commit: r1537482 -
/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
Author: coheigea
Date: Thu Oct 31 13:25:41 2013
New Revision: 1537482
URL: http://svn.apache.org/r1537482
Log:
Merged revisions 1537479 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1537479 | coheigea | 2013-10-31 13:23:35 +0000 (Thu, 31 Oct 2013) | 8 lines
Fixing WS-SC Cancel operation + added unit tests
Conflicts:
systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/DoubleItWSSC.wsdl
systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml
........
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=1537482&r1=1537481&r2=1537482&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 31 13:25:41 2013
@@ -232,7 +232,12 @@ public final class STSUtils {
MessageInfo.Type.OUTPUT);
oi.setOutput("CancelSecurityTokenResponseMsg", mio);
mpi = mio.addMessagePart("response");
- mpi.setElementQName(new QName(namespace, "RequestSecurityTokenResponse"));
+
+ if (WST_NS_05_02.equals(namespace)) {
+ mpi.setElementQName(new QName(namespace, "RequestSecurityTokenResponse"));
+ } else {
+ mpi.setElementQName(new QName(namespace, "RequestSecurityTokenResponseCollection"));
+ }
return oi;
}
}