Author: darran.lofthouse(a)jboss.com Date: 2007-05-29 10:43:37 -0400 (Tue, 29 May 2007) New Revision: 3283 Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccount.java branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/Person.java branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/TelephoneNumber.java branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml Modified: branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java Log: Doc/Lit Out header test and implementation. Modified: branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2007-05-29 14:35:48 UTC (rev 3282) +++ branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2007-05-29 14:43:37 UTC (rev 3283) @@ -189,6 +189,11 @@ WSDLInterfaceOperationOutput opOutput = (WSDLInterfaceOperationOutput)outputs.get(qname); return opOutput; } + + public void removeOutput(QName element) + { + outputs.remove(element); + } public WSDLInterfaceOperationOutput getOutputByPartName(String partName) { Modified: branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-05-29 14:35:48 UTC (rev 3282) +++ branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-05-29 14:43:37 UTC (rev 3283) @@ -25,7 +25,6 @@ import java.io.FileWriter; import java.io.IOException; import java.net.URL; -import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -46,11 +45,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.jaxrpc.LiteralTypeMapping; import org.jboss.ws.core.utils.JavaUtils; -import org.jboss.ws.metadata.wsdl.WSDLBinding; -import org.jboss.ws.metadata.wsdl.WSDLBindingMessageReference; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; -import org.jboss.ws.metadata.wsdl.WSDLBindingOperationInput; -import org.jboss.ws.metadata.wsdl.WSDLBindingOperationOutput; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLException; import org.jboss.ws.metadata.wsdl.WSDLInterface; @@ -418,22 +413,36 @@ for (WSDLSOAPHeader currentInput : inputHeaders) { boolean holder = HeaderUtil.containsMatchingPart(outputHeaders, currentInput); - QName elementName = currentInput.getElement(); + appendHeaderParameter(buf, currentInput, holder); + } - JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); - XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI()); - XSTypeDefinition xt = xe.getTypeDefinition(); - QName xmlType = new QName(xt.getNamespace(), xt.getName()); + for (WSDLSOAPHeader currentOutput : outputHeaders) + { + boolean input = HeaderUtil.containsMatchingPart(inputHeaders, currentOutput); - if (buf.length() > 0) - { - buf.append(", "); - } + if (input == true) + continue; - generateParameter(buf, "", xmlType, xsmodel, xt, false, true, holder); - buf.append(" ").append(currentInput.getPartName()); + appendHeaderParameter(buf, currentOutput, true); } + } + private void appendHeaderParameter(StringBuilder buf, WSDLSOAPHeader header, boolean holder) throws IOException + { + QName elementName = header.getElement(); + + JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); + XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI()); + XSTypeDefinition xt = xe.getTypeDefinition(); + QName xmlType = new QName(xt.getNamespace(), xt.getName()); + + if (buf.length() > 0) + { + buf.append(", "); + } + + generateParameter(buf, "", xmlType, xsmodel, xt, false, true, holder); + buf.append(" ").append(header.getPartName()); } private void appendParameters(StringBuilder buf, WSDLInterfaceOperationInput in, WSDLInterfaceOperationOutput output, String containingElement) throws IOException Modified: branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-29 14:35:48 UTC (rev 3282) +++ branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-29 14:43:37 UTC (rev 3283) @@ -347,20 +347,56 @@ for (WSDLSOAPHeader currentInput : inputHeaders) { - QName elementName = currentInput.getElement(); + boolean inOutput = HeaderUtil.containsMatchingPart(outputHeaders, currentInput); + String mode = getMode(true, inOutput); - JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); - XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI()); - XSTypeDefinition xt = xe.getTypeDefinition(); - QName xmlType = new QName(xt.getNamespace(), xt.getName()); + constructHeaderParameter(semm, currentInput, paramPosition++, wsdlMessageName, mode); + } - String partName = currentInput.getPartName(); + for (WSDLSOAPHeader currentOutput : outputHeaders) + { + boolean inInput = HeaderUtil.containsMatchingPart(inputHeaders, currentOutput); - MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, elementName, xmlType, paramPosition++, wsdlMessageName, "IN", partName, false, true); - semm.addMethodParamPartsMapping(mpin); + if (inInput == true) + continue; + + constructHeaderParameter(semm, currentOutput, paramPosition++, wsdlMessageName, "OUT"); } } + private void constructHeaderParameter(ServiceEndpointMethodMapping semm, WSDLSOAPHeader header, int paramPosition, String wsdlMessageName, String mode) + { + QName elementName = header.getElement(); + + JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); + XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI()); + XSTypeDefinition xt = xe.getTypeDefinition(); + QName xmlType = new QName(xt.getNamespace(), xt.getName()); + + String partName = header.getPartName(); + + MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, elementName, xmlType, paramPosition, wsdlMessageName, mode, partName, false, true); + semm.addMethodParamPartsMapping(mpin); + } + + private String getMode(final boolean input, final boolean output) + { + if (input == true & output == true) + { + return "INOUT"; + } + else if (input == true) + { + return "IN"; + } + else if (output == true) + { + return "OUT"; + } + + return ""; + } + private String getMode(WSDLInterfaceOperation op, String name) { WSDLInterfaceOperationInput in = WSDLUtils.getWsdl11Input(op); @@ -827,10 +863,8 @@ if (javaType == null) { - if (log.isDebugEnabled()) - log.debug("Typemapping lookup failed for " + xmlName); - if (log.isDebugEnabled()) - log.debug("Falling back to identifier generation"); + log.debug("Typemapping lookup failed for " + xmlName); + log.debug("Falling back to identifier generation"); String className = xmlType.getLocalPart(); if (className.charAt(0) == '>') className = className.substring(1); Modified: branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-05-29 14:35:48 UTC (rev 3282) +++ branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-05-29 14:43:37 UTC (rev 3283) @@ -1105,7 +1105,7 @@ { WSDLInterfaceOperationOutput destIntfOutput = destIntfOperation.getOutput(element); if (destIntfOutput != null) - destIntfOperation.removeInput(element); + destIntfOperation.removeOutput(element); } public void removeRPCPart(String partName) Modified: branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-05-29 14:35:48 UTC (rev 3282) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-05-29 14:43:37 UTC (rev 3283) @@ -42,6 +42,11 @@ generateScenario("doclit_in"); } + public void testGenerateDocLitOut() throws Exception + { + generateScenario("doclit_out"); + } + protected void generateScenario(final String scenario) throws Exception { String resourceDir = "resources/tools/jbws1597/" + scenario; Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccount.java =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccount.java (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccount.java 2007-05-29 14:43:37 UTC (rev 3283) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 16:35:22 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.jbws1597; + + +public class BillingAccount +{ + +protected java.lang.String sortCode; + +protected java.lang.String accountNumber; +public BillingAccount(){} + +public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ +this.sortCode=sortCode; +this.accountNumber=accountNumber; +} +public java.lang.String getSortCode() { return sortCode ;} + +public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } + +public java.lang.String getAccountNumber() { return accountNumber ;} + +public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } + +} Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccount.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java 2007-05-29 14:43:37 UTC (rev 3283) @@ -0,0 +1,28 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 16:35:22 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.jbws1597; + +public class BillingAccountHolder implements javax.xml.rpc.holders.Holder +{ + + public org.jboss.test.ws.jbws1597.BillingAccount value; + + public BillingAccountHolder() + { + this.value = new org.jboss.test.ws.jbws1597.BillingAccount(); + } + + public BillingAccountHolder(final org.jboss.test.ws.jbws1597.BillingAccount value) + { + this.value = value; + } + +} Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/BillingAccountHolder.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/Person.java =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/Person.java (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/Person.java 2007-05-29 14:43:37 UTC (rev 3283) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 16:35:22 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.jbws1597; + + +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-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/Person.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl 2007-05-29 14:43:37 UTC (rev 3283) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1597' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1597' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1597/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='BillingAccount'> + <sequence> + <element name='sortCode' nillable='true' type='string'/> + <element name='accountNumber' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + <element name='billingAccount' type='tns:BillingAccount'/> + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + <part element='ns1:billingAccount' name='header'/> + </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' parts='result' /> + <soap:header use='literal' message='tns:PhoneBook_lookupResponse' part='header' /> + </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 Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java 2007-05-29 14:43:37 UTC (rev 3283) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 16:35:22 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.jbws1597; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1597.TelephoneNumber lookup(org.jboss.test.ws.jbws1597.Person lookup, org.jboss.test.ws.jbws1597.BillingAccountHolder header) throws java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/TelephoneNumber.java (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/TelephoneNumber.java 2007-05-29 14:43:37 UTC (rev 3283) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 16:35:22 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.jbws1597; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/TelephoneNumber.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml 2007-05-29 14:43:37 UTC (rev 3283) @@ -0,0 +1,89 @@ +<?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.jbws1597</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1597/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1597</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1597</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/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.jbws1597.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/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> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1597.BillingAccount</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1597/types'>typeNS:... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>sortCode</java-variable-name> + <xml-element-name>sortCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>accountNumber</java-variable-name> + <xml-element-name>accountNumber</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1597.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1597'>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.jbws1597.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1597'>portTypeN... + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1597'>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.jbws1597.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>1</param-position> + <param-type>org.jboss.test.ws.jbws1597.BillingAccount</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>wsdlMsgNS:... + <wsdl-message-part-name>header</wsdl-message-part-name> + <parameter-mode>OUT</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1597.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1597'>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 Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/jaxrpc-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml 2007-05-29 14:43:37 UTC (rev 3283) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1597/doclit_out/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_out/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF