Author: richard.opalka(a)jboss.com Date: 2008-04-11 14:14:02 -0400 (Fri, 11 Apr 2008) New Revision: 6367 Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml Modified: stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java stack/metro/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl Log: [JBWS-2097] finalizing Metro WS-RM client - based on Metro WS-RM tutorial Modified: stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-11 16:41:01 UTC (rev 6366) +++ stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-11 18:14:02 UTC (rev 6367) @@ -65,7 +65,7 @@ <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/> </classes> <webinf dir="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF"> - <include name="wsrm-jaxws-endpoint-config.xml"/> + <include name="wsit-*.xml"/> </webinf> <zipfileset dir="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF/wsdl" Modified: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-11 16:41:01 UTC (rev 6366) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-11 18:14:02 UTC (rev 6367) @@ -35,7 +35,7 @@ import com.sun.xml.ws.Closeable; /** - * Reliable JBoss WebService client invoking one way methods + * Client invoking web service using WS-RM * * @author richard.opalka(a)jboss.com */ @@ -64,8 +64,7 @@ { proxy.ping(); // one way call assertEquals("Hello World!", proxy.echo("Hello World!")); // request responce call - System.out.println("FIXME: [JBWS-2097] Unlock WS-ReliableMessaging in all stacks"); - //((Closeable)proxy).close(); // TODO: uncomment this + ((Closeable)proxy).close(); } } Modified: stack/metro/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2008-04-11 16:41:01 UTC (rev 6366) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2008-04-11 18:14:02 UTC (rev 6367) @@ -1,6 +1,19 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. --> -<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" name="SimpleService" 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="http://schemas.xmlsoap.org/wsdl/"> +<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" name="SimpleService" 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="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> + <wsp:UsingPolicy/> + <wsp:Policy + wsu:Id="wsrm11policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + <wsp:All> + <wsp:ExactlyOne> + <wsp:All> + <ns1:RMAssertion xmlns:ns1="http://docs.oasis-open.org/ws-rx/wsrmp/200702"/> + <ns2:UsingAddressing xmlns:ns2="http://www.w3.org/2006/05/addressing/wsdl"/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:All> + </wsp:Policy> <types> <xsd:schema> <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" schemaLocation="SimpleService_schema1.xsd"/> @@ -25,6 +38,7 @@ </operation> </portType> <binding name="SimpleServicePortBinding" type="tns:SimpleService"> + <wsp:PolicyReference URI="#wsrm11policy"/> <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> <operation name="ping"> <soap:operation soapAction=""/> Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml 2008-04-11 18:14:02 UTC (rev 6367) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + name="SimpleService" + targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" + xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" + xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + xmlns:wsaws="http://www.w3.org/2005/08/addressing" + xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"> + <message name="ping"/> + <message name="echo"/> + <message name="echoResponse"/> + <portType name="SimpleService"> + <operation name="ping"> + <input message="tns:ping"/> + </operation> + <operation name="echo"> + <input message="tns:echo"/> + <output message="tns:echoResponse"/> + </operation> + </portType> + <binding name="SimpleServicePortBinding" type="tns:SimpleService"> + <wsp:PolicyReference URI="#wsrm11policy"/> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <operation name="ping"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + </operation> + <operation name="echo"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + </binding> + <service name="SimpleService"> + <port name="SimpleServicePort" binding="tns:SimpleServicePortBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </port> + </service> + <wsp:Policy wsu:Id="CalculatorWSPortBindingPolicy"> + <wsp:ExactlyOne> + <wsp:All> + <wsaws:UsingAddressing xmlns:wsaws="http://www.w3.org/2006/05/addressing/wsdl"/> + <wsrm:RMAssertion/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy + wsu:Id="wsrm11policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + <wsp:All> + <wsp:ExactlyOne> + <wsp:All> + <ns1:RMAssertion xmlns:ns1="http://docs.oasis-open.org/ws-rx/wsrmp/200702"/> + <ns2:UsingAddressing xmlns:ns2="http://www.w3.org/2006/05/addressing/wsdl"/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:All> + </wsp:Policy> +</definitions> Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF