Author: darran.lofthouse(a)jboss.com Date: 2008-11-12 11:54:18 -0500 (Wed, 12 Nov 2008) New Revision: 8712 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1079/anonymous-mapping.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml Log: [JBWS-2389] WSDL To Java - Anonymous types nested within anonymous types generated JAX-RPC mapping does not match generated source. Correct <anonymous-type-qname> entries for a couple of tests in the testsuite. Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1079/anonymous-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1079/anonymous-mapping.xml 2008-11-12 15:42:46 UTC (rev 8711) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1079/anonymous-mapping.xml 2008-11-12 16:54:18 UTC (rev 8712) @@ -1,77 +1,76 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1079</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1079</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1079</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1079/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1079/types:&gt;T... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1079/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1079/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1079.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1079">serviceN... - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1079.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1079">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1079">bindingN... - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1079.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1079">wsdlMsgN... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1079.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1079">wsdlMsgN... - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1079</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1079/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1079</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1079</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1079.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1079.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1079.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1079.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1079'>serviceNS:... + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1079.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1079'>portTypeN... + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1079'>bindingNS:... + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1079.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1079'>wsdlMsgNS:... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1079.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1079'>wsdlMsgNS:... + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2008-11-12 15:42:46 UTC (rev 8711) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2008-11-12 16:54:18 UTC (rev 8712) @@ -18,7 +18,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jbws1873.LookupRequest</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:... + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>surname</java-variable-name> @@ -36,7 +36,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jbws1873.LookupResponseResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:... + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>number</java-variable-name>