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 B8BBE1028E for ; Thu, 17 Oct 2013 15:34:51 +0000 (UTC) Received: (qmail 88032 invoked by uid 500); 17 Oct 2013 15:34:49 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 87917 invoked by uid 500); 17 Oct 2013 15:34:49 -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 87909 invoked by uid 99); 17 Oct 2013 15:34:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Oct 2013 15:34:47 +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, 17 Oct 2013 15:34:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9756023888A6; Thu, 17 Oct 2013 15:34:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1533120 - /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java Date: Thu, 17 Oct 2013 15:34:26 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131017153426.9756023888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Oct 17 15:34:26 2013 New Revision: 1533120 URL: http://svn.apache.org/r1533120 Log: Make sure the STS endpoint has the correct action and structure for the Cancel Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java?rev=1533120&r1=1533119&r2=1533120&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java Thu Oct 17 15:34:26 2013 @@ -198,7 +198,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); } @@ -234,14 +234,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; } }