[jbossws-commits] JBossWS SVN: r1510 - in trunk: . src/ant src/main/java/org/jboss/ws/tools src/main/java/org/jboss/ws/tools/helpers src/main/java/org/jboss/ws/tools/mapping src/test/java/org/jboss/test/ws/tools src/test/java/org/jboss/test/ws/tools/jbws1079 src/test/resources/tools src/test/resources/tools/jbws1079

Author: thomas.diesler(a)jboss.com Date: 2006-11-22 17:22:35 -0500 (Wed, 22 Nov 2006) New Revision: 1510 Added: trunk/src/test/java/org/jboss/test/ws/tools/jbws1079/ trunk/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java trunk/src/test/resources/tools/jbws1079/ trunk/src/test/resources/tools/jbws1079/Anonymous.wsdl trunk/src/test/resources/tools/jbws1079/TelephoneNumber.java trunk/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java trunk/src/test/resources/tools/jbws1079/anonymous-mapping.xml trunk/src/test/resources/tools/jbws1079/wstools-config.xml Removed: trunk/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java trunk/src/test/resources/tools/jbws1079/Anonymous.wsdl trunk/src/test/resources/tools/jbws1079/TelephoneNumber.java trunk/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java trunk/src/test/resources/tools/jbws1079/anonymous-mapping.xml trunk/src/test/resources/tools/jbws1079/wstools-config.xml Modified: trunk/ant.properties.example trunk/build.xml trunk/src/ant/build-release.xml trunk/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java Log: [JBWS-1079] Bring name of class in jax-rpc mapping in synch with the name of the generated class. Modified: trunk/ant.properties.example =================================================================== --- trunk/ant.properties.example 2006-11-22 22:03:44 UTC (rev 1509) +++ trunk/ant.properties.example 2006-11-22 22:22:35 UTC (rev 1510) @@ -5,9 +5,6 @@ # Required JBoss Home #jboss.jdk15.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2 -# Optional JBoss Home -#jboss.jdk14.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_4_GA/build/output/jboss-4.0.4.GA - # The JBoss server instance jboss.server.instance=default Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-11-22 22:03:44 UTC (rev 1509) +++ trunk/build.xml 2006-11-22 22:22:35 UTC (rev 1510) @@ -67,7 +67,6 @@ <target name="prepare"> <echo message="jboss.jdk15.home = ${jboss.jdk15.home}"/> - <echo message="jboss.jdk14.home = ${jboss.jdk14.home}"/> <echo message="tomcat.home = ${tomcat.home}"/> <echo/> Modified: trunk/src/ant/build-release.xml =================================================================== --- trunk/src/ant/build-release.xml 2006-11-22 22:03:44 UTC (rev 1509) +++ trunk/src/ant/build-release.xml 2006-11-22 22:22:35 UTC (rev 1510) @@ -35,7 +35,7 @@ </target> <!-- Release to jboss.local.repository --> - <target name="release-to-repository" depends="module-jars,module-jars14" description="Release to jboss.local.repository"> + <target name="release-to-repository" depends="module-jars" description="Release to jboss.local.repository"> <!-- jbossws --> <property name="jbossws.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/> @@ -56,27 +56,6 @@ <filtersfile file="version.properties"/> </filterset> </copy> - - <!-- jbossws14 --> - <property name="jbossws14.dir" value="${jboss.local.repository}/jboss/jbossws14/${repository.id}"/> - <mkdir dir="${jbossws14.dir}/lib"/> - <copy todir="${jbossws14.dir}/lib" overwrite="true"> - <fileset dir="${build.lib.dir}"> - <include name="jbossws14.sar"/> - <include name="jbossws14-client.jar"/> - <include name="jbossws14-jboss-integration.jar"/> - <include name="jbossws14-tomcat-integration.jar"/> - <include name="jboss-jaxws14.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - <copy tofile="${jbossws14.dir}/component-info.xml" file="${src.etc.dir}/jbossws14-component-info.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="version.properties"/> - </filterset> - </copy> - </target> <!-- Release to portal content --> @@ -118,7 +97,7 @@ <!-- Build the bin dist --> <target name="build-bin-dist" description="Build the binary distribution" - depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs"> + depends="main,jbossws-thirdparty-jar,build-samples,build-docs"> <mkdir dir="${build.bin.dist}"/> <mkdir dir="${build.bin.dist}/bin"/> @@ -159,11 +138,6 @@ <fileset dir="${build.lib.dir}" includes="jbossws-client.jar,jbossws.sar"/> </copy> - <!-- lib/jdk1.4 --> - <copy todir="${build.bin.dist}/lib/jboss-jdk1.4" overwrite="true"> - <fileset dir="${build.lib.dir}" includes="jbossws14-client.jar,jbossws14.sar"/> - </copy> - <!-- lib/tomcat --> <copy todir="${build.bin.dist}/lib/tomcat/common/endorsed" overwrite="true"> <fileset dir="${thirdparty.dir}"> Modified: trunk/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2006-11-22 22:03:44 UTC (rev 1509) +++ trunk/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2006-11-22 22:22:35 UTC (rev 1510) @@ -53,7 +53,6 @@ import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; import org.jboss.ws.utils.JavaUtils; -import org.jboss.xb.binding.sunday.unmarshalling.TypeBinding; /** Class that converts a XSD Type into Java class * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana Modified: trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2006-11-22 22:03:44 UTC (rev 1509) +++ trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2006-11-22 22:22:35 UTC (rev 1510) @@ -91,7 +91,6 @@ private WSDLDefinitions wsdlDefinitions = null; private String serviceName = null; private String packageName = null; - private Set<String> registeredTypes = new HashSet<String>(); private LiteralTypeMapping typeMapping = null; @@ -101,8 +100,7 @@ private String parameterStyle; - public MappingFileGeneratorHelper(WSDLDefinitions wsdl, String sname, - String pname, Class seiClass, String tns,LiteralTypeMapping ltm, String parameterStyle) + public MappingFileGeneratorHelper(WSDLDefinitions wsdl, String sname, String pname, Class seiClass, String tns, LiteralTypeMapping ltm, String paramStyle) { this.wsdlDefinitions = wsdl; this.serviceName = sname; @@ -110,7 +108,7 @@ this.typeMapping = ltm; this.wsdlStyle = utils.getWSDLStyle(wsdl); - this.parameterStyle = parameterStyle; + this.parameterStyle = paramStyle; checkEssentials(); } @@ -344,12 +342,12 @@ if (isDocStyle()) { XSTypeDefinition xt = getXSType( input ); - addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), jwm, false); + addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", jwm, false); } else { for (WSDLRPCPart part : input.getChildParts()) - addJavaXMLTypeMap(getXSType(part.getType()), "", jwm, true); + addJavaXMLTypeMap(getXSType(part.getType()), "", "", jwm, true); } } @@ -358,12 +356,12 @@ if (isDocStyle()) { XSTypeDefinition xt = getXSType( output ); - addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), jwm, false); + addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", jwm, false); } else { for (WSDLRPCPart part : output.getChildParts()) - addJavaXMLTypeMap(getXSType(part.getType()), "", jwm, true); + addJavaXMLTypeMap(getXSType(part.getType()), "", "", jwm, true); } } @@ -375,7 +373,7 @@ WSDLTypes types = wsdlDefinitions.getWsdlTypes(); JBossXSModel xsmodel = WSDLUtils.getSchemaModel(types); XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); - addJavaXMLTypeMap(xt, xmlName.getLocalPart(), jwm, true); + addJavaXMLTypeMap(xt, xmlName.getLocalPart(), "", jwm, true); ExceptionMapping exceptionMapping = new ExceptionMapping(jwm); exceptionMapping.setExceptionType(getJavaTypeAsString(null, xmlType, false, true)); @@ -518,7 +516,7 @@ return xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); } - private void addJavaXMLTypeMap(XSTypeDefinition xt, String containingElement, JavaWsdlMapping jwm, boolean skipWrapperArray) + private void addJavaXMLTypeMap(XSTypeDefinition xt,String name, String containingElement, JavaWsdlMapping jwm, boolean skipWrapperArray) { JavaXmlTypeMapping jxtm = null; @@ -538,7 +536,7 @@ } } - if (! (skipWrapperArray && isRepresentsArray(xt))) + if ((skipWrapperArray && isRepresentsArray(xt)) == false) { jxtm = new JavaXmlTypeMapping(jwm); String javaType; @@ -547,8 +545,8 @@ // Anonymous if (localName == null) { - javaType = getJavaTypeAsString(null, new QName(containingElement), false, true); - localName = ">" + containingElement; + javaType = getJavaTypeAsString(null, new QName(containingElement + name), false, true); + localName = ">" + name; jxtm.setAnonymousTypeQName(new QName(xt.getNamespace(), localName, "typeNS")); } else @@ -576,7 +574,7 @@ XSSimpleTypeDefinition simple = xc.getSimpleType(); if (simple != null) { - addJavaXMLTypeMap(simple, xc.getName(), jwm, skipWrapperArray); + addJavaXMLTypeMap(simple, xc.getName(), "", jwm, skipWrapperArray); } // Add attributes @@ -622,7 +620,7 @@ XSAttributeUse obj = (XSAttributeUse)attributes.item(i); XSAttributeDeclaration att = obj.getAttrDeclaration(); XSSimpleTypeDefinition simple = att.getTypeDefinition(); - addJavaXMLTypeMap(simple, "none", jxtm.getJavaWsdlMapping(), true); + addJavaXMLTypeMap(simple, "none", "", jxtm.getJavaWsdlMapping(), true); VariableMapping vm = new VariableMapping(jxtm); String name = att.getName(); vm.setXmlAttributeName(name); @@ -647,7 +645,7 @@ { XSElementDeclaration xe = (XSElementDeclaration)xsterm; XSTypeDefinition typeDefinition = xe.getTypeDefinition(); - addJavaXMLTypeMap(typeDefinition, xe.getName(), jwm, true); + addJavaXMLTypeMap(typeDefinition, xe.getName(), xe.getEnclosingCTDefinition().getName(), jwm, true); } } } Modified: trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-11-22 22:03:44 UTC (rev 1509) +++ trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-11-22 22:22:35 UTC (rev 1510) @@ -311,8 +311,7 @@ MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new LiteralTypeMapping()); mgf.setPackageName(getPackageName(wsdl, glc)); mgf.setServiceName(wsdl.getServices()[0].getName().toString()); - mgf.setParameterStyle(w2jc.parameterStyle); - //mgf.generate(); + mgf.setParameterStyle(w2jc.parameterStyle); JavaWsdlMapping jwm = mgf.generate(); Writer writer = IOUtils.getCharsetFileWriter(new File(outDir + "/" + w2jc.mappingFileName), Constants.DEFAULT_XML_CHARSET); Modified: trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2006-11-22 22:03:44 UTC (rev 1509) +++ trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2006-11-22 22:22:35 UTC (rev 1510) @@ -219,9 +219,7 @@ MethodParamPartsMapping[] mppmarr = mm.getMethodParamPartsMappings(); int lenmppmarr = mppmarr != null ? mppmarr.length : 0; for (int j = 0; j < lenmppmarr; j++) - { - MethodParamPartsMapping mppm = mppmarr[j]; - String paramType = mppm.getParamType(); + { listInputs.addAll(xst.getVARList((XSComplexTypeDefinition)xsmodel.getTypeDefinition(opname, typeNamespace), xsmodel, false)); } JavaWriter jw = new JavaWriter(); Copied: trunk/src/test/java/org/jboss/test/ws/tools/jbws1079 (from rev 1452, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1079) Deleted: trunk/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2006-11-16 22:50:57 UTC (rev 1452) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2006-11-22 22:22:35 UTC (rev 1510) @@ -1,65 +0,0 @@ -/* - * 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.test.ws.tools.jbws1079; - -import java.io.File; -import java.io.FileInputStream; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.ws.tools.WSTools; -import org.jboss.ws.utils.DOMUtils; -import org.w3c.dom.Element; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 5, 2006 - */ -public class JBWS1079TestCase extends JBossWSTest -{ - - public void testAnonymousType() throws Exception - { - String resourceDir = "resources/tools/jbws1079"; - String toolsDir = "tools/jbws1079"; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - - Element exp = DOMUtils.parse(new FileInputStream(resourceDir + "/anonymous-mapping.xml")); - Element was = DOMUtils.parse(new FileInputStream(toolsDir + "/anonymous-mapping.xml")); - assertEquals(exp, was); - - compareSource(resourceDir + "/TelephoneNumber.java", toolsDir + "/org/jboss/test/ws/jbws1079/TelephoneNumber.java"); - compareSource(resourceDir + "/TelephoneNumberNumber.java", toolsDir + "/org/jboss/test/ws/jbws1079/TelephoneNumberNumber.java"); - } - - 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/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java (from rev 1452, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java) Copied: trunk/src/test/resources/tools/jbws1079 (from rev 1452, branches/jbossws-1.0/src/test/resources/tools/jbws1079) Deleted: trunk/src/test/resources/tools/jbws1079/Anonymous.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/tools/jbws1079/Anonymous.wsdl 2006-11-16 22:50:57 UTC (rev 1452) +++ trunk/src/test/resources/tools/jbws1079/Anonymous.wsdl 2006-11-22 22:22:35 UTC (rev 1510) @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1079' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1079/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1079' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1079/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1079/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - <complexType name='TelephoneNumber'> - <sequence> - <element name='Number'> - <complexType> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - </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> \ No newline at end of file Copied: trunk/src/test/resources/tools/jbws1079/Anonymous.wsdl (from rev 1452, branches/jbossws-1.0/src/test/resources/tools/jbws1079/Anonymous.wsdl) Deleted: trunk/src/test/resources/tools/jbws1079/TelephoneNumber.java =================================================================== --- branches/jbossws-1.0/src/test/resources/tools/jbws1079/TelephoneNumber.java 2006-11-16 22:50:57 UTC (rev 1452) +++ trunk/src/test/resources/tools/jbws1079/TelephoneNumber.java 2006-11-22 22:22:35 UTC (rev 1510) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sun Nov 05 12:21:27 CET 2006 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1079; - - -public class TelephoneNumber -{ - -protected org.jboss.test.ws.jbws1079.TelephoneNumberNumber number; -public TelephoneNumber(){} - -public TelephoneNumber(org.jboss.test.ws.jbws1079.TelephoneNumberNumber number){ -this.number=number; -} -public org.jboss.test.ws.jbws1079.TelephoneNumberNumber getNumber() { return number ;} - -public void setNumber(org.jboss.test.ws.jbws1079.TelephoneNumberNumber number){ this.number=number; } - -} Copied: trunk/src/test/resources/tools/jbws1079/TelephoneNumber.java (from rev 1452, branches/jbossws-1.0/src/test/resources/tools/jbws1079/TelephoneNumber.java) Deleted: trunk/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java =================================================================== --- branches/jbossws-1.0/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java 2006-11-16 22:50:57 UTC (rev 1452) +++ trunk/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java 2006-11-22 22:22:35 UTC (rev 1510) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sun Nov 05 12:21:27 CET 2006 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1079; - - -public class TelephoneNumberNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumberNumber(){} - -public TelephoneNumberNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: trunk/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java (from rev 1452, branches/jbossws-1.0/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java) Deleted: trunk/src/test/resources/tools/jbws1079/anonymous-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/tools/jbws1079/anonymous-mapping.xml 2006-11-16 22:50:57 UTC (rev 1452) +++ trunk/src/test/resources/tools/jbws1079/anonymous-mapping.xml 2006-11-22 22:22:35 UTC (rev 1510) @@ -1,72 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1079</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1079</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.TelephoneNumberNumber</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1079.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1079'>serviceNS:... - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1079.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1079'>portTypeN... - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1079'>bindingNS:... - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1079.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1079'>wsdlMsgNS:... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1079.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1079'>wsdlMsgNS:... - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: trunk/src/test/resources/tools/jbws1079/anonymous-mapping.xml (from rev 1452, branches/jbossws-1.0/src/test/resources/tools/jbws1079/anonymous-mapping.xml) Deleted: trunk/src/test/resources/tools/jbws1079/wstools-config.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/tools/jbws1079/wstools-config.xml 2006-11-16 22:50:57 UTC (rev 1452) +++ trunk/src/test/resources/tools/jbws1079/wstools-config.xml 2006-11-22 22:22:35 UTC (rev 1510) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1079/Anonymous.wsdl" parameter-style="bare"> - <mapping file="anonymous-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/src/test/resources/tools/jbws1079/wstools-config.xml (from rev 1452, branches/jbossws-1.0/src/test/resources/tools/jbws1079/wstools-config.xml)