[jbossws-commits] JBossWS SVN: r1880 - in trunk: jbossws-core/src/main/java/org/jboss/ws/tools and 44 other directories.

Author: darran.lofthouse(a)jboss.com Date: 2007-01-09 17:48:54 -0500 (Tue, 09 Jan 2007) New Revision: 1880 Added: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1260/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java trunk/jbossws-tests/src/main/resources/tools/jbws1079/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1079/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1079/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Telephone.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Title.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Name.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Telephone.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Name.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Telephone.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/wstools-config.xml Removed: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java trunk/jbossws-tests/src/main/resources/tools/jbws1079/TelephoneNumberNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Telephone.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Title.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/LookupName.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/LookupResponseNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Name.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Telephone.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Name.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Telephone.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Wrapped.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/wrapped-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/wstools-config.xml Modified: trunk/ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/WSToolsTest.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java trunk/jbossws-tests/src/main/resources/tools/jbws1079/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1079/anonymous-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1253/myporttype-mapping.xml Log: JBWS-1260 - wsdl to Java, Parameter unwrapping. Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - clipboard.xml output output-eclipse thirdparty ant.properties version.properties.md5 clipboard.txt .settings + clipboard.xml output output-eclipse thirdparty ant.properties version.properties.md5 clipboard.txt .settings .metadata Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,24 +1,24 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.tools; import java.io.File; @@ -58,6 +58,7 @@ import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; +import org.jboss.ws.tools.helpers.ReturnTypeUnwrapper; import org.jboss.ws.tools.interfaces.WSDLToJavaIntf; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.w3c.dom.Element; @@ -95,7 +96,7 @@ //Feature Set protected boolean annotate = false; - protected Map<String,String> namespacePackageMap = null; + protected Map<String, String> namespacePackageMap = null; //private String wsdlStyle = Constants.RPC_LITERAL; @@ -125,39 +126,39 @@ /* (non-Javadoc) * @see org.jboss.ws.tools.WSDLToJavaIntf#getFeature(java.lang.String) */ - public boolean getFeature( String name) + public boolean getFeature(String name) { - if(name == null) + if (name == null) throw new IllegalArgumentException("Illegal null argument:name"); - if(name.equalsIgnoreCase(WSToolsConstants.WSTOOLS_FEATURE_USE_ANNOTATIONS)) - return annotate ; + if (name.equalsIgnoreCase(WSToolsConstants.WSTOOLS_FEATURE_USE_ANNOTATIONS)) + return annotate; - throw new WSException("Feature:"+ name + " not recognized"); + throw new WSException("Feature:" + name + " not recognized"); } /* (non-Javadoc) * @see org.jboss.ws.tools.WSDLToJavaIntf#setFeature(java.lang.String, boolean) */ - public void setFeature( String name, boolean value) + public void setFeature(String name, boolean value) { - if(name == null) + if (name == null) throw new IllegalArgumentException("Illegal null argument:name"); - if(name.equalsIgnoreCase(WSToolsConstants.WSTOOLS_FEATURE_USE_ANNOTATIONS)) - annotate = value; + if (name.equalsIgnoreCase(WSToolsConstants.WSTOOLS_FEATURE_USE_ANNOTATIONS)) + annotate = value; } /* (non-Javadoc) * @see org.jboss.ws.tools.WSDLToJavaIntf#generateSEI(java.net.URL, java.io.File, boolean) */ - public void generateSEI( URL wsdlFile, File dir, boolean annotate) throws IOException + public void generateSEI(URL wsdlFile, File dir, boolean annotate) throws IOException { checkTypeMapping(); - WSDLDefinitions wsdl = convertWSDL2Java( wsdlFile); + WSDLDefinitions wsdl = convertWSDL2Java(wsdlFile); this.annotate = annotate; this.directoryToGenerate = dir.getAbsolutePath(); - generateSEI( wsdl, dir); + generateSEI(wsdl, dir); } /* (non-Javadoc) @@ -170,15 +171,14 @@ this.wsdl = wsdl; style = utils.getWSDLStyle(wsdl); - //TODO: Handle annotations flag, as per JAX-WS 2.0 Spec. //Given the WSDL Object Tree, generate the SEI //Also take in the location where the SEI should be written - // String typeNS = wsdl.getNamespaceURI(WSDLConstants.PREFIX_TNS); + // String typeNS = wsdl.getNamespaceURI(WSDLConstants.PREFIX_TNS); String targetNS = wsdl.getTargetNamespace(); //Check if there is an user override - String packageName = namespacePackageMap != null?namespacePackageMap.get(targetNS):null; - if(packageName == null || packageName.length() == 0) + String packageName = namespacePackageMap != null ? namespacePackageMap.get(targetNS) : null; + if (packageName == null || packageName.length() == 0) packageName = NamespacePackageMapping.getJavaPackageName(targetNS); this.seiPkgName = packageName; @@ -188,7 +188,6 @@ //xsdJava.generateJavaSource(wsdl.getTypes().getSchemaModel(), dir, packageName, true); } - public Map<String, String> getNamespacePackageMap() { return namespacePackageMap; @@ -199,15 +198,16 @@ */ public void setNamespacePackageMap(Map<String, String> map) { - //Lets convert the package->namespace map to namespace->package map - Set keys = map.keySet(); - Iterator<String> iter = keys.iterator(); - while(iter != null && iter.hasNext()) - { - if(namespacePackageMap == null) namespacePackageMap = new HashMap<String,String>(); - String pkg = iter.next(); - namespacePackageMap.put(map.get(pkg),pkg); - } + //Lets convert the package->namespace map to namespace->package map + Set keys = map.keySet(); + Iterator<String> iter = keys.iterator(); + while (iter != null && iter.hasNext()) + { + if (namespacePackageMap == null) + namespacePackageMap = new HashMap<String, String>(); + String pkg = iter.next(); + namespacePackageMap.put(map.get(pkg), pkg); + } } public void setTypeMapping(LiteralTypeMapping tm) @@ -229,7 +229,7 @@ public boolean unwrap() { - if (! Constants.DOCUMENT_LITERAL.equals(style)) + if (!Constants.DOCUMENT_LITERAL.equals(style)) { XSElementDeclaration unwrapped = SchemaUtils.unwrapArrayType(xt); StringBuilder builder = new StringBuilder(); @@ -252,7 +252,6 @@ } } - //*************************************************************************** // PRIVATE METHODS //*************************************************************************** @@ -261,113 +260,12 @@ { return Constants.DOCUMENT_LITERAL.equals(style); } - + private boolean isWrapped() { return "wrapped".equals(parameterStyle) && Constants.DOCUMENT_LITERAL.equals(style); } - private void unwrapRequest(StringBuilder buf, XSTypeDefinition xt) throws IOException - { - if (xt instanceof XSComplexTypeDefinition == false) - throw new WSException("Tried to unwrap a non-complex type."); - - XSComplexTypeDefinition wrapper = (XSComplexTypeDefinition)xt; - XSParticle particle = wrapper.getParticle(); - if (particle == null) - throw new WSException("Attempt to unwrap a request type with no particles"); - XSTerm term = particle.getTerm(); - if (term instanceof XSModelGroup == false) - throw new WSException("Expected model group, could not unwrap"); - unwrapRequestParticles(buf, (XSModelGroup)term); - - // We need a wrapper class generated - generateJavaSource(wrapper, WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()), wrapper.getName()); - } - - private int unwrapRequestParticles(StringBuilder buf, XSModelGroup group) throws IOException - { - if (group.getCompositor() != XSModelGroup.COMPOSITOR_SEQUENCE) - throw new WSException("Only a sequence type can be unwrapped."); - - int elementCount = 0; - XSObjectList particles = group.getParticles(); - for (int i = 0; i < particles.getLength(); i++) - { - XSParticle particle = (XSParticle) particles.item(i); - XSTerm term = particle.getTerm(); - if (term instanceof XSModelGroup) - { - elementCount += unwrapRequestParticles(buf, (XSModelGroup)term); - } - else if (term instanceof XSElementDeclaration) - { - if (elementCount++ > 0) - buf.append(", "); - XSElementDeclaration element = (XSElementDeclaration)term; - QName xmlName = new QName(element.getNamespace(), element.getName()); - QName xmlType = new QName(element.getTypeDefinition().getNamespace(), element.getTypeDefinition().getName()); - JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); - boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs() > 1; - generateParameter(buf, xmlName, xmlType, xsmodel, element.getTypeDefinition(), array, !element.getNillable(), false); - buf.append(" ").append(getMethodParam(xmlName)); - } - } - - return elementCount; - } - - private String unwrapResponse(XSTypeDefinition xt) throws IOException - { - if (xt instanceof XSComplexTypeDefinition == false) - throw new WSException("Tried to unwrap a non-complex type."); - - XSComplexTypeDefinition wrapper = (XSComplexTypeDefinition)xt; - XSParticle particle = wrapper.getParticle(); - if (particle == null) - throw new WSException("Attempt to unwrap a response type with no particles"); - XSTerm term = particle.getTerm(); - if (term instanceof XSModelGroup == false) - throw new WSException("Expected model group, could not unwrap"); - String returnType = unwrapResponseParticles((XSModelGroup)term); - // We need a wrapper class generated - generateJavaSource(wrapper, WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()), wrapper.getName()); - return returnType; - } - - private String unwrapResponseParticles(XSModelGroup group) throws IOException - { - if (group.getCompositor() != XSModelGroup.COMPOSITOR_SEQUENCE) - throw new WSException("Only a sequence type can be unwrapped."); - - XSObjectList particles = group.getParticles(); - String returnType = null; - for (int i = 0; i < particles.getLength(); i++) - { - XSParticle particle = (XSParticle) particles.item(i); - XSTerm term = particle.getTerm(); - if (term instanceof XSModelGroup) - { - returnType = unwrapResponseParticles((XSModelGroup)term); - if (returnType != null) - return returnType; - } - else if (term instanceof XSElementDeclaration) - { - XSElementDeclaration element = (XSElementDeclaration)term; - QName xmlName = new QName(element.getNamespace(), element.getName()); - QName xmlType = new QName(element.getTypeDefinition().getNamespace(), element.getTypeDefinition().getName()); - JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); - boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs() > 1; - StringBuilder buf = new StringBuilder(); - generateParameter(buf, xmlName, xmlType, xsmodel, element.getTypeDefinition(), array, !element.getNillable(), false); - return buf.toString(); - } - } - - return null; - } - private void appendMethods(WSDLInterface intf, StringBuilder buf) throws IOException { buf.append(newline); @@ -377,7 +275,6 @@ throw new IllegalArgumentException("Interface " + itfname + " doesn't have operations"); int len = ops != null ? ops.length : 0; - // FIXME - Add support for headers for (int i = 0; i < len; i++) { @@ -402,7 +299,7 @@ returnType = "void"; buf.append(" public " + returnType + " "); - buf.append(ToolsUtils.firstLetterLowerCase(op.getName().toString()) ); + buf.append(ToolsUtils.firstLetterLowerCase(op.getName().toString())); buf.append("(").append(paramBuffer); buf.append(") throws "); @@ -419,12 +316,12 @@ QName faultXMLName = intfFault.getElement(); QName faultXMLType = intfFault.getXmlType(); - XSElementDeclaration xe = xsmodel.getElementDeclaration(faultXMLName.getLocalPart(),faultXMLName.getNamespaceURI()); - XSTypeDefinition xt = xe.getTypeDefinition(); - if (! xt.getAnonymous()) + XSElementDeclaration xe = xsmodel.getElementDeclaration(faultXMLName.getLocalPart(), faultXMLName.getNamespaceURI()); + XSTypeDefinition xt = xe.getTypeDefinition(); + if (!xt.getAnonymous()) xt = xsmodel.getTypeDefinition(xt.getName(), xt.getNamespace()); - if(xt instanceof XSComplexTypeDefinition) - generateJavaSource((XSComplexTypeDefinition)xt,xsmodel, faultXMLName.getLocalPart(), true); + if (xt instanceof XSComplexTypeDefinition) + generateJavaSource((XSComplexTypeDefinition)xt, xsmodel, faultXMLName.getLocalPart(), true); Class cl = getJavaType(faultXMLType, false); if (cl == null) @@ -432,9 +329,8 @@ String faultTypeName = (!xt.getAnonymous()) ? faultXMLType.getLocalPart() : faultXMLName.getLocalPart(); buf.append(seiPkgName + "." + cleanUpFaultName(faultTypeName)); } - else - buf.append( cl.getName()); - buf.append( "," ); + else buf.append(cl.getName()); + buf.append(","); } buf.append(" java.rmi.RemoteException"); buf.append(";"); @@ -453,17 +349,16 @@ if (first) first = false; - else - paramBuffer.append(", "); + else paramBuffer.append(", "); QName xmlName = new QName(part.getName()); QName xmlType = part.getType(); JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); - XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); + XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); boolean holder = output != null && output.getChildPart(part.getName()) != null; - generateParameter(paramBuffer, xmlName, xmlType, xsmodel, xt, false, true, holder); - paramBuffer.append(" ").append(getMethodParam(xmlName)); + generateParameter(paramBuffer, xmlName.getLocalPart(), xmlType, xsmodel, xt, false, true, holder); + paramBuffer.append(" ").append(getMethodParam(xmlName.getLocalPart())); } if (signature.returnParameter() != null) @@ -471,7 +366,7 @@ QName xmlName = new QName(signature.returnParameter().getName()); QName xmlType = signature.returnParameter().getType(); JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); - XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); + XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); returnType = getReturnType(xmlName, xmlType, xt); } @@ -487,40 +382,153 @@ QName xmlName = input.getElement(); QName xmlType = input.getXMLType(); JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); - XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); + XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); - if (isWrapped()) - { - unwrapRequest(paramBuffer, xt); - } - else - { - holder = output != null && xmlName.equals(output.getElement()); - generateParameter(paramBuffer, xmlName, xmlType, xsmodel, xt, false, true, holder); - paramBuffer.append(" ").append(getMethodParam(xmlName)); - } + appendParameters(paramBuffer, input, output, xmlName.getLocalPart()); } if (!holder && output != null && output.getElement() != null) { QName xmlName = output.getElement(); QName xmlType = output.getXMLType(); JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); - XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); + XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); - if (isWrapped()) + returnType = getReturnType(xmlName, xmlType, xt); + } + + return returnType; + } + + private void appendParameters(StringBuilder buf, WSDLInterfaceOperationInput in, WSDLInterfaceOperationOutput output, String containingElement) throws IOException + { + + QName xmlType = in.getXMLType(); + JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); + XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); + + boolean wrapped = isWrapped(); + + if (wrapped) + { + int inputs = in.getWsdlOperation().getInputs().length; + if (inputs > 1) + throw new WSException("Can not unwrap parameters for operation with mutliple inputs. inputs=" + inputs); + + String operationName = in.getWsdlOperation().getName().toString(); + String elementName = in.getElement().getLocalPart(); + + if (elementName.equals(operationName) == false) + throw new WSException("Unable to unwrap parameters, wrapper element name must match operation name. operationName=" + operationName + " elementName=" + + elementName); + + wrapped = unwrapElementParameters(buf, containingElement, xt); + } + + if (wrapped == false) + { + QName xmlName = in.getElement(); + boolean holder = output != null && xmlName.equals(output.getElement()); + generateParameter(buf, containingElement, xmlType, xsmodel, xt, false, true, holder); + buf.append(" ").append(getMethodParam(containingElement)); + } + + } + + private boolean unwrapElementParameters(StringBuilder buf, String containingElement, XSTypeDefinition xt) throws IOException + { + // If at any point parameter unwrapping can not happen return false so we drop back to not unwrapping. + + if (xt instanceof XSComplexTypeDefinition == false) + return false; + + StringBuilder tempBuf = new StringBuilder(); + XSComplexTypeDefinition wrapper = (XSComplexTypeDefinition)xt; + + boolean hasAttributes = wrapper.getAttributeUses().getLength() > 0; + if (hasAttributes) + throw new WSException("Can not unwrap, complex type contains attributes."); + + boolean unwrappedElement = false; + + XSParticle particle = wrapper.getParticle(); + if (particle == null) + { + unwrappedElement = true; + } + else + { + XSTerm term = particle.getTerm(); + if (term instanceof XSModelGroup) { - returnType = unwrapResponse(xt); + unwrappedElement = unwrapGroup(tempBuf, containingElement, (XSModelGroup)term); } - else + } + + if (unwrappedElement) + { + buf.append(tempBuf); + + // We need a wrapper class generated + generateJavaSource(wrapper, WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()), containingElement); + + return true; + } + + return false; + } + + public boolean unwrapGroup(StringBuilder buf, String containingElement, XSModelGroup group) throws IOException + { + if (group.getCompositor() != XSModelGroup.COMPOSITOR_SEQUENCE) + return false; + + XSObjectList particles = group.getParticles(); + for (int i = 0; i < particles.getLength(); i++) + { + XSParticle particle = (XSParticle)particles.item(i); + XSTerm term = particle.getTerm(); + if (term instanceof XSModelGroup) { - returnType = getReturnType(xmlName, xmlType, xt); + if (unwrapGroup(buf, containingElement, (XSModelGroup)term) == false) + return false; } + else if (term instanceof XSElementDeclaration) + { + if (buf.length() > 0) + buf.append(", "); + + XSElementDeclaration element = (XSElementDeclaration)term; + XSTypeDefinition type = element.getTypeDefinition(); + String tempContainingElement = containingElement + element.getName(); + + QName xmlType = null; + if (type.getAnonymous() == false) + xmlType = new QName(type.getNamespace(), type.getName()); + + JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); + boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs() > 1; + generateParameter(buf, tempContainingElement, xmlType, xsmodel, type, array, !element.getNillable(), false); + + String paramName; + if (type.getAnonymous()) + { + paramName = containingElement; + } + else + { + paramName = element.getName(); + } + + buf.append(" ").append(getMethodParam(paramName)); + } } - return returnType; + // If we reach here we must have successfully unwrapped the parameters. + return true; } - private void generateParameter(StringBuilder buf, QName xmlName, QName xmlType, JBossXSModel xsmodel, XSTypeDefinition xt, boolean array, boolean primitive, boolean holder) throws IOException + private void generateParameter(StringBuilder buf, String containingElement, QName xmlType, JBossXSModel xsmodel, XSTypeDefinition xt, boolean array, + boolean primitive, boolean holder) throws IOException { WrappedArray wrappedArray = new WrappedArray(xt); String arraySuffix = (array) ? "[]" : ""; @@ -533,12 +541,14 @@ } if (xt instanceof XSSimpleTypeDefinition) - xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition) xt); + xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); - Class cl = getJavaType(xmlType, primitive); - //Class cl = typeMapping.getJavaType(inqname,true); + Class cl = null; - if(cl != null) + if (xmlType != null) + cl = getJavaType(xmlType, primitive); + + if (cl != null) { if (holder) cl = utils.getHolder(cl); @@ -547,15 +557,23 @@ } else { - //buf.append(inqname.getLocalPart() + " " + inqname.getLocalPart().toLowerCase()); - String className = xmlType.getLocalPart(); + String className; + if (xt == null || xt.getAnonymous()) + { + className = containingElement; + } + else + { + className = xmlType.getLocalPart(); + } + if (className.charAt(0) == '>') className = className.substring(1); className = utils.firstLetterUpperCase(className); buf.append(seiPkgName + "." + className + arraySuffix); - if(xt instanceof XSComplexTypeDefinition) - generateJavaSource((XSComplexTypeDefinition)xt, xsmodel, xmlName.getLocalPart()); + if (xt instanceof XSComplexTypeDefinition) + generateJavaSource((XSComplexTypeDefinition)xt, xsmodel, containingElement); } } @@ -610,14 +628,35 @@ private String getReturnType(QName xmlName, QName xmlType, XSTypeDefinition xt) throws IOException { + String containingElement = xmlName.getLocalPart(); + String arraySuffix = ""; + JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); + xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); - if (isWrapped()) - return unwrapResponse(xt); + ReturnTypeUnwrapper unwrapper = new ReturnTypeUnwrapper(xmlType, xsmodel, isWrapped()); + if (unwrapper.unwrap()) + { + // Need to generate wrapper class as well. + if (xt instanceof XSComplexTypeDefinition) + generateJavaSource((XSComplexTypeDefinition)xt, xsmodel, containingElement); + if (unwrapper.unwrappedElement != null) + { + xt = unwrapper.unwrappedElement.getTypeDefinition(); + + if (unwrapper.xmlType != null) + xmlType = unwrapper.xmlType; + + containingElement = containingElement + unwrapper.unwrappedElement.getName(); + + if (unwrapper.array) + arraySuffix = "[]"; + } + } + boolean primitive = true; WrappedArray wrappedArray = new WrappedArray(xt); - String arraySuffix = ""; if (wrappedArray.unwrap()) { xt = wrappedArray.xt; @@ -627,25 +666,34 @@ } if (xt instanceof XSSimpleTypeDefinition) - xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition) xt); + xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); Class cls = getJavaType(xmlType, primitive); - if(xt instanceof XSComplexTypeDefinition) - generateJavaSource((XSComplexTypeDefinition)xt, xsmodel, xmlName.getLocalPart()); + if (xt instanceof XSComplexTypeDefinition) + generateJavaSource((XSComplexTypeDefinition)xt, xsmodel, containingElement); - if(cls == null) + if (cls == null) { - String className = xmlType.getLocalPart(); + String className; + if (xt.getAnonymous() == true) + { + className = containingElement; + } + else + { + className = xmlType.getLocalPart(); + } + if (className.charAt(0) == '>') className = className.substring(1); className = utils.firstLetterUpperCase(className); return seiPkgName + "." + className + arraySuffix; } - if(cls.isArray()) + + if (cls.isArray()) return JavaUtils.getSourceName(cls); - - return cls.getName() + arraySuffix; + return cls.getName() + arraySuffix; } /** @@ -677,7 +725,7 @@ private void checkTypeMapping() { - if(typeMapping == null) + if (typeMapping == null) throw new WSException("TypeMapping has not been set."); } @@ -688,20 +736,19 @@ * Special case - when qname=xsd:anyType && cls == Element * then cls has to be javax.xml.soap.SOAPElement */ - if( qname.getNamespaceURI().equals(Constants.NS_SCHEMA_XSD) - && "anyType".equals(qname.getLocalPart()) && cls == Element.class) + if (qname.getNamespaceURI().equals(Constants.NS_SCHEMA_XSD) && "anyType".equals(qname.getLocalPart()) && cls == Element.class) cls = SOAPElement.class; return cls; } - private String getMethodParam(QName qn) + private String getMethodParam(String containingElement) { - return ToolsUtils.firstLetterLowerCase(qn.getLocalPart()); + return ToolsUtils.firstLetterLowerCase(containingElement); } private File getLocationForJavaGeneration() { - return new File( this.directoryToGenerate + "/" + seiPkgName.replace(".","/")); + return new File(this.directoryToGenerate + "/" + seiPkgName.replace(".", "/")); } private void generateJavaSource(XSComplexTypeDefinition xt, JBossXSModel xsmodel, String containingElement) throws IOException Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,24 +1,24 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.tools; import java.beans.Introspector; @@ -67,6 +67,7 @@ protected JavaWriter jwriter = new JavaWriter(); //Additional variables + protected String containingElement = ""; protected String fname = ""; protected File loc = null; protected String pkgname = ""; @@ -78,46 +79,43 @@ * obtained from the base class go into the generated constructor alone and * not as accessors */ - private Map<String,List> typeNameToBaseVARList = new HashMap<String,List>(); + private Map<String, List> typeNameToBaseVARList = new HashMap<String, List>(); public XSDTypeToJava() { } - public void createJavaFile(XSComplexTypeDefinition type, File loc, - String pkgname, XSModel schema) - throws IOException + public void createJavaFile(XSComplexTypeDefinition type, File loc, String pkgname, XSModel schema) throws IOException { - if(typeMapping == null) + if (typeMapping == null) throw new WSException("TypeMapping has not been set"); this.fname = type.getName(); - if (fname == null) throw new WSException("File Name is null"); + if (fname == null) + throw new WSException("File Name is null"); this.loc = loc; this.pkgname = pkgname; createJavaFile(type, schema, false); } - public void createJavaFile(XSComplexTypeDefinition type, String filename, File loc, - String pkgname, XSModel schema, boolean isExceptionType) - throws IOException + public void createJavaFile(XSComplexTypeDefinition type, String containingElement, File loc, String pkgname, XSModel schema, boolean isExceptionType) + throws IOException { - if(typeMapping == null) + if (typeMapping == null) throw new WSException("TypeMapping has not been set"); this.fname = type.getName(); + this.containingElement = containingElement; if (fname == null) - fname = filename; + fname = containingElement; this.loc = loc; this.pkgname = pkgname; - createJavaFile(type, schema,isExceptionType ); + createJavaFile(type, schema, isExceptionType); } - public void createJavaFile(XSSimpleTypeDefinition type, File loc, - String pkgname, XSModel schema) - throws IOException + public void createJavaFile(XSSimpleTypeDefinition type, File loc, String pkgname, XSModel schema) throws IOException { - if(typeMapping == null) + if (typeMapping == null) throw new WSException("TypeMapping has not been set"); this.fname = type.getName(); this.loc = loc; @@ -126,11 +124,9 @@ createJavaFile(type, schema); } - - public void createJavaFile(XSComplexTypeDefinition type, XSModel schema, boolean isExceptionType) - throws IOException + public void createJavaFile(XSComplexTypeDefinition type, XSModel schema, boolean isExceptionType) throws IOException { - if(typeMapping == null) + if (typeMapping == null) throw new WSException("TypeMapping has not been set"); XSTypeDefinition baseType = type.getBaseType(); //Ensure that the first character is uppercase @@ -145,24 +141,21 @@ generatedFiles.add(baseName); String pushName = fname; fname = baseName; - this.createJavaFile((XSComplexTypeDefinition) baseType, schema, isExceptionType); + this.createJavaFile((XSComplexTypeDefinition)baseType, schema, isExceptionType); fname = pushName; } } - vars = this.getVARList(type, schema, isExceptionType); + vars = this.getVARList(type, schema, isExceptionType); if (baseName == null && isExceptionType) baseName = "Exception"; - jwriter.createJavaFile(loc, fname, pkgname, vars, null, - baseName, isExceptionType, typeNameToBaseVARList); + jwriter.createJavaFile(loc, fname, pkgname, vars, null, baseName, isExceptionType, typeNameToBaseVARList); } - - public void createJavaFile(XSSimpleTypeDefinition xsSimple, XSModel schema) - throws IOException + public void createJavaFile(XSSimpleTypeDefinition xsSimple, XSModel schema) throws IOException { - if(typeMapping == null) + if (typeMapping == null) throw new WSException("TypeMapping has not been set"); XSTypeDefinition baseType = xsSimple.getBaseType(); @@ -174,23 +167,21 @@ if (slist != null && slist.getLength() > 0) { //Enumerated List - jwriter.createJavaFileForEnumeratedValues(fname, slist, - loc, pkgname, xsSimple); + jwriter.createJavaFileForEnumeratedValues(fname, slist, loc, pkgname, xsSimple); } else { - if(Constants.NS_SCHEMA_XSD.equals(xsSimple.getNamespace()) ) - return; + if (Constants.NS_SCHEMA_XSD.equals(xsSimple.getNamespace())) + return; //TODO: Take care of other cases return; } } } - public List<VAR> getVARList(XSComplexTypeDefinition type, XSModel schema, boolean isExceptionType) - throws IOException + public List<VAR> getVARList(XSComplexTypeDefinition type, XSModel schema, boolean isExceptionType) throws IOException { - if(typeMapping == null) + if (typeMapping == null) throw new WSException("TypeMapping has not been set"); XSTypeDefinition baseType = type.getBaseType(); List vars = new ArrayList(); @@ -220,7 +211,7 @@ if (XSConstants.DERIVATION_RESTRICTION == der) { - vars.addAll(createVARsforXSParticle(type, schema) ); + vars.addAll(createVARsforXSParticle(type, schema)); } } else if (XSComplexTypeDefinition.CONTENTTYPE_ELEMENT == contentType) @@ -229,7 +220,7 @@ { short der = type.getDerivationMethod(); - if(XSConstants.DERIVATION_NONE == der) + if (XSConstants.DERIVATION_NONE == der) { handleContentTypeElementsWithDerivationNone(type, schema, isExceptionType, vars, type.getParticle()); } @@ -279,21 +270,19 @@ XSTerm xterm = xspar.getTerm(); if (xterm instanceof XSElementDeclaration) { - vars.addAll(createVARforXSElementDeclaration(xterm, - schemautils.isArrayType(xspar) , schema, type)); + vars.addAll(createVARforXSElementDeclaration(xterm, schemautils.isArrayType(xspar), schema, type)); } else if (xterm instanceof XSModelGroup) { XSModelGroup xsmodelgrp = (XSModelGroup)xterm; - vars.addAll(createVARsforXSModelGroup(xsmodelgrp , schema, type)); + vars.addAll(createVARsforXSModelGroup(xsmodelgrp, schema, type)); } } } } - private void handleContentTypeElementsWithDerivationExtension(XSComplexTypeDefinition type, XSModel schema, - boolean isExceptionType, List vars, XSParticle xsparticle) - throws IOException + private void handleContentTypeElementsWithDerivationExtension(XSComplexTypeDefinition type, XSModel schema, boolean isExceptionType, List vars, XSParticle xsparticle) + throws IOException { if (xsparticle != null) { @@ -317,28 +306,25 @@ // HACK - The only way to know what elements are local to the subclass, and not inherited, is to compare to the base class // THIS TIES US TO XERCES - if (baseType instanceof XSComplexTypeDefinition == false || ((XSComplexTypeDefinition) baseType).getParticle().getTerm() == xsterm) + if (baseType instanceof XSComplexTypeDefinition == false || ((XSComplexTypeDefinition)baseType).getParticle().getTerm() == xsterm) return; } XSParticle xspar = (XSParticle)xparts.item(length - 1); XSTerm xsparTerm = xspar.getTerm(); - if(xsparTerm instanceof XSModelGroup) + if (xsparTerm instanceof XSModelGroup) { XSModelGroup xsmodelgrp = (XSModelGroup)xspar.getTerm(); vars.addAll(createVARsforXSModelGroup(xsmodelgrp, schema, type)); } - else - if(xsparTerm instanceof XSElementDeclaration) - vars.addAll(createVARforXSElementDeclaration(xsparTerm, - schemautils.isArrayType(xspar), schema, type)); + else if (xsparTerm instanceof XSElementDeclaration) + vars.addAll(createVARforXSElementDeclaration(xsparTerm, schemautils.isArrayType(xspar), schema, type)); } } } - private void handleContentTypeElementsWithDerivationNone(XSComplexTypeDefinition type, - XSModel schema, boolean isExceptionType, List vars, XSParticle xsparticle) - throws IOException + private void handleContentTypeElementsWithDerivationNone(XSComplexTypeDefinition type, XSModel schema, boolean isExceptionType, List vars, XSParticle xsparticle) + throws IOException { if (xsparticle != null) { @@ -347,33 +333,33 @@ { XSModelGroup xsm = (XSModelGroup)xsterm; XSObjectList xparts = xsm.getParticles(); - int len = xparts != null ? xparts.getLength():0; + int len = xparts != null ? xparts.getLength() : 0; int diff = len - 0; - for(int i = 0 ; i < len ; i++) + for (int i = 0; i < len; i++) { - if(isExceptionType && type.getBaseType() != null ) + if (isExceptionType && type.getBaseType() != null) { List<VAR> baseList = new ArrayList<VAR>(); //The first few xsterms are modelgroups for base class - for(int j = 0; j < diff -1 ; j++) + for (int j = 0; j < diff - 1; j++) { XSParticle xspar = (XSParticle)xparts.item(j); XSTerm xsparTerm = xspar.getTerm(); - if(xsparTerm instanceof XSModelGroup) + if (xsparTerm instanceof XSModelGroup) { XSModelGroup xsmodelgrp = (XSModelGroup)xspar.getTerm(); baseList.addAll(createVARsforXSModelGroup(xsmodelgrp, schema, type)); } } - if(baseList.size() > 0) - this.typeNameToBaseVARList.put(type.getName(),baseList); + if (baseList.size() > 0) + this.typeNameToBaseVARList.put(type.getName(), baseList); //Now take the modelgroup for the type in question - XSParticle xspar = (XSParticle)xparts.item(len-1); + XSParticle xspar = (XSParticle)xparts.item(len - 1); XSTerm xsparTerm = xspar.getTerm(); - if(xsparTerm instanceof XSModelGroup) + if (xsparTerm instanceof XSModelGroup) { XSModelGroup xsmodelgrp = (XSModelGroup)xspar.getTerm(); vars.addAll(createVARsforXSModelGroup(xsmodelgrp, schema, type)); @@ -382,24 +368,20 @@ } XSParticle xspar = (XSParticle)xparts.item(i); XSTerm xsparTerm = xspar.getTerm(); - if(xsparTerm instanceof XSModelGroup) + if (xsparTerm instanceof XSModelGroup) { XSModelGroup xsmodelgrp = (XSModelGroup)xspar.getTerm(); vars.addAll(createVARsforXSModelGroup(xsmodelgrp, schema, type)); } - else - if(xsparTerm instanceof XSElementDeclaration) - vars.addAll(createVARforXSElementDeclaration(xsparTerm, - schemautils.isArrayType(xspar) , schema, type) ); + else if (xsparTerm instanceof XSElementDeclaration) + vars.addAll(createVARforXSElementDeclaration(xsparTerm, schemautils.isArrayType(xspar), schema, type)); } - }else - if(xsterm instanceof XSElementDeclaration) - { - vars.addAll(createVARforXSElementDeclaration(xsterm, - schemautils.isArrayType(xsparticle) , schema, type) ); - } - else - throw new WSException("Unhandled Type"); + } + else if (xsterm instanceof XSElementDeclaration) + { + vars.addAll(createVARforXSElementDeclaration(xsterm, schemautils.isArrayType(xsparticle), schema, type)); + } + else throw new WSException("Unhandled Type"); } } @@ -417,15 +399,15 @@ XSSimpleTypeDefinition xstype = att.getTypeDefinition(); QName qn = SchemaUtils.handleSimpleType(xstype); VAR v = createVAR(qn, att.getName(), pkgname); - if (vars == null) vars = new ArrayList(); + if (vars == null) + vars = new ArrayList(); vars.add(v); } } return vars; } - private List createVARsforXSParticle(XSComplexTypeDefinition type, XSModel schema) - throws IOException + private List createVARsforXSParticle(XSComplexTypeDefinition type, XSModel schema) throws IOException { List<VAR> list = new ArrayList<VAR>(); XSParticle xsparticle = type.getParticle(); @@ -448,11 +430,9 @@ return list; } - private List<VAR> createVARsforXSModelGroup(XSModelGroup xsm, XSModel schema, - XSComplexTypeDefinition origType) - throws IOException + private List<VAR> createVARsforXSModelGroup(XSModelGroup xsm, XSModel schema, XSComplexTypeDefinition origType) throws IOException { - List<VAR> vars = new ArrayList<VAR>(); + List<VAR> vars = new ArrayList<VAR>(); short compositor = xsm.getCompositor(); if (XSModelGroup.COMPOSITOR_SEQUENCE == compositor) @@ -467,12 +447,11 @@ if (term instanceof XSElementDeclaration) { - vars.addAll(createVARforXSElementDeclaration(term, - schemautils.isArrayType(xsparticle) , schema, origType) ); + vars.addAll(createVARforXSElementDeclaration(term, schemautils.isArrayType(xsparticle), schema, origType)); } else if (term instanceof XSModelGroup) { - vars.addAll(createVARsforXSModelGroup((XSModelGroup) term, schema, origType)); + vars.addAll(createVARsforXSModelGroup((XSModelGroup)term, schema, origType)); } } } @@ -480,7 +459,6 @@ return vars; } - private VAR createVAR(QName qn, String varstr, String pkgname) { String clname = ""; @@ -503,42 +481,35 @@ return v; } - private List createVARsForElements(XSObjectList xsobjlist, - XSModel schema , - XSComplexTypeDefinition origType) - throws IOException + private List createVARsForElements(XSObjectList xsobjlist, XSModel schema, XSComplexTypeDefinition origType) throws IOException { - List<VAR> list = new ArrayList<VAR>(); + List<VAR> list = new ArrayList<VAR>(); int len = xsobjlist.getLength(); for (int i = 0; i < len; i++) { XSParticle xsparticle = (XSParticle)xsobjlist.item(i); XSTerm xsterm = xsparticle.getTerm(); - list.addAll(createVARforXSElementDeclaration(xsterm, - schemautils.isArrayType(xsparticle), schema, origType) ); + list.addAll(createVARforXSElementDeclaration(xsterm, schemautils.isArrayType(xsparticle), schema, origType)); continue; } return list; } - - private List createVARforXSElementDeclaration(XSTerm xsterm, - boolean arrayType, XSModel schema, XSComplexTypeDefinition origType) - throws IOException + private List createVARforXSElementDeclaration(XSTerm xsterm, boolean arrayType, XSModel schema, XSComplexTypeDefinition origType) throws IOException { - List <VAR> vars = new ArrayList<VAR>(); + List<VAR> vars = new ArrayList<VAR>(); // Handle xsd:any elements if (xsterm instanceof XSWildcard) { XSWildcard xsw = (XSWildcard)xsterm; -// if (xsw.getConstraintType() == XSWildcard.NSCONSTRAINT_ANY) -// { - VAR v = new VAR("_any", "javax.xml.soap.SOAPElement", arrayType); - vars.add(v); - return vars; -// } + // if (xsw.getConstraintType() == XSWildcard.NSCONSTRAINT_ANY) + // { + VAR v = new VAR("_any", "javax.xml.soap.SOAPElement", arrayType); + vars.add(v); + return vars; + // } } // Handle xsd:group @@ -550,8 +521,6 @@ XSElementDeclaration elem = (XSElementDeclaration)xsterm; - - // TODO: Check if the element contains any anon complex type // TODO: If yes, create class that is ComplexTypeName+ElementName // TODO: ItemsItem If the elem contains anon simpletype @@ -562,86 +531,88 @@ String xstypename = xstypedef.getName(); // Check if it is a composite type - if(xstypename != null && xstypedef.getName().equals(origType.getName()) - && xstypedef.getNamespace().equals(origType.getNamespace())) + if (xstypename != null && xstypedef.getName().equals(origType.getName()) && xstypedef.getNamespace().equals(origType.getNamespace())) { // it is a composite type - QName qn = new QName(origType.getNamespace(),origType.getName()); + QName qn = new QName(origType.getNamespace(), origType.getName()); VAR vr = createVAR(qn, elem, (XSComplexTypeDefinition)xstypedef, tname, pkgname, arrayType); vars.add(vr); return vars; } else - if (xstypename == null && xstypedef instanceof XSComplexTypeDefinition) + if (xstypename == null && xstypedef instanceof XSComplexTypeDefinition) + { + XSComplexTypeDefinition xsc = (XSComplexTypeDefinition)xstypedef; + String subname = utils.firstLetterUpperCase(tname); + // Save the fname in a temp var + String tempfname = this.fname; + // it will be an anonymous type + if (containingElement == null || containingElement.length() == 0) + containingElement = origType.getName(); + + String anonName = containingElement + subname; + anonName = utils.firstLetterUpperCase(anonName); + this.fname = anonName; + this.createJavaFile((XSComplexTypeDefinition)xstypedef, schema, false); + + // Restore the fname + this.fname = tempfname; + // Bypass rest of processing + QName anonqn = new QName(anonName); + VAR vr = createVAR(anonqn, elem, xsc, tname, pkgname, arrayType); + vars.add(vr); + return vars; + } + else + { + // Unwrap any array wrappers + if (SchemaUtils.isWrapperArrayType(xstypedef)) { - XSComplexTypeDefinition xsc = (XSComplexTypeDefinition)xstypedef; - String subname = utils.firstLetterUpperCase(tname); - // Save the fname in a temp var - String tempfname = this.fname; - // it will be an anonymous type - String anonName = fname + subname; - this.fname = anonName; - this.createJavaFile((XSComplexTypeDefinition)xstypedef, schema, false); + XSComplexTypeDefinition complex = (XSComplexTypeDefinition)xstypedef; + XSModelGroup group = (XSModelGroup)complex.getParticle().getTerm(); + XSElementDeclaration element = (XSElementDeclaration)((XSParticle)group.getParticles().item(0)).getTerm(); + xstypedef = element.getTypeDefinition(); + xstypename = xstypedef.getName(); + arrayType = true; + } - // Restore the fname - this.fname = tempfname; - // Bypass rest of processing - QName anonqn = new QName(anonName); - VAR vr = createVAR(anonqn, elem, xsc, tname, pkgname, arrayType); - vars.add(vr); - return vars; + QName qn = null; + if (xstypedef instanceof XSSimpleTypeDefinition) + { + qn = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xstypedef); } else { - // Unwrap any array wrappers - if (SchemaUtils.isWrapperArrayType(xstypedef)) - { - XSComplexTypeDefinition complex = (XSComplexTypeDefinition) xstypedef; - XSModelGroup group = (XSModelGroup) complex.getParticle().getTerm(); - XSElementDeclaration element = (XSElementDeclaration) ((XSParticle)group.getParticles().item(0)).getTerm(); - xstypedef = element.getTypeDefinition(); - xstypename = xstypedef.getName(); - arrayType = true; - } + qn = new QName(xstypedef.getNamespace(), xstypename); + } - QName qn = null; - if (xstypedef instanceof XSSimpleTypeDefinition) - { - qn = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xstypedef); - } - else - { - qn = new QName(xstypedef.getNamespace(), xstypename); - } + String temp = this.fname; - String temp = this.fname; - - if (xstypename != null && xstypedef instanceof XSComplexTypeDefinition) + if (xstypename != null && xstypedef instanceof XSComplexTypeDefinition) + { + this.fname = utils.firstLetterUpperCase(xstypename); + if (!generatedFiles.contains(this.fname)) { - this.fname = utils.firstLetterUpperCase(xstypename); - if (! generatedFiles.contains(this.fname)) - { - generatedFiles.add(this.fname); - this.createJavaFile((XSComplexTypeDefinition)xstypedef, schema, false); - } - this.fname = temp; + generatedFiles.add(this.fname); + this.createJavaFile((XSComplexTypeDefinition)xstypedef, schema, false); } - - VAR v = createVAR( qn , elem, xstypedef, tname, pkgname, arrayType); - vars.add(v); + this.fname = temp; } + + VAR v = createVAR(qn, elem, xstypedef, tname, pkgname, arrayType); + vars.add(v); + } return vars; } - - private VAR createVAR(QName qn, XSElementDeclaration elem, - XSTypeDefinition t, String varstr, String pkgname, boolean arrayType) + private VAR createVAR(QName qn, XSElementDeclaration elem, XSTypeDefinition t, String varstr, String pkgname, boolean arrayType) { if (t instanceof XSSimpleTypeDefinition) { QName tempqn = schemautils.handleSimpleType((XSSimpleTypeDefinition)t); - if (tempqn != null) qn = tempqn; + if (tempqn != null) + qn = tempqn; } String clname = ""; Class cls = typeMapping.getJavaType(qn); @@ -650,7 +621,7 @@ { clname = JavaUtils.getSourceName(cls); String primitive = utils.getPrimitive(clname); - if ((! elem.getNillable()) && primitive != null) + if ((!elem.getNillable()) && primitive != null) clname = primitive; } else @@ -659,8 +630,7 @@ if (t.getName() == null) typename = qn; - else - typename = new QName(t.getName()); + else typename = new QName(t.getName()); if (typename != null) { String nsuri = typename.getNamespaceURI(); @@ -668,7 +638,8 @@ clname = pkgname + "."; clname += typename.getLocalPart(); } - else if (qn != null) clname = qn.getLocalPart(); + else if (qn != null) + clname = qn.getLocalPart(); } v = new VAR(Introspector.decapitalize(varstr), clname, arrayType); @@ -687,8 +658,7 @@ //Check baseType is xsd:anyType if (baseType != null) { - if (baseType.getNamespace() == Constants.NS_SCHEMA_XSD && - baseType.getName().equals("anyType")) + if (baseType.getNamespace() == Constants.NS_SCHEMA_XSD && baseType.getName().equals("anyType")) baseType = null; //Ignore this baseType } if (XSComplexTypeDefinition.CONTENTTYPE_SIMPLE == t.getContentType()) @@ -697,7 +667,7 @@ } } - if(baseName == null && baseType != null) + if (baseName == null && baseType != null) baseName = baseType.getName(); return baseName; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,28 +1,30 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.tools.helpers; import java.beans.Introspector; +import java.util.ArrayList; import java.util.HashSet; +import java.util.List; import java.util.Set; import javax.xml.namespace.QName; @@ -89,6 +91,7 @@ // provide logging private static final Logger log = Logger.getLogger(MappingFileGeneratorHelper.class); private WSDLDefinitions wsdlDefinitions = null; + private String typeNamespace; private String serviceName = null; private String packageName = null; private Set<String> registeredTypes = new HashSet<String>(); @@ -100,7 +103,7 @@ private String parameterStyle; - public MappingFileGeneratorHelper(WSDLDefinitions wsdl, String sname, String pname, Class seiClass, String tns, LiteralTypeMapping ltm, String paramStyle) + public MappingFileGeneratorHelper(WSDLDefinitions wsdl, String sname, String pname, Class seiClass, LiteralTypeMapping ltm, String paramStyle) { this.wsdlDefinitions = wsdl; this.serviceName = sname; @@ -112,22 +115,28 @@ checkEssentials(); } - public PackageMapping constructPackageMapping(JavaWsdlMapping jwm, - String packageType, String ns) + /** + * Returns the type namespace that was discovered during generation. + */ + public String getTypeNamespace() { + return typeNamespace; + } + + public PackageMapping constructPackageMapping(JavaWsdlMapping jwm, String packageType, String ns) + { PackageMapping pk = new PackageMapping(jwm); pk.setPackageType(packageType); pk.setNamespaceURI(ns); return pk; } - public ServiceInterfaceMapping constructServiceInterfaceMapping(JavaWsdlMapping jwm, WSDLService ser) { serviceName = ser.getName().toString(); String javaServiceName = serviceName; //Check if the serviceName conflicts with a portType or interface name - if(wsdlDefinitions.getInterface(new NCName(serviceName)) != null) + if (wsdlDefinitions.getInterface(new NCName(serviceName)) != null) javaServiceName += "_Service"; if (this.serviceName == null || serviceName.length() == 0) @@ -137,7 +146,7 @@ String prefix = WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_SERVICE_PREFIX; ServiceInterfaceMapping sim = new ServiceInterfaceMapping(jwm); sim.setServiceInterface(packageName + "." + javaServiceName); - sim.setWsdlServiceName(new QName(targetNS, serviceName, prefix) ); + sim.setWsdlServiceName(new QName(targetNS, serviceName, prefix)); WSDLEndpoint[] endpoints = ser.getEndpoints(); int lenendpoints = 0; @@ -156,7 +165,6 @@ return sim; } - public void constructServiceEndpointInterfaceMapping(JavaWsdlMapping jwm, WSDLService ser) { serviceName = ser.getName().toString(); @@ -184,16 +192,15 @@ ServiceEndpointInterfaceMapping seim = new ServiceEndpointInterfaceMapping(jwm); seim.setServiceEndpointInterface(packageName + "." + javaPortName); - seim.setWsdlPortType(new QName(targetNS,portName,"portTypeNS")); - seim.setWsdlBinding(new QName(targetNS,bindName,"bindingNS")); + seim.setWsdlPortType(new QName(targetNS, portName, "portTypeNS")); + seim.setWsdlBinding(new QName(targetNS, bindName, "bindingNS")); constructServiceEndpointMethodMapping(seim, wsdlintf); jwm.addServiceEndpointInterfaceMappings(seim); } } - public void constructServiceEndpointMethodMapping( - ServiceEndpointInterfaceMapping seim, WSDLInterface intf ) + public void constructServiceEndpointMethodMapping(ServiceEndpointInterfaceMapping seim, WSDLInterface intf) { WSDLInterfaceOperation[] wioparr = intf.getOperations(); int len = 0; @@ -209,17 +216,17 @@ semm.setWrappedElement(isWrapped()); if (isDocStyle()) - constructDOCParameters(semm, wiop); - else - constructRPCParameters(semm, wiop); + constructDOCParameters(semm, wiop, j); + else constructRPCParameters(semm, wiop); seim.addServiceEndpointMethodMapping(semm); } } - private void constructDOCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop) + private void constructDOCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop, int paramPosition) { WSDLInterfaceOperationInput win = WSDLUtils.getWsdl11Input(wiop); + JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); MethodParamPartsMapping mpin = null; if (win != null) { @@ -228,15 +235,17 @@ String partName = win.getPartName(); String wsdlMessageName = win.getMessageName().getLocalPart(); - if (isWrapped()) + boolean wrapped = isWrapped(); + + if (wrapped) { - JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); - XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); - unwrapRequest(semm, wsdlMessageName, xt); + XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); + wrapped = unwrapRequest(semm, wsdlMessageName, xmlName.getLocalPart(), xt); } - else + + if (wrapped == false) { - mpin = getMethodParamPartsMapping(semm,xmlName, xmlType, 0, wsdlMessageName, "IN", partName, false, true); + mpin = getMethodParamPartsMapping(semm, xmlName, xmlType, paramPosition, wsdlMessageName, "IN", partName, false, true); semm.addMethodParamPartsMapping(mpin); } } @@ -244,27 +253,55 @@ WSDLInterfaceOperationOutput output = WSDLUtils.getWsdl11Output(wiop); if (output != null) { + QName xmlName = output.getElement(); QName xmlType = output.getXMLType(); - QName messageName = output.getMessageName(); - if (isWrapped()) + String targetNS = wsdlDefinitions.getTargetNamespace(); + QName messageName = new QName(targetNS, output.getMessageName().getLocalPart(), WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_WSDL_MESSAGE_NS); + + String partName = output.getPartName(); + String containingElement = xmlName.getLocalPart(); + boolean array = false; + XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); + + ReturnTypeUnwrapper unwrapper = new ReturnTypeUnwrapper(xmlType, schemaModel, isWrapped()); + if (unwrapper.unwrap()) { - JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); - XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); - unwrapResponse(semm, messageName, xt); + if (unwrapper.unwrappedElement != null) + { + XSElementDeclaration element = unwrapper.unwrappedElement; + xt = element.getTypeDefinition(); + partName = element.getName(); + containingElement = containingElement + unwrapper.unwrappedElement.getName(); + array = unwrapper.array; + if (xt.getAnonymous()) + { + xmlType = new QName(containingElement); + } + else if (unwrapper.xmlType != null) + { + xmlType = unwrapper.xmlType; + } + } } - else if (win.getElement() != null && win.getElement().equals(output.getElement())) - { - mpin.getWsdlMessageMapping().setParameterMode("INOUT"); - } - else - { - WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm); - wrvm.setMethodReturnValue(getJavaTypeAsString(output.getElement(), output.getXMLType(), false, true)); - wrvm.setWsdlMessage(new QName(messageName.getNamespaceURI(), messageName.getLocalPart(), WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_WSDL_MESSAGE_NS)); - wrvm.setWsdlMessagePartName(output.getPartName()); - semm.setWsdlReturnValueMapping(wrvm); - } + + //Check it is a holder. If it is, return + if (wiop.getInputByPartName(xmlName.getLocalPart()) != null) + return; + + if (xt instanceof XSSimpleTypeDefinition) + xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); + + String javaType = getJavaTypeAsString(xmlName, xmlType, array, true); + + if (isDocStyle() == false && "void".equals(javaType)) + return; + + WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm); + wrvm.setMethodReturnValue(javaType); + wrvm.setWsdlMessage(messageName); + wrvm.setWsdlMessagePartName(partName); + semm.setWsdlReturnValueMapping(wrvm); } } @@ -273,7 +310,7 @@ WSDLInterfaceOperationInput in = WSDLUtils.getWsdl11Input(op); WSDLInterfaceOperationOutput out = WSDLUtils.getWsdl11Output(op); - boolean i = false ,o = false; + boolean i = false, o = false; if (in != null && in.getChildPart(name) != null) i = true; if (out != null && out.getChildPart(name) != null) @@ -303,8 +340,7 @@ QName xmlName = new QName(partName); QName xmlType = part.getType(); - MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm,xmlName, xmlType, - i++, wsdlMessageName, getMode(wiop, part.getName()), partName, false, true); + MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, xmlName, xmlType, i++, wsdlMessageName, getMode(wiop, part.getName()), partName, false, true); semm.addMethodParamPartsMapping(mpin); } @@ -319,7 +355,7 @@ WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm); wrvm.setMethodReturnValue(getJavaTypeAsString(xmlName, xmlType, false, true)); QName messageName = WSDLUtils.getWsdl11Output(wiop).getMessageName(); - wrvm.setWsdlMessage(new QName(messageName.getNamespaceURI(), messageName.getLocalPart(), WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_WSDL_MESSAGE_NS)); + wrvm.setWsdlMessage(new QName(messageName.getNamespaceURI(), messageName.getLocalPart(), WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_WSDL_MESSAGE_NS)); wrvm.setWsdlMessagePartName(partName); semm.setWsdlReturnValueMapping(wrvm); } @@ -329,25 +365,25 @@ { WSDLInterface[] intfArr = wsdlDefinitions.getInterfaces(); int len = intfArr != null ? intfArr.length : 0; - for(int i = 0 ; i < len ; i++) + for (int i = 0; i < len; i++) { WSDLInterface wi = intfArr[i]; WSDLInterfaceOperation[] ops = wi.getOperations(); int lenOps = ops.length; for (int j = 0; j < lenOps; j++) { - WSDLInterfaceOperation op = ops[j]; + WSDLInterfaceOperation op = ops[j]; for (WSDLInterfaceOperationInput input : op.getInputs()) { if (isDocStyle()) { - XSTypeDefinition xt = getXSType( input ); - addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", jwm, false); + XSTypeDefinition xt = getXSType(input); + addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, !isDocStyle()); } else { for (WSDLRPCPart part : input.getChildParts()) - addJavaXMLTypeMap(getXSType(part.getType()), "", "", jwm, true); + addJavaXMLTypeMap(getXSType(part.getType()), input.getElement().getLocalPart(), "", "", jwm, true); } } @@ -355,13 +391,13 @@ { if (isDocStyle()) { - XSTypeDefinition xt = getXSType( output ); - addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", jwm, false); + XSTypeDefinition xt = getXSType(output); + addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, false); } else { for (WSDLRPCPart part : output.getChildParts()) - addJavaXMLTypeMap(getXSType(part.getType()), "", "", jwm, true); + addJavaXMLTypeMap(getXSType(part.getType()), output.getElement().getLocalPart(), "", "", jwm, true); } } @@ -372,8 +408,8 @@ WSDLTypes types = wsdlDefinitions.getWsdlTypes(); JBossXSModel xsmodel = WSDLUtils.getSchemaModel(types); - XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); - addJavaXMLTypeMap(xt, xmlName.getLocalPart(), "", jwm, true); + XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); + addJavaXMLTypeMap(xt, xmlName.getLocalPart(), "", "", jwm, true); ExceptionMapping exceptionMapping = new ExceptionMapping(jwm); exceptionMapping.setExceptionType(getJavaTypeAsString(null, xmlType, false, true)); @@ -384,48 +420,94 @@ } } - private void unwrapRequest(ServiceEndpointMethodMapping methodMapping, String messageName, XSTypeDefinition xt) + private boolean unwrapRequest(ServiceEndpointMethodMapping methodMapping, String messageName, String containingElement, XSTypeDefinition xt) { if (xt instanceof XSComplexTypeDefinition == false) throw new WSException("Tried to unwrap a non-complex type."); + List<MethodParamPartsMapping> partsMappings = new ArrayList<MethodParamPartsMapping>(); + XSComplexTypeDefinition wrapper = (XSComplexTypeDefinition)xt; + + if (wrapper.getAttributeUses().getLength() > 0) + return false; + + boolean unwrappedElement = false; + XSParticle particle = wrapper.getParticle(); - XSTerm term = particle.getTerm(); - if (term instanceof XSModelGroup == false) - throw new WSException("Expected model group, could not unwrap"); - unwrapRequestParticles(methodMapping, messageName, (XSModelGroup)term); + if (particle == null) + { + return true; + } + else + { + XSTerm term = particle.getTerm(); + if (term instanceof XSModelGroup) + { + unwrappedElement = unwrapGroup(partsMappings, methodMapping, messageName, containingElement, (XSModelGroup)term); + } + } + + if (unwrappedElement) + { + addMethodParamPartsMappings(partsMappings, methodMapping); + + return true; + } + + return false; } - private int unwrapRequestParticles(ServiceEndpointMethodMapping methodMapping, String messageName, XSModelGroup group) + private void addMethodParamPartsMappings(List<MethodParamPartsMapping> partsMappings, ServiceEndpointMethodMapping methodMapping) { + for (MethodParamPartsMapping current : partsMappings) + { + methodMapping.addMethodParamPartsMapping(current); + } + } + + private boolean unwrapGroup(List<MethodParamPartsMapping> partsMappings, ServiceEndpointMethodMapping methodMapping, String messageName, String containingElement, + XSModelGroup group) + { if (group.getCompositor() != XSModelGroup.COMPOSITOR_SEQUENCE) - throw new WSException("Only a sequence type can be unwrapped."); + return false; - int elementCount = 0; XSObjectList particles = group.getParticles(); for (int i = 0; i < particles.getLength(); i++) { - XSParticle particle = (XSParticle) particles.item(i); + XSParticle particle = (XSParticle)particles.item(i); XSTerm term = particle.getTerm(); if (term instanceof XSModelGroup) { - elementCount += unwrapRequestParticles(methodMapping, messageName, (XSModelGroup)term); + if (unwrapGroup(partsMappings, methodMapping, messageName, containingElement, (XSModelGroup)term) == false) + return false; } else if (term instanceof XSElementDeclaration) { XSElementDeclaration element = (XSElementDeclaration)term; + XSTypeDefinition type = element.getTypeDefinition(); + QName xmlName = new QName(element.getNamespace(), element.getName()); - QName xmlType = new QName(element.getTypeDefinition().getNamespace(), element.getTypeDefinition().getName()); + QName xmlType; + if (type.getAnonymous()) + { + xmlType = new QName(type.getNamespace(), containingElement + element.getName()); + } + else + { + xmlType = new QName(type.getNamespace(), type.getName()); + } + boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs() > 1; - MethodParamPartsMapping parts = getMethodParamPartsMapping(methodMapping, xmlName, xmlType, elementCount, messageName, "IN", xmlName.getLocalPart(), array, - !element.getNillable()); - methodMapping.addMethodParamPartsMapping(parts); - elementCount++; + + MethodParamPartsMapping part = getMethodParamPartsMapping(methodMapping, xmlName, xmlType, partsMappings.size(), messageName, "IN", xmlName.getLocalPart(), + array, !element.getNillable()); + partsMappings.add(part); } } - return elementCount; + // If we reach here we must have successfully unwrapped the parameters. + return true; } private void unwrapResponse(ServiceEndpointMethodMapping methodMapping, QName messageName, XSTypeDefinition xt) @@ -450,7 +532,7 @@ String returnType = null; for (int i = 0; i < particles.getLength(); i++) { - XSParticle particle = (XSParticle) particles.item(i); + XSParticle particle = (XSParticle)particles.item(i); XSTerm term = particle.getTerm(); if (term instanceof XSModelGroup) { @@ -480,24 +562,22 @@ return false; } - - private void checkEssentials() { - if(typeMapping == null) + if (typeMapping == null) throw new WSException("typeMapping is null"); } private XSTypeDefinition getXSType(WSDLInterfaceMessageReference part) { //Check if there are any custom properties - WSDLInterfaceOperation op = part.getWsdlOperation(); + WSDLInterfaceOperation op = part.getWsdlOperation(); String zeroarg1 = null; String zeroarg2 = null; WSDLProperty prop1 = op.getProperty(Constants.WSDL_PROPERTY_ZERO_ARGS); if (prop1 != null) zeroarg1 = prop1.getValue(); - if(zeroarg1 != null && zeroarg2 != null && zeroarg1.equals(zeroarg2) == false) + if (zeroarg1 != null && zeroarg2 != null && zeroarg1.equals(zeroarg2) == false) return null; if (zeroarg1 != null && "true".equals(zeroarg1)) return null; @@ -506,32 +586,32 @@ WSDLTypes types = wsdlDefinitions.getWsdlTypes(); JBossXSModel xsmodel = WSDLUtils.getSchemaModel(types); - return xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); + return xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); } private XSTypeDefinition getXSType(QName xmlType) { WSDLTypes types = wsdlDefinitions.getWsdlTypes(); JBossXSModel xsmodel = WSDLUtils.getSchemaModel(types); - return xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); + return xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); } - private void addJavaXMLTypeMap(XSTypeDefinition xt,String name, String containingElement, JavaWsdlMapping jwm, boolean skipWrapperArray) + private void addJavaXMLTypeMap(XSTypeDefinition xt, String name, String containingElement, String containingType, JavaWsdlMapping jwm, boolean skipWrapperArray) { JavaXmlTypeMapping jxtm = null; - if(xt instanceof XSComplexTypeDefinition) + if (xt instanceof XSComplexTypeDefinition) { XSModelGroup xm = null; XSComplexTypeDefinition xc = (XSComplexTypeDefinition)xt; - if(xc.getContentType() != XSComplexTypeDefinition.CONTENTTYPE_EMPTY) + if (xc.getContentType() != XSComplexTypeDefinition.CONTENTTYPE_EMPTY) { XSParticle xp = xc.getParticle(); if (xp != null) { XSTerm xterm = xp.getTerm(); - if(xterm instanceof XSModelGroup) + if (xterm instanceof XSModelGroup) xm = (XSModelGroup)xterm; } } @@ -546,7 +626,11 @@ if (localName == null) { javaType = getJavaTypeAsString(null, new QName(containingElement + name), false, true); - localName = ">" + name; + StringBuilder temp = new StringBuilder(); + if (containingType != null && containingType.length() > 0) + temp.append(">").append(containingType); + temp.append(">").append(name); + localName = temp.toString(); jxtm.setAnonymousTypeQName(new QName(xt.getNamespace(), localName, "typeNS")); } else @@ -555,6 +639,11 @@ jxtm.setRootTypeQName(new QName(xt.getNamespace(), xt.getName(), "typeNS")); } + if (typeNamespace == null) + { + typeNamespace = xt.getNamespace(); + } + if (registeredTypes.contains(javaType)) return; @@ -574,7 +663,7 @@ XSSimpleTypeDefinition simple = xc.getSimpleType(); if (simple != null) { - addJavaXMLTypeMap(simple, xc.getName(), "", jwm, skipWrapperArray); + addJavaXMLTypeMap(simple, xc.getName(), "", "", jwm, skipWrapperArray); } // Add attributes @@ -584,25 +673,24 @@ } if (xm != null) - addGroup(xm, jwm); + addGroup(xm, name, xc.getName(), jwm); } // Add enum simpleType support } - private void addVariableMappingMap(XSModelGroup xm, JavaXmlTypeMapping jxtm, String javaType) { XSObjectList xo = xm.getParticles(); int len = xo != null ? xo.getLength() : 0; for (int i = 0; i < len; i++) { - XSTerm xsterm = ((XSParticle) xo.item(i)).getTerm(); + XSTerm xsterm = ((XSParticle)xo.item(i)).getTerm(); if (xsterm instanceof XSModelGroup) - addVariableMappingMap((XSModelGroup) xsterm, jxtm, javaType); + addVariableMappingMap((XSModelGroup)xsterm, jxtm, javaType); else if (xsterm instanceof XSElementDeclaration) { - XSElementDeclaration xe = (XSElementDeclaration) xsterm; + XSElementDeclaration xe = (XSElementDeclaration)xsterm; VariableMapping vm = new VariableMapping(jxtm); String name = xe.getName(); // JBWS-1170 Convert characters which are illegal in Java identifiers @@ -620,7 +708,7 @@ XSAttributeUse obj = (XSAttributeUse)attributes.item(i); XSAttributeDeclaration att = obj.getAttrDeclaration(); XSSimpleTypeDefinition simple = att.getTypeDefinition(); - addJavaXMLTypeMap(simple, "none", "", jxtm.getJavaWsdlMapping(), true); + addJavaXMLTypeMap(simple, "none", "", "", jxtm.getJavaWsdlMapping(), true); VariableMapping vm = new VariableMapping(jxtm); String name = att.getName(); vm.setXmlAttributeName(name); @@ -630,22 +718,23 @@ } } - private void addGroup(XSModelGroup xm, JavaWsdlMapping jwm) + private void addGroup(XSModelGroup xm, String containingElement, String containingType, JavaWsdlMapping jwm) { XSObjectList xo = xm.getParticles(); int len = xo != null ? xo.getLength() : 0; - for(int i = 0; i < len ; i++) + for (int i = 0; i < len; i++) { XSTerm xsterm = ((XSParticle)xo.item(i)).getTerm(); - if(xsterm instanceof XSModelGroup) + if (xsterm instanceof XSModelGroup) { - addGroup((XSModelGroup)xsterm, jwm); + addGroup((XSModelGroup)xsterm, containingElement, containingType, jwm); } - else if(xsterm instanceof XSElementDeclaration) + else if (xsterm instanceof XSElementDeclaration) { XSElementDeclaration xe = (XSElementDeclaration)xsterm; XSTypeDefinition typeDefinition = xe.getTypeDefinition(); - addJavaXMLTypeMap(typeDefinition, xe.getName(), xe.getEnclosingCTDefinition().getName(), jwm, true); + //XSTypeDefinition xt, String name, String containingElement, JavaWsdlMapping jwm, boolean skipWrapperArray + addJavaXMLTypeMap(typeDefinition, xe.getName(), containingElement, containingType, jwm, !isDocStyle()); } } } @@ -655,10 +744,10 @@ String jtype = null; String arraySuffix = (array) ? "[]" : ""; - if (! isDocStyle()) + if (!isDocStyle()) { JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); - XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); + XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); XSElementDeclaration unwrapped = SchemaUtils.unwrapArrayType(xt); StringBuilder builder = new StringBuilder(); @@ -683,14 +772,13 @@ * Special case - when qname=xsd:anyType && javaType == Element * then cls has to be javax.xml.soap.SOAPElement */ - if( xmlType.getNamespaceURI().equals(Constants.NS_SCHEMA_XSD) - && "anyType".equals(xmlType.getLocalPart()) && javaType == Element.class) + if (xmlType.getNamespaceURI().equals(Constants.NS_SCHEMA_XSD) && "anyType".equals(xmlType.getLocalPart()) && javaType == Element.class) javaType = SOAPElement.class; - javaType = this.makeCustomDecisions(javaType,xmlName,xmlType); + javaType = this.makeCustomDecisions(javaType, xmlName, xmlType); - if(javaType == null) + if (javaType == null) { - log.debug("Typemapping lookup failed for "+xmlName); + log.debug("Typemapping lookup failed for " + xmlName); log.debug("Falling back to identifier generation"); String className = xmlType.getLocalPart(); if (className.charAt(0) == '>') @@ -700,12 +788,11 @@ else { //Handle arrays - if(javaType.isArray()) + if (javaType.isArray()) { jtype = JavaUtils.getSourceName(javaType); } - else - jtype = javaType.getName(); + else jtype = javaType.getName(); } return jtype + arraySuffix; @@ -722,13 +809,13 @@ * @param xst * @return true: type represents an array */ - private boolean isRepresentsArray( XSTypeDefinition xst) + private boolean isRepresentsArray(XSTypeDefinition xst) { boolean bool = false; - if( xst instanceof XSComplexTypeDefinition) + if (xst instanceof XSComplexTypeDefinition) { XSComplexTypeDefinition xc = (XSComplexTypeDefinition)xst; - if(xc.getContentType() == XSComplexTypeDefinition.CONTENTTYPE_EMPTY) + if (xc.getContentType() == XSComplexTypeDefinition.CONTENTTYPE_EMPTY) return false; XSParticle xsp = xc.getParticle(); @@ -736,11 +823,11 @@ return false; XSTerm xsterm = xsp.getTerm(); - if(xsterm instanceof XSModelGroup) + if (xsterm instanceof XSModelGroup) { XSModelGroup xm = (XSModelGroup)xsterm; XSObjectList xo = xm.getParticles(); - if(xo.getLength() == 1) + if (xo.getLength() == 1) { XSParticle xp = (XSParticle)xo.item(0); bool = xp.getMaxOccursUnbounded() || xp.getMaxOccurs() > 1; @@ -757,12 +844,11 @@ * @param xmlName * @param xmlType */ - private Class makeCustomDecisions( Class javaType, QName xmlName, QName xmlType) + private Class makeCustomDecisions(Class javaType, QName xmlName, QName xmlType) { - if(javaType != null && xmlType != null) + if (javaType != null && xmlType != null) { - if(Byte[].class == javaType && Constants.NS_SCHEMA_XSD.equals(xmlType.getNamespaceURI()) - && "base64Binary".equals(xmlType.getLocalPart())) + if (Byte[].class == javaType && Constants.NS_SCHEMA_XSD.equals(xmlType.getNamespaceURI()) && "base64Binary".equals(xmlType.getLocalPart())) javaType = byte[].class; } return javaType; @@ -773,9 +859,8 @@ return "wrapped".equals(parameterStyle) && Constants.DOCUMENT_LITERAL.equals(wsdlStyle); } - private MethodParamPartsMapping getMethodParamPartsMapping(ServiceEndpointMethodMapping semm, - QName xmlName, QName xmlType, - int paramPosition, String wsdlMessageName, String paramMode, String wsdlMessagePartName, boolean array, boolean primitive) + private MethodParamPartsMapping getMethodParamPartsMapping(ServiceEndpointMethodMapping semm, QName xmlName, QName xmlType, int paramPosition, + String wsdlMessageName, String paramMode, String wsdlMessagePartName, boolean array, boolean primitive) { String targetNS = wsdlDefinitions.getTargetNamespace(); MethodParamPartsMapping mppm = new MethodParamPartsMapping(semm); @@ -787,8 +872,8 @@ WsdlMessageMapping wmm = new WsdlMessageMapping(mppm); wmm.setParameterMode(paramMode); String wsdlNS = WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_WSDL_MESSAGE_NS; - wmm.setWsdlMessage(new QName(targetNS,wsdlMessageName, wsdlNS)); - wmm.setWsdlMessagePartName( wsdlMessagePartName ); + wmm.setWsdlMessage(new QName(targetNS, wsdlMessageName, wsdlNS)); + wmm.setWsdlMessagePartName(wsdlMessagePartName); mppm.setWsdlMessageMapping(wmm); return mppm; } Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -84,11 +84,6 @@ protected Class serviceEndpointInterface = null; /** - * Server side generation - user can provide a type Namespace - */ - protected String typeNamespace; - - /** * Type Mapping that is input from outside */ protected LiteralTypeMapping typeMapping = null; @@ -145,17 +140,6 @@ this.serviceName = serviceName; } - /** - * The user may have generated the types in a different namespace - * aka typeNamespace in comparison to the wsdl targetNamespace - * - * @param typeNamespace - */ - public void setTypeNamespace(String typeNamespace) - { - this.typeNamespace = typeNamespace; - } - public void setParameterStyle(String paramStyle) { this.parameterStyle = paramStyle; @@ -172,17 +156,9 @@ */ public JavaWsdlMapping generate() throws IOException { - MappingFileGeneratorHelper helper = new MappingFileGeneratorHelper(wsdlDefinitions, serviceName, packageName, serviceEndpointInterface, - typeNamespace, typeMapping, parameterStyle); - String targetNS = wsdlDefinitions.getTargetNamespace(); - if (typeNamespace == null) - typeNamespace = targetNS; + MappingFileGeneratorHelper helper = new MappingFileGeneratorHelper(this.wsdlDefinitions, this.serviceName, this.packageName, this.serviceEndpointInterface, + this.typeMapping, this.parameterStyle); JavaWsdlMapping jwm = new JavaWsdlMapping(); - //Construct package mapping - //Check if the user has provided a typeNamespace - if (typeNamespace != null && typeNamespace.equals(targetNS) == false || isServerSideGeneration()) - jwm.addPackageMapping(helper.constructPackageMapping(jwm, packageName, typeNamespace)); - jwm.addPackageMapping(helper.constructPackageMapping(jwm, packageName, targetNS)); //If the schema has types, we will need to generate the java/xml type mapping helper.constructJavaXmlTypeMapping(jwm); @@ -196,6 +172,19 @@ jwm.addServiceInterfaceMappings(helper.constructServiceInterfaceMapping(jwm, wsdlService)); helper.constructServiceEndpointInterfaceMapping(jwm, wsdlService); } + + // Add package to namespace mapping after helper has generated the rest of the file. + String targetNS = wsdlDefinitions.getTargetNamespace(); + String typeNamespace = helper.getTypeNamespace(); + if (typeNamespace == null) + typeNamespace = targetNS; + + //Construct package mapping + //Check if the user has provided a typeNamespace + if (typeNamespace != null && typeNamespace.equals(targetNS) == false || isServerSideGeneration()) + jwm.addPackageMapping(helper.constructPackageMapping(jwm, packageName, typeNamespace)); + jwm.addPackageMapping(helper.constructPackageMapping(jwm, packageName, targetNS)); + return jwm; } @@ -219,7 +208,7 @@ MethodParamPartsMapping[] mppmarr = mm.getMethodParamPartsMappings(); int lenmppmarr = mppmarr != null ? mppmarr.length : 0; for (int j = 0; j < lenmppmarr; j++) - { + { listInputs.addAll(xst.getVARList((XSComplexTypeDefinition)xsmodel.getTypeDefinition(opname, typeNamespace), xsmodel, false)); } JavaWriter jw = new JavaWriter(); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/WSToolsTest.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/WSToolsTest.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/WSToolsTest.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -179,21 +179,21 @@ return typeMapping; } - protected void generateMappingFile(String packageName, WSDLDefinitions wsdl, TypeMapping typeMapping, String serviceName, String fileLoc, Class seiClass, - String typeNamespace) throws IOException - { - MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new LiteralTypeMapping()); - mgf.setPackageName(packageName); - mgf.setServiceName(serviceName); - if (seiClass != null) - mgf.setServiceEndpointInterface(seiClass); - if (typeNamespace != null && typeNamespace.length() > 0) - mgf.setTypeNamespace(typeNamespace); - JavaWsdlMapping jwm = mgf.generate(); - FileWriter fw = new FileWriter(fileLoc); - fw.write(DOMWriter.printNode(DOMUtils.parse(jwm.serialize()), true)); - fw.close(); - } + // protected void generateMappingFile(String packageName, WSDLDefinitions wsdl, TypeMapping typeMapping, String serviceName, String fileLoc, Class seiClass, + // String typeNamespace) throws IOException + // { + // MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new LiteralTypeMapping()); + // mgf.setPackageName(packageName); + // mgf.setServiceName(serviceName); + // if (seiClass != null) + // mgf.setServiceEndpointInterface(seiClass); + // if (typeNamespace != null && typeNamespace.length() > 0) + // mgf.setTypeNamespace(typeNamespace); + // JavaWsdlMapping jwm = mgf.generate(); + // FileWriter fw = new FileWriter(fileLoc); + // fw.write(DOMWriter.printNode(DOMUtils.parse(jwm.serialize()), true)); + // fw.close(); + // } protected void generateServiceFile(String packageName, WSDLDefinitions wsdl, String location) throws IOException { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -22,13 +22,11 @@ package org.jboss.test.ws.tools.jbws1079; import java.io.File; -import java.io.FileInputStream; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.ws.core.utils.DOMUtils; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools; -import org.w3c.dom.Element; /** * @@ -45,12 +43,13 @@ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); - Element exp = DOMUtils.parse(new FileInputStream(resourceDir + "/anonymous-mapping.xml")); - Element was = DOMUtils.parse(new FileInputStream(toolsDir + "/anonymous-mapping.xml")); - assertEquals(exp, was); - + compareSource(resourceDir + "/LookupResponseNumber.java", toolsDir + "/org/jboss/test/ws/jbws1079/LookupResponseNumber.java"); + compareSource(resourceDir + "/Person.java", toolsDir + "/org/jboss/test/ws/jbws1079/Person.java"); + compareSource(resourceDir + "/PhoneBook_PortType.java", toolsDir + "/org/jboss/test/ws/jbws1079/PhoneBook_PortType.java"); compareSource(resourceDir + "/TelephoneNumber.java", toolsDir + "/org/jboss/test/ws/jbws1079/TelephoneNumber.java"); - compareSource(resourceDir + "/TelephoneNumberNumber.java", toolsDir + "/org/jboss/test/ws/jbws1079/TelephoneNumberNumber.java"); + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/anonymous-mapping.xml", toolsDir + "/anonymous-mapping.xml"); } private static void compareSource(final String expectedName, final String generatedName) throws Exception Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -22,13 +22,11 @@ package org.jboss.test.ws.tools.jbws1253; import java.io.File; -import java.io.FileInputStream; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.ws.core.utils.DOMUtils; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools; -import org.w3c.dom.Element; /** * Test for a port name which ends 'PortType' @@ -45,10 +43,9 @@ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); - Element exp = DOMUtils.parse(new FileInputStream(resourceDir + "/myporttype-mapping.xml")); - Element was = DOMUtils.parse(new FileInputStream(toolsDir + "/myporttype-mapping.xml")); - assertEquals(exp, was); - + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/myporttype-mapping.xml", toolsDir + "/myporttype-mapping.xml"); + File expSEI = new File(resourceDir + "/My.java"); File wasSEI = new File(toolsDir + "/org/jboss/test/ws/jbws1253/My.java"); Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1260 (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1260) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,901 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.tools.jbws1260; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.WSException; -import org.jboss.ws.tools.WSTools; - -/** - * Test case to test various scenarios unwrapping parameters - * when using wsdl-java. - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 22, 2006 - */ -public class JBWS1260TestCase extends JBossWSTest -{ - - /** - * Test scenario where the element referenced as the message - * parts contains an anonymous complex type which contains - * a single element. - * - * <element name='lookupResponse'> - * <complexType> - * <sequence> - * <element name='number' nillable='true' type='string'/> - * </sequence> - * </complexType> - * </element> - * - */ - public void testScenario_A() throws Exception - { - generateScenario("A"); - } - - /** - * Test scenario where the element referenced as the message - * parts contains an anonymous complex type which contains - * two elements. - * - * <element name='lookupResponse'> - * <complexType> - * <sequence> - * <element name='areaCode' nillable='true' type='string'/> - * <element name='number' nillable='true' type='string'/> - * </sequence> - * </complexType> - * </element> - * - */ - public void testScenario_B() throws Exception - { - try - { - generateScenario("B"); - fail("Expected exception not thrown."); - } - catch (WSException e) - { - } - } - - /** - * Test scenario where the element referenced as the message - * parts references a complex type which contains - * a single element. - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='number' nillable='true' type='string'/> - * </sequence> - * </complexType> - * - */ - public void testScenario_C() throws Exception - { - generateScenario("C"); - } - - /** - * Test scenario where the element referenced as the message - * parts references a complex type which contains two - * elements. - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='areaCode' nillable='true' type='string'/> - * <element name='number' nillable='true' type='string'/> - * </sequence> - * </complexType> - * - */ - public void testScenario_D() throws Exception - { - try - { - generateScenario("D"); - fail("Expected exception not thrown."); - } - catch (WSException e) - { - } - } - - /** - * Test scenario where the element referenced as the message part - * references a complex type which contains an anonymous complex - * type which contains one element. - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='Number'> - * <complexType> - * <sequence> - * <element name='number' nillable='true' type='string'/> - * </sequence> - * </complexType> - * </element> - * </sequence> - * </complexType> - */ - public void testScenario_E() throws Exception - { - generateScenario("E"); - } - - /** - * Test scenario where the element referenced as the message part - * references a complex type which contains an anonymout complex - * type which contains two elements. - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='Number'> - * <complexType> - * <sequence> - * <element name='areaCode' nillable='true' type='string'/> - * <element name='number' nillable='true' type='string'/> - * </sequence> - * </complexType> - * </element> - * </sequence> - * </complexType> - * - */ - public void testScenario_F() throws Exception - { - generateScenario("F"); - } - - /** - * Test scenario where the element referenced as the message - * parts contains an anonymous complex type which contains - * a single element which is an array. - * - * <element name='lookupResponse'> - * <complexType> - * <sequence> - * <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> - * </sequence> - * </complexType> - * </element> - */ - public void testScenario_G() throws Exception - { - generateScenario("G"); - } - - /** - * Test scenario where the element referenced as the message - * parts references a complex type which contains a single - * element which is an array. - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> - * </sequence> - * </complexType> - * - */ - public void testScenario_H() throws Exception - { - generateScenario("H"); - } - - /** - * Test scenario where the element referenced as the message - * parts references a complex type which contains an anonymous - * complex type which contains a single element which is an array. - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='Number'> - * <complexType> - * <sequence> - * <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> - * </sequence> - * </complexType> - * </element> - * </sequence> - * </complexType> - * - */ - public void testScenario_I() throws Exception - { - generateScenario("I"); - } - - /** - * Test scenario where the element referenced as the message - * parts contains an anonymous complex type which contains - * an empty sequence. - * - * <element name='lookupResponse'> - * <complexType> - * <sequence> - * </sequence> - * </complexType> - * </element> - * - */ - public void testScenario_J() throws Exception - { - generateScenario("J"); - } - - /** - * Test scenario where the element referenced as the message - * parts references a complex type which contains - * an empty sequence. - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * </sequence> - * </complexType> - * - */ - public void testScenario_K() throws Exception - { - generateScenario("K"); - } - - /** - * Test scenario where the element referenced as the message - * parts references a complex type which contains an anonymous - * complex type which contains an empty sequence. - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='Number'> - * <complexType> - * <sequence> - * </sequence> - * </complexType> - * </element> - * </sequence> - * </complexType> - * - */ - public void testScenario_L() throws Exception - { - generateScenario("L"); - } - - /** - * Test scenario where the element referenced as the message - * parts contains an anonymous complex type which contains - * a single element and an attribute. - * - * <element name='lookupResponse'> - * <complexType> - * <sequence> - * <element name='number' nillable='true' type='string'/> - * </sequence> - * <attribute name='postcode' type='string'/> - * </complexType> - * </element> - * - */ - public void testScenario_M() throws Exception - { - try - { - generateScenario("M"); - fail("Expected exception not thrown."); - } - catch (WSException e) - { - } - } - - /** - * Test scenario where the element referenced as the message - * parts references a complex type which contains - * a single element and an attribute. - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='number' nillable='true' type='string'/> - * </sequence> - * <attribute name='postcode' type='string'/> - * </complexType> - * - */ - public void testScenario_N() throws Exception - { - try - { - generateScenario("N"); - fail("Expected exception not thrown."); - } - catch (WSException e) - { - } - } - - /** - * Test scenario where the element referenced as the message part - * references a complex type which contains an anonymous complex - * type which contains one element and one attribute. - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='Number'> - * <complexType> - * <sequence> - * <element name='number' nillable='true' type='string'/> - * </sequence> - * <attribute name='postcode' type='string'/> - * </complexType> - * </element> - * </sequence> - * </complexType> - * - */ - public void testScenario_O() throws Exception - { - generateScenario("O"); - } - - /** - * Test scenario where the element referenced as the message - * parts contains an anonymous complex type which contains - * a single element which is an array and a single parameter. - * - * <element name='lookupResponse'> - * <complexType> - * <sequence> - * <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> - * </sequence> - * <attribute name='postcode' type='string'/> - * </complexType> - * </element> - * - */ - public void testScenario_P() throws Exception - { - try - { - generateScenario("P"); - fail("Expected exception not thrown."); - } - catch (WSException e) - { - } - } - - /** - * Test scenario where the element referenced as the message - * parts references a complex type which contains a single - * element which is an array and a single attribute. - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> - * </sequence> - * <attribute name='postcode' type='string'/> - * </complexType> - * - */ - public void testScenario_Q() throws Exception - { - try - { - generateScenario("Q"); - fail("Expected exception not thrown."); - } - catch (WSException e) - { - } - } - - /** - * Test scenario where the element referenced as the message - * parts references a complex type which contains an anonymous - * complex type which contains a single element which is an array - * and a single attribute. - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='Number'> - * <complexType> - * <sequence> - * <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> - * </sequence> - * <attribute name='postcode' type='string'/> - * </complexType> - * </element> - * </sequence> - * </complexType> - * - */ - public void testScenario_R() throws Exception - { - generateScenario("R"); - } - - /** - * Test scenario where the element referenced as the message - * parts contains an anonymous complex type which contains - * an empty sequence and a single attribute. - * - * <element name='lookupResponse'> - * <complexType> - * <sequence> - * </sequence> - * <attribute name='postcode' type='string'/> - * </complexType> - * </element> - * - */ - public void testScenario_S() throws Exception - { - try - { - generateScenario("S"); - fail("Expected exception not thrown."); - } - catch (WSException e) - { - } - } - - /** - * Test scenario where the element referenced as the message - * parts references a complex type which contains - * an empty sequence and a single attribute. - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * </sequence> - * <attribute name='postcode' type='string'/> - * </complexType> - * - */ - public void testScenario_T() throws Exception - { - try - { - generateScenario("T"); - fail("Expected exception not thrown."); - } - catch (WSException e) - { - } - } - - /** - * Test scenario where the element referenced as the message - * parts references a complex type which contains an anonymous - * complex type which contains an empty sequence and a single - * attribute. - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='Number'> - * <complexType> - * <sequence> - * </sequence> - * <attribute name='postcode' type='string'/> - * </complexType> - * </element> - * </sequence> - * </complexType> - * - */ - public void testScenario_U() throws Exception - { - generateScenario("U"); - } - - /** - * Test scenario where the element referenced as the message - * parts contains an anonymous complex type which contains - * a single attribute. - * - * <element name='lookupResponse'> - * <complexType> - * <attribute name='postcode' type='string'/> - * </complexType> - * </element> - * - */ - public void testScenario_V() throws Exception - { - try - { - generateScenario("V"); - fail("Expected exception not thrown."); - } - catch (WSException e) - { - } - } - - /** - * Test scenario where the element referenced as the message - * parts references a complex type which contains - * a single attribute. - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <attribute name='postcode' type='string'/> - * </complexType> - * - */ - public void testScenario_W() throws Exception - { - try - { - generateScenario("W"); - fail("Expected exception not thrown."); - } - catch (WSException e) - { - } - } - - /** - * Test scenario where the element referenced as the message - * parts references a complex type which contains an anonymous - * complex type which contains a single attribute. - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='Number'> - * <complexType> - * <attribute name='postcode' type='string'/> - * </complexType> - * </element> - * </sequence> - * </complexType> - * - */ - public void testScenario_X() throws Exception - { - generateScenario("X"); - } - - /** - * Test case to test where the element referenced as the message - * parts contains an anonymous complex type which contains a - * single element which is an array (which is a complex type). - * - * <complexType name='Telephone'> - * <sequence> - * <element name='digits' type='string'/> - * </sequence> - * </complexType> - * - * <element name='lookupResponse'> - * <complexType> - * <sequence> - * <element name='number' nillable='true' type='tns:Telephone' maxOccurs='unbounded'/> - * </sequence> - * </complexType> - * </element> - * - */ - public void testScenario_Y() throws Exception - { - generateScenario("Y"); - } - - /** - * Test case to test where the element referenced as the message - * parts references a complex type which contains a single element - * which is an array (which is a complex type). - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='Telephone'> - * <sequence> - * <element name='digits' type='string'/> - * </sequence> - * </complexType> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='number' nillable='true' type='tns:Telephone' maxOccurs='unbounded'/> - * </sequence> - * </complexType> - * - */ - public void testScenario_Z() throws Exception - { - generateScenario("Z"); - } - - /** - * Test case to test where the element referenced as the message - * parts references a complex type which contains an anonymous type - * which contains a single element which is an array (which is a comlex type). - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='Title'> - * <sequence> - * <element name='text' type='string'/> - * </sequence> - * </complexType> - * - * <complexType name='Person'> - * <sequence> - * <element name='Name'> - * <complexType> - * <sequence> - * <element name='surname' nillable='true' type='tns:Title' maxOccurs='unbounded'/> - * </sequence> - * </complexType> - * </element> - * </sequence> - * </complexType> - * - */ - public void testScenario_AA() throws Exception - { - generateScenario("AA"); - } - - /** - * Test case to test where the element referenced as the message - * parts contains an anonymous simple type. - * - * <element name='lookupResponse'> - * <simpleType> - * <restriction base='string'> - * <maxLength value="50"/> - * </restriction> - * </simpleType> - * </element> - * - */ - public void testScenario_AB() throws Exception - { - try - { - generateScenario("AB"); - fail("Expected exception not thrown."); - } - catch (WSException e) - { - } - } - - /** - * Test case to test where the element referenced as the message - * parts references a named simple type. - * - * <element name='lookupResponse' type='tns:number'/> - * - * <simpleType name='number'> - * <restriction base='string'> - * <maxLength value="50"/> - * </restriction> - * </simpleType> - * - */ - public void testScenario_AC() throws Exception - { - try - { - generateScenario("AC"); - fail("Expected exception not thrown."); - } - catch (WSException e) - { - } - } - - /** - * Test scenario where the element referenced as the input message - * part contains an anonymous complex type which contains - * two elements. - * - * The element referenced as the output message part contains an - * anonymous complex type with a single element. - * - * <element name='lookupResponse'> - * <complexType> - * <sequence> - * <element name='number' nillable='true' type='string'/> - * </sequence> - * </complexType> - * </element> - * - */ - public void testScenario_AD() throws Exception - { - generateScenario("AD"); - } - - /** - * Test scenario where the element referenced as the input message - * part references a complex type which contains two elements. - * - * The element referenced as the output message part references a - * complex type with a single element. - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='number' nillable='true' type='string'/> - * </sequence> - * </complexType> - * - */ - public void testScenario_AE() throws Exception - { - generateScenario("AE"); - } - - /** - * Test scenario where the element referenced as the input message - * part references a complex type which contains an element which - * contains an anonymous complex type which contains two elements. - * - * The element referenced as the output message part references a - * complex type which contains an element which contains an anonymous - * complex type which contains a single element. - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='Number'> - * <complexType> - * <sequence> - * <element name='number' nillable='true' type='string'/> - * </sequence> - * </complexType> - * </element> - * </sequence> - * </complexType> - * - */ - public void testScenario_AF() throws Exception - { - generateScenario("AF"); - } - - /** - * Test scenario where unwrapping should not occur as the element for the request - * message does not match the name of the operation. - * - * <operation name='lookup'> - * <input message='tns:PhoneBook_lookup'/> - * <output message='tns:PhoneBook_lookupResponse'/> - * </operation> - * - * <message name='PhoneBook_lookup'> - * <part element='ns1:lookupPerson' name='parameters'/> - * </message> - */ - public void testScenario_AG() throws Exception - { - try - { - generateScenario("AG"); - fail("Expected exception not thrown."); - } - catch (WSException e) - { - } - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1260/scenario_" + scenario; - String toolsDir = "tools/jbws1260/scenario_" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - - File resourceDirFile = new File(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.endsWith(".java"); - } - }); - - for (int i = 0; i < expectedFiles.length; i++) - { - String currentFile = expectedFiles[i]; - - try - { - compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1260/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1260"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBook_Service.java".equals(currentFile); - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/wrapped-mapping.xml", toolsDir + "/wrapped-mapping.xml"); - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java) =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -0,0 +1,901 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.tools.jbws1260; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.WSException; +import org.jboss.ws.tools.WSTools; + +/** + * [JBWS-1260] - Test case to test various scenarios unwrapping parameters + * when using wsdl-java. + * + * @author darran.lofthouse(a)jboss.com + * @since Nov 22, 2006 + */ +public class JBWS1260TestCase extends JBossWSTest +{ + + /** + * Test scenario where the element referenced as the message + * parts contains an anonymous complex type which contains + * a single element. + * + * <element name='lookupResponse'> + * <complexType> + * <sequence> + * <element name='number' nillable='true' type='string'/> + * </sequence> + * </complexType> + * </element> + * + */ + public void testScenario_A() throws Exception + { + generateScenario("A"); + } + + /** + * Test scenario where the element referenced as the message + * parts contains an anonymous complex type which contains + * two elements. + * + * <element name='lookupResponse'> + * <complexType> + * <sequence> + * <element name='areaCode' nillable='true' type='string'/> + * <element name='number' nillable='true' type='string'/> + * </sequence> + * </complexType> + * </element> + * + */ + public void testScenario_B() throws Exception + { + try + { + generateScenario("B"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } + } + + /** + * Test scenario where the element referenced as the message + * parts references a complex type which contains + * a single element. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='number' nillable='true' type='string'/> + * </sequence> + * </complexType> + * + */ + public void testScenario_C() throws Exception + { + generateScenario("C"); + } + + /** + * Test scenario where the element referenced as the message + * parts references a complex type which contains two + * elements. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='areaCode' nillable='true' type='string'/> + * <element name='number' nillable='true' type='string'/> + * </sequence> + * </complexType> + * + */ + public void testScenario_D() throws Exception + { + try + { + generateScenario("D"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } + } + + /** + * Test scenario where the element referenced as the message part + * references a complex type which contains an anonymous complex + * type which contains one element. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='Number'> + * <complexType> + * <sequence> + * <element name='number' nillable='true' type='string'/> + * </sequence> + * </complexType> + * </element> + * </sequence> + * </complexType> + */ + public void testScenario_E() throws Exception + { + generateScenario("E"); + } + + /** + * Test scenario where the element referenced as the message part + * references a complex type which contains an anonymout complex + * type which contains two elements. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='Number'> + * <complexType> + * <sequence> + * <element name='areaCode' nillable='true' type='string'/> + * <element name='number' nillable='true' type='string'/> + * </sequence> + * </complexType> + * </element> + * </sequence> + * </complexType> + * + */ + public void testScenario_F() throws Exception + { + generateScenario("F"); + } + + /** + * Test scenario where the element referenced as the message + * parts contains an anonymous complex type which contains + * a single element which is an array. + * + * <element name='lookupResponse'> + * <complexType> + * <sequence> + * <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> + * </sequence> + * </complexType> + * </element> + */ + public void testScenario_G() throws Exception + { + generateScenario("G"); + } + + /** + * Test scenario where the element referenced as the message + * parts references a complex type which contains a single + * element which is an array. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> + * </sequence> + * </complexType> + * + */ + public void testScenario_H() throws Exception + { + generateScenario("H"); + } + + /** + * Test scenario where the element referenced as the message + * parts references a complex type which contains an anonymous + * complex type which contains a single element which is an array. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='Number'> + * <complexType> + * <sequence> + * <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> + * </sequence> + * </complexType> + * </element> + * </sequence> + * </complexType> + * + */ + public void testScenario_I() throws Exception + { + generateScenario("I"); + } + + /** + * Test scenario where the element referenced as the message + * parts contains an anonymous complex type which contains + * an empty sequence. + * + * <element name='lookupResponse'> + * <complexType> + * <sequence> + * </sequence> + * </complexType> + * </element> + * + */ + public void testScenario_J() throws Exception + { + generateScenario("J"); + } + + /** + * Test scenario where the element referenced as the message + * parts references a complex type which contains + * an empty sequence. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * </sequence> + * </complexType> + * + */ + public void testScenario_K() throws Exception + { + generateScenario("K"); + } + + /** + * Test scenario where the element referenced as the message + * parts references a complex type which contains an anonymous + * complex type which contains an empty sequence. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='Number'> + * <complexType> + * <sequence> + * </sequence> + * </complexType> + * </element> + * </sequence> + * </complexType> + * + */ + public void testScenario_L() throws Exception + { + generateScenario("L"); + } + + /** + * Test scenario where the element referenced as the message + * parts contains an anonymous complex type which contains + * a single element and an attribute. + * + * <element name='lookupResponse'> + * <complexType> + * <sequence> + * <element name='number' nillable='true' type='string'/> + * </sequence> + * <attribute name='postcode' type='string'/> + * </complexType> + * </element> + * + */ + public void testScenario_M() throws Exception + { + try + { + generateScenario("M"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } + } + + /** + * Test scenario where the element referenced as the message + * parts references a complex type which contains + * a single element and an attribute. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='number' nillable='true' type='string'/> + * </sequence> + * <attribute name='postcode' type='string'/> + * </complexType> + * + */ + public void testScenario_N() throws Exception + { + try + { + generateScenario("N"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } + } + + /** + * Test scenario where the element referenced as the message part + * references a complex type which contains an anonymous complex + * type which contains one element and one attribute. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='Number'> + * <complexType> + * <sequence> + * <element name='number' nillable='true' type='string'/> + * </sequence> + * <attribute name='postcode' type='string'/> + * </complexType> + * </element> + * </sequence> + * </complexType> + * + */ + public void testScenario_O() throws Exception + { + generateScenario("O"); + } + + /** + * Test scenario where the element referenced as the message + * parts contains an anonymous complex type which contains + * a single element which is an array and a single parameter. + * + * <element name='lookupResponse'> + * <complexType> + * <sequence> + * <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> + * </sequence> + * <attribute name='postcode' type='string'/> + * </complexType> + * </element> + * + */ + public void testScenario_P() throws Exception + { + try + { + generateScenario("P"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } + } + + /** + * Test scenario where the element referenced as the message + * parts references a complex type which contains a single + * element which is an array and a single attribute. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> + * </sequence> + * <attribute name='postcode' type='string'/> + * </complexType> + * + */ + public void testScenario_Q() throws Exception + { + try + { + generateScenario("Q"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } + } + + /** + * Test scenario where the element referenced as the message + * parts references a complex type which contains an anonymous + * complex type which contains a single element which is an array + * and a single attribute. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='Number'> + * <complexType> + * <sequence> + * <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> + * </sequence> + * <attribute name='postcode' type='string'/> + * </complexType> + * </element> + * </sequence> + * </complexType> + * + */ + public void testScenario_R() throws Exception + { + generateScenario("R"); + } + + /** + * Test scenario where the element referenced as the message + * parts contains an anonymous complex type which contains + * an empty sequence and a single attribute. + * + * <element name='lookupResponse'> + * <complexType> + * <sequence> + * </sequence> + * <attribute name='postcode' type='string'/> + * </complexType> + * </element> + * + */ + public void testScenario_S() throws Exception + { + try + { + generateScenario("S"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } + } + + /** + * Test scenario where the element referenced as the message + * parts references a complex type which contains + * an empty sequence and a single attribute. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * </sequence> + * <attribute name='postcode' type='string'/> + * </complexType> + * + */ + public void testScenario_T() throws Exception + { + try + { + generateScenario("T"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } + } + + /** + * Test scenario where the element referenced as the message + * parts references a complex type which contains an anonymous + * complex type which contains an empty sequence and a single + * attribute. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='Number'> + * <complexType> + * <sequence> + * </sequence> + * <attribute name='postcode' type='string'/> + * </complexType> + * </element> + * </sequence> + * </complexType> + * + */ + public void testScenario_U() throws Exception + { + generateScenario("U"); + } + + /** + * Test scenario where the element referenced as the message + * parts contains an anonymous complex type which contains + * a single attribute. + * + * <element name='lookupResponse'> + * <complexType> + * <attribute name='postcode' type='string'/> + * </complexType> + * </element> + * + */ + public void testScenario_V() throws Exception + { + try + { + generateScenario("V"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } + } + + /** + * Test scenario where the element referenced as the message + * parts references a complex type which contains + * a single attribute. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <attribute name='postcode' type='string'/> + * </complexType> + * + */ + public void testScenario_W() throws Exception + { + try + { + generateScenario("W"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } + } + + /** + * Test scenario where the element referenced as the message + * parts references a complex type which contains an anonymous + * complex type which contains a single attribute. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='Number'> + * <complexType> + * <attribute name='postcode' type='string'/> + * </complexType> + * </element> + * </sequence> + * </complexType> + * + */ + public void testScenario_X() throws Exception + { + generateScenario("X"); + } + + /** + * Test case to test where the element referenced as the message + * parts contains an anonymous complex type which contains a + * single element which is an array (which is a complex type). + * + * <complexType name='Telephone'> + * <sequence> + * <element name='digits' type='string'/> + * </sequence> + * </complexType> + * + * <element name='lookupResponse'> + * <complexType> + * <sequence> + * <element name='number' nillable='true' type='tns:Telephone' maxOccurs='unbounded'/> + * </sequence> + * </complexType> + * </element> + * + */ + public void testScenario_Y() throws Exception + { + generateScenario("Y"); + } + + /** + * Test case to test where the element referenced as the message + * parts references a complex type which contains a single element + * which is an array (which is a complex type). + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='Telephone'> + * <sequence> + * <element name='digits' type='string'/> + * </sequence> + * </complexType> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='number' nillable='true' type='tns:Telephone' maxOccurs='unbounded'/> + * </sequence> + * </complexType> + * + */ + public void testScenario_Z() throws Exception + { + generateScenario("Z"); + } + + /** + * Test case to test where the element referenced as the message + * parts references a complex type which contains an anonymous type + * which contains a single element which is an array (which is a comlex type). + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='Title'> + * <sequence> + * <element name='text' type='string'/> + * </sequence> + * </complexType> + * + * <complexType name='Person'> + * <sequence> + * <element name='Name'> + * <complexType> + * <sequence> + * <element name='surname' nillable='true' type='tns:Title' maxOccurs='unbounded'/> + * </sequence> + * </complexType> + * </element> + * </sequence> + * </complexType> + * + */ + public void testScenario_AA() throws Exception + { + generateScenario("AA"); + } + + /** + * Test case to test where the element referenced as the message + * parts contains an anonymous simple type. + * + * <element name='lookupResponse'> + * <simpleType> + * <restriction base='string'> + * <maxLength value="50"/> + * </restriction> + * </simpleType> + * </element> + * + */ + public void testScenario_AB() throws Exception + { + try + { + generateScenario("AB"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } + } + + /** + * Test case to test where the element referenced as the message + * parts references a named simple type. + * + * <element name='lookupResponse' type='tns:number'/> + * + * <simpleType name='number'> + * <restriction base='string'> + * <maxLength value="50"/> + * </restriction> + * </simpleType> + * + */ + public void testScenario_AC() throws Exception + { + try + { + generateScenario("AC"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } + } + + /** + * Test scenario where the element referenced as the input message + * part contains an anonymous complex type which contains + * two elements. + * + * The element referenced as the output message part contains an + * anonymous complex type with a single element. + * + * <element name='lookupResponse'> + * <complexType> + * <sequence> + * <element name='number' nillable='true' type='string'/> + * </sequence> + * </complexType> + * </element> + * + */ + public void testScenario_AD() throws Exception + { + generateScenario("AD"); + } + + /** + * Test scenario where the element referenced as the input message + * part references a complex type which contains two elements. + * + * The element referenced as the output message part references a + * complex type with a single element. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='number' nillable='true' type='string'/> + * </sequence> + * </complexType> + * + */ + public void testScenario_AE() throws Exception + { + generateScenario("AE"); + } + + /** + * Test scenario where the element referenced as the input message + * part references a complex type which contains an element which + * contains an anonymous complex type which contains two elements. + * + * The element referenced as the output message part references a + * complex type which contains an element which contains an anonymous + * complex type which contains a single element. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='Number'> + * <complexType> + * <sequence> + * <element name='number' nillable='true' type='string'/> + * </sequence> + * </complexType> + * </element> + * </sequence> + * </complexType> + * + */ + public void testScenario_AF() throws Exception + { + generateScenario("AF"); + } + + /** + * Test scenario where unwrapping should not occur as the element for the request + * message does not match the name of the operation. + * + * <operation name='lookup'> + * <input message='tns:PhoneBook_lookup'/> + * <output message='tns:PhoneBook_lookupResponse'/> + * </operation> + * + * <message name='PhoneBook_lookup'> + * <part element='ns1:lookupPerson' name='parameters'/> + * </message> + */ + public void testScenario_AG() throws Exception + { + try + { + generateScenario("AG"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1260/scenario_" + scenario; + String toolsDir = "tools/jbws1260/scenario_" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1260/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1260"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBook_Service.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/wrapped-mapping.xml", toolsDir + "/wrapped-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } +} Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,27 +1,28 @@ /* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.tools.validation; import java.io.File; +import java.util.HashMap; import javax.xml.namespace.QName; @@ -48,419 +49,451 @@ public class JaxrpcMappingValidator { public static Logger log = Logger.getLogger(JaxrpcMappingValidator.class); - /** - * Validates two jaxrpc mapping files given their location as strings - * - * @param mappingFile1 location of the first mapping file - * @param mappingFile2 location of the second mapping file - * @return true - both are equal, false - Do not match - * @throws Exception - */ - public boolean validate(String mappingFile1, String mappingFile2) throws Exception - { - JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance(); - JavaWsdlMapping javaWsdlMapping1 = mappingFactory.parse(new File(mappingFile1).toURL()); - JavaWsdlMapping javaWsdlMapping2 = mappingFactory.parse(new File(mappingFile2).toURL()); - return validate(javaWsdlMapping1,javaWsdlMapping2); - } - - /** - * Validates two mapping metadata models - * - * @param jw1 metadata model for the first mapping file - * @param jw2 metadata model for the second mapping file - * @return - */ - public boolean validate(JavaWsdlMapping jw1, JavaWsdlMapping jw2) - { - boolean bool = true; - bool = validatePackageMappings(jw1.getPackageMappings(),jw2.getPackageMappings()); - if(bool) - bool = validateJavaXmlTypeMappings(jw1.getJavaXmlTypeMappings(), - jw2.getJavaXmlTypeMappings()); - else - throw new IllegalStateException("Validation of PackageMappings failed"); - if(bool) - bool = validateServiceInterfaceMappings(jw1.getServiceInterfaceMappings(), - jw2.getServiceInterfaceMappings()); - else - throw new IllegalStateException("Validation of JavaXmlTypeMappings failed"); - if(bool) - bool = validateServiceEndpointInterfaceMappings(jw1.getServiceEndpointInterfaceMappings(), - jw2.getServiceEndpointInterfaceMappings()); - else - throw new IllegalStateException("Validation of ServiceInterfaceMappings failed"); - - if(bool == false) - throw new IllegalStateException("Validation of ServiceEndpointInterfaceMappings failed"); - return bool; - } - - //PRIVATE METHODS - private boolean validatePackageMappings(PackageMapping[] pm1, PackageMapping[] pm2) - { - boolean bool = true; - int len1 = pm1 != null ? pm1.length : 0; - int len2 = pm2 != null ? pm2.length : 0; - if(len1 != len2) return false; - for(int i =0; i < len1; i++) - { - bool = validatePackageMapping( pm1[i], pm2[i]); - if( bool == false) break; - } - return bool; - } - - private boolean validatePackageMapping(PackageMapping pm1, PackageMapping pm2) - { - boolean bool = true; - bool = checkStringEquality(pm1.getPackageType(),pm2.getPackageType()); - if(bool) - bool = checkStringEquality(pm1.getNamespaceURI(),pm2.getNamespaceURI()); - else - throw new IllegalStateException("Validation of PackageMapping/PackageType failed"); - - if(bool == false) - throw new IllegalStateException("Validation of PackageMapping/NamespaceURI failed"); - return bool; - } - - private boolean validateJavaXmlTypeMappings(JavaXmlTypeMapping[] jm1, - JavaXmlTypeMapping[] jm2) - { - boolean bool = true; - int len1 = jm1 != null ? jm1.length : 0; - int len2 = jm2 != null ? jm2.length : 0; - if(len1 != len2) - { - throw new IllegalStateException("Length of JavaXmlTypeMapping[] do not match"); - } + /** + * Validates two jaxrpc mapping files given their location as strings + * + * @param mappingFile1 location of the first mapping file + * @param mappingFile2 location of the second mapping file + * @return true - both are equal, false - Do not match + * @throws Exception + */ + public boolean validate(String mappingFile1, String mappingFile2) throws Exception + { + JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance(); + JavaWsdlMapping javaWsdlMapping1 = mappingFactory.parse(new File(mappingFile1).toURL()); + JavaWsdlMapping javaWsdlMapping2 = mappingFactory.parse(new File(mappingFile2).toURL()); + return validate(javaWsdlMapping1, javaWsdlMapping2); + } - for(int i =0; i < len1; i++) - { - //Now go over the other array to see possible match - for(int j = 0; j < len1; j++) - { - bool = validateJavaXmlTypeMapping( jm1[i], jm2[j]); - if(bool) - break; - } - //bool = validateJavaXmlTypeMapping( jm1[i], jm2[i]); - if( bool == false) - { - throw new IllegalStateException(jm1[i] + " does not match with other side"); - } - } - return bool; - } - - private boolean validateJavaXmlTypeMapping(JavaXmlTypeMapping jm1, - JavaXmlTypeMapping jm2) - { - boolean bool = true; - bool = checkStringEquality(jm1.getJavaType(),jm2.getJavaType()); - if(bool) - bool = checkStringEquality(jm1.getQnameScope(),jm2.getQnameScope()); - if(bool) - bool = checkQNameEquality(jm1.getRootTypeQName(),jm2.getRootTypeQName()); - if(bool) - bool = checkQNameEquality(jm1.getAnonymousTypeQName(),jm2.getAnonymousTypeQName()); - if(bool) - bool = validateVariableMappings(jm1.getVariableMappings(),jm2.getVariableMappings()); - - return bool; - } - - private boolean validateVariableMappings(VariableMapping[] vm1, VariableMapping[] vm2) - { - boolean bool = true; - int len1 = vm1 != null ? vm1.length : 0; - int len2 = vm2 != null ? vm2.length : 0; - if(len1 != len2) - { - throw new IllegalStateException("Length of VariableMapping[] do not match"); - } + /** + * Validates two mapping metadata models + * + * @param jw1 metadata model for the first mapping file + * @param jw2 metadata model for the second mapping file + * @return + */ + public boolean validate(JavaWsdlMapping jw1, JavaWsdlMapping jw2) + { + boolean bool = true; + bool = validatePackageMappings(jw1.getPackageMappings(), jw2.getPackageMappings()); + if (bool) + bool = validateJavaXmlTypeMappings(jw1.getJavaXmlTypeMappings(), jw2.getJavaXmlTypeMappings()); + else throw new IllegalStateException("Validation of PackageMappings failed"); + if (bool) + bool = validateServiceInterfaceMappings(jw1.getServiceInterfaceMappings(), jw2.getServiceInterfaceMappings()); + else throw new IllegalStateException("Validation of JavaXmlTypeMappings failed"); - for(int i =0; i < len1; i++) - { - bool = validateVariableMapping( vm1[i], vm2[i]); - if( bool == false) - throw new IllegalStateException("VariableMapping" + vm1[i] + " does not match with "+vm2[i]); - - } - return bool; - } - - private boolean validateVariableMapping(VariableMapping vm1, VariableMapping vm2) - { - boolean bool = true; - bool = checkStringEquality(vm1.getJavaVariableName(),vm2.getJavaVariableName()); - if(bool) - bool = checkStringEquality(vm1.getXmlAttributeName(),vm2.getXmlAttributeName()); - if(bool) - bool = checkStringEquality(vm1.getXmlElementName(),vm2.getXmlElementName()); - if(bool) - bool = vm1.getXmlWildcard() == vm2.getXmlWildcard(); - if(bool) - bool = vm1.isDataMember() == vm2.isDataMember(); - return bool; - } - - private boolean validateServiceInterfaceMappings(ServiceInterfaceMapping[] sim1, - ServiceInterfaceMapping[] sim2) - { - boolean bool = true; - int len1 = sim1 != null ? sim1.length : 0; - int len2 = sim2 != null ? sim2.length : 0; - if(len1 != len2) - { - throw new IllegalStateException("Length of ServiceInterfaceMapping[] do not match"); - } + if (bool) + bool = validateServiceEndpointInterfaceMappings(jw1.getServiceEndpointInterfaceMappings(), jw2.getServiceEndpointInterfaceMappings()); + else throw new IllegalStateException("Validation of ServiceInterfaceMappings failed"); - for(int i =0; i < len1; i++) - { - bool = validateServiceInterfaceMapping( sim1[i], sim2[i]); - if( bool == false) break; - } - return bool; - } - - private boolean validateServiceInterfaceMapping(ServiceInterfaceMapping sim1, - ServiceInterfaceMapping sim2) - { - boolean bool = true; - bool = checkStringEquality(sim1.getServiceInterface(),sim2.getServiceInterface()); - if(bool) - bool = checkQNameEquality(sim1.getWsdlServiceName(),sim2.getWsdlServiceName()); - if(bool) - bool = validatePortMappings(sim1.getPortMappings(),sim2.getPortMappings()); - return bool; - } - - private boolean validatePortMappings(PortMapping[] pm1, PortMapping[] pm2 ) - { - boolean bool = true; + if (bool == false) + throw new IllegalStateException("Validation of ServiceEndpointInterfaceMappings failed"); + return bool; + } - int len1 = pm1 != null ? pm1.length : 0; - int len2 = pm2 != null ? pm2.length : 0; - if(len1 != len2) - { - throw new IllegalStateException("Length of PortMapping[] do not match"); - } + //PRIVATE METHODS + private boolean validatePackageMappings(PackageMapping[] pm1, PackageMapping[] pm2) + { + boolean bool = true; + int len1 = pm1 != null ? pm1.length : 0; + int len2 = pm2 != null ? pm2.length : 0; + if (len1 != len2) + throw new IllegalStateException("Number of package mappings does not match expected=" + len1 + " actual=" + len2); - for(int i =0; i < len1; i++) - { - bool = validatePortMapping( pm1[i], pm2[i]); - if( bool == false) break; - } - return bool; - } - - private boolean validatePortMapping( PortMapping pm1, PortMapping pm2) - { - boolean bool = true; - bool = checkStringEquality(pm1.getPortName(),pm2.getJavaPortName()); - if(bool) - bool = checkStringEquality(pm1.getJavaPortName(),pm2.getJavaPortName()); - return bool; - } - - private boolean validateServiceEndpointInterfaceMappings(ServiceEndpointInterfaceMapping[] sm1, - ServiceEndpointInterfaceMapping[] sm2) - { - boolean bool = true; + for (int i = 0; i < len1; i++) + { + bool = validatePackageMapping(pm1[i], pm2[i]); + if (bool == false) + break; + } + return bool; + } - int len1 = sm1 != null ? sm1.length : 0; - int len2 = sm2 != null ? sm2.length : 0; - if(len1 != len2) - { - throw new IllegalStateException("Length of ServiceEndpointInterfaceMapping[] do not match"); - } + private boolean validatePackageMapping(PackageMapping pm1, PackageMapping pm2) + { + String expectedPackage = pm1.getPackageType(); + String actualPackage = pm2.getPackageType(); - for(int i =0; i < len1; i++) - { - for(int j = 0 ; j < len1; j++) - { - bool = validateServiceEndpointInterfaceMapping( sm1[i], sm2[j]); - if (bool) - break; - } - if( bool == false) - throw new IllegalStateException(sm1[i].getServiceEndpointInterface() + " has no match"); - } - return bool; - } - - private boolean validateServiceEndpointInterfaceMapping(ServiceEndpointInterfaceMapping sm1, - ServiceEndpointInterfaceMapping sm2) - { - boolean bool = true; - bool = checkStringEquality(sm1.getServiceEndpointInterface(),sm2.getServiceEndpointInterface()); - if(bool) - bool = checkQNameEquality(sm1.getWsdlBinding(),sm2.getWsdlBinding()); - if(bool) - bool = checkQNameEquality(sm1.getWsdlPortType(),sm2.getWsdlPortType()); - if(bool) - bool = validateServiceEndpointMethodMappings(sm1.getServiceEndpointMethodMappings(), - sm2.getServiceEndpointMethodMappings()); - return bool; - } - - private boolean validateServiceEndpointMethodMappings(ServiceEndpointMethodMapping[] semm1, - ServiceEndpointMethodMapping[] semm2) - { - boolean bool = true; + if (checkStringEquality(expectedPackage, actualPackage) == false) + { + throw new IllegalStateException("Package type '" + expectedPackage + "' does not equal '" + actualPackage + "'"); + } - int len1 = semm1 != null ? semm1.length : 0; - int len2 = semm2 != null ? semm2.length : 0; - if(len1 != len2) - { - throw new IllegalStateException("Length of ServiceEndpointMethodMapping[] do not match"); - } + String expectedNamespace = pm1.getNamespaceURI(); + String actualNamespace = pm2.getNamespaceURI(); - for(int i =0; i < len1; i++) - { - for(int j = 0 ; j < len1; j++) - { - bool = validateServiceEndpointMethodMapping( semm1[i], semm2[j]); - if(bool) - break; - } - if( bool == false) - throw new IllegalStateException(semm1[i].getJavaMethodName() + " do not match in" - + " in ServiceEndpointMethod Mapping"); - - } - return bool; - } - - private boolean validateServiceEndpointMethodMapping(ServiceEndpointMethodMapping semm1, - ServiceEndpointMethodMapping semm2) - { - boolean bool = true; - bool = checkStringEquality(semm1.getJavaMethodName(),semm2.getJavaMethodName()); - if(bool) - bool = checkStringEquality(semm1.getWsdlOperation(),semm2.getWsdlOperation()); - else - log.error("getJavaMethodName check failed"); - if(bool) - bool = semm1.isWrappedElement() == semm2.isWrappedElement(); - else - log.error("wsdloperation check failed"); - if(bool) - bool = validateWsdlReturnValueMapping(semm1.getWsdlReturnValueMapping(), - semm2.getWsdlReturnValueMapping()); - else - log.error("isWrappedElement check failed"); - if(bool) - bool = validateMethodParamPartsMappings(semm1.getMethodParamPartsMappings(), - semm2.getMethodParamPartsMappings()); - else - log.error("validateWsdlReturnValueMapping check failed"); - - if(bool == false) - log.error("validateMethodParamPartsMappings check failed"); - return bool; - } - - private boolean validateWsdlReturnValueMapping(WsdlReturnValueMapping w1, WsdlReturnValueMapping w2) - { - checkNullParametersInconsistency(w1,w2,WsdlReturnValueMapping.class); - boolean bool = true; - if(w1 != null && w2 != null) - { - bool = checkStringEquality(w1.getMethodReturnValue(),w2.getMethodReturnValue()); - if(bool) - bool = checkStringEquality(w1.getWsdlMessagePartName(),w2.getWsdlMessagePartName()); - if(bool) - bool = checkQNameEquality(w1.getWsdlMessage(),w2.getWsdlMessage()); - } - - return bool; - } - - private boolean validateMethodParamPartsMappings(MethodParamPartsMapping[] mppm1, - MethodParamPartsMapping[] mppm2) - { - boolean bool = true; + if (checkStringEquality(expectedPackage, actualPackage) == false) + { + throw new IllegalStateException("Namespace '" + expectedNamespace + "' does not equal '" + actualNamespace + "'"); + } - int len1 = mppm1 != null ? mppm1.length : 0; - int len2 = mppm2 != null ? mppm2.length : 0; - if(len1 != len2) - { - throw new IllegalStateException("Length of MethodParamPartsMapping[] do not match"); - } + return true; + } - for(int i =0; i < len1; i++) - { - bool = validateMethodParamPartsMapping( mppm1[i], mppm2[i]); - if( bool == false) break; - } - return bool; - } - - private boolean validateMethodParamPartsMapping(MethodParamPartsMapping mppm1, - MethodParamPartsMapping mppm2) - { - boolean bool = true; - bool = mppm1.getParamPosition() == mppm2.getParamPosition(); - if(bool) - bool = checkStringEquality(mppm1.getParamType(), mppm2.getParamType()); - if(bool) - bool = validateWsdlMessageMapping(mppm1.getWsdlMessageMapping(),mppm2.getWsdlMessageMapping()); - return bool; - } - - private boolean validateWsdlMessageMapping(WsdlMessageMapping wmm1,WsdlMessageMapping wmm2) - { - String semmName = wmm1.getMethodParamPartsMapping().getServiceEndpointMethodMapping().getJavaMethodName(); - - String path = "ServiceEndpointMethodMapping-"+semmName + "/methodparampartsmapping"; - boolean bool = true; - if(bool) - bool = checkStringEquality(wmm1.getParameterMode(),wmm2.getParameterMode()); - if(bool) - bool = checkStringEquality(wmm1.getWsdlMessagePartName(),wmm2.getWsdlMessagePartName()); - else - throw new IllegalStateException(path + "/parameterMode does not match"); - if(bool) - bool = checkQNameEquality(wmm1.getWsdlMessage(),wmm2.getWsdlMessage()); - if(bool) - bool = wmm1.isSoapHeader() == wmm2.isSoapHeader(); - else - throw new IllegalStateException(path + "/wsdlMessage does not match"); - return bool; - } - - //PRIVATE EQUALITY CHECKS - - private boolean checkStringEquality(String str1, String str2) - { - if(str1 == null && str2 == null) - return true; - if(str1 == null && str2 != null) - return false; - if(str1 != null && str2 == null) - return false; - return str1.equals(str2); - } - - private boolean checkQNameEquality(QName q1, QName q2) - { - if(q1 == null && q2 == null) - return true; - if(q1 == null && q2 != null) - return false; - if(q1 != null && q2 == null) - return false; - return q1.equals(q2); - } - - private void checkNullParametersInconsistency(Object o1, Object o2, Class c) - { - WSDLUtils utils = WSDLUtils.getInstance(); - if((o1 == null && o2 != null) || (o1 != null && o2 == null) ) - throw new IllegalStateException(utils.getJustClassName(c) + " does not match"); - } + private boolean validateJavaXmlTypeMappings(JavaXmlTypeMapping[] jm1, JavaXmlTypeMapping[] jm2) + { + int len1 = jm1 != null ? jm1.length : 0; + int len2 = jm2 != null ? jm2.length : 0; + if (len1 != len2) + { + throw new IllegalStateException("Length of JavaXmlTypeMapping[] do not match expected=" + len1 + " actual=" + len2); + } + + // Don't need the order to be the same so cope with this. + HashMap actualMappings = new HashMap(len1); + + for (int i = 0; i < len1; i++) + { + JavaXmlTypeMapping current = jm2[i]; + String name = current.getJavaType(); + if (actualMappings.containsKey(name)) + { + throw new IllegalStateException("Type '" + name + "' registered more than once."); + } + + actualMappings.put(name, current); + } + + for (int i = 0; i < len1; i++) + { + JavaXmlTypeMapping expected = jm1[i]; + JavaXmlTypeMapping actual = (JavaXmlTypeMapping)actualMappings.get(expected.getJavaType()); + + if (actual == null) + { + throw new IllegalStateException("Mapping not found for '" + expected.getJavaType() + "'"); + } + + if (validateJavaXmlTypeMapping(expected, actual) == false) + { + throw new IllegalStateException(expected + " does not match with other side " + actual); + } + } + + return true; + } + + private boolean validateJavaXmlTypeMapping(JavaXmlTypeMapping jm1, JavaXmlTypeMapping jm2) + { + boolean bool = true; + bool = checkStringEquality(jm1.getJavaType(), jm2.getJavaType()); + if (bool) + bool = checkStringEquality(jm1.getQnameScope(), jm2.getQnameScope()); + if (bool) + bool = checkQNameEquality(jm1.getRootTypeQName(), jm2.getRootTypeQName()); + if (bool) + bool = checkQNameEquality(jm1.getAnonymousTypeQName(), jm2.getAnonymousTypeQName()); + if (bool) + bool = validateVariableMappings(jm1.getVariableMappings(), jm2.getVariableMappings()); + + return bool; + } + + private boolean validateVariableMappings(VariableMapping[] vm1, VariableMapping[] vm2) + { + boolean bool = true; + int len1 = vm1 != null ? vm1.length : 0; + int len2 = vm2 != null ? vm2.length : 0; + if (len1 != len2) + { + throw new IllegalStateException("Length of VariableMapping[] do not match"); + } + + HashMap<String, VariableMapping> actualMappings = new HashMap<String, VariableMapping>(vm2.length); + for (int i = 0; i < len1; i++) + { + VariableMapping current = vm2[i]; + if (actualMappings.containsKey(current.getJavaVariableName())) + throw new IllegalStateException("Variable '" + current.getJavaVariableName() + "' mapped more than once!"); + + actualMappings.put(current.getJavaVariableName(), current); + } + + for (int i = 0; i < len1; i++) + { + VariableMapping expected = vm1[i]; + VariableMapping actual = actualMappings.get(expected.getJavaVariableName()); + + if (actual == null) + throw new IllegalStateException("Variable '" + expected.getJavaVariableName() + "' not found."); + + bool = validateVariableMapping(expected, actual); + if (bool == false) + throw new IllegalStateException("VariableMapping " + variableMappingToString(expected) + " does not match with " + variableMappingToString(actual)); + + } + return bool; + } + + private String variableMappingToString(VariableMapping vm) + { + StringBuffer sb = new StringBuffer("["); + sb.append("JavaVariableName=").append(vm.getJavaVariableName()); + sb.append(",XmlAttributeName=").append(vm.getXmlAttributeName()); + sb.append(",XmlElementName=").append(vm.getXmlElementName()); + sb.append(",XmlWildcard=").append(vm.getXmlWildcard()); + sb.append(",DataMember=").append(vm.isDataMember()); + sb.append("]"); + + return sb.toString(); + } + + private boolean validateVariableMapping(VariableMapping vm1, VariableMapping vm2) + { + boolean bool = true; + bool = checkStringEquality(vm1.getJavaVariableName(), vm2.getJavaVariableName()); + if (bool) + bool = checkStringEquality(vm1.getXmlAttributeName(), vm2.getXmlAttributeName()); + if (bool) + bool = checkStringEquality(vm1.getXmlElementName(), vm2.getXmlElementName()); + if (bool) + bool = vm1.getXmlWildcard() == vm2.getXmlWildcard(); + if (bool) + bool = vm1.isDataMember() == vm2.isDataMember(); + return bool; + } + + private boolean validateServiceInterfaceMappings(ServiceInterfaceMapping[] sim1, ServiceInterfaceMapping[] sim2) + { + boolean bool = true; + int len1 = sim1 != null ? sim1.length : 0; + int len2 = sim2 != null ? sim2.length : 0; + if (len1 != len2) + { + throw new IllegalStateException("Length of ServiceInterfaceMapping[] do not match"); + } + + for (int i = 0; i < len1; i++) + { + bool = validateServiceInterfaceMapping(sim1[i], sim2[i]); + if (bool == false) + break; + } + return bool; + } + + private boolean validateServiceInterfaceMapping(ServiceInterfaceMapping sim1, ServiceInterfaceMapping sim2) + { + boolean bool = true; + bool = checkStringEquality(sim1.getServiceInterface(), sim2.getServiceInterface()); + if (bool) + bool = checkQNameEquality(sim1.getWsdlServiceName(), sim2.getWsdlServiceName()); + if (bool) + bool = validatePortMappings(sim1.getPortMappings(), sim2.getPortMappings()); + return bool; + } + + private boolean validatePortMappings(PortMapping[] pm1, PortMapping[] pm2) + { + boolean bool = true; + + int len1 = pm1 != null ? pm1.length : 0; + int len2 = pm2 != null ? pm2.length : 0; + if (len1 != len2) + { + throw new IllegalStateException("Length of PortMapping[] do not match"); + } + + for (int i = 0; i < len1; i++) + { + bool = validatePortMapping(pm1[i], pm2[i]); + if (bool == false) + break; + } + return bool; + } + + private boolean validatePortMapping(PortMapping pm1, PortMapping pm2) + { + boolean bool = true; + bool = checkStringEquality(pm1.getPortName(), pm2.getJavaPortName()); + if (bool) + bool = checkStringEquality(pm1.getJavaPortName(), pm2.getJavaPortName()); + return bool; + } + + private boolean validateServiceEndpointInterfaceMappings(ServiceEndpointInterfaceMapping[] sm1, ServiceEndpointInterfaceMapping[] sm2) + { + boolean bool = true; + + int len1 = sm1 != null ? sm1.length : 0; + int len2 = sm2 != null ? sm2.length : 0; + if (len1 != len2) + { + throw new IllegalStateException("Length of ServiceEndpointInterfaceMapping[] do not match"); + } + + for (int i = 0; i < len1; i++) + { + for (int j = 0; j < len1; j++) + { + bool = validateServiceEndpointInterfaceMapping(sm1[i], sm2[j]); + if (bool) + break; + } + if (bool == false) + throw new IllegalStateException(sm1[i].getServiceEndpointInterface() + " has no match"); + } + return bool; + } + + private boolean validateServiceEndpointInterfaceMapping(ServiceEndpointInterfaceMapping sm1, ServiceEndpointInterfaceMapping sm2) + { + boolean bool = true; + bool = checkStringEquality(sm1.getServiceEndpointInterface(), sm2.getServiceEndpointInterface()); + if (bool) + bool = checkQNameEquality(sm1.getWsdlBinding(), sm2.getWsdlBinding()); + if (bool) + bool = checkQNameEquality(sm1.getWsdlPortType(), sm2.getWsdlPortType()); + if (bool) + bool = validateServiceEndpointMethodMappings(sm1.getServiceEndpointMethodMappings(), sm2.getServiceEndpointMethodMappings()); + return bool; + } + + private boolean validateServiceEndpointMethodMappings(ServiceEndpointMethodMapping[] semm1, ServiceEndpointMethodMapping[] semm2) + { + boolean bool = true; + + int len1 = semm1 != null ? semm1.length : 0; + int len2 = semm2 != null ? semm2.length : 0; + if (len1 != len2) + { + throw new IllegalStateException("Length of ServiceEndpointMethodMapping[] do not match"); + } + + for (int i = 0; i < len1; i++) + { + for (int j = 0; j < len1; j++) + { + bool = validateServiceEndpointMethodMapping(semm1[i], semm2[j]); + if (bool) + break; + } + if (bool == false) + throw new IllegalStateException(semm1[i].getJavaMethodName() + " do not match in" + " in ServiceEndpointMethod Mapping"); + + } + return bool; + } + + private boolean validateServiceEndpointMethodMapping(ServiceEndpointMethodMapping semm1, ServiceEndpointMethodMapping semm2) + { + boolean bool = true; + bool = checkStringEquality(semm1.getJavaMethodName(), semm2.getJavaMethodName()); + if (bool) + bool = checkStringEquality(semm1.getWsdlOperation(), semm2.getWsdlOperation()); + else log.error("getJavaMethodName check failed"); + if (bool) + bool = semm1.isWrappedElement() == semm2.isWrappedElement(); + else log.error("wsdloperation check failed"); + if (bool) + bool = validateWsdlReturnValueMapping(semm1.getWsdlReturnValueMapping(), semm2.getWsdlReturnValueMapping()); + else log.error("isWrappedElement check failed"); + if (bool) + bool = validateMethodParamPartsMappings(semm1.getMethodParamPartsMappings(), semm2.getMethodParamPartsMappings()); + else log.error("validateWsdlReturnValueMapping check failed"); + + if (bool == false) + log.error("validateMethodParamPartsMappings check failed"); + return bool; + } + + private boolean validateWsdlReturnValueMapping(WsdlReturnValueMapping w1, WsdlReturnValueMapping w2) + { + checkNullParametersInconsistency(w1, w2, WsdlReturnValueMapping.class); + boolean bool = true; + if (w1 != null && w2 != null) + { + bool = checkStringEquality(w1.getMethodReturnValue(), w2.getMethodReturnValue()); + if (bool) + bool = checkStringEquality(w1.getWsdlMessagePartName(), w2.getWsdlMessagePartName()); + if (bool) + bool = checkQNameEquality(w1.getWsdlMessage(), w2.getWsdlMessage()); + } + + return bool; + } + + private boolean validateMethodParamPartsMappings(MethodParamPartsMapping[] mppm1, MethodParamPartsMapping[] mppm2) + { + boolean bool = true; + + int len1 = mppm1 != null ? mppm1.length : 0; + int len2 = mppm2 != null ? mppm2.length : 0; + if (len1 != len2) + { + throw new IllegalStateException("Length of MethodParamPartsMapping[] do not match"); + } + + for (int i = 0; i < len1; i++) + { + bool = validateMethodParamPartsMapping(mppm1[i], mppm2[i]); + if (bool == false) + break; + } + return bool; + } + + private boolean validateMethodParamPartsMapping(MethodParamPartsMapping mppm1, MethodParamPartsMapping mppm2) + { + boolean bool = true; + bool = mppm1.getParamPosition() == mppm2.getParamPosition(); + if (bool) + bool = checkStringEquality(mppm1.getParamType(), mppm2.getParamType()); + if (bool) + bool = validateWsdlMessageMapping(mppm1.getWsdlMessageMapping(), mppm2.getWsdlMessageMapping()); + return bool; + } + + private boolean validateWsdlMessageMapping(WsdlMessageMapping wmm1, WsdlMessageMapping wmm2) + { + String semmName = wmm1.getMethodParamPartsMapping().getServiceEndpointMethodMapping().getJavaMethodName(); + + String path = "ServiceEndpointMethodMapping-" + semmName + "/methodparampartsmapping"; + boolean bool = true; + if (bool) + bool = checkStringEquality(wmm1.getParameterMode(), wmm2.getParameterMode()); + if (bool) + bool = checkStringEquality(wmm1.getWsdlMessagePartName(), wmm2.getWsdlMessagePartName()); + else throw new IllegalStateException(path + "/parameterMode does not match"); + if (bool) + bool = checkQNameEquality(wmm1.getWsdlMessage(), wmm2.getWsdlMessage()); + if (bool) + bool = wmm1.isSoapHeader() == wmm2.isSoapHeader(); + else throw new IllegalStateException(path + "/wsdlMessage does not match"); + return bool; + } + + //PRIVATE EQUALITY CHECKS + + private boolean checkStringEquality(String str1, String str2) + { + if (str1 == null && str2 == null) + return true; + if (str1 == null && str2 != null) + return false; + if (str1 != null && str2 == null) + return false; + return str1.equals(str2); + } + + private boolean checkQNameEquality(QName q1, QName q2) + { + if (q1 == null && q2 == null) + return true; + if (q1 == null && q2 != null) + return false; + if (q1 != null && q2 == null) + return false; + return q1.equals(q2); + } + + private void checkNullParametersInconsistency(Object o1, Object o2, Class c) + { + WSDLUtils utils = WSDLUtils.getInstance(); + if ((o1 == null && o2 != null) || (o1 != null && o2 == null)) + throw new IllegalStateException(utils.getJustClassName(c) + " does not match"); + } } Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1079/LookupResponseNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1079/LookupResponseNumber.java) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1079/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1079/Person.java) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1079/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1079/PhoneBook_PortType.java) Modified: trunk/jbossws-tests/src/main/resources/tools/jbws1079/TelephoneNumber.java =================================================================== --- trunk/jbossws-tests/src/main/resources/tools/jbws1079/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1079/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,27 +1,26 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sun Nov 05 12:21:27 CET 2006 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 package org.jboss.test.ws.jbws1079; -public class TelephoneNumber -{ - -protected org.jboss.test.ws.jbws1079.TelephoneNumberNumber number; -public TelephoneNumber(){} - -public TelephoneNumber(org.jboss.test.ws.jbws1079.TelephoneNumberNumber number){ -this.number=number; +public class TelephoneNumber { + protected org.jboss.test.ws.jbws1079.LookupResponseNumber number; + + public TelephoneNumber() { + } + + public TelephoneNumber(org.jboss.test.ws.jbws1079.LookupResponseNumber number) { + this.number = number; + } + + public org.jboss.test.ws.jbws1079.LookupResponseNumber getNumber() { + return number; + } + + public void setNumber(org.jboss.test.ws.jbws1079.LookupResponseNumber number) { + this.number = number; + } } -public org.jboss.test.ws.jbws1079.TelephoneNumberNumber getNumber() { return number ;} - -public void setNumber(org.jboss.test.ws.jbws1079.TelephoneNumberNumber number){ this.number=number; } - -} Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1079/TelephoneNumberNumber.java =================================================================== --- trunk/jbossws-tests/src/main/resources/tools/jbws1079/TelephoneNumberNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1079/TelephoneNumberNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sun Nov 05 12:21:27 CET 2006 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1079; - - -public class TelephoneNumberNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumberNumber(){} - -public TelephoneNumberNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Modified: trunk/jbossws-tests/src/main/resources/tools/jbws1079/anonymous-mapping.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/tools/jbws1079/anonymous-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1079/anonymous-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,72 +1,77 @@ -<?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</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.TelephoneNumberNumber</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 +<?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> Modified: trunk/jbossws-tests/src/main/resources/tools/jbws1253/myporttype-mapping.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/tools/jbws1253/myporttype-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1253/myporttype-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,6 +1,10 @@ <?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.jbws1253</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1253/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1253</package-type> <namespaceURI>http://test.jboss.org/ws/jbws1253</namespaceURI> </package-mapping> <java-xml-type-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260 (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/Lookup.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/Lookup.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/Lookup.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Lookup { - protected java.lang.String surname; - - public Lookup() { - } - - public Lookup(java.lang.String surname) { - this.surname = surname; - } - - public java.lang.String getSurname() { - return surname; - } - - public void setSurname(java.lang.String surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/Lookup.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/Lookup.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/LookupResponse.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/LookupResponse.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/LookupResponse.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponse { - protected java.lang.String number; - - public LookupResponse() { - } - - public LookupResponse(java.lang.String number) { - this.number = number; - } - - public java.lang.String getNumber() { - return number; - } - - public void setNumber(java.lang.String number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/LookupResponse.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/LookupResponse.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public java.lang.String lookup(java.lang.String surname) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <element name='lookup'> - <complexType> - <sequence> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - - <element name='lookupResponse'> - <complexType> - <sequence> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,61 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponse</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... - <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.jbws1260.Lookup</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... - <qname-scope>complexType</qname-scope> - <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.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <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> - <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>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_A/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_A/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/LookupName.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/LookupName.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/LookupName.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupName { - protected org.jboss.test.ws.jbws1260.Title[] surname; - - public LookupName() { - } - - public LookupName(org.jboss.test.ws.jbws1260.Title[] surname) { - this.surname = surname; - } - - public org.jboss.test.ws.jbws1260.Title[] getSurname() { - return surname; - } - - public void setSurname(org.jboss.test.ws.jbws1260.Title[] surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/LookupName.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/LookupName.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/LookupResponseNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/LookupResponseNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/LookupResponseNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponseNumber { - protected org.jboss.test.ws.jbws1260.Telephone[] number; - - public LookupResponseNumber() { - } - - public LookupResponseNumber(org.jboss.test.ws.jbws1260.Telephone[] number) { - this.number = number; - } - - public org.jboss.test.ws.jbws1260.Telephone[] getNumber() { - return number; - } - - public void setNumber(org.jboss.test.ws.jbws1260.Telephone[] number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/LookupResponseNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/LookupResponseNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected org.jboss.test.ws.jbws1260.LookupName name; - - public Person() { - } - - public Person(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } - - public org.jboss.test.ws.jbws1260.LookupName getName() { - return name; - } - - public void setName(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponseNumber lookup(org.jboss.test.ws.jbws1260.LookupName name) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Telephone.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Telephone.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Telephone.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Telephone { - protected java.lang.String digits; - - public Telephone() { - } - - public Telephone(java.lang.String digits) { - this.digits = digits; - } - - public java.lang.String getDigits() { - return digits; - } - - public void setDigits(java.lang.String digits) { - this.digits = digits; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Telephone.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Telephone.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected org.jboss.test.ws.jbws1260.LookupResponseNumber number; - - public TelephoneNumber() { - } - - public TelephoneNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } - - public org.jboss.test.ws.jbws1260.LookupResponseNumber getNumber() { - return number; - } - - public void setNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Title.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Title.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Title.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Title { - protected java.lang.String text; - - public Title() { - } - - public Title(java.lang.String text) { - this.text = text; - } - - public java.lang.String getText() { - return text; - } - - public void setText(java.lang.String text) { - this.text = text; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Title.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Title.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Title'> - <sequence> - <element name='text' type='string'/> - </sequence> - </complexType> - - <complexType name='Person'> - <sequence> - <element name='Name'> - <complexType> - <sequence> - <element name='surname' nillable='true' type='tns:Title' maxOccurs='unbounded'/> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - - <complexType name='Telephone'> - <sequence> - <element name='digits' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='Number'> - <complexType> - <sequence> - <element name='number' nillable='true' type='tns:Telephone' maxOccurs='unbounded'/> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,110 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;T... - <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.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>name</java-variable-name> - <xml-element-name>Name</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Telephone</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>digits</java-variable-name> - <xml-element-name>digits</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;P... - <qname-scope>complexType</qname-scope> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/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.jbws1260.Title</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>text</java-variable-name> - <xml-element-name>text</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <!-- Anonymous wrapping of arrays not required for JBossWS --> - <!--java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Telephone[]</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;T... - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping--> - <!--java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Title[]</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;P... - <qname-scope>complexType</qname-scope> - </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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <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>org.jboss.test.ws.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Name</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.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_AA/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AA/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public java.lang.String lookup(java.lang.String parameters) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <element name='lookup'> - <simpleType> - <restriction base='string'> - <maxLength value="50"/> - </restriction> - </simpleType> - </element> - - <element name='lookupResponse'> - <simpleType> - <restriction base='string'> - <maxLength value="50"/> - </restriction> - </simpleType> - </element> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,38 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">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>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_AB/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AB/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public java.lang.String lookup(java.lang.String parameters) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <simpleType name='person'> - <restriction base='string'> - <maxLength value="50"/> - </restriction> - </simpleType> - - <simpleType name='number'> - <restriction base='string'> - <maxLength value="50"/> - </restriction> - </simpleType> - - <element name='lookup' type='tns:person'/> - <element name='lookupResponse' type='tns:number'/> - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,38 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">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>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_AC/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AC/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/Lookup.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/Lookup.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/Lookup.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Lookup { - protected java.lang.String firstName; - protected java.lang.String surname; - - public Lookup() { - } - - public Lookup(java.lang.String firstName, java.lang.String surname) { - this.firstName = firstName; - this.surname = surname; - } - - public java.lang.String getFirstName() { - return firstName; - } - - public void setFirstName(java.lang.String firstName) { - this.firstName = firstName; - } - - public java.lang.String getSurname() { - return surname; - } - - public void setSurname(java.lang.String surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/Lookup.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/Lookup.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/LookupResponse.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/LookupResponse.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/LookupResponse.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponse { - protected java.lang.String number; - - public LookupResponse() { - } - - public LookupResponse(java.lang.String number) { - this.number = number; - } - - public java.lang.String getNumber() { - return number; - } - - public void setNumber(java.lang.String number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/LookupResponse.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/LookupResponse.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public java.lang.String lookup(java.lang.String firstName, java.lang.String surname) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <element name='lookup'> - <complexType> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - - <element name='lookupResponse'> - <complexType> - <sequence> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,74 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponse</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... - <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.jbws1260.Lookup</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... - <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.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <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> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>firstName</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>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_AD/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AD/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected java.lang.String firstName; - protected java.lang.String surname; - - public Person() { - } - - public Person(java.lang.String firstName, java.lang.String surname) { - this.firstName = firstName; - this.surname = surname; - } - - public java.lang.String getFirstName() { - return firstName; - } - - public void setFirstName(java.lang.String firstName) { - this.firstName = firstName; - } - - public java.lang.String getSurname() { - return surname; - } - - public void setSurname(java.lang.String surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public java.lang.String lookup(java.lang.String firstName, java.lang.String surname) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected java.lang.String number; - - public TelephoneNumber() { - } - - public TelephoneNumber(java.lang.String number) { - this.number = number; - } - - public java.lang.String getNumber() { - return number; - } - - public void setNumber(java.lang.String number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,74 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/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.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/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.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <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> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>firstName</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>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_AE/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AE/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/LookupName.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/LookupName.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/LookupName.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupName { - protected java.lang.String firstName; - protected java.lang.String surname; - - public LookupName() { - } - - public LookupName(java.lang.String firstName, java.lang.String surname) { - this.firstName = firstName; - this.surname = surname; - } - - public java.lang.String getFirstName() { - return firstName; - } - - public void setFirstName(java.lang.String firstName) { - this.firstName = firstName; - } - - public java.lang.String getSurname() { - return surname; - } - - public void setSurname(java.lang.String surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/LookupName.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/LookupName.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/LookupResponseNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/LookupResponseNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/LookupResponseNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponseNumber { - protected java.lang.String number; - - public LookupResponseNumber() { - } - - public LookupResponseNumber(java.lang.String number) { - this.number = number; - } - - public java.lang.String getNumber() { - return number; - } - - public void setNumber(java.lang.String number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/LookupResponseNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/LookupResponseNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected org.jboss.test.ws.jbws1260.LookupName name; - - public Person() { - } - - public Person(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } - - public org.jboss.test.ws.jbws1260.LookupName getName() { - return name; - } - - public void setName(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponseNumber lookup(org.jboss.test.ws.jbws1260.LookupName name) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected org.jboss.test.ws.jbws1260.LookupResponseNumber number; - - public TelephoneNumber() { - } - - public TelephoneNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } - - public org.jboss.test.ws.jbws1260.LookupResponseNumber getNumber() { - return number; - } - - public void setNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='Name'> - <complexType> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='Number'> - <complexType> - <sequence> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,83 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/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.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;P... - <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.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;T... - <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.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>name</java-variable-name> - <xml-element-name>Name</xml-element-name> - </variable-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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <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>org.jboss.test.ws.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Name</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.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_AF/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AF/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected java.lang.String surname; - - public Person() { - } - - public Person(java.lang.String surname) { - this.surname = surname; - } - - public java.lang.String getSurname() { - return surname; - } - - public void setSurname(java.lang.String surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(org.jboss.test.ws.jbws1260.Person parameters) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected java.lang.String number; - - public TelephoneNumber() { - } - - public TelephoneNumber(java.lang.String number) { - this.number = number; - } - - public java.lang.String getNumber() { - return number; - } - - public void setNumber(java.lang.String number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - <element name='lookupPerson' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookupPerson' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,60 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/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.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <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.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_AG/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_AG/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/Lookup.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/Lookup.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/Lookup.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Lookup { - protected java.lang.String firstName; - protected java.lang.String surname; - - public Lookup() { - } - - public Lookup(java.lang.String firstName, java.lang.String surname) { - this.firstName = firstName; - this.surname = surname; - } - - public java.lang.String getFirstName() { - return firstName; - } - - public void setFirstName(java.lang.String firstName) { - this.firstName = firstName; - } - - public java.lang.String getSurname() { - return surname; - } - - public void setSurname(java.lang.String surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/Lookup.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/Lookup.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/LookupResponse.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/LookupResponse.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/LookupResponse.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponse { - protected java.lang.String areaCode; - protected java.lang.String number; - - public LookupResponse() { - } - - public LookupResponse(java.lang.String areaCode, java.lang.String number) { - this.areaCode = areaCode; - this.number = number; - } - - public java.lang.String getAreaCode() { - return areaCode; - } - - public void setAreaCode(java.lang.String areaCode) { - this.areaCode = areaCode; - } - - public java.lang.String getNumber() { - return number; - } - - public void setNumber(java.lang.String number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/LookupResponse.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/LookupResponse.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponse lookup(org.jboss.test.ws.jbws1260.Lookup parameters) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <element name='lookup'> - <complexType> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - - <element name='lookupResponse'> - <complexType> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,68 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponse</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... - <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.jbws1260.Lookup</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... - <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.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.Lookup</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.LookupResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_B/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_B/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected java.lang.String surname; - - public Person() { - } - - public Person(java.lang.String surname) { - this.surname = surname; - } - - public java.lang.String getSurname() { - return surname; - } - - public void setSurname(java.lang.String surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public java.lang.String lookup(java.lang.String surname) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected java.lang.String number; - - public TelephoneNumber() { - } - - public TelephoneNumber(java.lang.String number) { - this.number = number; - } - - public java.lang.String getNumber() { - return number; - } - - public void setNumber(java.lang.String number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,61 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/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.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <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.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <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> - <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>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_C/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_C/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected java.lang.String firstName; - protected java.lang.String surname; - - public Person() { - } - - public Person(java.lang.String firstName, java.lang.String surname) { - this.firstName = firstName; - this.surname = surname; - } - - public java.lang.String getFirstName() { - return firstName; - } - - public void setFirstName(java.lang.String firstName) { - this.firstName = firstName; - } - - public java.lang.String getSurname() { - return surname; - } - - public void setSurname(java.lang.String surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(org.jboss.test.ws.jbws1260.Person parameters) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected java.lang.String areaCode; - protected java.lang.String number; - - public TelephoneNumber() { - } - - public TelephoneNumber(java.lang.String areaCode, java.lang.String number) { - this.areaCode = areaCode; - this.number = number; - } - - public java.lang.String getAreaCode() { - return areaCode; - } - - public void setAreaCode(java.lang.String areaCode) { - this.areaCode = areaCode; - } - - public java.lang.String getNumber() { - return number; - } - - public void setNumber(java.lang.String number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,68 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <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.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/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.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_D/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_D/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/LookupName.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/LookupName.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/LookupName.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupName { - protected java.lang.String surname; - - public LookupName() { - } - - public LookupName(java.lang.String surname) { - this.surname = surname; - } - - public java.lang.String getSurname() { - return surname; - } - - public void setSurname(java.lang.String surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/LookupName.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/LookupName.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/LookupResponseNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/LookupResponseNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/LookupResponseNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponseNumber { - protected java.lang.String number; - - public LookupResponseNumber() { - } - - public LookupResponseNumber(java.lang.String number) { - this.number = number; - } - - public java.lang.String getNumber() { - return number; - } - - public void setNumber(java.lang.String number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/LookupResponseNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/LookupResponseNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected org.jboss.test.ws.jbws1260.LookupName name; - - public Person() { - } - - public Person(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } - - public org.jboss.test.ws.jbws1260.LookupName getName() { - return name; - } - - public void setName(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponseNumber lookup(org.jboss.test.ws.jbws1260.LookupName name) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected org.jboss.test.ws.jbws1260.LookupResponseNumber number; - - public TelephoneNumber() { - } - - public TelephoneNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } - - public org.jboss.test.ws.jbws1260.LookupResponseNumber getNumber() { - return number; - } - - public void setNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='Name'> - <complexType> - <sequence> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='Number'> - <complexType> - <sequence> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,79 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/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.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;P... - <qname-scope>complexType</qname-scope> - <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.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;T... - <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.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>name</java-variable-name> - <xml-element-name>Name</xml-element-name> - </variable-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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <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>org.jboss.test.ws.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Name</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.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_E/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_E/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/LookupName.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/LookupName.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/LookupName.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupName { - protected java.lang.String firstName; - protected java.lang.String surname; - - public LookupName() { - } - - public LookupName(java.lang.String firstName, java.lang.String surname) { - this.firstName = firstName; - this.surname = surname; - } - - public java.lang.String getFirstName() { - return firstName; - } - - public void setFirstName(java.lang.String firstName) { - this.firstName = firstName; - } - - public java.lang.String getSurname() { - return surname; - } - - public void setSurname(java.lang.String surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/LookupName.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/LookupName.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/LookupResponseNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/LookupResponseNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/LookupResponseNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponseNumber { - protected java.lang.String areaCode; - protected java.lang.String number; - - public LookupResponseNumber() { - } - - public LookupResponseNumber(java.lang.String areaCode, java.lang.String number) { - this.areaCode = areaCode; - this.number = number; - } - - public java.lang.String getAreaCode() { - return areaCode; - } - - public void setAreaCode(java.lang.String areaCode) { - this.areaCode = areaCode; - } - - public java.lang.String getNumber() { - return number; - } - - public void setNumber(java.lang.String number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/LookupResponseNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/LookupResponseNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected org.jboss.test.ws.jbws1260.LookupName name; - - public Person() { - } - - public Person(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } - - public org.jboss.test.ws.jbws1260.LookupName getName() { - return name; - } - - public void setName(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponseNumber lookup(org.jboss.test.ws.jbws1260.LookupName name) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected org.jboss.test.ws.jbws1260.LookupResponseNumber number; - - public TelephoneNumber() { - } - - public TelephoneNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } - - public org.jboss.test.ws.jbws1260.LookupResponseNumber getNumber() { - return number; - } - - public void setNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='Name'> - <complexType> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='Number'> - <complexType> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,87 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/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.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;P... - <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.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/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.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>name</java-variable-name> - <xml-element-name>Name</xml-element-name> - </variable-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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <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>org.jboss.test.ws.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Name</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.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_F/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_F/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/Lookup.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/Lookup.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/Lookup.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Lookup { - protected java.lang.String[] surname; - - public Lookup() { - } - - public Lookup(java.lang.String[] surname) { - this.surname = surname; - } - - public java.lang.String[] getSurname() { - return surname; - } - - public void setSurname(java.lang.String[] surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/Lookup.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/Lookup.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/LookupResponse.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/LookupResponse.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/LookupResponse.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponse { - protected java.lang.String[] number; - - public LookupResponse() { - } - - public LookupResponse(java.lang.String[] number) { - this.number = number; - } - - public java.lang.String[] getNumber() { - return number; - } - - public void setNumber(java.lang.String[] number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/LookupResponse.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/LookupResponse.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public java.lang.String[] lookup(java.lang.String[] surname) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <element name='lookup'> - <complexType> - <sequence> - <element name='surname' nillable='true' type='string' maxOccurs='unbounded'/> - </sequence> - </complexType> - </element> - - <element name='lookupResponse'> - <complexType> - <sequence> - <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> - </sequence> - </complexType> - </element> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,74 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponse</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... - <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>JavaXmlTypeMapping - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Lookup</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <!-- Anonymous wrapping of arrays not required for JBossWS --> - <!--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-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--> - - <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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <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> - <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>java.lang.String[]</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_G/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_G/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected java.lang.String[] surname; - - public Person() { - } - - public Person(java.lang.String[] surname) { - this.surname = surname; - } - - public java.lang.String[] getSurname() { - return surname; - } - - public void setSurname(java.lang.String[] surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public java.lang.String[] lookup(java.lang.String[] surname) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected java.lang.String[] number; - - public TelephoneNumber() { - } - - public TelephoneNumber(java.lang.String[] number) { - this.number = number; - } - - public java.lang.String[] getNumber() { - return number; - } - - public void setNumber(java.lang.String[] number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='surname' nillable='true' type='string' maxOccurs='unbounded'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,74 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/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.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <!-- Anonymous wrapping of arrays not required for JBossWS --> - <!--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> - <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--> - - <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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <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> - <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>java.lang.String[]</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_H/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_H/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/LookupName.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/LookupName.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/LookupName.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupName { - protected java.lang.String[] surname; - - public LookupName() { - } - - public LookupName(java.lang.String[] surname) { - this.surname = surname; - } - - public java.lang.String[] getSurname() { - return surname; - } - - public void setSurname(java.lang.String[] surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/LookupName.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/LookupName.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/LookupResponseNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/LookupResponseNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/LookupResponseNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponseNumber { - protected java.lang.String[] number; - - public LookupResponseNumber() { - } - - public LookupResponseNumber(java.lang.String[] number) { - this.number = number; - } - - public java.lang.String[] getNumber() { - return number; - } - - public void setNumber(java.lang.String[] number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/LookupResponseNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/LookupResponseNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected org.jboss.test.ws.jbws1260.LookupName name; - - public Person() { - } - - public Person(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } - - public org.jboss.test.ws.jbws1260.LookupName getName() { - return name; - } - - public void setName(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponseNumber lookup(org.jboss.test.ws.jbws1260.LookupName name) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected org.jboss.test.ws.jbws1260.LookupResponseNumber number; - - public TelephoneNumber() { - } - - public TelephoneNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } - - public org.jboss.test.ws.jbws1260.LookupResponseNumber getNumber() { - return number; - } - - public void setNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='Name'> - <complexType> - <sequence> - <element name='surname' nillable='true' type='string' maxOccurs='unbounded'/> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='Number'> - <complexType> - <sequence> - <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,92 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/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.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;P... - <qname-scope>complexType</qname-scope> - <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.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;T... - <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.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>name</java-variable-name> - <xml-element-name>Name</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <!-- Anonymous wrapping of arrays not required for JBossWS --> - <!--java-xml-type-mapping> - <java-type>java.lang.String[]</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;P... - <qname-scope>complexType</qname-scope> - </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;T... - <qname-scope>complexType</qname-scope> - </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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <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>org.jboss.test.ws.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Name</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.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_I/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_I/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/Lookup.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/Lookup.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/Lookup.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,13 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Lookup { - - public Lookup() { - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/Lookup.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/Lookup.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/LookupResponse.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/LookupResponse.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/LookupResponse.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,13 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponse { - - public LookupResponse() { - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/LookupResponse.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/LookupResponse.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponse lookup() throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <element name='lookup'> - <complexType> - <sequence> - </sequence> - </complexType> - </element> - - <element name='lookupResponse'> - <complexType> - <sequence> - </sequence> - </complexType> - </element> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,44 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Lookup</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-type>org.jboss.test.ws.jbws1260.LookupResponse</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... - <qname-scope>complexType</qname-scope> - </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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> - <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... - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_J/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_J/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,13 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - - public Person() { - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.TelephoneNumber lookup() throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,13 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - - public TelephoneNumber() { - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,44 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - </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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> - <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... - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_K/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_K/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/LookupName.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/LookupName.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/LookupName.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,13 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupName { - - public LookupName() { - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/LookupName.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/LookupName.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/LookupResponseNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/LookupResponseNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/LookupResponseNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,13 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponseNumber { - - public LookupResponseNumber() { - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/LookupResponseNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/LookupResponseNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected org.jboss.test.ws.jbws1260.LookupName name; - - public Person() { - } - - public Person(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } - - public org.jboss.test.ws.jbws1260.LookupName getName() { - return name; - } - - public void setName(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponseNumber lookup(org.jboss.test.ws.jbws1260.LookupName name) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected org.jboss.test.ws.jbws1260.LookupResponseNumber number; - - public TelephoneNumber() { - } - - public TelephoneNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } - - public org.jboss.test.ws.jbws1260.LookupResponseNumber getNumber() { - return number; - } - - public void setNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='Name'> - <complexType> - <sequence> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='Number'> - <complexType> - <sequence> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,71 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;P... - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;T... - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>name</java-variable-name> - <xml-element-name>Name</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/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> - <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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <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>org.jboss.test.ws.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Name</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.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_L/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_L/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/Lookup.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/Lookup.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/Lookup.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Lookup { - protected java.lang.String postcode; - protected java.lang.String surname; - - public Lookup() { - } - - public Lookup(java.lang.String postcode, java.lang.String surname) { - this.postcode = postcode; - this.surname = surname; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String getSurname() { - return surname; - } - - public void setSurname(java.lang.String surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/Lookup.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/Lookup.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/LookupResponse.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/LookupResponse.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/LookupResponse.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponse { - protected java.lang.String postcode; - protected java.lang.String number; - - public LookupResponse() { - } - - public LookupResponse(java.lang.String postcode, java.lang.String number) { - this.postcode = postcode; - this.number = number; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String getNumber() { - return number; - } - - public void setNumber(java.lang.String number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/LookupResponse.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/LookupResponse.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponse lookup(org.jboss.test.ws.jbws1260.Lookup parameters) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <element name='lookup'> - <complexType> - <sequence> - <element name='surname' nillable='true' type='string'/> - </sequence> - <attribute name='postcode' type='string'/> - </complexType> - </element> - - <element name='lookupResponse'> - <complexType> - <sequence> - <element name='number' nillable='true' type='string'/> - </sequence> - <attribute name='postcode' type='string'/> - </complexType> - </element> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,68 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Lookup</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-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.jbws1260.LookupResponse</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-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.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.Lookup</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.LookupResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_M/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_M/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected java.lang.String postcode; - protected java.lang.String surname; - - public Person() { - } - - public Person(java.lang.String postcode, java.lang.String surname) { - this.postcode = postcode; - this.surname = surname; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String getSurname() { - return surname; - } - - public void setSurname(java.lang.String surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(org.jboss.test.ws.jbws1260.Person parameters) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected java.lang.String postcode; - protected java.lang.String number; - - public TelephoneNumber() { - } - - public TelephoneNumber(java.lang.String postcode, java.lang.String number) { - this.postcode = postcode; - this.number = number; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String getNumber() { - return number; - } - - public void setNumber(java.lang.String number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='surname' nillable='true' type='string'/> - </sequence> - <attribute name='postcode' type='string'/> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='number' nillable='true' type='string'/> - </sequence> - <attribute name='postcode' type='string'/> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,68 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-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.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_N/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_N/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/LookupName.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/LookupName.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/LookupName.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupName { - protected java.lang.String postcode; - protected java.lang.String surname; - - public LookupName() { - } - - public LookupName(java.lang.String postcode, java.lang.String surname) { - this.postcode = postcode; - this.surname = surname; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String getSurname() { - return surname; - } - - public void setSurname(java.lang.String surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/LookupName.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/LookupName.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/LookupResponseNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/LookupResponseNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/LookupResponseNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponseNumber { - protected java.lang.String postcode; - protected java.lang.String number; - - public LookupResponseNumber() { - } - - public LookupResponseNumber(java.lang.String postcode, java.lang.String number) { - this.postcode = postcode; - this.number = number; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String getNumber() { - return number; - } - - public void setNumber(java.lang.String number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/LookupResponseNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/LookupResponseNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected org.jboss.test.ws.jbws1260.LookupName name; - - public Person() { - } - - public Person(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } - - public org.jboss.test.ws.jbws1260.LookupName getName() { - return name; - } - - public void setName(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponseNumber lookup(org.jboss.test.ws.jbws1260.LookupName name) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected org.jboss.test.ws.jbws1260.LookupResponseNumber number; - - public TelephoneNumber() { - } - - public TelephoneNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } - - public org.jboss.test.ws.jbws1260.LookupResponseNumber getNumber() { - return number; - } - - public void setNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='Name'> - <complexType> - <sequence> - <element name='surname' nillable='true' type='string'/> - </sequence> - <attribute name='postcode' type='string'/> - </complexType> - </element> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='Number'> - <complexType> - <sequence> - <element name='number' nillable='true' type='string'/> - </sequence> - <attribute name='postcode' type='string'/> - </complexType> - </element> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,87 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;P... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-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.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>name</java-variable-name> - <xml-element-name>Name</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/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.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;T... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-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.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <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>org.jboss.test.ws.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Name</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.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_O/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_O/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/Lookup.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/Lookup.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/Lookup.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Lookup { - protected java.lang.String postcode; - protected java.lang.String[] surname; - - public Lookup() { - } - - public Lookup(java.lang.String postcode, java.lang.String[] surname) { - this.postcode = postcode; - this.surname = surname; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String[] getSurname() { - return surname; - } - - public void setSurname(java.lang.String[] surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/Lookup.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/Lookup.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/LookupResponse.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/LookupResponse.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/LookupResponse.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponse { - protected java.lang.String postcode; - protected java.lang.String[] number; - - public LookupResponse() { - } - - public LookupResponse(java.lang.String postcode, java.lang.String[] number) { - this.postcode = postcode; - this.number = number; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String[] getNumber() { - return number; - } - - public void setNumber(java.lang.String[] number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/LookupResponse.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/LookupResponse.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponse lookup(org.jboss.test.ws.jbws1260.Lookup parameters) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <element name='lookup'> - <complexType> - <sequence> - <element name='surname' nillable='true' type='string' maxOccurs='unbounded'/> - </sequence> - <attribute name='postcode' type='string'/> - </complexType> - </element> - - <element name='lookupResponse'> - <complexType> - <sequence> - <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> - </sequence> - <attribute name='postcode' type='string'/> - </complexType> - </element> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,78 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Lookup</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-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.jbws1260.LookupResponse</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-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>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-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> - <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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.Lookup</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.LookupResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_P/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_P/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected java.lang.String postcode; - protected java.lang.String[] surname; - - public Person() { - } - - public Person(java.lang.String postcode, java.lang.String[] surname) { - this.postcode = postcode; - this.surname = surname; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String[] getSurname() { - return surname; - } - - public void setSurname(java.lang.String[] surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(org.jboss.test.ws.jbws1260.Person parameters) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected java.lang.String postcode; - protected java.lang.String[] number; - - public TelephoneNumber() { - } - - public TelephoneNumber(java.lang.String postcode, java.lang.String[] number) { - this.postcode = postcode; - this.number = number; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String[] getNumber() { - return number; - } - - public void setNumber(java.lang.String[] number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='surname' nillable='true' type='string' maxOccurs='unbounded'/> - </sequence> - <attribute name='postcode' type='string'/> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> - </sequence> - <attribute name='postcode' type='string'/> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,78 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-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>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-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> - <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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_Q/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Q/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/LookupName.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/LookupName.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/LookupName.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupName { - protected java.lang.String postcode; - protected java.lang.String[] surname; - - public LookupName() { - } - - public LookupName(java.lang.String postcode, java.lang.String[] surname) { - this.postcode = postcode; - this.surname = surname; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String[] getSurname() { - return surname; - } - - public void setSurname(java.lang.String[] surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/LookupName.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/LookupName.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/LookupResponseNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/LookupResponseNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/LookupResponseNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponseNumber { - protected java.lang.String postcode; - protected java.lang.String[] number; - - public LookupResponseNumber() { - } - - public LookupResponseNumber(java.lang.String postcode, java.lang.String[] number) { - this.postcode = postcode; - this.number = number; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String[] getNumber() { - return number; - } - - public void setNumber(java.lang.String[] number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/LookupResponseNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/LookupResponseNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected org.jboss.test.ws.jbws1260.LookupName name; - - public Person() { - } - - public Person(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } - - public org.jboss.test.ws.jbws1260.LookupName getName() { - return name; - } - - public void setName(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponseNumber lookup(org.jboss.test.ws.jbws1260.LookupName name) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected org.jboss.test.ws.jbws1260.LookupResponseNumber number; - - public TelephoneNumber() { - } - - public TelephoneNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } - - public org.jboss.test.ws.jbws1260.LookupResponseNumber getNumber() { - return number; - } - - public void setNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='Name'> - <complexType> - <sequence> - <element name='surname' nillable='true' type='string' maxOccurs='unbounded'/> - </sequence> - <attribute name='postcode' type='string'/> - </complexType> - </element> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='Number'> - <complexType> - <sequence> - <element name='number' nillable='true' type='string' maxOccurs='unbounded'/> - </sequence> - <attribute name='postcode' type='string'/> - </complexType> - </element> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,100 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;P... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-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.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>name</java-variable-name> - <xml-element-name>Name</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/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.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;T... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-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> - - <!-- Anonymous wrapping of arrays not required for JBossWS --> - <!--java-xml-type-mapping> - <java-type>java.lang.String[]</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;P... - <qname-scope>complexType</qname-scope> - </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;T... - <qname-scope>complexType</qname-scope> - </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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <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>org.jboss.test.ws.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Name</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.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_R/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_R/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/Lookup.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/Lookup.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/Lookup.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Lookup { - protected java.lang.String postcode; - - public Lookup() { - } - - public Lookup(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/Lookup.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/Lookup.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/LookupResponse.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/LookupResponse.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/LookupResponse.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponse { - protected java.lang.String postcode; - - public LookupResponse() { - } - - public LookupResponse(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/LookupResponse.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/LookupResponse.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponse lookup(org.jboss.test.ws.jbws1260.Lookup parameters) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <element name='lookup'> - <complexType> - <sequence> - </sequence> - <attribute name='postcode' type='string'/> - </complexType> - </element> - - <element name='lookupResponse'> - <complexType> - <sequence> - </sequence> - <attribute name='postcode' type='string'/> - </complexType> - </element> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,60 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Lookup</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponse</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.Lookup</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.LookupResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_S/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_S/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected java.lang.String postcode; - - public Person() { - } - - public Person(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(org.jboss.test.ws.jbws1260.Person parameters) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected java.lang.String postcode; - - public TelephoneNumber() { - } - - public TelephoneNumber(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - </sequence> - <attribute name='postcode' type='string'/> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - </sequence> - <attribute name='postcode' type='string'/> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,60 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_T/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_T/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/LookupName.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/LookupName.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/LookupName.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupName { - protected java.lang.String postcode; - - public LookupName() { - } - - public LookupName(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/LookupName.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/LookupName.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/LookupResponseNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/LookupResponseNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/LookupResponseNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponseNumber { - protected java.lang.String postcode; - - public LookupResponseNumber() { - } - - public LookupResponseNumber(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/LookupResponseNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/LookupResponseNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected org.jboss.test.ws.jbws1260.LookupName name; - - public Person() { - } - - public Person(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } - - public org.jboss.test.ws.jbws1260.LookupName getName() { - return name; - } - - public void setName(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponseNumber lookup(org.jboss.test.ws.jbws1260.LookupName name) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected org.jboss.test.ws.jbws1260.LookupResponseNumber number; - - public TelephoneNumber() { - } - - public TelephoneNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } - - public org.jboss.test.ws.jbws1260.LookupResponseNumber getNumber() { - return number; - } - - public void setNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='Name'> - <complexType> - <sequence> - </sequence> - <attribute name='postcode' type='string'/> - </complexType> - </element> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='Number'> - <complexType> - <sequence> - </sequence> - <attribute name='postcode' type='string'/> - </complexType> - </element> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,79 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;P... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>name</java-variable-name> - <xml-element-name>Name</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/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.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;T... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <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>org.jboss.test.ws.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Name</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.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_U/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_U/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/Lookup.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/Lookup.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/Lookup.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Lookup { - protected java.lang.String postcode; - - public Lookup() { - } - - public Lookup(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/Lookup.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/Lookup.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/LookupResponse.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/LookupResponse.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/LookupResponse.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponse { - protected java.lang.String postcode; - - public LookupResponse() { - } - - public LookupResponse(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/LookupResponse.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/LookupResponse.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponse lookup(org.jboss.test.ws.jbws1260.Lookup parameters) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <element name='lookup'> - <complexType> - <attribute name='postcode' type='string'/> - </complexType> - </element> - - <element name='lookupResponse'> - <complexType> - <attribute name='postcode' type='string'/> - </complexType> - </element> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,60 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Lookup</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponse</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.Lookup</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.LookupResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_V/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_V/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected java.lang.String postcode; - - public Person() { - } - - public Person(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(org.jboss.test.ws.jbws1260.Person parameters) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected java.lang.String postcode; - - public TelephoneNumber() { - } - - public TelephoneNumber(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <attribute name='postcode' type='string'/> - </complexType> - - <complexType name='TelephoneNumber'> - <attribute name='postcode' type='string'/> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,60 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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.jbws1260.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_W/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_W/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/LookupName.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/LookupName.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/LookupName.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupName { - protected java.lang.String postcode; - - public LookupName() { - } - - public LookupName(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/LookupName.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/LookupName.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/LookupResponseNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/LookupResponseNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/LookupResponseNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponseNumber { - protected java.lang.String postcode; - - public LookupResponseNumber() { - } - - public LookupResponseNumber(java.lang.String postcode) { - this.postcode = postcode; - } - - public java.lang.String getPostcode() { - return postcode; - } - - public void setPostcode(java.lang.String postcode) { - this.postcode = postcode; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/LookupResponseNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/LookupResponseNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected org.jboss.test.ws.jbws1260.LookupName name; - - public Person() { - } - - public Person(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } - - public org.jboss.test.ws.jbws1260.LookupName getName() { - return name; - } - - public void setName(org.jboss.test.ws.jbws1260.LookupName name) { - this.name = name; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponseNumber lookup(org.jboss.test.ws.jbws1260.LookupName name) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected org.jboss.test.ws.jbws1260.LookupResponseNumber number; - - public TelephoneNumber() { - } - - public TelephoneNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } - - public org.jboss.test.ws.jbws1260.LookupResponseNumber getNumber() { - return number; - } - - public void setNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='Name'> - <complexType> - <attribute name='postcode' type='string'/> - </complexType> - </element> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='Number'> - <complexType> - <attribute name='postcode' type='string'/> - </complexType> - </element> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,79 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>name</java-variable-name> - <xml-element-name>Name</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/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.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <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>org.jboss.test.ws.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Name</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.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_X/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_X/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Lookup.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Lookup.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Lookup.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Lookup { - protected org.jboss.test.ws.jbws1260.Name[] surname; - - public Lookup() { - } - - public Lookup(org.jboss.test.ws.jbws1260.Name[] surname) { - this.surname = surname; - } - - public org.jboss.test.ws.jbws1260.Name[] getSurname() { - return surname; - } - - public void setSurname(org.jboss.test.ws.jbws1260.Name[] surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Lookup.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Lookup.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/LookupResponse.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/LookupResponse.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/LookupResponse.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class LookupResponse { - protected org.jboss.test.ws.jbws1260.Telephone[] number; - - public LookupResponse() { - } - - public LookupResponse(org.jboss.test.ws.jbws1260.Telephone[] number) { - this.number = number; - } - - public org.jboss.test.ws.jbws1260.Telephone[] getNumber() { - return number; - } - - public void setNumber(org.jboss.test.ws.jbws1260.Telephone[] number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/LookupResponse.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/LookupResponse.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Name.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Name.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Name.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Name { - protected java.lang.String title; - - public Name() { - } - - public Name(java.lang.String title) { - this.title = title; - } - - public java.lang.String getTitle() { - return title; - } - - public void setTitle(java.lang.String title) { - this.title = title; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Name.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Name.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.Telephone[] lookup(org.jboss.test.ws.jbws1260.Name[] surname) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Telephone.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Telephone.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Telephone.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Telephone { - protected java.lang.String digits; - - public Telephone() { - } - - public Telephone(java.lang.String digits) { - this.digits = digits; - } - - public java.lang.String getDigits() { - return digits; - } - - public void setDigits(java.lang.String digits) { - this.digits = digits; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Telephone.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Telephone.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Name'> - <sequence> - <element name='title' type='string'/> - </sequence> - </complexType> - - <element name='lookup'> - <complexType> - <sequence> - <element name='surname' nillable='true' type='tns:Name' maxOccurs='unbounded'/> - </sequence> - </complexType> - </element> - - <complexType name='Telephone'> - <sequence> - <element name='digits' type='string'/> - </sequence> - </complexType> - - <element name='lookupResponse'> - <complexType> - <sequence> - <element name='number' nillable='true' type='tns:Telephone' maxOccurs='unbounded'/> - </sequence> - </complexType> - </element> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,92 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponse</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... - <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.jbws1260.Name</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>title</java-variable-name> - <xml-element-name>title</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Telephone</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>digits</java-variable-name> - <xml-element-name>digits</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Lookup</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <!-- Anonymous wrapping of arrays not required for JBossWS --> - <!--java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Telephone[]</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-type>org.jboss.test.ws.jbws1260.Name[]</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:&gt;l... - <qname-scope>complexType</qname-scope> - </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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <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>org.jboss.test.ws.jbws1260.Name[]</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.Telephone[]</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_Y/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Y/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Name.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Name.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Name.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Name { - protected java.lang.String title; - - public Name() { - } - - public Name(java.lang.String title) { - this.title = title; - } - - public java.lang.String getTitle() { - return title; - } - - public void setTitle(java.lang.String title) { - this.title = title; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Name.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Name.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Person.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Person.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Person { - protected org.jboss.test.ws.jbws1260.Name[] surname; - - public Person() { - } - - public Person(org.jboss.test.ws.jbws1260.Name[] surname) { - this.surname = surname; - } - - public org.jboss.test.ws.jbws1260.Name[] getSurname() { - return surname; - } - - public void setSurname(org.jboss.test.ws.jbws1260.Name[] surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Person.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/PhoneBook_PortType.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/PhoneBook_PortType.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.Telephone[] lookup(org.jboss.test.ws.jbws1260.Name[] surname) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/PhoneBook_PortType.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Telephone.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Telephone.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Telephone.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class Telephone { - protected java.lang.String digits; - - public Telephone() { - } - - public Telephone(java.lang.String digits) { - this.digits = digits; - } - - public java.lang.String getDigits() { - return digits; - } - - public void setDigits(java.lang.String digits) { - this.digits = digits; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Telephone.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Telephone.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/TelephoneNumber.java 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/TelephoneNumber.java 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,26 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1260; - - -public class TelephoneNumber { - protected org.jboss.test.ws.jbws1260.Telephone[] number; - - public TelephoneNumber() { - } - - public TelephoneNumber(org.jboss.test.ws.jbws1260.Telephone[] number) { - this.number = number; - } - - public org.jboss.test.ws.jbws1260.Telephone[] getNumber() { - return number; - } - - public void setNumber(org.jboss.test.ws.jbws1260.Telephone[] number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/TelephoneNumber.java (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Wrapped.wsdl 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Wrapped.wsdl 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Name'> - <sequence> - <element name='title' type='string'/> - </sequence> - </complexType> - - <complexType name='Person'> - <sequence> - <element name='surname' nillable='true' type='tns:Name' maxOccurs='unbounded'/> - </sequence> - </complexType> - - <complexType name='Telephone'> - <sequence> - <element name='digits' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='number' nillable='true' type='tns:Telephone' maxOccurs='unbounded'/> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Wrapped.wsdl (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/Wrapped.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/wrapped-mapping.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/wrapped-mapping.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,92 +0,0 @@ -<?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.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/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.jbws1260.Name</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>title</java-variable-name> - <xml-element-name>title</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Telephone</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>digits</java-variable-name> - <xml-element-name>digits</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <!-- Anonymous wrapping of arrays not required for JBossWS --> - <!--java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Telephone[]</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> - <java-type>org.jboss.test.ws.jbws1260.Name[]</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:Person&am... - <qname-scope>complexType</qname-scope> - </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... - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingN... - <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>org.jboss.test.ws.jbws1260.Name[]</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.Telephone[]</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgN... - <wsdl-message-part-name>number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/wrapped-mapping.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/wrapped-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/wstools-config.xml 2007-01-09 19:26:38 UTC (rev 1879) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/wstools-config.xml 2007-01-09 22:48:54 UTC (rev 1880) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1260/scenario_Z/Wrapped.wsdl" parameter-style="wrapped"> - <mapping file="wrapped-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/wstools-config.xml (from rev 1879, branches/dlofthouse/JBWS-1260/jbossws-tests/src/main/resources/tools/jbws1260/scenario_Z/wstools-config.xml)