Author: darran.lofthouse(a)jboss.com Date: 2007-01-04 10:06:47 -0500 (Thu, 04 Jan 2007) New Revision: 1789 Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/LookupResponseNumber.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/Person.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/PhoneBook_PortType.java Removed: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/TelephoneNumber.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/anonymous-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1253/myporttype-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml Log: JBWS-1260 - Fixed test cases broken by the refactoring. Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -33,12 +33,9 @@ import javax.xml.namespace.QName; import javax.xml.soap.SOAPElement; -import org.apache.xerces.xs.XSAttributeDeclaration; -import org.apache.xerces.xs.XSAttributeUse; import org.apache.xerces.xs.XSComplexTypeDefinition; import org.apache.xerces.xs.XSElementDeclaration; import org.apache.xerces.xs.XSModelGroup; -import org.apache.xerces.xs.XSObject; import org.apache.xerces.xs.XSObjectList; import org.apache.xerces.xs.XSParticle; import org.apache.xerces.xs.XSSimpleTypeDefinition; @@ -271,8 +268,8 @@ QName xmlType = outs[m].getXMLType(); JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); - boolean primitive = true; + WrappedArray wrappedArray = new WrappedArray(xt); if (wrappedArray.unwrap()) { @@ -285,7 +282,7 @@ xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); Class cls = this.getJavaType(xmlType, primitive); - //buf.append(utils.getHolder(cls).getName()).append(" ").append(getMethodParam(xmlName)); + buf.append(utils.getHolder(cls).getName()).append(" ").append(ToolsUtils.firstLetterLowerCase(xmlName.getLocalPart())); } } @@ -486,7 +483,6 @@ else { String className; - // TODO DAL - Check the need to null check. if (xt == null || xt.getAnonymous()) { className = containingElement; @@ -495,6 +491,7 @@ { className = xmlType.getLocalPart(); } + if (className.charAt(0) == '>') className = className.substring(1); className = utils.firstLetterUpperCase(className); @@ -587,10 +584,6 @@ if (unwrapper.array) arraySuffix = "[]"; } - else if (unwrapper.unwrappedAttribute != null) - { - xt = unwrapper.unwrappedAttribute.getTypeDefinition(); - } } boolean primitive = true; @@ -608,18 +601,21 @@ Class cls = getJavaType(xmlType, primitive); - // TODO DAL - Check the real need for the null check. - if (xt != null && xt.getAnonymous() == false) - { - containingElement = xmlType.getLocalPart(); - } - if (xt instanceof XSComplexTypeDefinition) generateJavaSource((XSComplexTypeDefinition)xt, xsmodel, containingElement); if (cls == null) { - String className = containingElement; + String className; + if (xt.getAnonymous() == true) + { + className = containingElement; + } + else + { + className = xmlType.getLocalPart(); + } + if (className.charAt(0) == '>') className = className.substring(1); className = utils.firstLetterUpperCase(className); Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -98,7 +98,8 @@ createJavaFile(type, schema, false); } - public void createJavaFile(XSComplexTypeDefinition type, String containingElement, 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) throw new WSException("TypeMapping has not been set"); @@ -547,6 +548,9 @@ // 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; Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -265,10 +265,6 @@ xmlType = unwrapper.xmlType; } } - else if (unwrapper.unwrappedAttribute != null) - { - xt = unwrapper.unwrappedAttribute.getTypeDefinition(); - } } //Check it is a holder. If it is, return Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -23,7 +23,6 @@ import javax.xml.namespace.QName; -import org.apache.xerces.xs.XSAttributeDeclaration; import org.apache.xerces.xs.XSComplexTypeDefinition; import org.apache.xerces.xs.XSElementDeclaration; import org.apache.xerces.xs.XSModelGroup; @@ -47,7 +46,6 @@ public WSDLInterfaceOperationOutput[] outputs; public JBossXSModel xsmodel; public QName xmlType; - public XSAttributeDeclaration unwrappedAttribute; public XSElementDeclaration unwrappedElement; public boolean array = false; private boolean wrapped; Modified: branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -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.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools; -import org.jboss.ws.utils.DOMUtils; -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: branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -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.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools; -import org.jboss.ws.utils.DOMUtils; -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"); Modified: branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -844,14 +844,6 @@ protected void generateScenario(final String scenario) throws Exception { - String tests = System.getProperty("client.scenario"); - - if ((tests == null || tests.length() == 0 || tests.contains("-" + scenario)) == false) - { - System.out.println("Skipping test '" + scenario + "' client.scenario=" + tests); - return; - } - String resourceDir = "resources/tools/jbws1260/scenario_" + scenario; String toolsDir = "tools/jbws1260/scenario_" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/LookupResponseNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/LookupResponseNumber.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/LookupResponseNumber.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -0,0 +1,36 @@ +// 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 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; + } +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/LookupResponseNumber.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/Person.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/Person.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -0,0 +1,36 @@ +// 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 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; + } +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/Person.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/PhoneBook_PortType.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/PhoneBook_PortType.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -0,0 +1,11 @@ +// 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 interface PhoneBook_PortType extends java.rmi.Remote { + public org.jboss.test.ws.jbws1079.TelephoneNumber lookup(org.jboss.test.ws.jbws1079.Person parameters) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/TelephoneNumber.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/TelephoneNumber.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -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: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -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: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/anonymous-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/anonymous-mapping.xml 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/anonymous-mapping.xml 2007-01-04 15:06:47 UTC (rev 1789) @@ -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: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1253/myporttype-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1253/myporttype-mapping.xml 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1253/myporttype-mapping.xml 2007-01-04 15:06:47 UTC (rev 1789) @@ -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> Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml 2007-01-04 15:06:47 UTC (rev 1789) @@ -10,7 +10,7 @@ </package-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... + <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> @@ -37,7 +37,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeN... + <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>