Author: richard.opalka(a)jboss.com Date: 2009-08-26 10:17:19 -0400 (Wed, 26 Aug 2009) New Revision: 10606 Modified: stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/jbossws-cxf.xml stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl Log: [JBWS-2457] fixing sample - svn merge -r 10603:10604 https://svn.jboss.org/repos/jbossws/stack/cxf/trunk Modified: stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2009-08-26 14:16:37 UTC (rev 10605) +++ stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2009-08-26 14:17:19 UTC (rev 10606) @@ -32,12 +32,6 @@ prefix="WEB-INF/wsdl"/> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsa-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsa"> - <include name="cxf.xml"/> - </metainf> - </jar> - <!-- jaxws-samples-wsrm --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war" Modified: stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2009-08-26 14:16:37 UTC (rev 10605) +++ stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2009-08-26 14:17:19 UTC (rev 10606) @@ -24,6 +24,7 @@ import java.net.URL; import javax.xml.namespace.QName; import javax.xml.ws.Service; +import javax.xml.ws.soap.AddressingFeature; import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; @@ -37,26 +38,20 @@ public final class AddressingTestCase extends JBossWSTest { private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsa/AddressingService"; - private ServiceIface proxy; public static Test suite() { - return new JBossWSTestSetup(AddressingTestCase.class, "jaxws-samples-wsa.war,jaxws-samples-wsa-client.jar"); + return new JBossWSTestSetup(AddressingTestCase.class, "jaxws-samples-wsa.war"); } - @Override - protected void setUp() throws Exception + public void test() throws Exception { - super.setUp(); - + // construct proxy QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsaddressing";, "AddressingService"); URL wsdlURL = new URL(serviceURL + "?wsdl"); Service service = Service.create(wsdlURL, serviceName); - proxy = (ServiceIface)service.getPort(ServiceIface.class); - } - - public void test() throws Exception - { + ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class, new AddressingFeature()); + // invoke method assertEquals("Hello World!", proxy.sayHello()); } Modified: stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java 2009-08-26 14:16:37 UTC (rev 10605) +++ stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java 2009-08-26 14:17:19 UTC (rev 10606) @@ -22,6 +22,7 @@ package org.jboss.test.ws.jaxws.samples.wsa; import javax.jws.WebService; +import javax.xml.ws.soap.Addressing; @WebService ( @@ -31,6 +32,7 @@ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing", endpointInterface = "org.jboss.test.ws.jaxws.samples.wsa.ServiceIface" ) +@Addressing(enabled=true, required=true) public class ServiceImpl implements ServiceIface { public String sayHello() Modified: stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/jbossws-cxf.xml 2009-08-26 14:16:37 UTC (rev 10605) +++ stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/jbossws-cxf.xml 2009-08-26 14:17:19 UTC (rev 10606) @@ -7,7 +7,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd '> - + <jaxws:endpoint id='ServiceImpl' address='http://@jboss.bind.address@:8080/jaxws-samples-wsa' @@ -15,9 +15,6 @@ <jaxws:invoker> <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> </jaxws:invoker> - <jaxws:features> - <wsa:addressing usingAddressingAdvisory="false" allowDuplicates="false"/> - </jaxws:features> </jaxws:endpoint> - + </beans> Modified: stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl =================================================================== --- stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl 2009-08-26 14:16:37 UTC (rev 10605) +++ stack/cxf/branches/jbossws-cxf-3.2.0.GA/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl 2009-08-26 14:17:19 UTC (rev 10606) @@ -45,7 +45,6 @@ <wsdl:service name="AddressingService"> <wsdl:port name="AddressingServicePort" binding="tns:AddressingServiceSoapBinding"> <soap:address location="http://localhost:9090/hello"/> - <UsingAddressing xmlns="http://www.w3.org/2006/05/addressing/wsdl"/> </wsdl:port> </wsdl:service> </wsdl:definitions>