Author: darran.lofthouse(a)jboss.com Date: 2008-01-23 06:52:05 -0500 (Wed, 23 Jan 2008) New Revision: 5515 Added: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/java/org/jboss/test/ws/tools/jbws1873/ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/LookupRequest.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/Person.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/wstools-config.xml Removed: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/LookupRequest.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/Person.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/wstools-config.xml Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/main/java/org/jboss/ws/tools/WSDLToJava.java stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java Log: [JBWS-1963] WSDL to Java - Incorrect case of generated type for anonymous type. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-01-23 11:49:29 UTC (rev 5514) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-01-23 11:52:05 UTC (rev 5515) @@ -555,7 +555,7 @@ XSElementDeclaration element = (XSElementDeclaration)term; XSTypeDefinition type = element.getTypeDefinition(); - String tempContainingElement = containingElement + element.getName(); + String tempContainingElement = containingElement + ToolsUtils.firstLetterUpperCase(element.getName()); QName xmlType = null; if (type.getAnonymous() == false) @@ -711,7 +711,7 @@ if (unwrapper.xmlType != null) xmlType = unwrapper.xmlType; - containingElement = containingElement + unwrapper.unwrappedElement.getName(); + containingElement = containingElement + ToolsUtils.firstLetterUpperCase(unwrapper.unwrappedElement.getName()); if (unwrapper.array) arraySuffix = "[]"; Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-01-23 11:49:29 UTC (rev 5514) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-01-23 11:52:05 UTC (rev 5515) @@ -298,7 +298,7 @@ xt = element.getTypeDefinition(); primitive = unwrapper.primitive; partName = element.getName(); - containingElement = containingElement + unwrapper.unwrappedElement.getName(); + containingElement = containingElement + ToolsUtils.firstLetterUpperCase(unwrapper.unwrappedElement.getName()); array = unwrapper.array; if (xt.getAnonymous()) { @@ -632,7 +632,8 @@ QName xmlType; if (type.getAnonymous()) { - xmlType = new QName(type.getNamespace(), containingElement + element.getName()); + String tempName = ToolsUtils.firstLetterUpperCase(containingElement) + ToolsUtils.firstLetterUpperCase(element.getName()); + xmlType = new QName(type.getNamespace(), tempName); } else { @@ -715,7 +716,8 @@ // Anonymous if (localName == null) { - javaType = getJavaTypeAsString(null, new QName(containingElement + name), false, true); + String tempName = containingElement + ToolsUtils.firstLetterUpperCase(name); + javaType = getJavaTypeAsString(null, new QName(tempName), false, true); StringBuilder temp = new StringBuilder(); if (containingType != null && containingType.length() > 0) temp.append(">").append(containingType); Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/java/org/jboss/test/ws/tools/jbws1873 (from rev 4927, stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2007-10-29 18:44:57 UTC (rev 4927) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-01-23 11:52:05 UTC (rev 5515) @@ -1,104 +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.jbws1873; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.tools.WSTools; -import org.jboss.wsf.test.JBossWSTest; - -/** - * Test case to test the following fix: - - * - * @see http://jira.jboss.com/jira/browse/JBWS-1873 - * - * @author darran.lofthouse(a)jboss.com - * @since Oct 29, 2007 - */ -public class JBWS1873TestCase extends JBossWSTest -{ - - public void testDocumentLiteral() throws Exception - { - generateScenario("doclit"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1873/" + scenario; - String toolsDir = "tools/jbws1873/" + 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/jbws1873/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1873"); - 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: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java (from rev 4927, stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-01-23 11:52:05 UTC (rev 5515) @@ -0,0 +1,104 @@ +/* + * 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.jbws1873; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.test.JBossWSTest; + +/** + * Test case to test the following fix: - + * + * @see http://jira.jboss.com/jira/browse/JBWS-1873 + * + * @author darran.lofthouse(a)jboss.com + * @since Oct 29, 2007 + */ +public class JBWS1873TestCase extends JBossWSTest +{ + + public void testDocumentLiteral() throws Exception + { + generateScenario("doclit"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1873/" + scenario; + String toolsDir = "tools/jbws1873/" + 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/jbws1873/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1873"); + 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: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873 (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873) Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/LookupRequest.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupRequest.java 2007-10-29 18:44:57 UTC (rev 4927) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/LookupRequest.java 2008-01-23 11:52:05 UTC (rev 5515) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Mon Oct 29 15:50:46 GMT 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.jbws1873; - - -public class LookupRequest -{ - -protected java.lang.String surname; -public LookupRequest(){} - -public LookupRequest(java.lang.String surname){ -this.surname=surname; -} -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/LookupRequest.java (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupRequest.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/LookupRequest.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/LookupRequest.java 2008-01-23 11:52:05 UTC (rev 5515) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Oct 29 15:50:46 GMT 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.jbws1873; + + +public class LookupRequest +{ + +protected java.lang.String surname; +public LookupRequest(){} + +public LookupRequest(java.lang.String surname){ +this.surname=surname; +} +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java 2007-10-29 18:44:57 UTC (rev 4927) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java 2008-01-23 11:52:05 UTC (rev 5515) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Mon Oct 29 15:50:46 GMT 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.jbws1873; - - -public class LookupResponseResponse -{ - -protected java.lang.String number; -public LookupResponseResponse(){} - -public LookupResponseResponse(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: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/LookupResponseResponse.java 2008-01-23 11:52:05 UTC (rev 5515) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Oct 29 15:50:46 GMT 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.jbws1873; + + +public class LookupResponseResponse +{ + +protected java.lang.String number; +public LookupResponseResponse(){} + +public LookupResponseResponse(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: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/Person.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/Person.java 2007-10-29 18:44:57 UTC (rev 4927) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/Person.java 2008-01-23 11:52:05 UTC (rev 5515) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Mon Oct 29 15:50:46 GMT 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.jbws1873; - - -public class Person -{ - -protected org.jboss.test.ws.jbws1873.LookupRequest request; -public Person(){} - -public Person(org.jboss.test.ws.jbws1873.LookupRequest request){ -this.request=request; -} -public org.jboss.test.ws.jbws1873.LookupRequest getRequest() { return request ;} - -public void setRequest(org.jboss.test.ws.jbws1873.LookupRequest request){ this.request=request; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/Person.java (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/Person.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/Person.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/Person.java 2008-01-23 11:52:05 UTC (rev 5515) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Oct 29 15:50:46 GMT 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.jbws1873; + + +public class Person +{ + +protected org.jboss.test.ws.jbws1873.LookupRequest request; +public Person(){} + +public Person(org.jboss.test.ws.jbws1873.LookupRequest request){ +this.request=request; +} +public org.jboss.test.ws.jbws1873.LookupRequest getRequest() { return request ;} + +public void setRequest(org.jboss.test.ws.jbws1873.LookupRequest request){ this.request=request; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl 2007-10-29 18:44:57 UTC (rev 4927) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl 2008-01-23 11:52:05 UTC (rev 5515) @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1873' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1873/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1873' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1873/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1873/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name="request" minOccurs="0"> - <complexType> - <all> - <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/> - </all> - </complexType> - </element> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name="response" minOccurs="0"> - <complexType> - <all> - <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/> - </all> - </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' parts='parameters'/> - </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: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/PhoneBook.wsdl 2008-01-23 11:52:05 UTC (rev 5515) @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1873' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1873/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1873' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1873/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1873/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name="request" minOccurs="0"> + <complexType> + <all> + <element maxOccurs="unbounded" minOccurs="0" name="surname" nillable="true" type="string"/> + </all> + </complexType> + </element> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name="response" minOccurs="0"> + <complexType> + <all> + <element maxOccurs="unbounded" minOccurs="0" name="number" nillable="true" type="string"/> + </all> + </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' parts='parameters'/> + </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 Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java 2007-10-29 18:44:57 UTC (rev 4927) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java 2008-01-23 11:52:05 UTC (rev 5515) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Mon Oct 29 15:50:46 GMT 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.jbws1873; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1873.LookupResponseResponse lookup(org.jboss.test.ws.jbws1873.LookupRequest lookup) throws java.rmi.RemoteException; -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/PhoneBook_PortType.java 2008-01-23 11:52:05 UTC (rev 5515) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Oct 29 15:50:46 GMT 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.jbws1873; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1873.LookupResponseResponse lookup(org.jboss.test.ws.jbws1873.LookupRequest lookup) throws java.rmi.RemoteException; +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java 2007-10-29 18:44:57 UTC (rev 4927) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java 2008-01-23 11:52:05 UTC (rev 5515) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Mon Oct 29 15:50:46 GMT 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.jbws1873; - - -public class TelephoneNumber -{ - -protected org.jboss.test.ws.jbws1873.LookupResponseResponse response; -public TelephoneNumber(){} - -public TelephoneNumber(org.jboss.test.ws.jbws1873.LookupResponseResponse response){ -this.response=response; -} -public org.jboss.test.ws.jbws1873.LookupResponseResponse getResponse() { return response ;} - -public void setResponse(org.jboss.test.ws.jbws1873.LookupResponseResponse response){ this.response=response; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/TelephoneNumber.java 2008-01-23 11:52:05 UTC (rev 5515) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Mon Oct 29 15:50:46 GMT 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.jbws1873; + + +public class TelephoneNumber +{ + +protected org.jboss.test.ws.jbws1873.LookupResponseResponse response; +public TelephoneNumber(){} + +public TelephoneNumber(org.jboss.test.ws.jbws1873.LookupResponseResponse response){ +this.response=response; +} +public org.jboss.test.ws.jbws1873.LookupResponseResponse getResponse() { return response ;} + +public void setResponse(org.jboss.test.ws.jbws1873.LookupResponseResponse response){ this.response=response; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2007-10-29 18:44:57 UTC (rev 4927) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2008-01-23 11:52:05 UTC (rev 5515) @@ -1,78 +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.jbws1873</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1873/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1873</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1873</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1873.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>request</java-variable-name> - <xml-element-name>request</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1873.LookupRequest</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/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> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1873.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>response</java-variable-name> - <xml-element-name>response</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1873.LookupResponseResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/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.jbws1873.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1873'>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.jbws1873.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1873'>portTypeN... - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1873'>bindingNS:... - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1873.LookupRequest</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:... - <wsdl-message-part-name>request</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.jbws1873.LookupResponseResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:... - <wsdl-message-part-name>response</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: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2008-01-23 11:52:05 UTC (rev 5515) @@ -0,0 +1,78 @@ +<?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.jbws1873</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1873/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1873</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1873</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1873.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>request</java-variable-name> + <xml-element-name>request</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1873.LookupRequest</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/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> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1873.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>response</java-variable-name> + <xml-element-name>response</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1873.LookupResponseResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/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.jbws1873.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1873'>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.jbws1873.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1873'>portTypeN... + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1873'>bindingNS:... + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <wrapped-element/> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1873.LookupRequest</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:... + <wsdl-message-part-name>request</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.jbws1873.LookupResponseResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1873'>wsdlMsgNS:... + <wsdl-message-part-name>response</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: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/wstools-config.xml =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1873/doclit/wstools-config.xml 2007-10-29 18:44:57 UTC (rev 4927) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/wstools-config.xml 2008-01-23 11:52:05 UTC (rev 5515) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1873/doclit/PhoneBook.wsdl" - parameter-style="wrapped"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/wstools-config.xml (from rev 4927, stack/native/trunk/src/test/resources/tools/jbws1873/doclit/wstools-config.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/wstools-config.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBWS-1963/src/test/resources/tools/jbws1873/doclit/wstools-config.xml 2008-01-23 11:52:05 UTC (rev 5515) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1873/doclit/PhoneBook.wsdl" + parameter-style="wrapped"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>