[jbossws-commits] JBossWS SVN: r1914 - in branches/dlofthouse/JBWS-1259: jbossws-core/src/main/java/org/jboss/ws/tools/wsdl and 5 other directories.

Author: darran.lofthouse(a)jboss.com Date: 2007-01-10 17:49:33 -0500 (Wed, 10 Jan 2007) New Revision: 1914 Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/Lookup.java branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook.wsdl branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook_PortType.java branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/TelephoneNumber.java branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/jaxrpc-mapping.xml branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/wstools-config.xml branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/wsdl11/jaxrpc-mapping.xml Modified: branches/dlofthouse/JBWS-1259/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java branches/dlofthouse/JBWS-1259/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java Log: JBWS-1259 - Initial test case and fix for first stack overflow. Modified: branches/dlofthouse/JBWS-1259/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java 2007-01-10 22:47:20 UTC (rev 1913) +++ branches/dlofthouse/JBWS-1259/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java 2007-01-10 22:49:33 UTC (rev 1914) @@ -1,24 +1,24 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, 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. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, 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.metadata.wsdl.xmlschema; import java.io.IOException; @@ -77,7 +77,6 @@ this.targetNamespace = targetNamespace; } - /** * Checks whether given a targetNS and other regular schema namespaces, * the passed "checkNS" is a custom namespace @@ -87,15 +86,14 @@ */ public boolean checkCustomNamespace(String targetNS, String checkNS) { - String[] nsarr = new String[] {xsNS,Constants.NS_SCHEMA_XSI }; + String[] nsarr = new String[] { xsNS, Constants.NS_SCHEMA_XSI }; List<String> knownNamespaces = Arrays.asList(nsarr); boolean isCustom = false; - if(xsNS.equals(targetNS)) - throw new IllegalArgumentException("targetNamespace cannot be "+xsNS ); - if(checkNS == null) + if (xsNS.equals(targetNS)) + throw new IllegalArgumentException("targetNamespace cannot be " + xsNS); + if (checkNS == null) throw new IllegalArgumentException("checkNS is null"); - if(knownNamespaces.contains(checkNS) == false && - targetNS.equals(checkNS) == false) + if (knownNamespaces.contains(checkNS) == false && targetNS.equals(checkNS) == false) isCustom = true; return isCustom; } @@ -108,8 +106,7 @@ * @return */ - public JBossXSElementDeclaration createGlobalXSElementDeclaration(String name, XSTypeDefinition xstype, - String targetNS) + public JBossXSElementDeclaration createGlobalXSElementDeclaration(String name, XSTypeDefinition xstype, String targetNS) { JBossXSElementDeclaration xsel = new JBossXSElementDeclaration(); xsel.setName(name); @@ -130,11 +127,10 @@ return new JBossXSModel(); } - public JBossXSComplexTypeDefinition createXSComplexTypeDefinition( String name, - XSTypeDefinition baseType, List<XSParticle> xsparts, String typens) + public JBossXSComplexTypeDefinition createXSComplexTypeDefinition(String name, XSTypeDefinition baseType, List<XSParticle> xsparts, String typens) { //No complex type if particles are null - if(xsparts == null) + if (xsparts == null) return null; JBossXSComplexTypeDefinition ct = new JBossXSComplexTypeDefinition(); @@ -147,18 +143,17 @@ // Plug the particle array into the modelgroup JBossXSParticle xspa = new JBossXSParticle(null, typens); xspa.setTerm(group); - ((JBossXSComplexTypeDefinition) ct).setParticle(xspa); + ((JBossXSComplexTypeDefinition)ct).setParticle(xspa); if (baseType != null) { - ((JBossXSComplexTypeDefinition) ct).setDerivationMethod(XSConstants.DERIVATION_EXTENSION); - ((JBossXSComplexTypeDefinition) ct).setBaseType(baseType); + ((JBossXSComplexTypeDefinition)ct).setDerivationMethod(XSConstants.DERIVATION_EXTENSION); + ((JBossXSComplexTypeDefinition)ct).setBaseType(baseType); } return ct; } - /** * Create a local XSElementDeclaration object * @param name @@ -168,7 +163,7 @@ * @return */ - public JBossXSElementDeclaration createXSElementDeclaration(String name, XSTypeDefinition xstype,boolean isNillable) + public JBossXSElementDeclaration createXSElementDeclaration(String name, XSTypeDefinition xstype, boolean isNillable) { JBossXSElementDeclaration xsel = new JBossXSElementDeclaration(); xsel.setName(name); @@ -186,7 +181,6 @@ return xsp; } - /** * Creates a XSTypeDefinition object given a QName * @@ -201,7 +195,6 @@ return jbxs; } - /** * Generate a complex type for a custom exception * @param exname @@ -213,12 +206,11 @@ { JBossXSParticle xsp = new JBossXSParticle(); /*xsp.setType(XSConstants.ELEMENT_DECLARATION); - xsp.setMaxOccurs(-1); - JBossXSElementDeclaration xsel = (JBossXSElementDeclaration)createXSElementDeclaration("name", utils.getSchemaBasicType("string"), true); + xsp.setMaxOccurs(-1); + JBossXSElementDeclaration xsel = (JBossXSElementDeclaration)createXSElementDeclaration("name", utils.getSchemaBasicType("string"), true); - xsp.setTerm(xsel); */ - XSComplexTypeDefinition ct = - new JBossXSComplexTypeDefinition(exname, ns); + xsp.setTerm(xsel); */ + XSComplexTypeDefinition ct = new JBossXSComplexTypeDefinition(exname, ns); ((JBossXSComplexTypeDefinition)ct).setParticle(xsp); return ct; @@ -233,10 +225,10 @@ */ public JBossXSModel getJBossXSModel(XSModel xsmodel) { - if(xsmodel instanceof JBossXSModel) + if (xsmodel instanceof JBossXSModel) return (JBossXSModel)xsmodel; JBossXSModel jbxs = new JBossXSModel(); - copyXSModel(xsmodel,jbxs); + copyXSModel(xsmodel, jbxs); return jbxs; } @@ -248,18 +240,21 @@ */ public boolean isEmptySchema(JBossXSModel xsmodel, String namespace) { - if(xsmodel == null) return true; - if(namespace == null) throw new WSException("Target Namespace of xsmodel is null"); + if (xsmodel == null) + return true; + if (namespace == null) + throw new WSException("Target Namespace of xsmodel is null"); XSNamedMap tmap = xsmodel.getComponentsByNamespace(XSConstants.TYPE_DEFINITION, namespace); XSNamedMap emap = xsmodel.getComponentsByNamespace(XSConstants.ELEMENT_DECLARATION, namespace); - if (tmap != null && tmap.getLength() > 0) return false; - if (emap != null && emap.getLength() > 0) return false; + if (tmap != null && tmap.getLength() > 0) + return false; + if (emap != null && emap.getLength() > 0) + return false; return true; } - /** * Serialize the SchemaModel into a Writer * @param xsmodel Schema Model which needs to be serialized @@ -269,7 +264,7 @@ public void serialize(XSModel xsmodel, Writer writer) throws IOException { StringBuilder buffer = new StringBuilder(); - if(xsmodel instanceof JBossXSModel) + if (xsmodel instanceof JBossXSModel) { String str = ((JBossXSModel)xsmodel).serialize(); buffer.append(str); @@ -286,7 +281,6 @@ writer.write(buffer.toString()); } - /** * Serialize the SchemaModel (with no types and elements) into a Writer * @param xsmodel Schema Model which needs to be serialized @@ -316,7 +310,7 @@ public String write(XSElementDeclaration xsel, XSParticle xsp) { XSTypeDefinition xst = xsel.getTypeDefinition(); - if(xst == null) + if (xst == null) throw new IllegalStateException("Type xst is null"); boolean isGlobalRef = (xsel.getScope() == XSConstants.SCOPE_GLOBAL); @@ -326,7 +320,7 @@ String elname = xsel.getName(); String prefix = null; - if(isGlobalRef) + if (isGlobalRef) { String namespace = xsel.getNamespace(); prefix = getPrefix(namespace); @@ -337,14 +331,14 @@ String namespace = xst.getNamespace(); String typename = xst.getName(); - if (! Constants.NS_SCHEMA_XSD.equals(namespace)) + if (!Constants.NS_SCHEMA_XSD.equals(namespace)) { prefix = getPrefix(namespace); typename = prefix + ":" + typename; } buf.append("<element name='" + elname + "'"); - if(! isAnonType) + if (!isAnonType) buf.append(" type='" + typename + "' "); } @@ -357,16 +351,14 @@ { if (xsp.getMaxOccursUnbounded()) buf.append(" maxOccurs='unbounded' "); - else - buf.append(" maxOccurs='" + xsp.getMaxOccurs() + "'"); + else buf.append(" maxOccurs='" + xsp.getMaxOccurs() + "'"); buf.append(" minOccurs='" + xsp.getMinOccurs() + "'"); } - if(! isAnonType) + if (isAnonType == false || isGlobalRef == true) buf.append("/>"); - else - buf.append(">").append(write(xst)).append("</element>"); + else buf.append(">").append(write(xst)).append("</element>"); return buf.toString(); } @@ -374,7 +366,7 @@ public String write(XSAttributeDeclaration decl) { XSTypeDefinition xst = decl.getTypeDefinition(); - if(xst == null) + if (xst == null) throw new IllegalStateException("Type xst is null"); boolean isGlobalRef = (decl.getScope() == XSConstants.SCOPE_GLOBAL); @@ -395,21 +387,20 @@ String namespace = xst.getNamespace(); String typename = xst.getName(); - if (! Constants.NS_SCHEMA_XSD.equals(namespace)) + if (!Constants.NS_SCHEMA_XSD.equals(namespace)) { prefix = getPrefix(namespace); typename = prefix + ":" + typename; } buf.append("<attribute name='" + name + "'"); - if(! isAnonType) + if (!isAnonType) buf.append(" type='" + typename + "' "); } - if(! isAnonType) + if (!isAnonType) buf.append("/>"); - else - buf.append(">").append(write(xst)).append("</attribute>"); + else buf.append(">").append(write(xst)).append("</attribute>"); return buf.toString(); } @@ -434,25 +425,22 @@ String namespace = xst.getNamespace(); String prefix = null; - if (! Constants.NS_SCHEMA_XSD.equals(namespace)) + if (!Constants.NS_SCHEMA_XSD.equals(namespace)) { prefix = getPrefix(namespace); typename = prefix + ":" + typename; } buf.append("<element name='" + elname + "'"); - if(!isAnonType) + if (!isAnonType) buf.append(" type='" + typename + "' "); - else - buf.append(">").append(write(xst)); + else buf.append(">").append(write(xst)); - if (xsel.getNillable() && - xsel.getScope() != XSConstants.SCOPE_GLOBAL) + if (xsel.getNillable() && xsel.getScope() != XSConstants.SCOPE_GLOBAL) buf.append(" nillable='true' "); - if(!isAnonType) + if (!isAnonType) buf.append("/>"); - else - buf.append("</element>"); + else buf.append("</element>"); return buf.toString(); } @@ -474,13 +462,12 @@ XSParticle jxsp = (XSParticle)objlist.item(i); XSTerm xterm = jxsp.getTerm(); short termType = xterm.getType(); - if(termType == XSConstants.ELEMENT_DECLARATION) + if (termType == XSConstants.ELEMENT_DECLARATION) { XSElementDeclaration xsel = (XSElementDeclaration)jxsp.getTerm(); buf.append(this.write(xsel, jxsp)); } - else - if ( termType == XSConstants.MODEL_GROUP) + else if (termType == XSConstants.MODEL_GROUP) { XSObjectList olist = ((XSModelGroup)xterm).getParticles(); int lobj = olist != null ? olist.getLength() : 0; @@ -489,18 +476,16 @@ XSParticle jxp = (XSParticle)olist.item(k); XSTerm xsterm = jxp.getTerm(); termType = xsterm.getType(); - if(termType == XSConstants.ELEMENT_DECLARATION) + if (termType == XSConstants.ELEMENT_DECLARATION) buf.append(write((XSElementDeclaration)xsterm, jxsp)); - else - if(termType == XSConstants.MODEL_GROUP && k > 0) - buf.append(write((XSModelGroup)xsterm)); + else if (termType == XSConstants.MODEL_GROUP && k > 0) + buf.append(write((XSModelGroup)xsterm)); } } } return buf.toString(); } - /** * Return a string for the xs type * @param xstype @@ -517,9 +502,9 @@ String jxsTypeName = jxstype.getName(); boolean isSimple = jxstype.getContentType() == XSComplexTypeDefinition.CONTENTTYPE_SIMPLE; - if(xstype.getAnonymous()) buf.append("<complexType>"); - else - buf.append("<complexType name='" + jxsTypeName + "'>"); + if (xstype.getAnonymous()) + buf.append("<complexType>"); + else buf.append("<complexType name='" + jxsTypeName + "'>"); XSTypeDefinition xsbase = (XSTypeDefinition)jxstype.getBaseType(); String baseType = null; @@ -533,12 +518,13 @@ } XSParticle xsp = jxstype.getParticle(); - if (xsp != null) appendComplexTypeDefinition(buf,jxstype); + if (xsp != null) + appendComplexTypeDefinition(buf, jxstype); XSObjectList list = jxstype.getAttributeUses(); for (int i = 0; i < list.getLength(); i++) { - XSAttributeUse use = (XSAttributeUse) list.item(i); + XSAttributeUse use = (XSAttributeUse)list.item(i); XSAttributeDeclaration decl = use.getAttrDeclaration(); buf.append(write(decl)); } @@ -560,7 +546,7 @@ { String baseType = xsbase.getName(); String ns = xsbase.getNamespace(); - if (! Constants.NS_SCHEMA_XSD.equals(ns)) + if (!Constants.NS_SCHEMA_XSD.equals(ns)) { String prefix = getPrefix(ns); baseType = prefix + ":" + baseType; @@ -572,7 +558,7 @@ for (int i = 0; i < list.getLength(); i++) { String listItem = DOMWriter.normalize(list.item(i), false); - buf.append("<enumeration value='" + listItem +"'/>"); + buf.append("<enumeration value='" + listItem + "'/>"); } buf.append("</restriction>"); } @@ -582,7 +568,7 @@ return buf.toString(); } -// Private methods + // Private methods private void appendSchemaDefinitions(StringBuilder buffer, XSNamespaceItemList itemlist) { @@ -594,13 +580,14 @@ String ns = nsitem.getSchemaNamespace(); //Ignore the one for xsd - if (Constants.NS_SCHEMA_XSD.equals(ns)) continue; + if (Constants.NS_SCHEMA_XSD.equals(ns)) + continue; buffer.append(utils.getSchemaDefinitions(ns)); } //end for } - private void appendComplexTypeDefinition(StringBuilder buf , XSComplexTypeDefinition jxstype) + private void appendComplexTypeDefinition(StringBuilder buf, XSComplexTypeDefinition jxstype) { XSParticle xsp = jxstype.getParticle(); XSTerm xsterm = xsp.getTerm(); @@ -651,10 +638,11 @@ } else if (xterm instanceof XSModelGroup) { - if(deriveMethod == XSConstants.DERIVATION_EXTENSION && i != lenobj -1) + if (deriveMethod == XSConstants.DERIVATION_EXTENSION && i != lenobj - 1) continue; - if (i == 0) continue;//Ignore as it provides the baseclass sequence of elements + if (i == 0) + continue;//Ignore as it provides the baseclass sequence of elements XSObjectList olist = ((XSModelGroup)xterm).getParticles(); int lobj = olist != null ? olist.getLength() : 0; for (int k = 0; k < lobj; k++) @@ -662,11 +650,10 @@ XSParticle jxp = (XSParticle)olist.item(k); XSTerm jxpterm = jxp.getTerm(); short termType = jxpterm.getType(); - if(termType == XSConstants.ELEMENT_DECLARATION) + if (termType == XSConstants.ELEMENT_DECLARATION) buf.append(write((XSElementDeclaration)jxpterm, jxsp)); - else - if(termType == XSConstants.MODEL_GROUP) - buf.append(write((XSModelGroup)jxpterm)); + else if (termType == XSConstants.MODEL_GROUP) + buf.append(write((XSModelGroup)jxpterm)); } } } @@ -682,12 +669,12 @@ for (int i = 0; i < len; i++) { XSTypeDefinition xstype = (XSTypeDefinition)xsmap.item(i); - if (Constants.NS_SCHEMA_XSD.equals(xstype.getNamespace())) continue; + if (Constants.NS_SCHEMA_XSD.equals(xstype.getNamespace())) + continue; buffer.append(this.write(xstype)); } } - private void appendGlobalElements(StringBuilder buffer, XSModel xsmodel) { XSNamedMap xsmap = xsmodel.getComponents(XSConstants.ELEMENT_DECLARATION); @@ -695,7 +682,8 @@ for (int i = 0; i < len; i++) { XSElementDeclaration xsel = (XSElementDeclaration)xsmap.item(i); - if (Constants.NS_SCHEMA_XSD.equals(xsel.getNamespace())) continue; + if (Constants.NS_SCHEMA_XSD.equals(xsel.getNamespace())) + continue; buffer.append(this.write(xsel)); } } @@ -703,9 +691,9 @@ //Copy the Xerces implementation of XSModel into JBossXSModel public void copyXSModel(XSModel xsmodel, JBossXSModel jb) { - if(xsmodel == null) + if (xsmodel == null) throw new IllegalArgumentException("Illegal Null Argument:xsmodel"); - if(jb == null) + if (jb == null) throw new IllegalArgumentException("Illegal Null Argument:jb"); //Copy all the Namespace Items jb.setXSNamespaceItemList(xsmodel.getNamespaceItems()); @@ -724,7 +712,8 @@ for (int i = 0; i < len; i++) { XSTypeDefinition xstype = (XSTypeDefinition)xsmp.item(i); - if (!this.xsNS.equals(xstype.getNamespace())) jb.addXSTypeDefinition(xstype); + if (!this.xsNS.equals(xstype.getNamespace())) + jb.addXSTypeDefinition(xstype); } //Copy all the attributes @@ -739,7 +728,7 @@ //copy all the global annotations //xsmp = xsmodel.getComponents(XSConstants.ANNOTATION); XSObjectList xo = xsmodel.getAnnotations(); - len = xo != null ? xo.getLength():0; + len = xo != null ? xo.getLength() : 0; //len = xsmp != null ? xsmp.getLength() : 0; for (int i = 0; i < len; i++) { Modified: branches/dlofthouse/JBWS-1259/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-01-10 22:47:20 UTC (rev 1913) +++ branches/dlofthouse/JBWS-1259/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-01-10 22:49:33 UTC (rev 1914) @@ -291,7 +291,8 @@ } } - log.trace("END processTypes: " + wsdlLoc + "\n" + destTypes); + if (log.isTraceEnabled()) + log.trace("END processTypes: " + wsdlLoc + "\n" + destTypes); } private void copyParentNamespaceDeclarations(Element destElement, Element srcElement) @@ -547,7 +548,7 @@ WSDLInterfaceOperationInput destInput = new WSDLInterfaceOperationInput(destOperation); QName elementName = messagePartToElementName(srcMessage, srcPart, destOperation); destInput.setElement(elementName); - + //Lets remember the Message name destInput.setMessageName(srcMessage.getQName()); destOperation.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_IN, srcMessage.getQName().getLocalPart())); @@ -591,7 +592,7 @@ if (srcMessage == null) throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot find output message on operation " + srcOperation.getName() + " on port type: " + srcPortType.getQName()); - + log.trace("processOperationOutput: " + srcMessage.getQName()); destOperation.setPattern(Constants.WSDL20_PATTERN_IN_OUT); @@ -716,7 +717,7 @@ private QName messagePartToElementName(Message srcMessage, Part srcPart, WSDLInterfaceOperation destOperation) throws WSDLException { QName xmlName; - + // R2306 A wsdl:message in a DESCRIPTION MUST NOT specify both type and element attributes on the same wsdl:part if (srcPart.getTypeName() != null && srcPart.getElementName() != null) throw new WSDLException(WSDLException.INVALID_WSDL, "Message parts must not define an element name and type name: " + srcMessage.getQName()); @@ -728,11 +729,11 @@ // only to wsdl:part element(s) that have been defined using the type attribute. if (srcPart.getName() == null) throw new WSDLException(WSDLException.INVALID_WSDL, "RPC style message parts must define a typy name: " + srcMessage.getQName()); - + // <part name="param" element="tns:SomeType" /> // Headers do have an element name even in rpc xmlName = srcPart.getElementName(); - + // <part name="param" type="xsd:string" /> if (xmlName == null) xmlName = new QName(srcPart.getName()); @@ -743,7 +744,7 @@ // only to wsdl:part element(s) that have been defined using the element attribute if (srcPart.getElementName() == null) throw new WSDLException(WSDLException.INVALID_WSDL, "Document style message parts must define an element name: " + srcMessage.getQName()); - + // <part name="param" element="tns:SomeType" /> xmlName = srcPart.getElementName(); } @@ -1057,7 +1058,8 @@ } private void processBindingReference(Definition srcWsdl, WSDLBindingOperation destBindingOperation, WSDLInterfaceOperation destIntfOperation, QName soap11Body, - List<ExtensibilityElement> extList, WSDLBindingMessageReference reference, BindingOperation srcBindingOperation, ReferenceCallback callback) throws WSDLException + List<ExtensibilityElement> extList, WSDLBindingMessageReference reference, BindingOperation srcBindingOperation, ReferenceCallback callback) + throws WSDLException { for (ExtensibilityElement extElement : extList) { Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2007-01-10 22:47:20 UTC (rev 1913) +++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2007-01-10 22:49:33 UTC (rev 1914) @@ -0,0 +1,65 @@ +/* + * 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.jbws1259; + +import java.io.File; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 10 Jan 2007 + */ +public class JBWS1259TestCase extends JBossWSTest +{ + + private static final String resourceDir = "resources/tools/jbws1259"; + private static final String toolsDir = "tools/jbws1259"; + + public void testGenerate() throws Exception + { + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + + compareSource("Lookup.java"); + compareSource("PhoneBook_PortType.java"); + compareSource("TelephoneNumber.java"); + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String fileName) throws Exception + { + File expected = new File(resourceDir + "/" + fileName); + File generated = new File(toolsDir + "/org/jboss/test/ws/jbws1441/" + fileName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/Lookup.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/Lookup.java 2007-01-10 22:47:20 UTC (rev 1913) +++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/Lookup.java 2007-01-10 22:49:33 UTC (rev 1914) @@ -0,0 +1,46 @@ +// 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.jbws1259; + + +public class Lookup { + protected java.lang.String firstName; + protected java.lang.String surname; + protected org.jboss.test.ws.jbws1259.Lookup[] lookup; + + public Lookup() { + } + + public Lookup(java.lang.String firstName, java.lang.String surname, org.jboss.test.ws.jbws1259.Lookup[] lookup) { + this.firstName = firstName; + this.surname = surname; + this.lookup = lookup; + } + + 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; + } + + public org.jboss.test.ws.jbws1259.Lookup[] getLookup() { + return lookup; + } + + public void setLookup(org.jboss.test.ws.jbws1259.Lookup[] lookup) { + this.lookup = lookup; + } +} Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/Lookup.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook.wsdl =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook.wsdl 2007-01-10 22:47:20 UTC (rev 1913) +++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook.wsdl 2007-01-10 22:49:33 UTC (rev 1914) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1259' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1259/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1259' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1259/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1259/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='lookup'> + <complexType> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + <element maxOccurs='unbounded' ref='tns:lookup'/> + </sequence> + </complexType> + </element> + + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </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'/> + </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> Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook_PortType.java 2007-01-10 22:47:20 UTC (rev 1913) +++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook_PortType.java 2007-01-10 22:49:33 UTC (rev 1914) @@ -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.jbws1259; + +public interface PhoneBook_PortType extends java.rmi.Remote { + public org.jboss.test.ws.jbws1259.TelephoneNumber lookup(java.lang.String firstName, java.lang.String surname, org.jboss.test.ws.jbws1259.Lookup[] lookup) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/TelephoneNumber.java 2007-01-10 22:47:20 UTC (rev 1913) +++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/TelephoneNumber.java 2007-01-10 22:49:33 UTC (rev 1914) @@ -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.jbws1259; + + +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-1259/jbossws-tests/src/main/resources/tools/jbws1259/TelephoneNumber.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/jaxrpc-mapping.xml 2007-01-10 22:47:20 UTC (rev 1913) +++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/jaxrpc-mapping.xml 2007-01-10 22:49:33 UTC (rev 1914) @@ -0,0 +1,96 @@ +<?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.jbws1259</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1259</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1259</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1259/types</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1259.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1259/types">typeN... + <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.jbws1259.Lookup</java-type> + <anonymous-type-qname>http://test.jboss.org/ws/jbws1259/types:&gt;l... + <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> + <variable-mapping> + <java-variable-name>lookup</java-variable-name> + <xml-element-name>lookup</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1259.Lookup[]</java-type> + <anonymous-type-qname>http://test.jboss.org/ws/jbws1259/types:&gt;l... + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1259.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1259">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.jbws1259.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1259">portTyp... + <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1259">bindingN... + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <wrapped-element/> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgN... + <wsdl-message-part-name>firstName</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>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgN... + <wsdl-message-part-name>surname</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>2</param-position> + <param-type>org.jboss.test.ws.jbws1259.Lookup[]</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgN... + <wsdl-message-part-name>lookup</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.jbws1259.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">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> Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/jaxrpc-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/wstools-config.xml 2007-01-10 22:47:20 UTC (rev 1913) +++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/wstools-config.xml 2007-01-10 22:49:33 UTC (rev 1914) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1259/PhoneBook.wsdl" parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/wsdl11/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/wsdl11/jaxrpc-mapping.xml 2007-01-10 22:47:20 UTC (rev 1913) +++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/wsdl11/jaxrpc-mapping.xml 2007-01-10 22:49:33 UTC (rev 1914) @@ -0,0 +1,96 @@ +<?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.jbws810</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1441</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws810</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1441/types</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws810.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1441/types">typeN... + <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.jbws810.Lookup</java-type> + <anonymous-type-qname>http://test.jboss.org/ws/jbws1441/types:&gt;l... + <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> + <variable-mapping> + <java-variable-name>lookup</java-variable-name> + <xml-element-name>lookup</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws810.Lookup[]</java-type> + <anonymous-type-qname>http://test.jboss.org/ws/jbws1441/types:&gt;l... + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws810.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1441">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.jbws810.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1441">portTyp... + <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1441">bindingN... + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <wrapped-element/> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1441">wsdlMsgN... + <wsdl-message-part-name>firstName</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>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1441">wsdlMsgN... + <wsdl-message-part-name>surname</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>2</param-position> + <param-type>org.jboss.test.ws.jbws810.Lookup[]</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1441">wsdlMsgN... + <wsdl-message-part-name>lookup</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.jbws810.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1441">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> Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/wsdl11/jaxrpc-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF