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 F301F114E1 for ; Fri, 5 Sep 2014 15:55:15 +0000 (UTC) Received: (qmail 34444 invoked by uid 500); 5 Sep 2014 15:55:15 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 34387 invoked by uid 500); 5 Sep 2014 15:55:15 -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 34378 invoked by uid 99); 5 Sep 2014 15:55:15 -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, 05 Sep 2014 15:55:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 988BBA0A632; Fri, 5 Sep 2014 15:55:15 +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 Message-Id: <773d83509a79466c997ceda669053b61@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Adding another security "action" test. Needs a fix from latest WSS4J SNAPSHOT Date: Fri, 5 Sep 2014 15:55:15 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 43df09350 -> af4f8391c Adding another security "action" test. Needs a fix from latest WSS4J SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/af4f8391 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/af4f8391 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/af4f8391 Branch: refs/heads/3.0.x-fixes Commit: af4f8391c1b732f3e9501c65d594834fd2135318 Parents: 43df093 Author: Colm O hEigeartaigh Authored: Fri Sep 5 16:53:25 2014 +0100 Committer: Colm O hEigeartaigh Committed: Fri Sep 5 16:55:01 2014 +0100 ---------------------------------------------------------------------- .../cxf/systest/ws/action/ActionTest.java | 25 ++++++++ .../cxf/systest/ws/action/DoubleItAction.wsdl | 3 + .../systest/ws/action/DoubleItActionPolicy.wsdl | 64 ++++++++++++++++++++ .../org/apache/cxf/systest/ws/action/client.xml | 32 ++++++++++ .../org/apache/cxf/systest/ws/action/server.xml | 10 +++ 5 files changed, 134 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/af4f8391/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java index 3a51de6..c58c74f 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java @@ -244,4 +244,29 @@ public class ActionTest extends AbstractBusClientServerTestBase { ((java.io.Closeable)port).close(); bus.shutdown(true); } + + // Here the client is using "Actions", where the server is using an AsymmetricBinding policy + @org.junit.Test + public void testAsymmetricEncryptBeforeSigningActionToPolicy() throws Exception { + + SpringBusFactory bf = new SpringBusFactory(); + URL busFile = ActionTest.class.getResource("client.xml"); + + Bus bus = bf.createBus(busFile.toString()); + SpringBusFactory.setDefaultBus(bus); + SpringBusFactory.setThreadDefaultBus(bus); + + URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl"); + Service service = Service.create(wsdl, SERVICE_QNAME); + QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricEncryptBeforeSigningPort"); + DoubleItPortType port = + service.getPort(portQName, DoubleItPortType.class); + updateAddressPort(port, PORT); + + // Successful call + port.doubleIt(25); + + ((java.io.Closeable)port).close(); + bus.shutdown(true); + } } http://git-wip-us.apache.org/repos/asf/cxf/blob/af4f8391/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/DoubleItAction.wsdl ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/DoubleItAction.wsdl b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/DoubleItAction.wsdl index 41b37ed..9f0f855 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/DoubleItAction.wsdl +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/DoubleItAction.wsdl @@ -60,6 +60,9 @@ + + + http://git-wip-us.apache.org/repos/asf/cxf/blob/af4f8391/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/DoubleItActionPolicy.wsdl ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/DoubleItActionPolicy.wsdl b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/DoubleItActionPolicy.wsdl index 84403e2..ae69800 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/DoubleItActionPolicy.wsdl +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/DoubleItActionPolicy.wsdl @@ -37,11 +37,33 @@ + + + + + + + + + + + + + + + + + + + + + @@ -85,6 +107,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/cxf/blob/af4f8391/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client.xml index c45b4e1..835ec06 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/client.xml @@ -170,4 +170,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/cxf/blob/af4f8391/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml index a3789d0..1cc57d7 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml @@ -185,4 +185,14 @@ + + + + + + + + + +