[jbossws-commits] JBossWS SVN: r1898 - in trunk: jbossws-tests/src/main/java/org/jboss/test/ws/tools and 5 other directories.

Author: darran.lofthouse(a)jboss.com Date: 2007-01-10 10:07:59 -0500 (Wed, 10 Jan 2007) New Revision: 1898 Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java trunk/jbossws-tests/src/main/resources/tools/jbws810/ trunk/jbossws-tests/src/main/resources/tools/jbws810/document/ trunk/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws810/document/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws810/document/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/ trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/wstools-config.xml Removed: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java trunk/jbossws-tests/src/main/resources/tools/jbws810/document/ trunk/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws810/document/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws810/document/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/ trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/wstools-config.xml Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java Log: JBWS-810 - WSDL to Java handling for simple types. 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-10 14:55:22 UTC (rev 1897) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-10 15:07:59 UTC (rev 1898) @@ -234,17 +234,20 @@ QName xmlType = win.getXMLType(); String partName = win.getPartName(); String wsdlMessageName = win.getMessageName().getLocalPart(); + XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); boolean wrapped = isWrapped(); if (wrapped) { - XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); wrapped = unwrapRequest(semm, wsdlMessageName, xmlName.getLocalPart(), xt); } if (wrapped == false) { + if (xt instanceof XSSimpleTypeDefinition) + xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); + mpin = getMethodParamPartsMapping(semm, xmlName, xmlType, paramPosition, wsdlMessageName, "IN", partName, false, true); semm.addMethodParamPartsMapping(mpin); } @@ -331,6 +334,7 @@ if (win == null) throw new WSException("RPC endpoints require an input message"); String wsdlMessageName = win.getMessageName().getLocalPart(); + JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); RPCSignature signature = new RPCSignature(wiop); int i = 0; @@ -340,6 +344,10 @@ QName xmlName = new QName(partName); QName xmlType = part.getType(); + XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); + if (xt instanceof XSSimpleTypeDefinition) + xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); + MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, xmlName, xmlType, i++, wsdlMessageName, getMode(wiop, part.getName()), partName, false, true); semm.addMethodParamPartsMapping(mpin); @@ -352,6 +360,10 @@ QName xmlName = new QName(partName); QName xmlType = returnParameter.getType(); + XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); + if (xt instanceof XSSimpleTypeDefinition) + xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); + WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm); wrvm.setMethodReturnValue(getJavaTypeAsString(xmlName, xmlType, false, true)); QName messageName = WSDLUtils.getWsdl11Output(wiop).getMessageName(); Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810 (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2007-01-10 14:33:30 UTC (rev 1896) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2007-01-10 15:07:59 UTC (rev 1898) @@ -1,76 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, 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.jbws810; - -import java.io.File; - -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.tools.WSTools; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 10 Jan 2007 - */ -public class JBWS810TestCase extends JBossWSTest -{ - - private static final String resourceDir = "resources/tools/jbws810"; - private static final String toolsDir = "tools/jbws810"; - - public void testDocument() throws Exception - { - runTest("document"); - } - - public void testRPC() throws Exception - { - runTest("rpc"); - } - - public void runTest(final String type) throws Exception - { - String testToolsDir = toolsDir + "/" + type; - String testResourceDir = resourceDir + "/" + type; - - String[] args = new String[] { "-dest", testToolsDir, "-config", testResourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - - compareSource(type, "PhoneBook_PortType.java"); - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(testResourceDir + "/jaxrpc-mapping.xml", testToolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String type, final String fileName) throws Exception - { - File expected = new File(resourceDir + "/" + type + "/" + fileName); - File generated = new File(toolsDir + "/" + type + "/org/jboss/test/ws/jbws810/" + fileName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810 (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810/document (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook.wsdl =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook.wsdl 2007-01-10 14:33:30 UTC (rev 1896) +++ trunk/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook.wsdl 2007-01-10 15:07:59 UTC (rev 1898) @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws810' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws810/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws810' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws810/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws810/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <simpleType name="Person"> - <restriction base="string"> - <maxLength value="20"/> - </restriction> - </simpleType> - - <simpleType name="TelephoneNumber"> - <restriction base="string"> - <maxLength value="20"/> - </restriction> - </simpleType> - - <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/jbws810/document/PhoneBook.wsdl (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook_PortType.java 2007-01-10 14:33:30 UTC (rev 1896) +++ trunk/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook_PortType.java 2007-01-10 15:07:59 UTC (rev 1898) @@ -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.jbws810; - -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/jbws810/document/PhoneBook_PortType.java (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws810/document/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/jaxrpc-mapping.xml 2007-01-10 14:33:30 UTC (rev 1896) +++ trunk/jbossws-tests/src/main/resources/tools/jbws810/document/jaxrpc-mapping.xml 2007-01-10 15:07:59 UTC (rev 1898) @@ -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.jbws810</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws810</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws810.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws810">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.jbws810.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws810">portType... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws810">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>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws810">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>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws810">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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810/document/jaxrpc-mapping.xml (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/jaxrpc-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws810/document/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/wstools-config.xml 2007-01-10 14:33:30 UTC (rev 1896) +++ trunk/jbossws-tests/src/main/resources/tools/jbws810/document/wstools-config.xml 2007-01-10 15:07:59 UTC (rev 1898) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws810/document/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810/document/wstools-config.xml (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook.wsdl =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook.wsdl 2007-01-10 14:33:30 UTC (rev 1896) +++ trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook.wsdl 2007-01-10 15:07:59 UTC (rev 1898) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws810' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws810/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws810' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws810/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws810/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <simpleType name="Person"> - <restriction base="string"> - <maxLength value="20"/> - </restriction> - </simpleType> - - <simpleType name="TelephoneNumber"> - <restriction base="string"> - <maxLength value="20"/> - </restriction> - </simpleType> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part name='Person_1' type='ns1:Person'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part name='result' type='ns1:TelephoneNumber'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup' parameterOrder='Person_1'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://test.jboss.org/ws/jbws810' use='literal'/> - </input> - <output> - <soap:body namespace='http://test.jboss.org/ws/jbws810' 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/jbws810/rpc/PhoneBook.wsdl (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook_PortType.java 2007-01-10 14:33:30 UTC (rev 1896) +++ trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook_PortType.java 2007-01-10 15:07:59 UTC (rev 1898) @@ -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.jbws810; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public java.lang.String lookup(java.lang.String person_1) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook_PortType.java (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/jaxrpc-mapping.xml 2007-01-10 14:33:30 UTC (rev 1896) +++ trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/jaxrpc-mapping.xml 2007-01-10 15:07:59 UTC (rev 1898) @@ -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.jbws810</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws810</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws810.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws810">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.jbws810.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws810">portType... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws810">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>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws810">wsdlMsgNS... - <wsdl-message-part-name>Person_1</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/jbws810">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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/jaxrpc-mapping.xml (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/jaxrpc-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/wstools-config.xml 2007-01-10 14:33:30 UTC (rev 1896) +++ trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/wstools-config.xml 2007-01-10 15:07:59 UTC (rev 1898) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws810/rpc/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/wstools-config.xml (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/wstools-config.xml)