Author: thomas.diesler(a)jboss.com Date: 2007-12-20 14:54:45 -0500 (Thu, 20 Dec 2007) New Revision: 5382 Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.java stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.java stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/ stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/WEB-INF/ stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/WEB-INF/web.xml stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/wsrm-basic-doc.wsdl stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml Modified: stack/cxf/trunk/ant-import/build-testsuite-jars.xml Log: Add WS-RM basic doc test case Modified: stack/cxf/trunk/ant-import/build-testsuite-jars.xml =================================================================== --- stack/cxf/trunk/ant-import/build-testsuite-jars.xml 2007-12-20 18:45:28 UTC (rev 5381) +++ stack/cxf/trunk/ant-import/build-testsuite-jars.xml 2007-12-20 19:54:45 UTC (rev 5382) @@ -40,6 +40,17 @@ </webinf> </war> + <!-- jaxws-cxf-wsrm-basic-doc --> + <war warfile="${tests.output.dir}/libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/cxf/wsrm/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + </war> + <!-- Please add alphabetically --> </target> Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.java =================================================================== --- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.java (rev 0) +++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.java 2007-12-20 19:54:45 UTC (rev 5382) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.cxf.wsrm; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/wsrm") +public interface BasicDocEndpoint +{ + @WebMethod + public String echo(String arg0); + +} Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.java =================================================================== --- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.java (rev 0) +++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.java 2007-12-20 19:54:45 UTC (rev 5382) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.cxf.wsrm; + +// $Id$ + +import javax.jws.WebMethod; +import javax.jws.WebService; + +@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/wsrm", serviceName = "RMService") +public class BasicDocEndpointImpl implements BasicDocEndpoint +{ + @WebMethod + public String echo(String input) + { + return input; + } +} Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java =================================================================== --- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java (rev 0) +++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2007-12-20 19:54:45 UTC (rev 5382) @@ -0,0 +1,100 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.cxf.wsrm; + +import java.io.File; +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; +import org.w3c.dom.Element; + +/** + * Test the CXF WS-ReliableMessaging + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Dec-2007 + */ +public class BasicDocTestCase extends JBossWSTest +{ + private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-wsrm-basic-doc"; + private String targetNS = "http://org.jboss.ws.jaxws.cxf/wsrm"; + + public static Test suite() + { + return new JBossWSTestSetup(BasicDocTestCase.class, "jaxws-cxf-wsrm-basic-doc.war"); + } + + 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 _testStandardClient() throws Exception + { + URL wsdlURL = new File("resources/jaxws/cxf/wsrm/wsrm-basic-doc.wsdl").toURL(); + QName serviceName = new QName(targetNS, "RMService"); + + Service service = Service.create(wsdlURL, serviceName); + BasicDocEndpoint port = (BasicDocEndpoint)service.getPort(BasicDocEndpoint.class); + + System.out.println("FIXME: [CXF-1320] Configure WS-RM client from WSDL only"); + + //Object retObj = port.echo("Hello"); + //assertEquals("Hello", retObj); + } + + public void testSpringClient() throws Exception + { + SpringBusFactory bf = new SpringBusFactory(); + URL cxfConfig = new File("resources/jaxws/cxf/wsrm/wsrm-client-config.xml").toURL(); + Bus bus = bf.createBus(cxfConfig); + BusFactory.setDefaultBus(bus); + + URL wsdlURL = new File("resources/jaxws/cxf/wsrm/wsrm-basic-doc.wsdl").toURL(); + QName serviceName = new QName(targetNS, "RMService"); + + Service service = Service.create(wsdlURL, serviceName); + BasicDocEndpoint port = (BasicDocEndpoint)service.getPort(BasicDocEndpoint.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 Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/WEB-INF/jbossws-cxf.xml (rev 0) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/WEB-INF/jbossws-cxf.xml 2007-12-20 19:54:45 UTC (rev 5382) @@ -0,0 +1,28 @@ +<beans xmlns='http://www.springframework.org/schema/beans' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:beans='http://www.springframework.org/schema/beans' + xmlns:jaxws='http://cxf.apache.org/jaxws' xmlns:p="http://cxf.apache.org/policy" + xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd + http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/11/ws-policy.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> + + <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> + <wsp:Policy/> + </wsam:Addressing> + <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"> + <wsrmp:BaseRetransmissionInterval Milliseconds="10000"/> + </wsrmp:RMAssertion> + </wsp:Policy> + + <jaxws:endpoint id='RMService' address='http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-doc' implementor='org.jboss.test.ws.jaxws.cxf.wsrm.BasicDocEndpointImpl'> + <jaxws:invoker> + <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> + </jaxws:invoker> + <jaxws:features> + <p:policies namespace="http://www.w3.org/2006/07/ws-policy"> + <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> + </p:policies> + </jaxws:features> + </jaxws:endpoint> + +</beans> \ No newline at end of file Property changes on: stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/WEB-INF/jbossws-cxf.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/WEB-INF/web.xml 2007-12-20 19:54:45 UTC (rev 5382) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>RMService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.cxf.wsrm.BasicDocEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>RMService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Property changes on: stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/wsrm-basic-doc.wsdl =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/wsrm-basic-doc.wsdl (rev 0) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/wsrm-basic-doc.wsdl 2007-12-20 19:54:45 UTC (rev 5382) @@ -0,0 +1,68 @@ +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:tns="http://org.jboss.ws.jaxws.cxf/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="RMService" targetNamespace="http://org.jboss.ws.jaxws.cxf/wsrm"> + + <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> + <wsp:Policy/> + </wsam:Addressing> + <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"> + <wsrmp:BaseRetransmissionInterval Milliseconds="10000"/> + </wsrmp:RMAssertion> + </wsp:Policy> + + <wsdl:types> + <xsd:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://org.jboss.ws.jaxws.cxf/wsrm" + xmlns:tns="http://org.jboss.ws.jaxws.cxf/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <xsd:element name="echo" type="tns:echo"/> + <xsd:complexType name="echo"> + <xsd:sequence> + <xsd:element minOccurs="0" name="arg0" type="xsd:string"/> + </xsd:sequence> + </xsd:complexType> + <xsd:element name="echoResponse" type="tns:echoResponse"/> + <xsd:complexType name="echoResponse"> + <xsd:sequence> + <xsd:element minOccurs="0" name="return" type="xsd:string"/> + </xsd:sequence> + </xsd:complexType> + </xsd:schema> + </wsdl:types> + + <wsdl:message name="echo"> + <wsdl:part element="tns:echo" name="parameters"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="echoResponse"> + <wsdl:part element="tns:echoResponse" name="parameters"> + </wsdl:part> + </wsdl:message> + + <wsdl:portType name="RMEndpoint"> + <wsdl:operation name="echo"> + <wsdl:input message="tns:echo" name="echo"> + </wsdl:input> + <wsdl:output message="tns:echoResponse" name="echoResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + + <wsdl:binding name="RMServiceSoapBinding" type="tns:RMEndpoint"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="echo"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="echo"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="echoResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + + <wsdl:service name="RMService"> + <wsdl:port binding="tns:RMServiceSoapBinding" name="RMEndpointPort"> + <soap:address location="http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-doc"/> + <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file Property changes on: stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/wsrm-basic-doc.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml (rev 0) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml 2007-12-20 19:54:45 UTC (rev 5382) @@ -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/wsrm/wsrm-client-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF