[jbossws-commits] JBossWS SVN: r1939 - in trunk: jbossws-core/src/main/java/org/jboss/ws/tools and 10 other directories.

Author: darran.lofthouse(a)jboss.com Date: 2007-01-12 07:03:04 -0500 (Fri, 12 Jan 2007) New Revision: 1939 Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Comment.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Comment.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/wsdl11/jaxrpc-mapping.xml Removed: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/Lookup.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/LookupResponse.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Comment.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/wstools-config.xml trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Comment.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/wstools-config.xml Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java Log: JBWS-1259 - WSDL to Java, handling of cyclic element references with anonymous complex types. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java 2007-01-12 11:17:14 UTC (rev 1938) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java 2007-01-12 12:03:04 UTC (rev 1939) @@ -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: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-12 11:17:14 UTC (rev 1938) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-12 12:03:04 UTC (rev 1939) @@ -563,11 +563,25 @@ if (containingElement == null || containingElement.length() == 0) containingElement = origType.getName(); - String anonName = containingElement + subname; + String anonName; + if (elem.getScope() == XSConstants.SCOPE_GLOBAL) + { + anonName = subname; + } + else + { + anonName = containingElement + subname; + } + anonName = utils.firstLetterUpperCase(anonName); this.fname = anonName; - this.createJavaFile((XSComplexTypeDefinition)xstypedef, schema, false); + if (!generatedFiles.contains(this.fname)) + { + generatedFiles.add(this.fname); + this.createJavaFile((XSComplexTypeDefinition)xstypedef, schema, false); + } + // Restore the fname this.fname = tempfname; // Bypass rest of processing Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-12 11:17:14 UTC (rev 1938) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-12 12:03:04 UTC (rev 1939) @@ -33,6 +33,7 @@ import org.apache.xerces.xs.XSAttributeDeclaration; import org.apache.xerces.xs.XSAttributeUse; import org.apache.xerces.xs.XSComplexTypeDefinition; +import org.apache.xerces.xs.XSConstants; import org.apache.xerces.xs.XSElementDeclaration; import org.apache.xerces.xs.XSModelGroup; import org.apache.xerces.xs.XSObjectList; @@ -745,8 +746,15 @@ { XSElementDeclaration xe = (XSElementDeclaration)xsterm; XSTypeDefinition typeDefinition = xe.getTypeDefinition(); - //XSTypeDefinition xt, String name, String containingElement, JavaWsdlMapping jwm, boolean skipWrapperArray - addJavaXMLTypeMap(typeDefinition, xe.getName(), containingElement, containingType, jwm, !isDocStyle()); + String tempContainingElement = ""; + String tempContainingType = ""; + if (xe.getScope() != XSConstants.SCOPE_GLOBAL) + { + tempContainingElement = containingElement; + tempContainingType = containingType; + } + + addJavaXMLTypeMap(typeDefinition, xe.getName(), tempContainingElement, tempContainingType, jwm, !isDocStyle()); } } } Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259 (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259) Deleted: trunk/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-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,186 +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.jbws1259; - -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 10 Jan 2007 - */ -public class JBWS1259TestCase extends JBossWSTest -{ - - /** - * - * <element name='lookupResponse'> - * <complexType> - * <sequence> - * <element name='areaCode' nillable='true' type='string'/> - * <element name='number' nillable='true' type='string'/> - * <element ref='tns:lookupResponse'/> - * </sequence> - * </complexType> - * </element> - * - */ - public void testScenario_A() throws Exception - { - generateScenario("A"); - } - - /** - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='areaCode' nillable='true' type='string'/> - * <element name='number' nillable='true' type='string'/> - * <element ref='tns:lookupResponse'/> - * </sequence> - * </complexType> - * - */ - public void testScenario_B() throws Exception - { - generateScenario("B"); - } - - /** - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='areaCode' nillable='true' type='string'/> - * <element name='number' nillable='true' type='string'/> - * <element ref='tns:comment'/> - * </sequence> - * </complexType> - * - * <element name='comment'> - * <complexType> - * <sequence> - * <element name='test' type='string' /> - * <element ref='tns:comment' /> - * </sequence> - * </complexType> - * </element> - * - */ - public void testScenario_C() throws Exception - { - generateScenario("C"); - } - - /** - * - * <element name='lookupResponse' type='tns:TelephoneNumber'/> - * - * <complexType name='TelephoneNumber'> - * <sequence> - * <element name='areaCode' nillable='true' type='string'/> - * <element name='number' nillable='true' type='string'/> - * <element ref='tns:comment'/> - * </sequence> - * </complexType> - * - * <element name='comment' type='tns:Comment' /> - * - * <complexType name='Comment'> - * <sequence> - * <element name='test' type='string' /> - * <element ref='tns:comment' /> - * </sequence> - * </complexType> - * - */ - public void testScenario_D() throws Exception - { - generateScenario("D"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1259/scenario_" + scenario; - String toolsDir = "tools/jbws1259/scenario_" + 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/jbws1259/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1259"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBook_Service.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: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259 (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/Lookup.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/Lookup.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/Lookup.java 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,46 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.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; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/Lookup.java (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/Lookup.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/LookupResponse.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/LookupResponse.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/LookupResponse.java 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,46 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1259; - - -public class LookupResponse { - protected java.lang.String areaCode; - protected java.lang.String number; - protected org.jboss.test.ws.jbws1259.LookupResponse lookupResponse; - - public LookupResponse() { - } - - public LookupResponse(java.lang.String areaCode, java.lang.String number, org.jboss.test.ws.jbws1259.LookupResponse lookupResponse) { - this.areaCode = areaCode; - this.number = number; - this.lookupResponse = lookupResponse; - } - - 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; - } - - public org.jboss.test.ws.jbws1259.LookupResponse getLookupResponse() { - return lookupResponse; - } - - public void setLookupResponse(org.jboss.test.ws.jbws1259.LookupResponse lookupResponse) { - this.lookupResponse = lookupResponse; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/LookupResponse.java (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/LookupResponse.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook.wsdl =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook.wsdl 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook.wsdl 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,57 +0,0 @@ -<?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'> - - <element name='lookup'> - <complexType> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - <element ref='tns:lookup'/> - </sequence> - </complexType> - </element> - - <element name='lookupResponse'> - <complexType> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - <element ref='tns:lookupResponse'/> - </sequence> - </complexType> - </element> - - </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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook.wsdl (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook_PortType.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook_PortType.java 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1259; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1259.LookupResponse lookup(org.jboss.test.ws.jbws1259.Lookup parameters) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook_PortType.java (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/jaxrpc-mapping.xml 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/jaxrpc-mapping.xml 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.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.LookupResponse</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1259/types:&gt;l... - <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> - <variable-mapping> - <java-variable-name>lookupResponse</java-variable-name> - <xml-element-name>lookupResponse</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> - <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> - <method-param-parts-mapping> - <param-position>0</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>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1259.LookupResponse</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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/jaxrpc-mapping.xml (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/jaxrpc-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/wstools-config.xml 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/wstools-config.xml 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1259/scenario_A/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/wstools-config.xml (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/Person.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/Person.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/Person.java 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,46 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1259; - - -public class Person { - protected java.lang.String firstName; - protected java.lang.String surname; - protected org.jboss.test.ws.jbws1259.Person lookup; - - public Person() { - } - - public Person(java.lang.String firstName, java.lang.String surname, org.jboss.test.ws.jbws1259.Person 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.Person getLookup() { - return lookup; - } - - public void setLookup(org.jboss.test.ws.jbws1259.Person lookup) { - this.lookup = lookup; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/Person.java (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook.wsdl =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook.wsdl 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook.wsdl 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,55 +0,0 @@ -<?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='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - <element ref='tns:lookup'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - <element ref='tns:lookupResponse'/> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person' /> - <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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook.wsdl (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook_PortType.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook_PortType.java 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1259; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1259.TelephoneNumber lookup(org.jboss.test.ws.jbws1259.Person parameters) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook_PortType.java (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/TelephoneNumber.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/TelephoneNumber.java 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,46 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1259; - - -public class TelephoneNumber { - protected java.lang.String areaCode; - protected java.lang.String number; - protected org.jboss.test.ws.jbws1259.TelephoneNumber lookupResponse; - - public TelephoneNumber() { - } - - public TelephoneNumber(java.lang.String areaCode, java.lang.String number, org.jboss.test.ws.jbws1259.TelephoneNumber lookupResponse) { - this.areaCode = areaCode; - this.number = number; - this.lookupResponse = lookupResponse; - } - - 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; - } - - public org.jboss.test.ws.jbws1259.TelephoneNumber getLookupResponse() { - return lookupResponse; - } - - public void setLookupResponse(org.jboss.test.ws.jbws1259.TelephoneNumber lookupResponse) { - this.lookupResponse = lookupResponse; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/TelephoneNumber.java (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/jaxrpc-mapping.xml 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/jaxrpc-mapping.xml 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.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> - <variable-mapping> - <java-variable-name>lookupResponse</java-variable-name> - <xml-element-name>lookupResponse</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1259.Person</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>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> - <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> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1259.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgN... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/jaxrpc-mapping.xml (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/jaxrpc-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/wstools-config.xml 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/wstools-config.xml 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1259/scenario_B/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/wstools-config.xml (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Comment.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Comment.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Comment.java 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1259; - - -public class Comment { - protected java.lang.String test; - protected org.jboss.test.ws.jbws1259.Comment comment; - - public Comment() { - } - - public Comment(java.lang.String test, org.jboss.test.ws.jbws1259.Comment comment) { - this.test = test; - this.comment = comment; - } - - public java.lang.String getTest() { - return test; - } - - public void setTest(java.lang.String test) { - this.test = test; - } - - public org.jboss.test.ws.jbws1259.Comment getComment() { - return comment; - } - - public void setComment(org.jboss.test.ws.jbws1259.Comment comment) { - this.comment = comment; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Comment.java (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Comment.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Person.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Person.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Person.java 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,46 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1259; - - -public class Person { - protected java.lang.String firstName; - protected java.lang.String surname; - protected org.jboss.test.ws.jbws1259.Comment comment; - - public Person() { - } - - public Person(java.lang.String firstName, java.lang.String surname, org.jboss.test.ws.jbws1259.Comment comment) { - this.firstName = firstName; - this.surname = surname; - this.comment = comment; - } - - 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.Comment getComment() { - return comment; - } - - public void setComment(org.jboss.test.ws.jbws1259.Comment comment) { - this.comment = comment; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Person.java (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook.wsdl =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook.wsdl 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook.wsdl 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,64 +0,0 @@ -<?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='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - <element ref='tns:comment'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - <element ref='tns:comment'/> - </sequence> - </complexType> - - <element name='comment'> - <complexType> - <sequence> - <element name='test' type='string' /> - <element ref='tns:comment' /> - </sequence> - </complexType> - </element> - - <element name='lookup' type='tns:Person' /> - <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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook.wsdl (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook_PortType.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook_PortType.java 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1259; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1259.TelephoneNumber lookup(org.jboss.test.ws.jbws1259.Person parameters) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook_PortType.java (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/TelephoneNumber.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/TelephoneNumber.java 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,46 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1259; - - -public class TelephoneNumber { - protected java.lang.String areaCode; - protected java.lang.String number; - protected org.jboss.test.ws.jbws1259.Comment comment; - - public TelephoneNumber() { - } - - public TelephoneNumber(java.lang.String areaCode, java.lang.String number, org.jboss.test.ws.jbws1259.Comment comment) { - this.areaCode = areaCode; - this.number = number; - this.comment = comment; - } - - 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; - } - - public org.jboss.test.ws.jbws1259.Comment getComment() { - return comment; - } - - public void setComment(org.jboss.test.ws.jbws1259.Comment comment) { - this.comment = comment; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/TelephoneNumber.java (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/jaxrpc-mapping.xml 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/jaxrpc-mapping.xml 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.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> - <variable-mapping> - <java-variable-name>comment</java-variable-name> - <xml-element-name>comment</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1259.Comment</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1259/types:&gt;T... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>test</java-variable-name> - <xml-element-name>test</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>comment</java-variable-name> - <xml-element-name>comment</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1259.Person</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>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>comment</java-variable-name> - <xml-element-name>comment</xml-element-name> - </variable-mapping> - </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> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1259.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgN... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/jaxrpc-mapping.xml (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/jaxrpc-mapping.xml) =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/jaxrpc-mapping.xml 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/jaxrpc-mapping.xml 2007-01-12 12:03:04 UTC (rev 1939) @@ -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> + <variable-mapping> + <java-variable-name>comment</java-variable-name> + <xml-element-name>comment</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <!-- The QName generated by wscompile is not correct. --> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1259.Comment</java-type> + + <!-- This is according to use case 4 from section 7.3.2.2 of the Web Services for J2EE specification --> + + <anonymous-type-qname>http://test.jboss.org/ws/jbws1259/types:>comme... + + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>test</java-variable-name> + <xml-element-name>test</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>comment</java-variable-name> + <xml-element-name>comment</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1259.Person</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>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>comment</java-variable-name> + <xml-element-name>comment</xml-element-name> + </variable-mapping> + </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> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1259.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgN... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.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> Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/wstools-config.xml 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/wstools-config.xml 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1259/scenario_C/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/wstools-config.xml (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Comment.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Comment.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Comment.java 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,36 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1259; - - -public class Comment { - protected java.lang.String test; - protected org.jboss.test.ws.jbws1259.Comment comment; - - public Comment() { - } - - public Comment(java.lang.String test, org.jboss.test.ws.jbws1259.Comment comment) { - this.test = test; - this.comment = comment; - } - - public java.lang.String getTest() { - return test; - } - - public void setTest(java.lang.String test) { - this.test = test; - } - - public org.jboss.test.ws.jbws1259.Comment getComment() { - return comment; - } - - public void setComment(org.jboss.test.ws.jbws1259.Comment comment) { - this.comment = comment; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Comment.java (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Comment.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Person.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Person.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Person.java 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,46 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1259; - - -public class Person { - protected java.lang.String firstName; - protected java.lang.String surname; - protected org.jboss.test.ws.jbws1259.Comment comment; - - public Person() { - } - - public Person(java.lang.String firstName, java.lang.String surname, org.jboss.test.ws.jbws1259.Comment comment) { - this.firstName = firstName; - this.surname = surname; - this.comment = comment; - } - - 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.Comment getComment() { - return comment; - } - - public void setComment(org.jboss.test.ws.jbws1259.Comment comment) { - this.comment = comment; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Person.java (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook.wsdl =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook.wsdl 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook.wsdl 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,64 +0,0 @@ -<?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='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - <element ref='tns:comment'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - <element ref='tns:comment'/> - </sequence> - </complexType> - - <complexType name='Comment'> - <sequence> - <element name='test' type='string' /> - <element ref='tns:comment' /> - </sequence> - </complexType> - - <element name='comment' type='tns:Comment' /> - - <element name='lookup' type='tns:Person' /> - <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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook.wsdl (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook_PortType.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook_PortType.java 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,11 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1259; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1259.TelephoneNumber lookup(org.jboss.test.ws.jbws1259.Person parameters) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook_PortType.java (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/TelephoneNumber.java 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/TelephoneNumber.java 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,46 +0,0 @@ -// This class was generated by the JAXRPC SI, do not edit. -// Contents subject to change without notice. -// JAX-RPC Standard Implementation (1.1.3, build R1) -// Generated source version: 1.1.3 - -package org.jboss.test.ws.jbws1259; - - -public class TelephoneNumber { - protected java.lang.String areaCode; - protected java.lang.String number; - protected org.jboss.test.ws.jbws1259.Comment comment; - - public TelephoneNumber() { - } - - public TelephoneNumber(java.lang.String areaCode, java.lang.String number, org.jboss.test.ws.jbws1259.Comment comment) { - this.areaCode = areaCode; - this.number = number; - this.comment = comment; - } - - 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; - } - - public org.jboss.test.ws.jbws1259.Comment getComment() { - return comment; - } - - public void setComment(org.jboss.test.ws.jbws1259.Comment comment) { - this.comment = comment; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/TelephoneNumber.java (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/jaxrpc-mapping.xml 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/jaxrpc-mapping.xml 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.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> - <variable-mapping> - <java-variable-name>comment</java-variable-name> - <xml-element-name>comment</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1259.Comment</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>test</java-variable-name> - <xml-element-name>test</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>comment</java-variable-name> - <xml-element-name>comment</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1259.Person</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>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>comment</java-variable-name> - <xml-element-name>comment</xml-element-name> - </variable-mapping> - </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> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1259.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgN... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.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> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/jaxrpc-mapping.xml (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/jaxrpc-mapping.xml) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/wstools-config.xml 2007-01-11 15:00:58 UTC (rev 1927) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/wstools-config.xml 2007-01-12 12:03:04 UTC (rev 1939) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1259/scenario_D/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/wstools-config.xml (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/wstools-config.xml) Copied: trunk/jbossws-tests/src/main/resources/tools/wsdl11/jaxrpc-mapping.xml (from rev 1927, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/wsdl11/jaxrpc-mapping.xml)