Author: alessio.soldano(a)jboss.com Date: 2010-08-11 13:46:31 -0400 (Wed, 11 Aug 2010) New Revision: 12775 Removed: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl Log: Simplifying WS-ReliableMessaging sample Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2010-08-11 10:31:26 UTC (rev 12774) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2010-08-11 17:46:31 UTC (rev 12775) @@ -96,9 +96,6 @@ <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/> </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" prefix="WEB-INF/wsdl"/> Deleted: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml 2010-08-11 10:31:26 UTC (rev 12774) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml 2010-08-11 17:46:31 UTC (rev 12775) @@ -1,36 +0,0 @@ -<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:wsp='http://www.w3.org/2006/07/ws-policy' - 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/07/ws-policy.xsd - http://cxf.apache.org/jaxws - http://cxf.apache.org/schemas/jaxws.xsd'> - - <wsp:Policy wsu:Id="wsrm10policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... - <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2006/05/addressing/wsdl"/> - <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"/> - </wsp:Policy> - - <jaxws:endpoint - id='SimpleServiceImpl' - address='http://@jboss.bind.address@:8080/jaxws-samples-wsrm' - implementor='org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl'> - <jaxws:invoker> - <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> - </jaxws:invoker> - <jaxws:features> - <p:policies> - <wsp:PolicyReference URI="#wsrm10policy" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - -</beans> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2010-08-11 10:31:26 UTC (rev 12774) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2010-08-11 17:46:31 UTC (rev 12775) @@ -1,14 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <wsdl:definitions name="SimpleService" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"> - - <wsp:UsingPolicy/> - <wsp:Policy wsu:Id="wsrm10policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... - <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2006/05/addressing/wsdl"> - <wsp:Policy/> - </wswa:UsingAddressing> - <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"/> - </wsp:Policy> - <wsdl:types> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm&quo... <xsd:element name="ping" type="tns:ping"/> @@ -54,7 +45,10 @@ </wsdl:operation> </wsdl:portType> <wsdl:binding name="SimpleServiceSoapBinding" type="tns:SimpleService"> - <wsp:PolicyReference URI="#wsrm10policy"/> + <wsp:Policy> + <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2006/05/addressing/wsdl"/> + <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"/> + </wsp:Policy> <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> <wsdl:operation name="ping"> <soap:operation soapAction="" style="document"/>