Author: jason.greene(a)jboss.com Date: 2006-10-16 23:11:31 -0400 (Mon, 16 Oct 2006) New Revision: 1232 Modified: trunk/src/test/resources/jaxrpc/jbws1125/WEB-INF/jaxrpc-mapping.xml trunk/src/test/resources/jaxrpc/jbws1125/WEB-INF/wsdl/TestService.wsdl trunk/src/test/resources/jaxrpc/jbws1125/wstools-config.xml Log: Correct test case Modified: trunk/src/test/resources/jaxrpc/jbws1125/WEB-INF/jaxrpc-mapping.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws1125/WEB-INF/jaxrpc-mapping.xml 2006-10-16 21:51:49 UTC (rev 1231) +++ trunk/src/test/resources/jaxrpc/jbws1125/WEB-INF/jaxrpc-mapping.xml 2006-10-17 03:11:31 UTC (rev 1232) @@ -3,34 +3,6 @@ <package-type>org.jboss.test.ws.jaxrpc.jbws1125</package-type> <namespaceURI>http://jbws1125.jaxrpc.ws.test.jboss.org/jaws/types</n... </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws1125.TestEndpoint_noParamPart_RequestStruct</java-type> - <root-type-qname xmlns:typeNS='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws/types'... - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws1125.TestEndpoint_noParamPart_ResponseStruct</java-type> - <root-type-qname xmlns:typeNS='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws/types'... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>result</java-variable-name> - <xml-element-name>result</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws1125.TestEndpoint_noReturnPart_RequestStruct</java-type> - <root-type-qname xmlns:typeNS='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws/types'... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>string_1</java-variable-name> - <xml-element-name>String_1</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws1125.TestEndpoint_noReturnPart_ResponseStruct</java-type> - <root-type-qname xmlns:typeNS='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws/types'... - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> <service-interface-mapping> <service-interface>org.jboss.test.ws.jaxrpc.jbws1125.TestService</service-interface> <wsdl-service-name xmlns:serviceNS='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws'&g... @@ -46,23 +18,21 @@ <service-endpoint-method-mapping> <java-method-name>noParamPart</java-method-name> <wsdl-operation>noParamPart</wsdl-operation> - <wrapped-element/> <wsdl-return-value-mapping> <method-return-value>java.lang.String</method-return-value> <wsdl-message xmlns:wsdlMsgNS='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws'&g... - <wsdl-message-part-name>result</wsdl-message-part-name> + <wsdl-message-part-name>noParamPartResponse</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> <service-endpoint-method-mapping> <java-method-name>noReturnPart</java-method-name> <wsdl-operation>noReturnPart</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> <param-type>java.lang.String</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws'&g... - <wsdl-message-part-name>String_1</wsdl-message-part-name> + <wsdl-message-part-name>noReturnPart</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> Modified: trunk/src/test/resources/jaxrpc/jbws1125/WEB-INF/wsdl/TestService.wsdl =================================================================== --- trunk/src/test/resources/jaxrpc/jbws1125/WEB-INF/wsdl/TestService.wsdl 2006-10-16 21:51:49 UTC (rev 1231) +++ trunk/src/test/resources/jaxrpc/jbws1125/WEB-INF/wsdl/TestService.wsdl 2006-10-17 03:11:31 UTC (rev 1232) @@ -2,54 +2,24 @@ <definitions name='TestService' targetNamespace='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> <types> <schema targetNamespace='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws/types&... xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://jbws1125.jaxrpc.ws.test.jboss.org/jaws/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <complexType name='noParamPart'> - <sequence/> - </complexType> - <complexType name='noParamPartResponse'> - <sequence> - <element name='result' nillable='true' type='string'/> - </sequence> - </complexType> - <complexType name='noReturnPart'> - <sequence> - <element name='String_1' nillable='true' type='string'/> - </sequence> - </complexType> - <complexType name='noReturnPartResponse'> - <sequence/> - </complexType> - <element name='noParamPart' type='tns:noParamPart'/> - <element name='noParamPartResponse' type='tns:noParamPartResponse'/> - <element name='noReturnPart' type='tns:noReturnPart'/> - <element name='noReturnPartResponse' type='tns:noReturnPartResponse'/> + <element name='noParamPartResponse' type='string'/> + <element name='noReturnPart' type='string'/> </schema> </types> - - <!-- - BP-1.0 5.3.1 Bindings and Parts - Use of wsdl:message elements with zero parts is permitted in Document styles to permit operations - that can send or receive messages with empty soap:Bodys. - --> - <message name='TestEndpoint_noParamPart'> - <!-- part element='ns1:noParamPart' name='parameters'/ --> - </message> + <message name='TestEndpoint_noParamPart'/> <message name='TestEndpoint_noParamPartResponse'> - <part element='ns1:noParamPartResponse' name='result'/> + <part element='ns1:noParamPartResponse' name='noParamPartResponse'/> </message> - <message name='TestEndpoint_noReturnPart'> - <part element='ns1:noReturnPart' name='parameters'/> + <part element='ns1:noReturnPart' name='noReturnPart'/> </message> - <message name='TestEndpoint_noReturnPartResponse'> - <!-- part element='ns1:noReturnPartResponse' name='result'/ --> - </message> - + <message name='TestEndpoint_noReturnPartResponse'/> <portType name='TestEndpoint'> <operation name='noParamPart'> <input message='tns:TestEndpoint_noParamPart'/> <output message='tns:TestEndpoint_noParamPartResponse'/> </operation> - <operation name='noReturnPart'> + <operation name='noReturnPart' parameterOrder='noReturnPart'> <input message='tns:TestEndpoint_noReturnPart'/> <output message='tns:TestEndpoint_noReturnPartResponse'/> </operation> @@ -80,4 +50,4 @@ <soap:address location='REPLACE_WITH_ACTUAL_URL'/> </port> </service> -</definitions> \ No newline at end of file +</definitions> Modified: trunk/src/test/resources/jaxrpc/jbws1125/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws1125/wstools-config.xml 2006-10-16 21:51:49 UTC (rev 1231) +++ trunk/src/test/resources/jaxrpc/jbws1125/wstools-config.xml 2006-10-17 03:11:31 UTC (rev 1232) @@ -7,7 +7,7 @@ <configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> <java-wsdl> - <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1125.TestEndpoint" style="document"> + <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1125.TestEndpoint" style="document" parameter-style="bare"> </service> <namespaces target-namespace="http://jbws1125.jaxrpc.ws.test.jboss.org/jaws" type-namespace="http://jbws1125.jaxrpc.ws.test.jboss.org/jaws/types&... <mapping file="jaxrpc-mapping.xml"/>