Author: dkulp
Date: Wed Aug 1 18:23:49 2012
New Revision: 1368161
URL: http://svn.apache.org/viewvc?rev=1368161&view=rev
Log:
Merged revisions 1368156 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1368156 | dkulp | 2012-08-01 14:18:23 -0400 (Wed, 01 Aug 2012) | 2 lines
Newer version of ws-t uses a response collection
........
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=1368161&r1=1368160&r2=1368161&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
Wed Aug 1 18:23:49 2012
@@ -212,11 +212,16 @@ public final class STSUtils {
mpi.setElementQName(new QName(namespace, "RequestSecurityToken"));
MessageInfo mio = oi.createMessage(new QName(servNamespace,
-
"RequestSecurityTokenResponseMsg"),
- MessageInfo.Type.OUTPUT);
+ "RequestSecurityTokenResponseMsg"),
+ MessageInfo.Type.OUTPUT);
oi.setOutput("RequestSecurityTokenResponseMsg", 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;
}
private static OperationInfo addCancelOperation(InterfaceInfo ii,
