Author: darran.lofthouse(a)jboss.com Date: 2007-05-29 09:31:56 -0400 (Tue, 29 May 2007) New Revision: 3281 Added: branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/HeaderUtil.java branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/ branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/BillingAccount.java branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/Person.java branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/TelephoneNumber.java branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml Removed: branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml 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/helpers/MappingFileGeneratorHelper.java Log: Doc/Lit Input header test case and implementation. Added: branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/HeaderUtil.java =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/HeaderUtil.java (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/HeaderUtil.java 2007-05-29 13:31:56 UTC (rev 3281) @@ -0,0 +1,97 @@ +/* + * 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.ws.tools; + +import java.util.ArrayList; + +import javax.xml.namespace.QName; + +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.WSDLDefinitions; +import org.jboss.ws.metadata.wsdl.WSDLInterface; +import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation; +import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader; + +/** + * Collection of static methods required for processing + * bound headers in WSDL to Java so they can be re-used for + * the JAX-RPC generation. + * + * @author darran.lofthouse(a)jboss.com + * @since 29 May 2007 + */ +public class HeaderUtil +{ + + public static WSDLBindingOperation getWSDLBindingOperation(final WSDLDefinitions wsdl, final WSDLInterfaceOperation operation) + { + WSDLBindingOperation bindingOperation = null; + + WSDLInterface wsdlInterface = operation.getWsdlInterface(); + QName operationName = operation.getName(); + + WSDLBinding binding = wsdl.getBindingByInterfaceName(wsdlInterface.getName()); + bindingOperation = binding.getOperationByRef(operationName); + + return bindingOperation; + } + + public static WSDLSOAPHeader[] getSignatureHeaders(final WSDLBindingMessageReference[] refs) + { + ArrayList<WSDLSOAPHeader> headers = new ArrayList<WSDLSOAPHeader>(); + + if (refs != null) + { + for (WSDLBindingMessageReference current : refs) + { + for (WSDLSOAPHeader header : current.getSoapHeaders()) + { + if (header.isIncludeInSignature()) + { + headers.add(header); + } + } + } + } + + return headers.toArray(new WSDLSOAPHeader[headers.size()]); + } + + public static boolean containsMatchingPart(WSDLSOAPHeader[] headers, WSDLSOAPHeader header) + { + for (WSDLSOAPHeader current : headers) + { + if (current.getPartName().equals(header.getPartName())) + { + if (current.getElement().equals(header.getElement())) + { + return true; + } + } + } + + return false; + } + +} Property changes on: branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/HeaderUtil.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF 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 13:30:34 UTC (rev 3280) +++ branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-05-29 13:31:56 UTC (rev 3281) @@ -25,6 +25,7 @@ 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; @@ -45,6 +46,11 @@ 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; @@ -54,6 +60,7 @@ import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutfault; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput; import org.jboss.ws.metadata.wsdl.WSDLRPCPart; +import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; @@ -195,7 +202,7 @@ public void setNamespacePackageMap(Map<String, String> map) { //Lets convert the package->namespace map to namespace->package map - Set keys = map.keySet(); + Set<String> keys = map.keySet(); Iterator<String> iter = keys.iterator(); while (iter != null && iter.hasNext()) { @@ -271,10 +278,12 @@ throw new IllegalArgumentException("Interface " + itfname + " doesn't have operations"); int len = ops != null ? ops.length : 0; - // FIXME - Add support for headers for (int i = 0; i < len; i++) { WSDLInterfaceOperation op = ops[i]; + + WSDLBindingOperation bindingOperation = HeaderUtil.getWSDLBindingOperation(wsdl, op); + //TODO: Take care of multiple outputs String returnType = null; @@ -284,7 +293,7 @@ WSDLInterfaceOperationOutput output = WSDLUtils.getWsdl11Output(op); if (isDocument()) { - returnType = appendDocParameters(paramBuffer, input, output); + returnType = appendDocParameters(paramBuffer, input, output, bindingOperation); } else { @@ -369,7 +378,8 @@ return returnType; } - private String appendDocParameters(StringBuilder paramBuffer, WSDLInterfaceOperationInput input, WSDLInterfaceOperationOutput output) throws IOException + private String appendDocParameters(StringBuilder paramBuffer, WSDLInterfaceOperationInput input, WSDLInterfaceOperationOutput output, + WSDLBindingOperation bindingOperation) throws IOException { String returnType = null; boolean holder = false; @@ -391,9 +401,41 @@ returnType = getReturnType(xmlName, xmlType, xt); } + if (bindingOperation != null) + { + appendHeaderParameters(paramBuffer, bindingOperation); + } + return returnType; } + private void appendHeaderParameters(StringBuilder buf, WSDLBindingOperation bindingOperation) throws IOException + { + WSDLSOAPHeader[] inputHeaders = HeaderUtil.getSignatureHeaders(bindingOperation.getInputs()); + WSDLSOAPHeader[] outputHeaders = HeaderUtil.getSignatureHeaders(bindingOperation.getOutputs()); + + // Process Inputs First + for (WSDLSOAPHeader currentInput : inputHeaders) + { + boolean holder = HeaderUtil.containsMatchingPart(outputHeaders, currentInput); + QName elementName = currentInput.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(currentInput.getPartName()); + } + + } + private void appendParameters(StringBuilder buf, WSDLInterfaceOperationInput in, WSDLInterfaceOperationOutput output, String containingElement) throws IOException { @@ -778,4 +820,5 @@ { this.parameterStyle = paramStyle; } + } 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 13:30:34 UTC (rev 3280) +++ branches/dlofthouse/JBWS-1597/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-29 13:31:56 UTC (rev 3281) @@ -59,6 +59,7 @@ import org.jboss.ws.metadata.jaxrpcmapping.WsdlMessageMapping; import org.jboss.ws.metadata.jaxrpcmapping.WsdlReturnValueMapping; import org.jboss.ws.metadata.wsdl.WSDLBinding; +import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLInterface; @@ -69,11 +70,13 @@ import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput; import org.jboss.ws.metadata.wsdl.WSDLProperty; import org.jboss.ws.metadata.wsdl.WSDLRPCPart; +import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLTypes; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; +import org.jboss.ws.tools.HeaderUtil; import org.jboss.ws.tools.RPCSignature; import org.jboss.ws.tools.ToolsUtils; import org.jboss.ws.tools.WSToolsConstants; @@ -216,15 +219,22 @@ semm.setWsdlOperation(opname); semm.setWrappedElement(isWrapped()); + WSDLBindingOperation bindingOperation = HeaderUtil.getWSDLBindingOperation(wsdlDefinitions, wiop); + if (isDocStyle()) - constructDOCParameters(semm, wiop); - else constructRPCParameters(semm, wiop); + { + constructDOCParameters(semm, wiop, bindingOperation); + } + else + { + constructRPCParameters(semm, wiop); + } seim.addServiceEndpointMethodMapping(semm); } } - private void constructDOCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop) + private void constructDOCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop, WSDLBindingOperation bindingOperation) { WSDLInterfaceOperationInput win = WSDLUtils.getWsdl11Input(wiop); WSDLInterfaceOperationOutput output = WSDLUtils.getWsdl11Output(wiop); @@ -301,26 +311,56 @@ } } - //Check it is a holder. If it is, return - if (wiop.getInputByPartName(xmlName.getLocalPart()) != null) - return; + //Check it is a holder. + if (wiop.getInputByPartName(xmlName.getLocalPart()) == null) + { - if (xt instanceof XSSimpleTypeDefinition) - xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); + if (xt instanceof XSSimpleTypeDefinition) + xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); - String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive); + String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive); - if (isDocStyle() == false && "void".equals(javaType)) - return; + if ((isDocStyle() == false && "void".equals(javaType)) == false) + { + WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm); + wrvm.setMethodReturnValue(javaType); + wrvm.setWsdlMessage(messageName); + wrvm.setWsdlMessagePartName(partName); + semm.setWsdlReturnValueMapping(wrvm); + } + } + } - WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm); - wrvm.setMethodReturnValue(javaType); - wrvm.setWsdlMessage(messageName); - wrvm.setWsdlMessagePartName(partName); - semm.setWsdlReturnValueMapping(wrvm); + if (bindingOperation != null) + { + constructHeaderParameters(semm, wiop, bindingOperation); } } + private void constructHeaderParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop, WSDLBindingOperation bindingOperation) + { + WSDLSOAPHeader[] inputHeaders = HeaderUtil.getSignatureHeaders(bindingOperation.getInputs()); + WSDLSOAPHeader[] outputHeaders = HeaderUtil.getSignatureHeaders(bindingOperation.getOutputs()); + + String wsdlMessageName = bindingOperation.getWsdlBinding().getInterface().getName().getLocalPart(); + int paramPosition = 1; + + for (WSDLSOAPHeader currentInput : inputHeaders) + { + QName elementName = currentInput.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 = currentInput.getPartName(); + + MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, elementName, xmlType, paramPosition++, wsdlMessageName, "IN", partName, false, true); + semm.addMethodParamPartsMapping(mpin); + } + } + private String getMode(WSDLInterfaceOperation op, String name) { WSDLInterfaceOperationInput in = WSDLUtils.getWsdl11Input(op); @@ -447,10 +487,32 @@ jwm.addExceptionMappings(exceptionMapping); } } + + WSDLBindingOperation bindingOperation = HeaderUtil.getWSDLBindingOperation(wsdlDefinitions, op); + if (bindingOperation != null) + { + constructHeaderJavaXmlTypeMapping(jwm, HeaderUtil.getSignatureHeaders(bindingOperation.getInputs())); + constructHeaderJavaXmlTypeMapping(jwm, HeaderUtil.getSignatureHeaders(bindingOperation.getOutputs())); + } + }//end for } } + public void constructHeaderJavaXmlTypeMapping(JavaWsdlMapping jwm, WSDLSOAPHeader[] headers) + { + for (WSDLSOAPHeader current : headers) + { + QName elementName = current.getElement(); + + JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); + XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI()); + XSTypeDefinition xt = xe.getTypeDefinition(); + + addJavaXMLTypeMap(xt, elementName.getLocalPart(), "", "", jwm, true); + } + } + private boolean unwrapRequest(ServiceEndpointMethodMapping methodMapping, String messageName, String containingElement, XSTypeDefinition xt) { if (xt instanceof XSComplexTypeDefinition == false) @@ -761,7 +823,7 @@ */ if (xmlType.getNamespaceURI().equals(Constants.NS_SCHEMA_XSD) && "anyType".equals(xmlType.getLocalPart()) && javaType == Element.class) javaType = SOAPElement.class; - javaType = this.makeCustomDecisions(javaType, xmlName, xmlType); + javaType = this.makeCustomDecisions(javaType, xmlType); if (javaType == null) { @@ -833,7 +895,7 @@ * @param xmlName * @param xmlType */ - private Class makeCustomDecisions(Class javaType, QName xmlName, QName xmlType) + private Class makeCustomDecisions(Class javaType, QName xmlType) { if (javaType != null && xmlType != null) { Copied: branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597 (from rev 2997, branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597) Deleted: 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-07 21:42:10 UTC (rev 2997) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-05-29 13:31:56 UTC (rev 3281) @@ -1,101 +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.jbws1597; - -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; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 27 Apr 2007 - */ -public class JBWS1597TestCase extends JBossWSTest -{ - - public void testGenerateDocLitIn() throws Exception - { - generateScenario("doclit_in"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1597/" + scenario; - String toolsDir = "tools/jbws1597/" + scenario; - 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/jbws1597/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1597"); - 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/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java (from rev 2997, 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 (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-05-29 13:31:56 UTC (rev 3281) @@ -0,0 +1,101 @@ +/* + * 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.jbws1597; + +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; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 27 Apr 2007 + */ +public class JBWS1597TestCase extends JBossWSTest +{ + + public void testGenerateDocLitIn() throws Exception + { + generateScenario("doclit_in"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1597/" + scenario; + String toolsDir = "tools/jbws1597/" + scenario; + 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/jbws1597/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1597"); + 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/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597 (from rev 2997, branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597) Copied: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in (from rev 2997, branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in) Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/BillingAccount.java =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/BillingAccount.java (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/BillingAccount.java 2007-05-29 13:31:56 UTC (rev 3281) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 15:19:38 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_in/BillingAccount.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/Person.java =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/Person.java (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/Person.java 2007-05-29 13:31:56 UTC (rev 3281) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 15:19:38 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_in/Person.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl 2007-05-07 21:42:10 UTC (rev 2997) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl 2007-05-29 13:31:56 UTC (rev 3281) @@ -1,77 +0,0 @@ -<?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'/> - <part element='ns1:billingAccount' name='header'/> - </message> - - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal' parts='parameters'/> - <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' /> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl (from rev 2997, branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl) =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl 2007-05-29 13:31:56 UTC (rev 3281) @@ -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'/> + <part element='ns1:billingAccount' name='header'/> + </message> + + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal' parts='parameters'/> + <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' /> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook_PortType.java 2007-05-29 13:31:56 UTC (rev 3281) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 15:19:38 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.BillingAccount header) throws java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/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_in/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/TelephoneNumber.java (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/TelephoneNumber.java 2007-05-29 13:31:56 UTC (rev 3281) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 29 15:19:38 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_in/TelephoneNumber.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/jaxrpc-mapping.xml 2007-05-29 13:31:56 UTC (rev 3281) @@ -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>IN</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_in/jaxrpc-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml 2007-05-07 21:42:10 UTC (rev 2997) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml 2007-05-29 13:31:56 UTC (rev 3281) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1597/doclit_in/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml (from rev 2997, branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml) =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml 2007-05-29 13:31:56 UTC (rev 3281) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1597/doclit_in/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>