Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E5ADE10B51 for ; Thu, 31 Oct 2013 13:24:21 +0000 (UTC) Received: (qmail 45413 invoked by uid 500); 31 Oct 2013 13:24:14 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 45298 invoked by uid 500); 31 Oct 2013 13:24:03 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 45270 invoked by uid 99); 31 Oct 2013 13:23:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Oct 2013 13:23:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Oct 2013 13:23:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2AA7123889B9; Thu, 31 Oct 2013 13:23:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1537479 - /cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java Date: Thu, 31 Oct 2013 13:23:36 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131031132336.2AA7123889B9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Thu Oct 31 13:23:35 2013 New Revision: 1537479 URL: http://svn.apache.org/r1537479 Log: 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.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java Modified: cxf/branches/2.7.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.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java?rev=1537479&r1=1537478&r2=1537479&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java (original) +++ cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java Thu Oct 31 13:23:35 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; } }