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 0258610967 for ; Fri, 28 Feb 2014 15:12:58 +0000 (UTC) Received: (qmail 31484 invoked by uid 500); 28 Feb 2014 15:12:52 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 31439 invoked by uid 500); 28 Feb 2014 15:12:52 -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 31419 invoked by uid 99); 28 Feb 2014 15:12:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Feb 2014 15:12:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E2DD29308E9; Fri, 28 Feb 2014 15:12:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Fri, 28 Feb 2014 15:12:51 -0000 Message-Id: In-Reply-To: <13e9b6a926d246eeb59096e3e536abc1@git.apache.org> References: <13e9b6a926d246eeb59096e3e536abc1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: [CXF-5585] - "SignatureConfirmation does not work with the Asymmetric Binding + EncryptBeforeSigning". [CXF-5585] - "SignatureConfirmation does not work with the Asymmetric Binding + EncryptBeforeSigning". Conflicts: rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client.xml systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4c25920e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4c25920e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4c25920e Branch: refs/heads/2.6.x-fixes Commit: 4c25920e0c603597cce73f47035972a8e06110f8 Parents: beb466f Author: Colm O hEigeartaigh Authored: Fri Feb 28 14:55:24 2014 +0000 Committer: Colm O hEigeartaigh Committed: Fri Feb 28 15:11:32 2014 +0000 ---------------------------------------------------------------------- .../ws/bindings/BindingPropertiesTest.java | 24 ++++++++++++++++++++ .../systest/ws/bindings/DoubleItBindings.wsdl | 3 +++ .../cxf/systest/ws/bindings/client/client.xml | 16 +++++++++++++ .../cxf/systest/ws/bindings/server/server.xml | 14 +++++++++++- 4 files changed, 56 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/4c25920e/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java index ccdbda3..4387bf3 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java @@ -425,4 +425,28 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase { bus.shutdown(true); } + @org.junit.Test + public void testSignatureConfirmationEncBeforeSigning() throws Exception { + + SpringBusFactory bf = new SpringBusFactory(); + URL busFile = BindingPropertiesTest.class.getResource("client/client.xml"); + + Bus bus = bf.createBus(busFile.toString()); + SpringBusFactory.setDefaultBus(bus); + SpringBusFactory.setThreadDefaultBus(bus); + + URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl"); + Service service = Service.create(wsdl, SERVICE_QNAME); + + QName portQName = new QName(NAMESPACE, "DoubleItSignatureConfirmationEncBeforeSigningPort"); + DoubleItPortType port = service.getPort(portQName, DoubleItPortType.class); + updateAddressPort(port, PORT); + + port.doubleIt(25); + + ((java.io.Closeable)port).close(); + bus.shutdown(true); + } + + } http://git-wip-us.apache.org/repos/asf/cxf/blob/4c25920e/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl index 10eff18..7d2d6f0 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl @@ -122,6 +122,9 @@ + + + http://git-wip-us.apache.org/repos/asf/cxf/blob/4c25920e/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client/client.xml index a10ed2b..29e6300 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client/client.xml @@ -480,4 +480,20 @@ + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/cxf/blob/4c25920e/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server/server.xml index 91dda30..8aa5ab3 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server/server.xml @@ -504,5 +504,17 @@ - + + + + + + + + + + + + +