Author: darran.lofthouse(a)jboss.com Date: 2007-05-07 09:03:45 -0400 (Mon, 07 May 2007) New Revision: 2989 Added: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/NickName.java branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/Person.java branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml Removed: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/NickName.java branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/Person.java branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml Modified: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java Log: JBWS-1646 - WSDL To Java - Array Unwrapping uses incorect case to reference array type. Modified: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-05-07 10:11:53 UTC (rev 2988) +++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-05-07 13:03:45 UTC (rev 2989) @@ -63,6 +63,7 @@ protected LiteralTypeMapping typeMapping = null; protected WSDLUtils utils = WSDLUtils.getInstance(); protected SchemaUtils schemautils = SchemaUtils.getInstance(); + protected WSDLUtils wsdlUtils = WSDLUtils.getInstance(); protected JavaWriter jwriter = new JavaWriter(); @@ -600,6 +601,7 @@ } else { + String temp = this.fname; // Unwrap any array wrappers if (SchemaUtils.isWrapperArrayType(xstypedef)) { @@ -621,8 +623,6 @@ qn = new QName(xstypedef.getNamespace(), xstypename); } - String temp = this.fname; - if (xstypename != null && xstypedef instanceof XSComplexTypeDefinition) { this.fname = utils.firstLetterUpperCase(xstypename); @@ -648,15 +648,15 @@ if (tempqn != null) qn = tempqn; } - String clname = ""; + String qualifiedClassName = ""; Class cls = typeMapping.getJavaType(qn); VAR v = null; if (cls != null) { - clname = JavaUtils.getSourceName(cls); - String primitive = utils.getPrimitive(clname); + qualifiedClassName = JavaUtils.getSourceName(cls); + String primitive = utils.getPrimitive(qualifiedClassName); if ((!elem.getNillable()) && primitive != null) - clname = primitive; + qualifiedClassName = primitive; } else { @@ -669,14 +669,15 @@ { String nsuri = typename.getNamespaceURI(); if (!nsuri.equals(Constants.NS_SCHEMA_XSD)) - clname = pkgname + "."; - clname += typename.getLocalPart(); + qualifiedClassName = pkgname + "."; + String className = wsdlUtils.firstLetterUpperCase(typename.getLocalPart()); + qualifiedClassName += className; } else if (qn != null) - clname = qn.getLocalPart(); + qualifiedClassName = qn.getLocalPart(); } - v = new VAR(Introspector.decapitalize(varstr), clname, arrayType); + v = new VAR(Introspector.decapitalize(varstr), qualifiedClassName, arrayType); return v; } Modified: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-07 10:11:53 UTC (rev 2988) +++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-07 13:03:45 UTC (rev 2989) @@ -393,7 +393,7 @@ if (isDocStyle()) { XSTypeDefinition xt = getXSType(input); - addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, !isDocStyle()); + addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", "", jwm, !isWrapped()); } else { @@ -407,7 +407,7 @@ if (isDocStyle()) { XSTypeDefinition xt = getXSType(output); - addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, false); + addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", "", jwm, !isWrapped()); } else { @@ -711,7 +711,7 @@ tempContainingType = containingType; } - addJavaXMLTypeMap(typeDefinition, xe.getName(), tempContainingElement, tempContainingType, jwm, !isDocStyle()); + addJavaXMLTypeMap(typeDefinition, xe.getName(), tempContainingElement, tempContainingType, jwm, !isWrapped()); } } } Copied: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627 (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627) Deleted: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-05-06 22:04:32 UTC (rev 2985) +++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-05-07 13:03:45 UTC (rev 2989) @@ -1,107 +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.jbws1627; - -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; - -/** - * Test case for http://jira.jboss.com/jira/browse/JBWS-1627 - * - * WSDL to Java, Unwrapping arrays the wrong case is used to - * reference the generated class. - * - * @author darran.lofthouse(a)jboss.com - * @since 26 Apr 2007 - */ -public class JBWS1627TestCase extends JBossWSTest -{ - - /** - * Test generation of the SEI. - * - * @throws Exception - */ - public void testGenerate() throws Exception - { - String resourceDir = "resources/tools/jbws1627"; - String toolsDir = "tools/jbws1627"; - 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/jbws1627/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1627"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBookService.java".equals(currentFile); - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-05-07 13:03:45 UTC (rev 2989) @@ -0,0 +1,107 @@ +/* + * 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.jbws1627; + +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; + +/** + * Test case for http://jira.jboss.com/jira/browse/JBWS-1627 + * + * WSDL to Java, Unwrapping arrays the wrong case is used to + * reference the generated class. + * + * @author darran.lofthouse(a)jboss.com + * @since 26 Apr 2007 + */ +public class JBWS1627TestCase extends JBossWSTest +{ + + /** + * Test generation of the SEI. + * + * @throws Exception + */ + public void testGenerate() throws Exception + { + String resourceDir = "resources/tools/jbws1627"; + String toolsDir = "tools/jbws1627"; + 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/jbws1627/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1627"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Copied: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627 (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627) Deleted: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/NickName.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/NickName.java 2007-05-06 22:04:32 UTC (rev 2985) +++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/NickName.java 2007-05-07 13:03:45 UTC (rev 2989) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sun May 06 14:14:38 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1627; - - -public class NickName -{ - -protected java.lang.String name; -public NickName(){} - -public NickName(java.lang.String name){ -this.name=name; -} -public java.lang.String getName() { return name ;} - -public void setName(java.lang.String name){ this.name=name; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/NickName.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/NickName.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/NickName.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/NickName.java 2007-05-07 13:03:45 UTC (rev 2989) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sun May 06 14:14:38 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1627; + + +public class NickName +{ + +protected java.lang.String name; +public NickName(){} + +public NickName(java.lang.String name){ +this.name=name; +} +public java.lang.String getName() { return name ;} + +public void setName(java.lang.String name){ this.name=name; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/Person.java 2007-05-06 22:04:32 UTC (rev 2985) +++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/Person.java 2007-05-07 13:03:45 UTC (rev 2989) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sun May 06 14:14:38 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1627; - - -public class Person -{ - -protected java.lang.String surname; - -protected org.jboss.test.ws.jbws1627.NickName[] nickNames; -public Person(){} - -public Person(java.lang.String surname, org.jboss.test.ws.jbws1627.NickName[] nickNames){ -this.surname=surname; -this.nickNames=nickNames; -} -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -public org.jboss.test.ws.jbws1627.NickName[] getNickNames() { return nickNames ;} - -public void setNickNames(org.jboss.test.ws.jbws1627.NickName[] nickNames){ this.nickNames=nickNames; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/Person.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/Person.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/Person.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/Person.java 2007-05-07 13:03:45 UTC (rev 2989) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sun May 06 14:14:38 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1627; + + +public class Person +{ + +protected java.lang.String surname; + +protected org.jboss.test.ws.jbws1627.NickName[] nickNames; +public Person(){} + +public Person(java.lang.String surname, org.jboss.test.ws.jbws1627.NickName[] nickNames){ +this.surname=surname; +this.nickNames=nickNames; +} +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +public org.jboss.test.ws.jbws1627.NickName[] getNickNames() { return nickNames ;} + +public void setNickNames(org.jboss.test.ws.jbws1627.NickName[] nickNames){ this.nickNames=nickNames; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl 2007-05-06 22:04:32 UTC (rev 2985) +++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl 2007-05-07 13:03:45 UTC (rev 2989) @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1627' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1627/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1627' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1627/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1627/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='surname' nillable='true' type='string'/> - <element name='nickNames' nillable='true' type='tns:ArrayOf_nickNames'/> - </sequence> - </complexType> - - <complexType name='ArrayOf_nickNames'> - <sequence> - <element name='names' maxOccurs='unbounded' nillable='true' type='tns:nickName'/> - </sequence> - </complexType> - - <complexType name='nickName'> - <sequence> - <element name='name' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='number' nillable='true' type='string'/> - </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: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl 2007-05-07 13:03:45 UTC (rev 2989) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1627' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1627/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1627' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1627/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1627/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='surname' nillable='true' type='string'/> + <element name='nickNames' nillable='true' type='tns:ArrayOf_nickNames'/> + </sequence> + </complexType> + + <complexType name='ArrayOf_nickNames'> + <sequence> + <element name='names' maxOccurs='unbounded' nillable='true' type='tns:nickName'/> + </sequence> + </complexType> + + <complexType name='nickName'> + <sequence> + <element name='name' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='number' nillable='true' type='string'/> + </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> Deleted: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java 2007-05-06 22:04:32 UTC (rev 2985) +++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java 2007-05-07 13:03:45 UTC (rev 2989) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sun May 06 14:14:38 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1627; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1627.TelephoneNumber lookup(org.jboss.test.ws.jbws1627.Person lookup) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java 2007-05-07 13:03:45 UTC (rev 2989) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sun May 06 14:14:38 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1627; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1627.TelephoneNumber lookup(org.jboss.test.ws.jbws1627.Person lookup) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java 2007-05-06 22:04:32 UTC (rev 2985) +++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java 2007-05-07 13:03:45 UTC (rev 2989) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sun May 06 14:14:38 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1627; - - -public class TelephoneNumber -{ - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String number){ -this.number=number; -} -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java 2007-05-07 13:03:45 UTC (rev 2989) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sun May 06 14:14:38 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1627; + + +public class TelephoneNumber +{ + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String number){ +this.number=number; +} +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml 2007-05-06 22:04:32 UTC (rev 2985) +++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml 2007-05-07 13:03:45 UTC (rev 2989) @@ -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.jbws1627</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1627/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1627</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1627</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1627.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>nickNames</java-variable-name> - <xml-element-name>nickNames</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1627.NickName</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>name</java-variable-name> - <xml-element-name>name</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1627.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/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> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1627.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1627'>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.jbws1627.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1627'>portTypeN... - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1627'>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.jbws1627.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>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.jbws1627.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>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: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml 2007-05-07 13:03:45 UTC (rev 2989) @@ -0,0 +1,72 @@ +<?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.jbws1627</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1627/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1627</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1627</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1627.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>nickNames</java-variable-name> + <xml-element-name>nickNames</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1627.NickName</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>name</java-variable-name> + <xml-element-name>name</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1627.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/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> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1627.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1627'>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.jbws1627.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1627'>portTypeN... + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1627'>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.jbws1627.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>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.jbws1627.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>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 Deleted: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2007-05-06 22:04:32 UTC (rev 2985) +++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2007-05-07 13:03:45 UTC (rev 2989) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1627/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml (from rev 2985, branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1646/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2007-05-07 13:03:45 UTC (rev 2989) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1627/PhoneBook.wsdl" parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>