[jbossws-commits] JBossWS SVN: r5383 - in stack/cxf/trunk: src/test/java/org/jboss/test/ws/jaxws/cxf and 6 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-12-20 15:13:24 -0500 (Thu, 20 Dec 2007) New Revision: 5383 Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.java stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.java stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-doc/ stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/ stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-rpc/ stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/ stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl Removed: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/ stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/ stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/WEB-INF/ stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/wsrm-basic-doc.wsdl Modified: stack/cxf/trunk/ant-import/build-testsuite-jars.xml stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml Log: Use BasicRPC & BasicDoc testcase Modified: stack/cxf/trunk/ant-import/build-testsuite-jars.xml =================================================================== --- stack/cxf/trunk/ant-import/build-testsuite-jars.xml 2007-12-20 19:54:45 UTC (rev 5382) +++ stack/cxf/trunk/ant-import/build-testsuite-jars.xml 2007-12-20 20:13:24 UTC (rev 5383) @@ -30,23 +30,24 @@ </webinf> </war> - <!-- jaxws-cxf-reliable --> - <war warfile="${tests.output.dir}/libs/jaxws-cxf-reliable.war" webxml="${tests.output.dir}/resources/jaxws/cxf/reliable/WEB-INF/web.xml"> + <!-- 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/basic-doc/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/cxf/reliable/RMEndpointImpl.class"/> + <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/reliable/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF"> <include name="jbossws-cxf.xml"/> </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"> + <!-- jaxws-cxf-wsrm-basic-rpc --> + <war warfile="${tests.output.dir}/libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-rpc/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"/> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/cxf/wsrm/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> <include name="jbossws-cxf.xml"/> </webinf> </war> Modified: 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 2007-12-20 19:54:45 UTC (rev 5382) +++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2007-12-20 20:13:24 UTC (rev 5383) @@ -54,7 +54,7 @@ return new JBossWSTestSetup(BasicDocTestCase.class, "jaxws-cxf-wsrm-basic-doc.war"); } - public void _testWSDLAccess() throws Exception + public void testWSDLAccess() throws Exception { URL wsdlURL = new URL(endpointURL + "?wsdl"); Element wsdl = DOMUtils.parse(wsdlURL.openStream()); @@ -65,7 +65,7 @@ public void _testStandardClient() throws Exception { - URL wsdlURL = new File("resources/jaxws/cxf/wsrm/wsrm-basic-doc.wsdl").toURL(); + URL wsdlURL = new File("resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl").toURL(); QName serviceName = new QName(targetNS, "RMService"); Service service = Service.create(wsdlURL, serviceName); @@ -84,7 +84,7 @@ Bus bus = bf.createBus(cxfConfig); BusFactory.setDefaultBus(bus); - URL wsdlURL = new File("resources/jaxws/cxf/wsrm/wsrm-basic-doc.wsdl").toURL(); + URL wsdlURL = new File("resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl").toURL(); QName serviceName = new QName(targetNS, "RMService"); Service service = Service.create(wsdlURL, serviceName); Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.java =================================================================== --- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.java (rev 0) +++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.java 2007-12-20 20:13:24 UTC (rev 5383) @@ -0,0 +1,44 @@ +/* + * 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.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * 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/wsrm") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface BasicRPCEndpoint +{ + @WebMethod + @WebResult(partName = "return") + public String echo(@WebParam(name = "arg0", partName = "arg0") String arg0); + +} Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.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/BasicRPCEndpointImpl.java =================================================================== --- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.java (rev 0) +++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.java 2007-12-20 20:13:24 UTC (rev 5383) @@ -0,0 +1,39 @@ +/* + * 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; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/wsrm", serviceName = "RMService") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class BasicRPCEndpointImpl implements BasicRPCEndpoint +{ + @WebMethod + public String echo(String input) + { + return input; + } +} Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.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/BasicRPCTestCase.java =================================================================== --- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java (rev 0) +++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java 2007-12-20 20:13:24 UTC (rev 5383) @@ -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 BasicRPCTestCase extends JBossWSTest +{ + private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-wsrm-basic-rpc"; + private String targetNS = "http://org.jboss.ws.jaxws.cxf/wsrm"; + + public static Test suite() + { + return new JBossWSTestSetup(BasicRPCTestCase.class, "jaxws-cxf-wsrm-basic-rpc.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/basic-rpc/wsrm-basic-rpc.wsdl").toURL(); + QName serviceName = new QName(targetNS, "RMService"); + + Service service = Service.create(wsdlURL, serviceName); + BasicRPCEndpoint port = (BasicRPCEndpoint)service.getPort(BasicRPCEndpoint.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/basic-rpc/wsrm-basic-rpc.wsdl").toURL(); + QName serviceName = new QName(targetNS, "RMService"); + + Service service = Service.create(wsdlURL, serviceName); + BasicRPCEndpoint port = (BasicRPCEndpoint)service.getPort(BasicRPCEndpoint.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/BasicRPCTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF (from rev 5382, stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/WEB-INF) Added: stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl (rev 0) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl 2007-12-20 20:13:24 UTC (rev 5383) @@ -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 Copied: stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF (from rev 5381, stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF) Modified: stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/jbossws-cxf.xml 2007-12-20 18:45:28 UTC (rev 5381) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml 2007-12-20 20:13:24 UTC (rev 5383) @@ -14,7 +14,7 @@ </wsrmp:RMAssertion> </wsp:Policy> - <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-reliable' implementor='org.jboss.test.ws.jaxws.cxf.reliable.RMEndpointImpl'> + <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-rpc' implementor='org.jboss.test.ws.jaxws.cxf.wsrm.BasicRPCEndpointImpl'> <jaxws:invoker> <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> </jaxws:invoker> Modified: stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/WEB-INF/web.xml 2007-12-20 18:45:28 UTC (rev 5381) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml 2007-12-20 20:13:24 UTC (rev 5383) @@ -6,12 +6,12 @@ version="2.4"> <servlet> - <servlet-name>TestService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.cxf.reliable.RMEndpointImpl</servlet-class> + <servlet-name>RMService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.cxf.wsrm.BasicRPCEndpointImpl</servlet-class> </servlet> <servlet-mapping> - <servlet-name>TestService</servlet-name> + <servlet-name>RMService</servlet-name> <url-pattern>/*</url-pattern> </servlet-mapping> Added: stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl (rev 0) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl 2007-12-20 20:13:24 UTC (rev 5383) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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:message name="echoResponse"> + <wsdl:part name="return" type="xsd:string"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="echo"> + <wsdl:part name="arg0" type="xsd:string"> + </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="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="echo"> + <soap:operation soapAction="" style="rpc"/> + <wsdl:input name="echo"> + <soap:body namespace="http://org.jboss.ws.jaxws.cxf/wsrm" use="literal"/> + </wsdl:input> + <wsdl:output name="echoResponse"> + <soap:body namespace="http://org.jboss.ws.jaxws.cxf/wsrm" 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-rpc"/> + <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Property changes on: stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: 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 2007-12-20 19:54:45 UTC (rev 5382) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/wsrm/wsrm-basic-doc.wsdl 2007-12-20 20:13:24 UTC (rev 5383) @@ -1,68 +0,0 @@ -<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