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 12F0E183E0 for ; Mon, 28 Dec 2015 16:15:08 +0000 (UTC) Received: (qmail 9003 invoked by uid 500); 28 Dec 2015 16:15:07 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 8942 invoked by uid 500); 28 Dec 2015 16:15:07 -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 8933 invoked by uid 99); 28 Dec 2015 16:15:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Dec 2015 16:15:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BEDF7E03CD; Mon, 28 Dec 2015 16:15:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ay@apache.org To: commits@cxf.apache.org Message-Id: <931c0e188d254dc08adafedc9dc8b3ac@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: adding a ws-addr policy test using wsam-2007/05 namespace Date: Mon, 28 Dec 2015 16:15:07 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 3aa4959dd -> dcc7914dc adding a ws-addr policy test using wsam-2007/05 namespace Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dcc7914d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dcc7914d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dcc7914d Branch: refs/heads/3.1.x-fixes Commit: dcc7914dc30dc5b05a817e60bb6cf9e8f2635945 Parents: 3aa4959 Author: Akitoshi Yoshida Authored: Tue Dec 29 00:49:19 2015 +0900 Committer: Akitoshi Yoshida Committed: Tue Dec 29 01:00:30 2015 +0900 ---------------------------------------------------------------------- .../ws/policy/AddressingPolicy0705Test.java | 161 +++++++++++++++++++ .../cxf/systest/ws/policy/addr-external0705.xml | 37 +++++ .../apache/cxf/systest/ws/policy/addr0705.xml | 31 ++++ 3 files changed, 229 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/dcc7914d/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java ---------------------------------------------------------------------- diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java new file mode 100644 index 0000000..405c60c --- /dev/null +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java @@ -0,0 +1,161 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.cxf.systest.ws.policy; + +import java.io.Closeable; +import java.util.logging.Logger; + +import javax.xml.ws.Endpoint; + +import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; +import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.common.logging.LogUtils; +import org.apache.cxf.greeter_control.BasicGreeterService; +import org.apache.cxf.greeter_control.Greeter; +import org.apache.cxf.greeter_control.PingMeFault; +import org.apache.cxf.helpers.FileUtils; +import org.apache.cxf.interceptor.LoggingInInterceptor; +import org.apache.cxf.interceptor.LoggingOutInterceptor; +import org.apache.cxf.systest.ws.util.ConnectionHelper; +import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import org.apache.cxf.testutil.common.AbstractBusTestServerBase; +import org.apache.cxf.testutil.common.TestUtil; + +import org.junit.BeforeClass; +import org.junit.Test; + + +/** + * Tests the use of the WS-Policy Framework to automatically engage WS-Addressing and + * WS-RM in response to Policies defined for the endpoint via an external policy attachment. + */ +// REVISIT this class is copied from AddressingPolicyTest to use the wsam-2007/05 namespace +// consolidate this class with the original +public class AddressingPolicy0705Test extends AbstractBusClientServerTestBase { + public static final String PORT = allocatePort(Server.class); + public static final String TEMPDIR = FileUtils.getDefaultTempDir().toURI().toString(); + + private static final Logger LOG = LogUtils.getLogger(AddressingPolicy0705Test.class); + + public static class Server extends AbstractBusTestServerBase { + String tmpDir = TEMPDIR; + Endpoint ep; + public Server() { + } + public Server(String dir) { + tmpDir = dir; + } + public Server(String[] args) { + tmpDir = args[0]; + } + protected void run() { + + System.setProperty("temp.location", tmpDir); + SpringBusFactory bf = new SpringBusFactory(); + Bus bus = bf.createBus("org/apache/cxf/systest/ws/policy/addr0705.xml"); + BusFactory.setDefaultBus(bus); + setBus(bus); + LoggingInInterceptor in = new LoggingInInterceptor(); + bus.getInInterceptors().add(in); + bus.getInFaultInterceptors().add(in); + LoggingOutInterceptor out = new LoggingOutInterceptor(); + bus.getOutInterceptors().add(out); + bus.getOutFaultInterceptors().add(out); + + GreeterImpl implementor = new GreeterImpl(); + String address = "http://localhost:" + PORT + "/SoapContext/GreeterPort"; + ep = Endpoint.publish(address, implementor); + LOG.info("Published greeter endpoint."); + } + public void tearDown() { + ep.stop(); + ep = null; + } + + + public static void main(String[] args) { + try { + Server s = new Server(args[0]); + s.start(); + } catch (Exception ex) { + ex.printStackTrace(); + System.exit(-1); + } finally { + System.out.println("done!"); + } + } + } + + @BeforeClass + public static void startServers() throws Exception { + TestUtil.getNewPortNumber("decoupled"); + PolicyTestHelper.updatePolicyRef("addr-external0705.xml", ":9020", ":" + PORT); + System.setProperty("temp.location", TEMPDIR); + + assertTrue("server did not launch correctly", launchServer(Server.class, null, + new String[] {TEMPDIR}, true)); + } + + @Test + public void testUsingAddressing() throws Exception { + SpringBusFactory bf = new SpringBusFactory(); + bus = bf.createBus("org/apache/cxf/systest/ws/policy/addr0705.xml"); + BusFactory.setDefaultBus(bus); + LoggingInInterceptor in = new LoggingInInterceptor(); + bus.getInInterceptors().add(in); + bus.getInFaultInterceptors().add(in); + LoggingOutInterceptor out = new LoggingOutInterceptor(); + bus.getOutInterceptors().add(out); + bus.getOutFaultInterceptors().add(out); + + BasicGreeterService gs = new BasicGreeterService(); + final Greeter greeter = gs.getGreeterPort(); + updateAddressPort(greeter, PORT); + LOG.fine("Created greeter client."); + ConnectionHelper.setKeepAliveConnection(greeter, true); + + // oneway + + //greeter.greetMeOneWay("CXF"); + + // two-way + + assertEquals("CXF", greeter.greetMe("cxf")); + + // exception + + try { + greeter.pingMe(); + } catch (PingMeFault ex) { + fail("First invocation should have succeeded."); + } + + try { + greeter.pingMe(); + fail("Expected PingMeFault not thrown."); + } catch (PingMeFault ex) { + assertEquals(2, ex.getFaultInfo().getMajor()); + assertEquals(1, ex.getFaultInfo().getMinor()); + } + ((Closeable)greeter).close(); + + } +} http://git-wip-us.apache.org/repos/asf/cxf/blob/dcc7914d/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-external0705.xml ---------------------------------------------------------------------- diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-external0705.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-external0705.xml new file mode 100644 index 0000000..33c4174 --- /dev/null +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr-external0705.xml @@ -0,0 +1,37 @@ + + + + + + + http://localhost:9020/SoapContext/GreeterPort + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/cxf/blob/dcc7914d/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr0705.xml ---------------------------------------------------------------------- diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr0705.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr0705.xml new file mode 100644 index 0000000..5f87f43 --- /dev/null +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/addr0705.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + +