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

Author: darran.lofthouse(a)jboss.com Date: 2007-06-07 08:29:17 -0400 (Thu, 07 Jun 2007) New Revision: 3485 Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java trunk/jbossws-core/src/test/resources/tools/jbws1691/ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml Removed: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java Log: JBWS-1691 - WSDL To Java - Initial Character of Service and SEI names should be upper case. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 12:20:41 UTC (rev 3484) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-06-07 12:29:17 UTC (rev 3485) @@ -183,7 +183,6 @@ File dirloc = utils.createPackage(dir.getAbsolutePath(), packageName); createSEI(dirloc, wsdl); - //xsdJava.generateJavaSource(wsdl.getTypes().getSchemaModel(), dir, packageName, true); } public Map<String, String> getNamespacePackageMap() @@ -665,7 +664,9 @@ //Check if the portType name conflicts with a service name if (wsdl.getService(seiName) != null) seiName += "_PortType"; - + + seiName = JavaUtils.capitalize(seiName); + return seiName; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java 2007-06-07 12:20:41 UTC (rev 3484) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/client/ServiceCreator.java 2007-06-07 12:29:17 UTC (rev 3485) @@ -1,24 +1,24 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.tools.client; import java.io.File; @@ -34,6 +34,7 @@ import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.interfaces.ServiceCreatorIntf; +import org.jboss.wsf.spi.utils.JavaUtils; /** * Creates the Service Interface<br> @@ -50,17 +51,17 @@ */ public class ServiceCreator implements ServiceCreatorIntf -{ +{ /** * The Package Name */ protected String packageName = null; - + /** * Directory Location where the service file has to be created */ - protected File dirLocation = null; - + protected File dirLocation = null; + /** * Root object of the WSDL Object Graph */ @@ -68,26 +69,26 @@ /** Singleton class that handles many utility functions */ private WSDLUtils utils = WSDLUtils.getInstance(); - + /** * Constructor */ public ServiceCreator() - { + { } - + /** * Constructor * @param serviceName Service Name * @param portName Port Name of the endpoint * @param packageName Package Name of the Service interface */ - public ServiceCreator( WSDLDefinitions wsdl, String packageName) - { + public ServiceCreator(WSDLDefinitions wsdl, String packageName) + { this.wsdl = wsdl; this.packageName = packageName; - } - + } + /** * Constructor * WebServices Layer uses this @@ -96,12 +97,12 @@ * @param packageName Package Name of the Service interface * @param location Directory Location where the Service File has to be created */ - public ServiceCreator( WSDLDefinitions wsdl, String packageName, File location ) + public ServiceCreator(WSDLDefinitions wsdl, String packageName, File location) { - this( wsdl, packageName); + this(wsdl, packageName); this.dirLocation = location; - } - + } + /** * @return Returns the dirLocation. */ @@ -132,12 +133,12 @@ public void setPackageName(String packageName) { this.packageName = packageName; - } - + } + /** * @see #wsdl * @return - */ + */ public WSDLDefinitions getWsdl() { return wsdl; @@ -158,23 +159,23 @@ * */ public void createServiceDescriptor() throws IOException - { - if( packageName == null) - throw new WSException("package name is null"); - if(dirLocation == null) - throw new WSException("dir location is null"); - if(wsdl == null) - throw new WSException("wsdl definitions is null"); - + { + if (packageName == null) + throw new WSException("package name is null"); + if (dirLocation == null) + throw new WSException("dir location is null"); + if (wsdl == null) + throw new WSException("wsdl definitions is null"); + WSDLService[] services = wsdl.getServices(); - int len = services != null ? services.length : 0; - for(int i = 0 ; i < len ; i++) + int len = services != null ? services.length : 0; + for (int i = 0; i < len; i++) { generateServiceFile(services[i]); - } + } } - + //PRIVATE METHODS private void generateHeader(StringBuilder buf) { @@ -184,78 +185,77 @@ buf.append("*/" + newLine(2)); buf.append("//Auto Generated by jbossws - Please do not edit!!!"); buf.append(newLine(2)); - } + } private void generatePackageNameAndImport(StringBuilder buf) { - buf.append("package " + packageName + ";" + newLine(3)); + buf.append("package " + packageName + ";" + newLine(3)); buf.append("import javax.xml.rpc.*; " + newLine(3)); } - - + private String getReturnType(WSDLBinding wbind) { String portType = wbind.getInterface().getName().getLocalPart(); portType = utils.chopPortType(portType); - + //Check if it conflicts with a service name - if(wsdl.getService(portType) != null) + if (wsdl.getService(portType) != null) portType += "_PortType"; - return packageName + "." + portType ; + return packageName + "." + JavaUtils.capitalize(portType); } - - private void generateServiceFile(WSDLService wsdlService) throws IOException - { + { String serviceName = wsdlService.getName().getLocalPart(); if (serviceName.endsWith("Service") == false) serviceName = serviceName + "Service"; - + //Check if the serviceName conflicts with a portType or interface name - if(wsdl.getInterface(new QName(wsdl.getTargetNamespace(), serviceName)) != null ) + if (wsdl.getInterface(new QName(wsdl.getTargetNamespace(), serviceName)) != null) serviceName = new StringBuilder(serviceName).insert(serviceName.lastIndexOf("Service"), '_').toString(); - + + serviceName = JavaUtils.capitalize(serviceName); + StringBuilder buf = new StringBuilder(); generateHeader(buf); - generatePackageNameAndImport(buf); - - buf.append("public interface " + serviceName + " extends javax.xml.rpc.Service" + newLine(1)); + generatePackageNameAndImport(buf); + + buf.append("public interface " + serviceName + " extends javax.xml.rpc.Service" + newLine(1)); buf.append("{" + newLine(2)); - + WSDLEndpoint[] endpts = wsdlService.getEndpoints(); - int len = endpts != null ? endpts.length : 0; - - for( int i = 0 ; i < len ; i++) + int len = endpts != null ? endpts.length : 0; + + for (int i = 0; i < len; i++) buf.append(generateServiceMethodForWSDLEndpoint(endpts[i])).append(newLine(1)); - + buf.append("}" + newLine(1)); - + File loc = utils.createPackage(dirLocation.getAbsolutePath(), packageName); File sei = utils.createPhysicalFile(loc, serviceName); FileWriter writer = new FileWriter(sei); writer.write(buf.toString()); writer.flush(); writer.close(); - } - + } + private String generateServiceMethodForWSDLEndpoint(WSDLEndpoint endpt) { StringBuilder buf = new StringBuilder(" public "); QName bindName = endpt.getBinding(); WSDLBinding wbind = wsdl.getBinding(bindName); - - buf.append(getReturnType(wbind)).append(" get"); + + buf.append(getReturnType(wbind)).append(" get"); buf.append(endpt.getName().getLocalPart()).append("()").append(" throws ServiceException;").append(newLine(1)); return buf.toString(); } - + private String newLine(int times) - { + { String newline = "\n"; StringBuilder buf = new StringBuilder(newline); - for(int i = 0; i < times -1 ; i++) + for (int i = 0; i < times - 1; i++) buf.append(newline); return buf.toString(); } -} \ No newline at end of file +} \ No newline at end of file Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691 (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691) Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2007-06-07 12:20:41 UTC (rev 3484) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2007-06-07 12:29:17 UTC (rev 3485) @@ -1,105 +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.jbws1691; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.test.ws.tools.WSToolsTest; -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-1691 - * - * WSDL To Java should ensure the first charachter in the - * Service and SEI name are upper case. - * - * @author darran.lofthouse(a)jboss.com - * @since Jun 7, 2007 - */ -public class JBWS1691TestCase extends WSToolsTest -{ - - public void testGenerateLowerCase() throws Exception - { - generateScenario("lowercase"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1691/" + scenario; - String toolsDir = "tools/jbws1691/" + 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/jbws1691/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1691"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = false; - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } - -} Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2007-06-07 12:29:17 UTC (rev 3485) @@ -0,0 +1,105 @@ +/* + * 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.jbws1691; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.tools.WSToolsTest; +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-1691 + * + * WSDL To Java should ensure the first charachter in the + * Service and SEI name are upper case. + * + * @author darran.lofthouse(a)jboss.com + * @since Jun 7, 2007 + */ +public class JBWS1691TestCase extends WSToolsTest +{ + + public void testGenerateLowerCase() throws Exception + { + generateScenario("lowercase"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1691/" + scenario; + String toolsDir = "tools/jbws1691/" + 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/jbws1691/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1691"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = false; + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Copied: trunk/jbossws-core/src/test/resources/tools/jbws1691 (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691) Copied: trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase) Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl 2007-06-07 12:20:41 UTC (rev 3484) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl 2007-06-07 12:29:17 UTC (rev 3485) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1691' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1691/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1691' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1691/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1691/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <element name='lookup' type='string'/> - <element name='lookupResponse' type='string'/> - </schema> - </types> - - <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part element='ns1:lookup' name='lookup'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='lookupResponse'/> - </message> - <portType name='phoneBook'> - <operation name='lookup' parameterOrder='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/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook.wsdl 2007-06-07 12:29:17 UTC (rev 3485) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1691' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1691/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1691' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1691/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1691/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <element name='lookup' type='string'/> + <element name='lookupResponse' type='string'/> + </schema> + </types> + + <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part element='ns1:lookup' name='lookup'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='lookupResponse'/> + </message> + <portType name='phoneBook'> + <operation name='lookup' parameterOrder='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 Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java 2007-06-07 12:20:41 UTC (rev 3484) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java 2007-06-07 12:29:17 UTC (rev 3485) @@ -1,19 +0,0 @@ -/* -* JBoss, the OpenSource EJB server -* Distributable under LGPL license. See terms of license at gnu.org. -*/ - -//Auto Generated by jbossws - Please do not edit!!! - -package org.jboss.test.ws.jbws1691; - - -import javax.xml.rpc.*; - - -public interface PhoneBookService extends javax.xml.rpc.Service -{ - - public org.jboss.test.ws.jbws1691.PhoneBook_PortType getPhoneBookPort() throws ServiceException; - -} Copied: trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBookService.java 2007-06-07 12:29:17 UTC (rev 3485) @@ -0,0 +1,19 @@ +/* +* JBoss, the OpenSource EJB server +* Distributable under LGPL license. See terms of license at gnu.org. +*/ + +//Auto Generated by jbossws - Please do not edit!!! + +package org.jboss.test.ws.jbws1691; + + +import javax.xml.rpc.*; + + +public interface PhoneBookService extends javax.xml.rpc.Service +{ + + public org.jboss.test.ws.jbws1691.PhoneBook_PortType getPhoneBookPort() throws ServiceException; + +} Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java 2007-06-07 12:20:41 UTC (rev 3484) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java 2007-06-07 12:29:17 UTC (rev 3485) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jun 07 13:52:44 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.jbws1691; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public java.lang.String lookup(java.lang.String lookup) throws java.rmi.RemoteException; -} Copied: trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/PhoneBook_PortType.java 2007-06-07 12:29:17 UTC (rev 3485) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jun 07 13:52:44 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.jbws1691; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public java.lang.String lookup(java.lang.String lookup) throws java.rmi.RemoteException; +} Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml 2007-06-07 12:20:41 UTC (rev 3484) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml 2007-06-07 12:29:17 UTC (rev 3485) @@ -1,37 +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.jbws1691</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1691</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1691.phoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1691'>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.jbws1691.phoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1691'>portTypeN... - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1691'>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>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1691'>wsdlMsgNS:... - <wsdl-message-part-name>lookup</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1691'>wsdlMsgNS:... - <wsdl-message-part-name>lookupResponse</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/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml 2007-06-07 12:29:17 UTC (rev 3485) @@ -0,0 +1,37 @@ +<?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.jbws1691</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1691</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1691.phoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1691'>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.jbws1691.phoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1691'>portTypeN... + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1691'>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>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1691'>wsdlMsgNS:... + <wsdl-message-part-name>lookup</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1691'>wsdlMsgNS:... + <wsdl-message-part-name>lookupResponse</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: trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml 2007-06-07 12:20:41 UTC (rev 3484) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml 2007-06-07 12:29:17 UTC (rev 3485) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1691/lowercase/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml (from rev 3484, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1691/lowercase/wstools-config.xml 2007-06-07 12:29:17 UTC (rev 3485) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1691/lowercase/PhoneBook.wsdl" parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>