Author: darran.lofthouse(a)jboss.com Date: 2006-12-17 17:04:17 -0500 (Sun, 17 Dec 2006) New Revision: 1663 Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_T/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_T/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_V/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_V/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/wrapped-mapping.xml Log: JBWS-1260 - Modified tests to remove partial unwrapping and to remove unwrapping of attributes. Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponse lookup(java.lang.String firstName, java.lang.String surname) throws + public org.jboss.test.ws.jbws1260.LookupResponse lookup(org.jboss.test.ws.jbws1260.Lookup parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -49,25 +49,15 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Lookup</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>firstName</wsdl-message-part-name> + <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>surname</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.jbws1260.LookupResponse</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(java.lang.String firstName, java.lang.String surname) throws + public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(org.jboss.test.ws.jbws1260.Person parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -49,25 +49,15 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Person</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>firstName</wsdl-message-part-name> + <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>surname</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.jbws1260.TelephoneNumber</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponse lookup(java.lang.String postcode, java.lang.String surname) throws + public org.jboss.test.ws.jbws1260.LookupResponse lookup(org.jboss.test.ws.jbws1260.Lookup parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -49,25 +49,15 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Lookup</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>surname</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.jbws1260.LookupResponse</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(java.lang.String postcode, java.lang.String surname) throws + public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(org.jboss.test.ws.jbws1260.Person parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -49,25 +49,15 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Person</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>surname</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.jbws1260.TelephoneNumber</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponse lookup(java.lang.String postcode, java.lang.String[] surname) throws + public org.jboss.test.ws.jbws1260.LookupResponse lookup(org.jboss.test.ws.jbws1260.Lookup parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -34,19 +34,16 @@ <xml-element-name>number</xml-element-name> </variable-mapping> </java-xml-type-mapping> - - <!-- Anonymous wrapping of arrays not required for JBossWS --> - <!--java-xml-type-mapping> + <java-xml-type-mapping> <java-type>java.lang.String[]</java-type> <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... <qname-scope>complexType</qname-scope> - </java-xml-type-mapping--> - <!--java-xml-type-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> <java-type>java.lang.String[]</java-type> <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... <qname-scope>complexType</qname-scope> - </java-xml-type-mapping--> - + </java-xml-type-mapping> <service-interface-mapping> <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceN... @@ -62,25 +59,15 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Lookup</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.String[]</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>surname</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.jbws1260.LookupResponse</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(java.lang.String postcode, java.lang.String[] surname) throws + public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(org.jboss.test.ws.jbws1260.Person parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -34,19 +34,16 @@ <xml-element-name>number</xml-element-name> </variable-mapping> </java-xml-type-mapping> - - <!-- Anonymous wrapping of arrays not required for JBossWS --> - <!--java-xml-type-mapping> + <java-xml-type-mapping> <java-type>java.lang.String[]</java-type> <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:Person&am... <qname-scope>complexType</qname-scope> - </java-xml-type-mapping--> - <!--java-xml-type-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> <java-type>java.lang.String[]</java-type> <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:Telephone... <qname-scope>complexType</qname-scope> - </java-xml-type-mapping--> - + </java-xml-type-mapping> <service-interface-mapping> <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceN... @@ -62,25 +59,15 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Person</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.String[]</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>surname</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.jbws1260.TelephoneNumber</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public java.lang.String lookup(java.lang.String postcode) throws + public org.jboss.test.ws.jbws1260.LookupResponse lookup(org.jboss.test.ws.jbws1260.Lookup parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -41,20 +41,19 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Lookup</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <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>java.lang.String</method-return-value> + <method-return-value>org.jboss.test.ws.jbws1260.LookupResponse</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> </service-endpoint-interface-mapping> Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_T/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_T/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_T/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public java.lang.String lookup(java.lang.String postcode) throws + public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(org.jboss.test.ws.jbws1260.Person parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_T/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_T/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_T/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -41,20 +41,19 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Person</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <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>java.lang.String</method-return-value> + <method-return-value>org.jboss.test.ws.jbws1260.TelephoneNumber</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> </service-endpoint-interface-mapping> Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_V/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_V/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_V/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public java.lang.String lookup(java.lang.String postcode) throws + public org.jboss.test.ws.jbws1260.LookupResponse lookup(org.jboss.test.ws.jbws1260.Lookup parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_V/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_V/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_V/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -41,20 +41,19 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Lookup</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <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>java.lang.String</method-return-value> + <method-return-value>org.jboss.test.ws.jbws1260.LookupResponse</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> </service-endpoint-interface-mapping> Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public java.lang.String lookup(java.lang.String postcode) throws + public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(org.jboss.test.ws.jbws1260.Person parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -41,20 +41,19 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Person</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <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>java.lang.String</method-return-value> + <method-return-value>org.jboss.test.ws.jbws1260.TelephoneNumber</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> </service-endpoint-interface-mapping>