Author: asoldano Date: 2015-03-11 18:21:55 -0400 (Wed, 11 Mar 2015) New Revision: 19553 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/CustomRMFeature.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/META-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/META-INF/jaxws-client-config.xml Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java Log: [JBWS-3875] Adding example on using a custom properties to set a custom feature extending and configuring a CXF one Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/CustomRMFeature.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/CustomRMFeature.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/CustomRMFeature.java 2015-03-11 22:21:55 UTC (rev 19553) @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2015, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsrm.client; + +import org.apache.cxf.ws.rm.feature.RMFeature; +import org.apache.cxf.ws.rm.manager.AcksPolicyType; +import org.apache.cxf.ws.rm.manager.DestinationPolicyType; +import org.apache.cxf.ws.rmp.v200502.RMAssertion; +import org.apache.cxf.ws.rmp.v200502.RMAssertion.AcknowledgementInterval; + +/** + * A custom version of RMFeature that + * sets a bunch of RM options + * + * @author alessio.soldano(a)jboss.com + * @since 11-Mar-2015 + */ +public class CustomRMFeature extends RMFeature +{ + public CustomRMFeature() { + super(); + RMAssertion rma = new RMAssertion(); + RMAssertion.BaseRetransmissionInterval bri = new RMAssertion.BaseRetransmissionInterval(); + bri.setMilliseconds(4000L); + rma.setBaseRetransmissionInterval(bri); + AcknowledgementInterval ai = new AcknowledgementInterval(); + ai.setMilliseconds(2000L); + rma.setAcknowledgementInterval(ai); + super.setRMAssertion(rma); + DestinationPolicyType dp = new DestinationPolicyType(); + AcksPolicyType ap = new AcksPolicyType(); + ap.setIntraMessageThreshold(0); + dp.setAcksPolicy(ap); + super.setDestinationPolicy(dp); + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/CustomRMFeature.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java 2015-03-11 21:43:27 UTC (rev 19552) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java 2015-03-11 22:21:55 UTC (rev 19553) @@ -30,6 +30,11 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; +import org.apache.cxf.ws.rm.feature.RMFeature; +import org.apache.cxf.ws.rm.manager.AcksPolicyType; +import org.apache.cxf.ws.rm.manager.DestinationPolicyType; +import org.apache.cxf.ws.rmp.v200502.RMAssertion; +import org.apache.cxf.ws.rmp.v200502.RMAssertion.AcknowledgementInterval; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; @@ -38,8 +43,11 @@ import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService; +import org.jboss.ws.api.configuration.ClientConfigUtil; +import org.jboss.ws.api.configuration.ClientConfigurer; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.WrapThreadContextClassLoader; import org.junit.Test; import org.junit.runner.RunWith; @@ -72,6 +80,17 @@ return archive; } + @Override + protected String getClientJarPaths() { + return JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jjaxws-samples-wsrm-api-client.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.wsrm.client.CustomRMFeature.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsrm/META-INF/jaxws-client-config.xml"), "jaxws-client-config.xml"); + } + }); + } + @Test @RunAsClient public void test() throws Exception @@ -92,4 +111,65 @@ } } + @Test + @RunAsClient + public void testWithFeature() throws Exception + { + final Bus bus = BusFactory.newInstance().createBus(); + BusFactory.setThreadDefaultBus(bus); + try { + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm";, "SimpleService"); + URL wsdlURL = getResourceURL("jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl"); + Service service = Service.create(wsdlURL, serviceName); + + RMFeature feature = new RMFeature(); + RMAssertion rma = new RMAssertion(); + RMAssertion.BaseRetransmissionInterval bri = new RMAssertion.BaseRetransmissionInterval(); + bri.setMilliseconds(4000L); + rma.setBaseRetransmissionInterval(bri); + AcknowledgementInterval ai = new AcknowledgementInterval(); + ai.setMilliseconds(2000L); + rma.setAcknowledgementInterval(ai); + feature.setRMAssertion(rma); + DestinationPolicyType dp = new DestinationPolicyType(); + AcksPolicyType ap = new AcksPolicyType(); + ap.setIntraMessageThreshold(0); + dp.setAcksPolicy(ap); + feature.setDestinationPolicy(dp); + + SimpleService proxy = (SimpleService)service.getPort(SimpleService.class, feature); + ((BindingProvider)proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, baseURL + "/jaxws-samples-wsrm-api/SimpleService"); + + assertEquals("Hello World!", proxy.echo("Hello World!")); // request response call + proxy.ping(); // one way call + } finally { + bus.shutdown(true); + } + } + + @Test + @RunAsClient + @WrapThreadContextClassLoader + public void testWithFeatureProperty() throws Exception + { + final Bus bus = BusFactory.newInstance().createBus(); + BusFactory.setThreadDefaultBus(bus); + try { + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm";, "SimpleService"); + URL wsdlURL = getResourceURL("jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl"); + Service service = Service.create(wsdlURL, serviceName); + SimpleService proxy = (SimpleService)service.getPort(SimpleService.class); + + ClientConfigurer configurer = ClientConfigUtil.resolveClientConfigurer(); + configurer.setConfigProperties(proxy, "META-INF/jaxws-client-config.xml", "Custom Client Config"); + + ((BindingProvider)proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, baseURL + "/jaxws-samples-wsrm-api/SimpleService"); + + assertEquals("Hello World!", proxy.echo("Hello World!")); // request response call + proxy.ping(); // one way call + } finally { + bus.shutdown(true); + } + } + } Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/META-INF/jaxws-client-config.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/META-INF/jaxws-client-config.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/META-INF/jaxws-client-config.xml 2015-03-11 22:21:55 UTC (rev 19553) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jbossws-jaxws-config_4_0.xsd"> + + <client-config> + <config-name>Custom Client Config</config-name> + <property> + <property-name>cxf.features</property-name> + <property-value>org.jboss.test.ws.jaxws.samples.wsrm.client.CustomRMFeature</property-value> + </property> + </client-config> + +</jaxws-config> \ No newline at end of file Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/META-INF/jaxws-client-config.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native