Author: darran.lofthouse(a)jboss.com Date: 2007-06-07 09:47:44 -0400 (Thu, 07 Jun 2007) New Revision: 3488 Added: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml Removed: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java Log: JBWS-1703 - WSDL To Java - document/literal, IN OUT parameter incorectly used as return type. Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 12:45:57 UTC (rev 3487) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 13:47:44 UTC (rev 3488) @@ -378,13 +378,12 @@ boolean holder = false; if (input != null && input.getElement() != null) { - QName xmlName = input.getElement(); - QName xmlType = input.getXMLType(); - JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); - XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); - + QName xmlName = input.getElement(); + holder = output != null && xmlName.equals(output.getElement()); + appendParameters(paramBuffer, input, output, xmlName.getLocalPart()); } + if (!holder && output != null && output.getElement() != null) { QName xmlName = output.getElement(); Modified: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-06-07 12:45:57 UTC (rev 3487) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-06-07 13:47:44 UTC (rev 3488) @@ -227,8 +227,13 @@ private void constructDOCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop) { WSDLInterfaceOperationInput win = WSDLUtils.getWsdl11Input(wiop); + WSDLInterfaceOperationOutput output = WSDLUtils.getWsdl11Output(wiop); + JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); MethodParamPartsMapping mpin = null; + + boolean holder = false; + if (win != null) { QName xmlName = win.getElement(); @@ -248,14 +253,19 @@ { if (xt instanceof XSSimpleTypeDefinition) xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); + String paramMode = "IN"; + holder = output != null && xmlName.equals(output.getElement()); + if (holder == true) + { + paramMode = "INOUT"; + } - mpin = getMethodParamPartsMapping(semm, xmlName, xmlType, 0, wsdlMessageName, "IN", partName, false, true); + mpin = getMethodParamPartsMapping(semm, xmlName, xmlType, 0, wsdlMessageName, paramMode, partName, false, true); semm.addMethodParamPartsMapping(mpin); } } - WSDLInterfaceOperationOutput output = WSDLUtils.getWsdl11Output(wiop); - if (output != null) + if (holder == false && output != null) { QName xmlName = output.getElement(); QName xmlType = output.getXMLType(); @@ -755,8 +765,10 @@ if (javaType == null) { - if(log.isDebugEnabled()) log.debug("Typemapping lookup failed for " + xmlName); - if(log.isDebugEnabled()) log.debug("Falling back to identifier generation"); + if (log.isDebugEnabled()) + log.debug("Typemapping lookup failed for " + xmlName); + if (log.isDebugEnabled()) + log.debug("Falling back to identifier generation"); String className = xmlType.getLocalPart(); if (className.charAt(0) == '>') className = className.substring(1); Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607 (from rev 2965, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2007-05-04 20:18:42 UTC (rev 2965) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2007-06-07 13:47:44 UTC (rev 3488) @@ -1,107 +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.jbws1607; - -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.tools.WSTools; - -/** - * Test case for http://jira.jboss.com/jira/browse/JBWS-1607 - * - * WSDL to Java, If an INOUT parameter has been mapped to a - * JAX-RPC holder it should not also be mapped to the return - * type. - * - * @author darran.lofthouse(a)jboss.com - * @since 11 Apr 2007 - */ -public class JBWS1607TestCase extends JBossWSTest -{ - - /** - * Test generation of the SEI. - * - * @throws Exception - */ - public void testGenerate() throws Exception - { - String resourceDir = "resources/tools/jbws1607"; - String toolsDir = "tools/jbws1607"; - 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/jbws1607/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1607"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBookService.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 + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java (from rev 2965, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2007-06-07 13:47:44 UTC (rev 3488) @@ -0,0 +1,107 @@ +/* + * 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.jbws1607; + +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.tools.WSTools; + +/** + * Test case for http://jira.jboss.com/jira/browse/JBWS-1607 + * + * WSDL to Java, If an INOUT parameter has been mapped to a + * JAX-RPC holder it should not also be mapped to the return + * type. + * + * @author darran.lofthouse(a)jboss.com + * @since 11 Apr 2007 + */ +public class JBWS1607TestCase extends JBossWSTest +{ + + /** + * Test generation of the SEI. + * + * @throws Exception + */ + public void testGenerate() throws Exception + { + String resourceDir = "resources/tools/jbws1607"; + String toolsDir = "tools/jbws1607"; + 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/jbws1607/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1607"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.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 + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-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: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607 (from rev 2965, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607) Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl 2007-05-04 20:18:42 UTC (rev 2965) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl 2007-06-07 13:47:44 UTC (rev 3488) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1607' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1607/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1607' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1607/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1607/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <element name='lookup' type='string'/> - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='lookup'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookup' name='lookup'/> - </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> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl (from rev 2965, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl 2007-06-07 13:47:44 UTC (rev 3488) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1607' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1607/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1607' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1607/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1607/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <element name='lookup' type='string'/> + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='lookup'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookup' name='lookup'/> + </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> Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java 2007-05-04 20:18:42 UTC (rev 2965) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java 2007-06-07 13:47:44 UTC (rev 3488) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Apr 11 17:06:28 CEST 2007 - * - * 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.jbws1607; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public void lookup(javax.xml.rpc.holders.StringHolder lookup) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java (from rev 2965, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java 2007-06-07 13:47:44 UTC (rev 3488) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Apr 11 17:06:28 CEST 2007 + * + * 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.jbws1607; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public void lookup(javax.xml.rpc.holders.StringHolder lookup) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml 2007-05-04 20:18:42 UTC (rev 2965) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml 2007-06-07 13:47:44 UTC (rev 3488) @@ -1,32 +0,0 @@ -<?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 xmlns='http://java.sun.com/xml/ns/j2ee'> - <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws... - <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/... - </package-mapping> - <service-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <service-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws... - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>serviceNS:PhoneBook<... - <port-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</port... - <java-port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</java... - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <service-endpoint-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws... - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>portTypeNS:PhoneBook&l... - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>bindingNS:PhoneBookBin... - <service-endpoint-method-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <java-method-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</java-method... - <wsdl-operation xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-operat... - <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>0</param-position> - <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>java.lang.String</p... - <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lo... - <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-messag... - <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>INOUT</parameter-mo... - </wsdl-message-mapping> - </method-param-parts-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml (from rev 2965, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml 2007-06-07 13:47:44 UTC (rev 3488) @@ -0,0 +1,32 @@ +<?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 xmlns='http://java.sun.com/xml/ns/j2ee'> + <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws... + <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/... + </package-mapping> + <service-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <service-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws... + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>serviceNS:PhoneBook<... + <port-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</port... + <java-port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</java... + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <service-endpoint-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws... + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>portTypeNS:PhoneBook&l... + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>bindingNS:PhoneBookBin... + <service-endpoint-method-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <java-method-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</java-method... + <wsdl-operation xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-operat... + <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>0</param-position> + <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>java.lang.String</p... + <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lo... + <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-messag... + <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>INOUT</parameter-mo... + </wsdl-message-mapping> + </method-param-parts-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml 2007-05-04 20:18:42 UTC (rev 2965) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml 2007-06-07 13:47:44 UTC (rev 3488) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1607/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml (from rev 2965, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1703/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml 2007-06-07 13:47:44 UTC (rev 3488) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1607/PhoneBook.wsdl" parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>