Author: darran.lofthouse(a)jboss.com Date: 2007-01-15 10:25:51 -0500 (Mon, 15 Jan 2007) New Revision: 1970 Added: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1455/ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/MyException.java branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint.wsdl branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint_PortType.java branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/jaxrpc-mapping.xml branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/wstools-config.xml Removed: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/MyException.java branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint.wsdl branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint_PortType.java branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/jaxrpc-mapping.xml branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/wstools-config.xml Modified: branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java Log: JBWS-1454 WSDL To Java - Generated jaxrpc mapping contains same exception mapped multiple times if there are multiple operations. Modified: branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt =================================================================== --- branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt 2007-01-15 15:07:36 UTC (rev 1969) +++ branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt 2007-01-15 15:25:51 UTC (rev 1970) @@ -34,7 +34,12 @@ WSDL to Java - maps required xsd:double attribute to java.lang.Double - http://jira.jboss.com/jira/browse/JBWS-1184 + http://jira.jboss.com/jira/browse/JBWS-1184 + + WSDL To Java - Generated jaxrpc mapping contains same exception mapped multiple times + if there are multiple operations. + + http://jira.jboss.com/jira/browse/JBWS-1455 MANUAL INSTALL INSTRUCTIONS: If you require the Java 1.4 version: - 1.) Copy lib/jbossws14-client.jar to $JBOSS_HOME/client/ Modified: branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-15 15:07:36 UTC (rev 1969) +++ branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-15 15:25:51 UTC (rev 1970) @@ -94,6 +94,7 @@ private String packageName = null; private Set<String> registeredTypes = new HashSet<String>(); + private Set<String> registeredExceptions = new HashSet<String>(); private LiteralTypeMapping typeMapping = null; private String wsdlStyle; @@ -236,7 +237,7 @@ QName xmlName = wiout.getElement(); QName xmlType = wiout.getXMLType(); boolean primitive = true; - + WSDLProperty wprop = wiout.getProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME); QName messageName = new QName(targetNS, wprop.getValue(), WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_WSDL_MESSAGE_NS); @@ -382,10 +383,16 @@ 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)); - exceptionMapping.setWsdlMessage(new QName(wsdlDefinitions.getTargetNamespace(), fault.getName().toString())); - jwm.addExceptionMappings(exceptionMapping); + String exceptionType = getJavaTypeAsString(null, xmlType, false, true); + + if (registeredExceptions.contains(exceptionType) == false) + { + registeredExceptions.add(exceptionType); + ExceptionMapping exceptionMapping = new ExceptionMapping(jwm); + exceptionMapping.setExceptionType(exceptionType); + exceptionMapping.setWsdlMessage(new QName(wsdlDefinitions.getTargetNamespace(), fault.getName().toString())); + jwm.addExceptionMappings(exceptionMapping); + } } }//end for } @@ -479,7 +486,7 @@ boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs() > 1; boolean primitive = !(element.getNillable() || (particle.getMinOccurs() == 0 && particle.getMaxOccurs() == 1)); - + MethodParamPartsMapping part = getMethodParamPartsMapping(methodMapping, xmlName, xmlType, partsMappings.size(), messageName, "IN", xmlName.getLocalPart(), array, primitive); partsMappings.add(part); Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1455 (from rev 1960, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1455) Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2007-01-15 11:50:03 UTC (rev 1960) +++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2007-01-15 15:25:51 UTC (rev 1970) @@ -1,64 +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.jbws1455; - -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 15 Jan 2007 - */ -public class JBWS1455TestCase extends JBossWSTest -{ - - private static final String resourceDir = "resources/tools/jbws1455"; - private static final String toolsDir = "tools/jbws1455"; - - public void testGenerate() throws Exception - { - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - - compareSource("MyException.java"); - compareSource("TestEndpoint_PortType.java"); - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String fileName) throws Exception - { - File expected = new File(resourceDir + "/" + fileName); - File generated = new File(toolsDir + "/org/jboss/test/ws/jbws1455/" + fileName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } - -} Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java (from rev 1960, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java) Modified: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java =================================================================== --- branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2007-01-15 15:07:36 UTC (rev 1969) +++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2007-01-15 15:25:51 UTC (rev 1970) @@ -27,6 +27,7 @@ import javax.xml.namespace.QName; import org.jboss.logging.Logger; +import org.jboss.ws.metadata.jaxrpcmapping.ExceptionMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping; @@ -77,22 +78,31 @@ { 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"); + checkBool(bool, "PackageMappings"); - if (bool) - bool = validateServiceEndpointInterfaceMappings(jw1.getServiceEndpointInterfaceMappings(), jw2.getServiceEndpointInterfaceMappings()); - else throw new IllegalStateException("Validation of ServiceInterfaceMappings failed"); + bool = validateJavaXmlTypeMappings(jw1.getJavaXmlTypeMappings(), jw2.getJavaXmlTypeMappings()); + checkBool(bool, "JavaXmlTypeMappings"); - if (bool == false) - throw new IllegalStateException("Validation of ServiceEndpointInterfaceMappings failed"); + bool = validateExceptionMapping(jw1.getExceptionMappings(), jw2.getExceptionMappings()); + checkBool(bool, "ExceptionMappings"); + + bool = validateServiceInterfaceMappings(jw1.getServiceInterfaceMappings(), jw2.getServiceInterfaceMappings()); + checkBool(bool, "ServiceInterfaceMappings"); + + bool = validateServiceEndpointInterfaceMappings(jw1.getServiceEndpointInterfaceMappings(), jw2.getServiceEndpointInterfaceMappings()); + checkBool(bool, "ServiceEndpointInterfaceMappings"); + return bool; } + private void checkBool(final boolean bool, final String check) + { + if (bool == false) + { + throw new IllegalStateException("Validation of " + check + " failed."); + } + } + //PRIVATE METHODS private boolean validatePackageMappings(PackageMapping[] pm1, PackageMapping[] pm2) { @@ -132,6 +142,22 @@ 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 validateJavaXmlTypeMappings(JavaXmlTypeMapping[] jm1, JavaXmlTypeMapping[] jm2) { int len1 = jm1 != null ? jm1.length : 0; @@ -175,19 +201,59 @@ return true; } - private boolean validateJavaXmlTypeMapping(JavaXmlTypeMapping jm1, JavaXmlTypeMapping jm2) + private boolean validateExceptionMapping(ExceptionMapping[] em1, ExceptionMapping[] em2) { + int len1 = em1 != null ? em1.length : 0; + int len2 = em2 != null ? em2.length : 0; + if (len1 != len2) + { + throw new IllegalStateException("Length of ExceptionMapping[] do not match expected=" + len1 + " actual=" + len2); + } + + HashMap actualMappings = new HashMap(len1); + + for (int i = 0; i < len1; i++) + { + ExceptionMapping current = em2[i]; + String name = current.getExceptionType(); + if (actualMappings.containsKey(name)) + { + throw new IllegalStateException("Type '" + name + "' registered more than once."); + } + + actualMappings.put(name, current); + } + + for (int i = 0; i < len1; i++) + { + ExceptionMapping expected = em1[i]; + ExceptionMapping actual = (ExceptionMapping)actualMappings.get(expected.getExceptionType()); + + if (actual == null) + { + throw new IllegalStateException("Mapping not found for '" + expected.getExceptionType() + "'"); + } + + if (validateExceptionMapping(expected, actual) == false) + { + throw new IllegalStateException(expected + " does not match with other side " + actual); + } + } + + return true; + } + + private boolean validateExceptionMapping(ExceptionMapping em1, ExceptionMapping em2) + { boolean bool = true; - bool = checkStringEquality(jm1.getJavaType(), jm2.getJavaType()); + bool = checkStringEquality(em1.getExceptionType(), em2.getExceptionType()); 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()); + bool = checkQNameEquality(em1.getWsdlMessage(), em2.getWsdlMessage()); + // Parameter order optional so don't enforce. + //if (bool) + // bool = checkStringArrayEquality(em1.getConstructorParameterOrder(), em2.getConstructorParameterOrder()); + return bool; } @@ -463,6 +529,23 @@ return str1.equals(str2); } + private boolean checkStringArrayEquality(String[] ar1, String[] ar2) + { + int len1 = ar1 != null ? ar1.length : 0; + int len2 = ar2 != null ? ar2.length : 0; + + if (len1 != len2) + return false; + + for (int i = 0; i < len1; i++) + { + if (checkStringEquality(ar1[i], ar2[i]) == false) + return false; + } + + return true; + } + private boolean checkQNameEquality(QName q1, QName q2) { if (q1 == null && q2 == null) Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455 (from rev 1960, trunk/jbossws-tests/src/main/resources/tools/jbws1455) Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/MyException.java =================================================================== --- trunk/jbossws-tests/src/main/resources/tools/jbws1455/MyException.java 2007-01-15 11:50:03 UTC (rev 1960) +++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/MyException.java 2007-01-15 15:25:51 UTC (rev 1970) @@ -1,21 +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.jbws1455; - - -public class MyException extends java.lang.Exception { - private java.lang.String comment; - - - public MyException(java.lang.String comment) { - super(comment); - this.comment = comment; - } - - public java.lang.String getComment() { - return comment; - } -} Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/MyException.java (from rev 1960, trunk/jbossws-tests/src/main/resources/tools/jbws1455/MyException.java) Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint.wsdl =================================================================== --- trunk/jbossws-tests/src/main/resources/tools/jbws1455/TestEndpoint.wsdl 2007-01-15 11:50:03 UTC (rev 1960) +++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint.wsdl 2007-01-15 15:25:51 UTC (rev 1970) @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestEndpoint' targetNamespace='http://test.jboss.org/ws/jbws1455' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1455/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1455' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1455/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1455/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <complexType name='MyException'> - <sequence> - <element name='comment' nillable='true' type='string'/> - </sequence> - </complexType> - <element name='methodOne' type='string'/> - <element name='methodOneResponse' type='string'/> - <element name='MyException' type='tns:MyException'/> - <element name='methodTwo' type='string'/> - <element name='methodTwoResponse' type='string'/> - </schema> - </types> - <message name='TestEndpoint_methodOne'> - <part element='ns1:methodOne' name='parameters'/> - </message> - <message name='TestEndpoint_methodOneResponse'> - <part element='ns1:methodOneResponse' name='result'/> - </message> - <message name='TestEndpoint_methodTwo'> - <part element='ns1:methodTwo' name='parameters'/> - </message> - <message name='TestEndpoint_methodTwoResponse'> - <part element='ns1:methodTwoResponse' name='result'/> - </message> - <message name='MyException'> - <part element='ns1:MyException' name='MyException'/> - </message> - <portType name='TestEndpoint'> - <operation name='methodOne'> - <input message='tns:TestEndpoint_methodOne'/> - <output message='tns:TestEndpoint_methodOneResponse'/> - </operation> - <operation name='methodTwo'> - <input message='tns:TestEndpoint_methodTwo'/> - <output message='tns:TestEndpoint_methodTwoResponse'/> - <fault message='tns:MyException' name='MyException'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='methodOne'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - <operation name='methodTwo'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - <fault name='MyException'> - <soap:fault name='MyException' use='literal'/> - </fault> - </operation> - </binding> - <service name='TestEndpoint'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint.wsdl (from rev 1960, trunk/jbossws-tests/src/main/resources/tools/jbws1455/TestEndpoint.wsdl) Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint_PortType.java =================================================================== --- trunk/jbossws-tests/src/main/resources/tools/jbws1455/TestEndpoint_PortType.java 2007-01-15 11:50:03 UTC (rev 1960) +++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint_PortType.java 2007-01-15 15:25:51 UTC (rev 1970) @@ -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.jbws1455; - -public interface TestEndpoint_PortType extends java.rmi.Remote { - public java.lang.String methodOne(java.lang.String parameters) throws - java.rmi.RemoteException; - public java.lang.String methodTwo(java.lang.String parameters) throws - org.jboss.test.ws.jbws1455.MyException, java.rmi.RemoteException; -} Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint_PortType.java (from rev 1960, trunk/jbossws-tests/src/main/resources/tools/jbws1455/TestEndpoint_PortType.java) Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/jaxrpc-mapping.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/tools/jbws1455/jaxrpc-mapping.xml 2007-01-15 11:50:03 UTC (rev 1960) +++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/jaxrpc-mapping.xml 2007-01-15 15:25:51 UTC (rev 1970) @@ -1,76 +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.jbws1455</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1455</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1455</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1455/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1455.MyException</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1455/types">typeN... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>comment</java-variable-name> - <xml-element-name>comment</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <exception-mapping> - <exception-type>org.jboss.test.ws.jbws1455.MyException</exception-type> - <wsdl-message xmlns:exMsgNS="http://test.jboss.org/ws/jbws1455">exMsgNS:My... - <constructor-parameter-order> - <element-name>comment</element-name> - </constructor-parameter-order> - </exception-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1455.TestEndpoint_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1455">serviceN... - <port-mapping> - <port-name>TestEndpointPort</port-name> - <java-port-name>TestEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1455.TestEndpoint_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1455">portTyp... - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1455">bindingN... - <service-endpoint-method-mapping> - <java-method-name>methodOne</java-method-name> - <wsdl-operation>methodOne</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/jbws1455">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/jbws1455">wsdlMsgN... - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - <service-endpoint-method-mapping> - <java-method-name>methodTwo</java-method-name> - <wsdl-operation>methodTwo</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/jbws1455">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/jbws1455">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: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/jaxrpc-mapping.xml (from rev 1960, trunk/jbossws-tests/src/main/resources/tools/jbws1455/jaxrpc-mapping.xml) Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/wstools-config.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/tools/jbws1455/wstools-config.xml 2007-01-15 11:50:03 UTC (rev 1960) +++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/wstools-config.xml 2007-01-15 15:25:51 UTC (rev 1970) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1455/TestEndpoint.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/wstools-config.xml (from rev 1960, trunk/jbossws-tests/src/main/resources/tools/jbws1455/wstools-config.xml)