Author: thomas.diesler(a)jboss.com Date: 2007-12-20 06:24:43 -0500 (Thu, 20 Dec 2007) New Revision: 5367 Added: stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf-client.xml Modified: stack/cxf/trunk/.classpath stack/cxf/trunk/ant-import/build-testsuite.xml stack/cxf/trunk/ant-import/build-thirdparty.xml stack/cxf/trunk/src/test/etc/log4j.xml stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/BasicRMTestCase.java stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpoint.java stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt Log: More work on CXF WS-RM integration Modified: stack/cxf/trunk/.classpath =================================================================== --- stack/cxf/trunk/.classpath 2007-12-20 09:50:42 UTC (rev 5366) +++ stack/cxf/trunk/.classpath 2007-12-20 11:24:43 UTC (rev 5367) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/main/java"/> - <classpathentry excluding="org/jboss/test/ws/jaxws/smoke/tools/" kind="src" path="src/test-framework/java"/> <classpathentry kind="src" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> @@ -15,7 +14,6 @@ <classpathentry kind="lib" path="thirdparty/jboss-common-core-sources.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> - <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/> <classpathentry kind="lib" path="thirdparty/jbossws-framework.jar"/> <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/> <classpathentry kind="lib" path="thirdparty/jdom-1.0.jar"/> @@ -37,5 +35,6 @@ <classpathentry kind="lib" path="thirdparty/jaxws-api-2.0.jar"/> <classpathentry kind="lib" path="tools/ant/lib/junit.jar"/> <classpathentry kind="lib" path="thirdparty/activation.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: stack/cxf/trunk/ant-import/build-testsuite.xml =================================================================== --- stack/cxf/trunk/ant-import/build-testsuite.xml 2007-12-20 09:50:42 UTC (rev 5366) +++ stack/cxf/trunk/ant-import/build-testsuite.xml 2007-12-20 11:24:43 UTC (rev 5367) @@ -35,6 +35,9 @@ <pathelement location="${int.cxf.dir}/thirdparty/neethi-${cxf.neethi}.jar"/> <pathelement location="${int.cxf.dir}/thirdparty/saaj-api-${cxf.saaj}.jar"/> <pathelement location="${int.cxf.dir}/thirdparty/saaj-impl-${cxf.saaj}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/spring-beans-${cxf.spring}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/spring-context-${cxf.spring}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/spring-core-${cxf.spring}.jar"/> <pathelement location="${int.cxf.dir}/thirdparty/xml-resolver-${cxf.xml.resolver}.jar"/> <pathelement location="${int.cxf.dir}/thirdparty/XmlSchema-${cxf.xmlschema}.jar"/> Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-12-20 09:50:42 UTC (rev 5366) +++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-12-20 11:24:43 UTC (rev 5367) @@ -37,6 +37,7 @@ <isfalse value="${checksum.ok}"/> </or> </condition> + <echo message="force.thirdparty.get=${force.thirdparty.get}"/> </target> <!-- Modified: stack/cxf/trunk/src/test/etc/log4j.xml =================================================================== --- stack/cxf/trunk/src/test/etc/log4j.xml 2007-12-20 09:50:42 UTC (rev 5366) +++ stack/cxf/trunk/src/test/etc/log4j.xml 2007-12-20 11:24:43 UTC (rev 5367) @@ -61,7 +61,7 @@ </category> <category name="org.apache.cxf"> - <priority value="DEBUG"/> + <priority value="TRACE"/> </category> <!-- Apache security is verbose --> Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/BasicRMTestCase.java =================================================================== --- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/BasicRMTestCase.java 2007-12-20 09:50:42 UTC (rev 5366) +++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/BasicRMTestCase.java 2007-12-20 11:24:43 UTC (rev 5367) @@ -25,10 +25,14 @@ import java.net.URL; import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; import junit.framework.Test; +import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; +import org.apache.cxf.bus.spring.SpringBusFactory; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -49,18 +53,17 @@ { return new JBossWSTestSetup(BasicRMTestCase.class, "jaxws-cxf-reliable.war"); } - - public void testWSDLAccess() throws Exception + + public void _testWSDLAccess() throws Exception { URL wsdlURL = new URL(endpointURL + "?wsdl"); Element wsdl = DOMUtils.parse(wsdlURL.openStream()); assertNotNull(wsdl); - + System.out.println("FIXME: [CXF-1310] Generated WSDL for an WS-RM endpoint does not contain RM policies"); } - - public void testBasicRMAccess() throws Exception + public void _testStandardAPIClient() throws Exception { URL wsdlURL = new File("resources/jaxws/cxf/reliable/reliable.wsdl").toURL(); QName serviceName = new QName(targetNS, "RMService"); @@ -71,4 +74,25 @@ Object retObj = port.echo("Hello"); assertEquals("Hello", retObj); } + + public void testSpringClient() throws Exception + { + SpringBusFactory bf = new SpringBusFactory(); + URL cxfConfig = new File("resources/jaxws/cxf/reliable/cxf-client.xml").toURL(); + Bus bus = bf.createBus(cxfConfig); + BusFactory.setDefaultBus(bus); + + URL wsdlURL = new File("resources/jaxws/cxf/reliable/reliable.wsdl").toURL(); + QName serviceName = new QName(targetNS, "RMService"); + + Service service = Service.create(wsdlURL, serviceName); + RMEndpoint port = (RMEndpoint)service.getPort(RMEndpoint.class); + + // Enable addressing + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE); + + Object retObj = port.echo("Hello"); + assertEquals("Hello", retObj); + } } \ No newline at end of file Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpoint.java =================================================================== --- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpoint.java 2007-12-20 09:50:42 UTC (rev 5366) +++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpoint.java 2007-12-20 11:24:43 UTC (rev 5367) @@ -21,14 +21,24 @@ */ package org.jboss.test.ws.jaxws.cxf.reliable; -// $Id$ - +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/reliable", serviceName = "RMService") +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.1-b03- + * Generated source version: 2.0 + * + */ +@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/reliable") @SOAPBinding(style = SOAPBinding.Style.RPC) public interface RMEndpoint { - String echo(String input); + @WebMethod + @WebResult(partName = "return") + public String echo(@WebParam(name = "arg0", partName = "arg0") String arg0); + } Added: stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf-client.xml =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf-client.xml (rev 0) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf-client.xml 2007-12-20 11:24:43 UTC (rev 5367) @@ -0,0 +1,51 @@ +<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" + xmlns:p="http://cxf.apache.org/policy" xmlns:cxf="http://cxf.apache.org/core" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd + http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> + + <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/> + <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/> + <bean id="rmLogicalOut" class="org.apache.cxf.ws.rm.RMOutInterceptor"> + <property name="bus" ref="cxf"/> + </bean> + <bean id="rmLogicalIn" class="org.apache.cxf.ws.rm.RMInInterceptor"> + <property name="bus" ref="cxf"/> + </bean> + <bean id="rmCodec" class="org.apache.cxf.ws.rm.soap.RMSoapInterceptor"/> + + <!--p:engine enabled="true" ignoreUnknownAssertions="true"/--> + + <cxf:bus name="cxf"> + <!--cxf:features> + <p:policies ignoreUnknownAssertions="true"/> + </cxf:features--> + <cxf:inInterceptors> + <ref bean="mapAggregator"/> + <ref bean="mapCodec"/> + <ref bean="rmLogicalIn"/> + <ref bean="rmCodec"/> + </cxf:inInterceptors> + <cxf:inFaultInterceptors> + <ref bean="mapAggregator"/> + <ref bean="mapCodec"/> + <ref bean="rmLogicalIn"/> + <ref bean="rmCodec"/> + </cxf:inFaultInterceptors> + <cxf:outInterceptors> + <ref bean="mapAggregator"/> + <ref bean="mapCodec"/> + <ref bean="rmLogicalOut"/> + <ref bean="rmCodec"/> + </cxf:outInterceptors> + <cxf:outFaultInterceptors> + <ref bean="mapAggregator"/> + <ref bean="mapCodec"/> + <ref bean="rmLogicalOut"/> + <ref bean="rmCodec"/> + </cxf:outFaultInterceptors> + </cxf:bus> + +</beans> \ No newline at end of file Property changes on: stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt =================================================================== --- stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt 2007-12-20 09:50:42 UTC (rev 5366) +++ stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt 2007-12-20 11:24:43 UTC (rev 5367) @@ -2,15 +2,6 @@ # $Id: test-excludes.txt 3915 2007-07-17 16:16:05Z heiko.braun(a)jboss.com $ # -################################################################### -# Exclude JBossWS-Native stuff -# -org/jboss/test/ws/jaxws/samples/wsaddressing/** -org/jboss/test/ws/jaxws/samples/wseventing/** -org/jboss/test/ws/jaxws/samples/wssecurity/** -# -################################################################### - # EJB3/Injection excludes org/jboss/test/ws/jaxws/samples/webserviceref/** Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt =================================================================== --- stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt 2007-12-20 09:50:42 UTC (rev 5366) +++ stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt 2007-12-20 11:24:43 UTC (rev 5367) @@ -2,15 +2,6 @@ # $Id$ # -################################################################### -# Exclude JBossWS-Native stuff -# -org/jboss/test/ws/jaxws/samples/wsaddressing/** -org/jboss/test/ws/jaxws/samples/wseventing/** -org/jboss/test/ws/jaxws/samples/wssecurity/** -# -################################################################### - # EJB3/Injection excludes org/jboss/test/ws/jaxws/samples/webserviceref/** Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt =================================================================== --- stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2007-12-20 09:50:42 UTC (rev 5366) +++ stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2007-12-20 11:24:43 UTC (rev 5367) @@ -2,15 +2,6 @@ # $Id: test-excludes.txt 3915 2007-07-17 16:16:05Z heiko.braun(a)jboss.com $ # -################################################################### -# Exclude JBossWS-Native stuff -# -org/jboss/test/ws/jaxws/samples/wsaddressing/** -org/jboss/test/ws/jaxws/samples/wseventing/** -org/jboss/test/ws/jaxws/samples/wssecurity/** -# -################################################################### - # [JBWS-1683] Fix JAXR samples for CXF org/jboss/test/ws/jaxws/samples/jaxr/**