jbossws-commits November 2008

jbossws-commits@lists.jboss.org

1 participants
208 discussions

JBossWS SVN: r8719 - stack/metro/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-13 06:54:05 -0500 (Thu, 13 Nov 2008) New Revision: 8719 Modified: stack/metro/trunk/src/main/distro/ReleaseNotes.txt Log: [JBWS-2303] Specify which Metro components are used in the release notes Modified: stack/metro/trunk/src/main/distro/ReleaseNotes.txt =================================================================== --- stack/metro/trunk/src/main/distro/ReleaseNotes.txt 2008-11-13 10:59:01 UTC (rev 8718) +++ stack/metro/trunk/src/main/distro/ReleaseNotes.txt 2008-11-13 11:54:05 UTC (rev 8719) @@ -7,7 +7,7 @@ Release Notes ============= -The wiki (http://labs.jboss.com/portal/jbossws/) is usally a good starting point. +The wiki (http://labs.jboss.com/portal/jbossws/) is usually a good starting point. It contains the User Guide and Quick Start instructions. A list of examples that accompany the UserGuide can be found in the tests directory @@ -41,6 +41,13 @@ See: TODO: reference to associated JIRA issue + +This version of ${project.name} is based on the following Metro components: +TODO: set actual component versions +* WSIT 1.3.1 +* JAX-WS RI 2.1.4 +* JAXB RI 2.1.9 + Enjoy, The JBossWS Team

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8718 - framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-13 05:59:01 -0500 (Thu, 13 Nov 2008) New Revision: 8718 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java Log: Specify environment also when calling delete-project in the project generator testcase Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2008-11-13 10:57:57 UTC (rev 8717) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2008-11-13 10:59:01 UTC (rev 8718) @@ -72,8 +72,8 @@ writeUserProjectProperties(userPrjProp); File distroBuild = new File(binDistroDir, "build.xml"); String integrationTarget = System.getProperty("jbossws.integration.target"); - executeCommand(ANT_SHELL + " -f " + distroBuild.getAbsolutePath() + " -D" + integrationTarget + ".home=" + jbossHome + " -Djbossws.integration.target=" - + integrationTarget + " create-project", "Error while creating the user project!"); + String env = " -D" + integrationTarget + ".home=" + jbossHome + " -Djbossws.integration.target=" + integrationTarget; + executeCommand(ANT_SHELL + " -f " + distroBuild.getAbsolutePath() + env + " create-project", "Error while creating the user project!"); File projectHomeDir = new File(binDistroDir, projectName); File packageDir = new File(projectHomeDir.getCanonicalPath() + FS + "src" + FS + "main" + FS + "java" + FS + "org" + FS + "jboss" + FS + "test" + FS + "ws" + FS + "projectGenerator"); packageDir.mkdirs(); @@ -98,7 +98,7 @@ finally { executeCommand(ANT_SHELL + " -f " + projectBuild + " undeploy", "Error while undeploying the user project"); - executeCommand(ANT_SHELL + " -f " + distroBuild.getCanonicalPath() + " delete-project", "Error while deleting the user project"); + executeCommand(ANT_SHELL + " -f " + distroBuild.getCanonicalPath() + env + " delete-project", "Error while deleting the user project"); userPrjProp.delete(); } }

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8717 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src: test/java/org/jboss/test/ws/tools and 16 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-11-13 05:57:57 -0500 (Thu, 13 Nov 2008) New Revision: 8717 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/java/org/jboss/test/ws/tools/jbws2389/ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/Lookup.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupDetails.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupName.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponse.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/wstools-config.xml Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/Lookup.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupDetails.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupName.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponse.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/wstools-config.xml Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1079/anonymous-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml Log: [JBPAPP-1369] WSDL To Java - Anonymous types nested within anonymous types generated JAX-RPC mapping does not match generated source. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-11-13 06:38:21 UTC (rev 8716) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-11-13 10:57:57 UTC (rev 8717) @@ -100,7 +100,7 @@ private String typeNamespace; private String serviceName = null; private String packageName = null; - private Map<String, String> namespacePackageMap = new HashMap<String,String>(); + private Map<String, String> namespacePackageMap = new HashMap<String, String>(); private Set<String> registeredTypes = new HashSet<String>(); private Set<String> registeredExceptions = new HashSet<String>(); @@ -717,10 +717,11 @@ XSComplexTypeDefinition xc = (XSComplexTypeDefinition)xt; XSTypeDefinition baseType = xc.getBaseType(); short der = xc.getDerivationMethod(); + String typeQName = ""; if ((baseType != null) && !utils.isBaseTypeIgnorable(baseType, xc)) { - addJavaXMLTypeMap(baseType, baseType.getName(), "", "", jwm, skipWrapperArray); //Recurse for base types + addJavaXMLTypeMap(baseType, baseType.getName(), "", "", jwm, skipWrapperArray); //Recurse for base types } // handleContentTypeElementsWithDerivationNone @@ -748,15 +749,17 @@ javaType = getJavaTypeAsString(null, new QName(tempName), xt.getNamespace(), false, true); StringBuilder temp = new StringBuilder(); if (containingType != null && containingType.length() > 0) - temp.append(">").append(containingType); + temp.append(containingType); temp.append(">").append(name); localName = temp.toString(); jxtm.setAnonymousTypeQName(new QName(xt.getNamespace(), localName, "typeNS")); + typeQName = localName; } else { javaType = getJavaTypeAsString(null, new QName(localName), xt.getNamespace(), false, true); jxtm.setRootTypeQName(new QName(xt.getNamespace(), xt.getName(), "typeNS")); + typeQName = xc.getName(); } if (typeNamespace == null) @@ -793,7 +796,15 @@ } if (xm != null) - addGroup(xm, name, xc.getName(), jwm); + { + String container = containingElement; + if (container == null || container.length() == 0) + { + container = name; + } + + addGroup(xm, container, typeQName, jwm); + } } // Add enum simpleType support @@ -815,7 +826,7 @@ XSElementDeclaration xe = (XSElementDeclaration)xsterm; VariableMapping vm = new VariableMapping(jxtm); String name = xe.getName(); - + // JBWS-1170 Convert characters which are illegal in Java identifiers vm.setJavaVariableName(ToolsUtils.convertInvalidCharacters(Introspector.decapitalize(name))); vm.setXmlElementName(name); @@ -923,7 +934,8 @@ { jtype = JavaUtils.getSourceName(javaType); } - else jtype = javaType.getName(); + else + jtype = javaType.getName(); } return jtype + arraySuffix; Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/java/org/jboss/test/ws/tools/jbws2389 (from rev 8715, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2389) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,109 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.jbws2389; - -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-2389 - * - * WSDL To Java - WSDL To Java - Anonymous types - * nested within anonymous types not being processed correctly. - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 10, 2008 - */ -public class JBWS2389TestCase extends JBossWSTest -{ - - public void testDocumentLiteral() throws Exception - { - generateScenario("doclit"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws2389/" + scenario; - String toolsDir = "tools/jbws2389/" + 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/jbws2389/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws2389"); - 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_CP03_JBPAPP-1369/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java (from rev 8715, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java 2008-11-13 10:57:57 UTC (rev 8717) @@ -0,0 +1,109 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws2389; + +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-2389 + * + * WSDL To Java - WSDL To Java - Anonymous types + * nested within anonymous types not being processed correctly. + * + * @author darran.lofthouse(a)jboss.com + * @since Nov 10, 2008 + */ +public class JBWS2389TestCase extends JBossWSTest +{ + + public void testDocumentLiteral() throws Exception + { + generateScenario("doclit"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws2389/" + scenario; + String toolsDir = "tools/jbws2389/" + 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/jbws2389/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws2389"); + 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(); + } + +} Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1079/anonymous-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1079/anonymous-mapping.xml 2008-11-13 06:38:21 UTC (rev 8716) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1079/anonymous-mapping.xml 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,77 +1,76 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1079</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1079</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1079</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1079/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1079/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1079/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1079/types">typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1079.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1079">serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1079.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1079">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1079">bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1079.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1079">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1079.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1079">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1079</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1079/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1079</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1079</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1079.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1079.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1079.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1079.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1079'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1079.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1079'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1079'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1079.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1079'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1079.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1079'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml 2008-11-13 06:38:21 UTC (rev 8716) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,110 +1,96 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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.jbws1260.Telephone</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Telephone</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>digits</java-variable-name> - <xml-element-name>digits</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Title</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Title</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>text</java-variable-name> - <xml-element-name>text</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - -  -  -  - - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <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.jbws1260.Title</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Title</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>text</java-variable-name> + <xml-element-name>text</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Telephone</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Telephone</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>digits</java-variable-name> + <xml-element-name>digits</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml 2008-11-13 06:38:21 UTC (rev 8716) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,83 +1,82 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <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.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml 2008-11-13 06:38:21 UTC (rev 8716) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,79 +1,78 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <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.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <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.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <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.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml 2008-11-13 06:38:21 UTC (rev 8716) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,87 +1,86 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml 2008-11-13 06:38:21 UTC (rev 8716) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,92 +1,78 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <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.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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> - -  -  -  - - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <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.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <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.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml 2008-11-13 06:38:21 UTC (rev 8716) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,71 +1,70 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <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.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml 2008-11-13 06:38:21 UTC (rev 8716) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,87 +1,86 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <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>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml 2008-11-13 06:38:21 UTC (rev 8716) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,100 +1,86 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - -  -  -  - - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <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>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml 2008-11-13 06:38:21 UTC (rev 8716) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,79 +1,78 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml 2008-11-13 06:38:21 UTC (rev 8716) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,79 +1,78 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2008-11-13 06:38:21 UTC (rev 8716) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2008-11-13 10:57:57 UTC (rev 8717) @@ -18,7 +18,7 @@ </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:>Person>request</anonymous-type-qname> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:Person>request</anonymous-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>surname</java-variable-name> @@ -36,7 +36,7 @@ </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:>TelephoneNumber>response</anonymous-type-qname> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:TelephoneNumber>response</anonymous-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>number</java-variable-name> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389 (from rev 8715, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389) Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit (from rev 8715, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/Lookup.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/Lookup.java 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/Lookup.java 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * 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.jbws2389; - - -public class Lookup -{ - -protected org.jboss.test.ws.jbws2389.LookupDetails details; -public Lookup(){} - -public Lookup(org.jboss.test.ws.jbws2389.LookupDetails details){ -this.details=details; -} -public org.jboss.test.ws.jbws2389.LookupDetails getDetails() { return details ;} - -public void setDetails(org.jboss.test.ws.jbws2389.LookupDetails details){ this.details=details; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/Lookup.java (from rev 8715, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/Lookup.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/Lookup.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/Lookup.java 2008-11-13 10:57:57 UTC (rev 8717) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * 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.jbws2389; + + +public class Lookup +{ + +protected org.jboss.test.ws.jbws2389.LookupDetails details; +public Lookup(){} + +public Lookup(org.jboss.test.ws.jbws2389.LookupDetails details){ +this.details=details; +} +public org.jboss.test.ws.jbws2389.LookupDetails getDetails() { return details ;} + +public void setDetails(org.jboss.test.ws.jbws2389.LookupDetails details){ this.details=details; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupDetails.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupDetails.java 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupDetails.java 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * 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.jbws2389; - - -public class LookupDetails -{ - -protected org.jboss.test.ws.jbws2389.LookupName name; -public LookupDetails(){} - -public LookupDetails(org.jboss.test.ws.jbws2389.LookupName name){ -this.name=name; -} -public org.jboss.test.ws.jbws2389.LookupName getName() { return name ;} - -public void setName(org.jboss.test.ws.jbws2389.LookupName name){ this.name=name; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupDetails.java (from rev 8715, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupDetails.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupDetails.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupDetails.java 2008-11-13 10:57:57 UTC (rev 8717) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * 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.jbws2389; + + +public class LookupDetails +{ + +protected org.jboss.test.ws.jbws2389.LookupName name; +public LookupDetails(){} + +public LookupDetails(org.jboss.test.ws.jbws2389.LookupName name){ +this.name=name; +} +public org.jboss.test.ws.jbws2389.LookupName getName() { return name ;} + +public void setName(org.jboss.test.ws.jbws2389.LookupName name){ this.name=name; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupName.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupName.java 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupName.java 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * 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.jbws2389; - - -public class LookupName -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public LookupName(){} - -public LookupName(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupName.java (from rev 8715, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupName.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupName.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupName.java 2008-11-13 10:57:57 UTC (rev 8717) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * 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.jbws2389; + + +public class LookupName +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public LookupName(){} + +public LookupName(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponse.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponse.java 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponse.java 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * 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.jbws2389; - - -public class LookupResponse -{ - -protected org.jboss.test.ws.jbws2389.LookupResponseDetails details; -public LookupResponse(){} - -public LookupResponse(org.jboss.test.ws.jbws2389.LookupResponseDetails details){ -this.details=details; -} -public org.jboss.test.ws.jbws2389.LookupResponseDetails getDetails() { return details ;} - -public void setDetails(org.jboss.test.ws.jbws2389.LookupResponseDetails details){ this.details=details; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponse.java (from rev 8715, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponse.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponse.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponse.java 2008-11-13 10:57:57 UTC (rev 8717) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * 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.jbws2389; + + +public class LookupResponse +{ + +protected org.jboss.test.ws.jbws2389.LookupResponseDetails details; +public LookupResponse(){} + +public LookupResponse(org.jboss.test.ws.jbws2389.LookupResponseDetails details){ +this.details=details; +} +public org.jboss.test.ws.jbws2389.LookupResponseDetails getDetails() { return details ;} + +public void setDetails(org.jboss.test.ws.jbws2389.LookupResponseDetails details){ this.details=details; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * 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.jbws2389; - - -public class LookupResponseDetails -{ - -protected org.jboss.test.ws.jbws2389.LookupResponseNumber number; -public LookupResponseDetails(){} - -public LookupResponseDetails(org.jboss.test.ws.jbws2389.LookupResponseNumber number){ -this.number=number; -} -public org.jboss.test.ws.jbws2389.LookupResponseNumber getNumber() { return number ;} - -public void setNumber(org.jboss.test.ws.jbws2389.LookupResponseNumber number){ this.number=number; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java (from rev 8715, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java 2008-11-13 10:57:57 UTC (rev 8717) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * 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.jbws2389; + + +public class LookupResponseDetails +{ + +protected org.jboss.test.ws.jbws2389.LookupResponseNumber number; +public LookupResponseDetails(){} + +public LookupResponseDetails(org.jboss.test.ws.jbws2389.LookupResponseNumber number){ +this.number=number; +} +public org.jboss.test.ws.jbws2389.LookupResponseNumber getNumber() { return number ;} + +public void setNumber(org.jboss.test.ws.jbws2389.LookupResponseNumber number){ this.number=number; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * 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.jbws2389; - - -public class LookupResponseNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public LookupResponseNumber(){} - -public LookupResponseNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java (from rev 8715, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java 2008-11-13 10:57:57 UTC (rev 8717) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * 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.jbws2389; + + +public class LookupResponseNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public LookupResponseNumber(){} + +public LookupResponseNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws2389' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws2389/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws2389' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws2389/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws2389/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <element name='lookup'> - <complexType> - <sequence> - <element name='Details'> - <complexType> - <sequence> - <element name='Name'> - <complexType> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - </element> - - <element name='lookupResponse'> - <complexType> - <sequence> - <element name='Details'> - <complexType> - <sequence> - <element name='Number'> - <complexType> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - </element> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl (from rev 8715, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl 2008-11-13 10:57:57 UTC (rev 8717) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws2389' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws2389/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws2389' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws2389/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws2389/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <element name='lookup'> + <complexType> + <sequence> + <element name='Details'> + <complexType> + <sequence> + <element name='Name'> + <complexType> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + </element> + </sequence> + </complexType> + </element> + </sequence> + </complexType> + </element> + + <element name='lookupResponse'> + <complexType> + <sequence> + <element name='Details'> + <complexType> + <sequence> + <element name='Number'> + <complexType> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + </element> + </sequence> + </complexType> + </element> + </sequence> + </complexType> + </element> + + </schema> + </types> + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * 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.jbws2389; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws2389.LookupResponse lookup(org.jboss.test.ws.jbws2389.Lookup lookup) throws java.rmi.RemoteException; -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java (from rev 8715, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java 2008-11-13 10:57:57 UTC (rev 8717) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * 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.jbws2389; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws2389.LookupResponse lookup(org.jboss.test.ws.jbws2389.Lookup lookup) throws java.rmi.RemoteException; +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,103 +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.jbws2389</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws2389/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws2389</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws2389</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws2389.Lookup</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>details</java-variable-name> - <xml-element-name>Details</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws2389.LookupDetails</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup>Details</anonymous-type-qname> - <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.jbws2389.LookupName</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup>Details>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws2389.LookupResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>details</java-variable-name> - <xml-element-name>Details</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws2389.LookupResponseDetails</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse>Details</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws2389.LookupResponseNumber</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse>Details>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws2389.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws2389'>serviceNS:PhoneBook</wsdl-service-name> - <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.jbws2389.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws2389'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws2389'>bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws2389.Lookup</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2389'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <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.jbws2389.LookupResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2389'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <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: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml (from rev 8715, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml 2008-11-13 10:57:57 UTC (rev 8717) @@ -0,0 +1,103 @@ +<?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.jbws2389</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws2389/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws2389</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws2389</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.Lookup</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>details</java-variable-name> + <xml-element-name>Details</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.LookupDetails</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup>Details</anonymous-type-qname> + <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.jbws2389.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup>Details>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.LookupResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>details</java-variable-name> + <xml-element-name>Details</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.LookupResponseDetails</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse>Details</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse>Details>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws2389.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws2389'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws2389.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws2389'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws2389'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws2389.Lookup</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2389'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <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.jbws2389.LookupResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2389'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <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: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/wstools-config.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/wstools-config.xml 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/wstools-config.xml 2008-11-13 10:57:57 UTC (rev 8717) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws2389/doclit/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/wstools-config.xml (from rev 8715, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/wstools-config.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/wstools-config.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP03_JBPAPP-1369/src/test/resources/tools/jbws2389/doclit/wstools-config.xml 2008-11-13 10:57:57 UTC (rev 8717) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws2389/doclit/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8716 - in stack/metro/trunk: modules/testsuite and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-11-13 01:38:21 -0500 (Thu, 13 Nov 2008) New Revision: 8716 Removed: stack/metro/trunk/modules/testsuite/test-excludes-jboss422-JDK6.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss423-JDK6.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss424-JDK6.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss500-JDK6.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt Modified: stack/metro/trunk/modules/testsuite/pom.xml stack/metro/trunk/pom.xml Log: removing JDK6 separate tests excludes files Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/metro/trunk/modules/testsuite/pom.xml 2008-11-13 06:38:21 UTC (rev 8716) @@ -317,7 +317,7 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration>  - <testExcludeFile>../test-excludes-jboss422${excludeFileSuffix}.txt</testExcludeFile> + <testExcludeFile>../test-excludes-jboss422.txt</testExcludeFile> </configuration> </plugin> <plugin> @@ -362,7 +362,7 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration>  - <testExcludeFile>../test-excludes-jboss423${excludeFileSuffix}.txt</testExcludeFile> + <testExcludeFile>../test-excludes-jboss423.txt</testExcludeFile> </configuration> </plugin> <plugin> @@ -407,7 +407,7 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration>  - <testExcludeFile>../test-excludes-jboss424${excludeFileSuffix}.txt</testExcludeFile> + <testExcludeFile>../test-excludes-jboss424.txt</testExcludeFile> </configuration> </plugin> <plugin> @@ -465,7 +465,7 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration>  - <testExcludeFile>../test-excludes-jboss500${excludeFileSuffix}.txt</testExcludeFile> + <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile> </configuration> </plugin> <plugin> @@ -528,7 +528,7 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration>  - <testExcludeFile>../test-excludes-jboss501${excludeFileSuffix}.txt</testExcludeFile> + <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile> </configuration> </plugin> <plugin> Deleted: stack/metro/trunk/modules/testsuite/test-excludes-jboss422-JDK6.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss422-JDK6.txt 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422-JDK6.txt 2008-11-13 06:38:21 UTC (rev 8716) @@ -1,52 +0,0 @@ -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/jbws2307/** - -# Exclude endpoints with AS5 @SecurityDomain -org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.* - -# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* - -# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** - -# [JBWS-1813] context-root from jboss.xml -org/jboss/test/ws/jaxws/jbws1813/** - -# [JBWS-1841] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws2183/** - -# [JBWS-2131] NoSuchElementException during wsdl generation at deploy -org/jboss/test/ws/jaxws/jbws1702/** - -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/jbws2000/** -org/jboss/test/ws/jaxws/samples/xop/** - -# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed -org/jboss/test/ws/jaxws/jbws2241/** - -# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2329] Failed to deploy service with multiple bindings -org/jboss/test/ws/jaxws/jbws2278/** - -# [JBWS-2347] Rewrite @WebFault related tests -org/jboss/test/ws/jaxws/jbws1904/** -org/jboss/test/ws/jaxws/webfault/** - -# [JBWS-2348] Fix jbws1969 testcase -org/jboss/test/ws/jaxws/jbws1969/** - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** - -# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 -org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* Deleted: stack/metro/trunk/modules/testsuite/test-excludes-jboss423-JDK6.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss423-JDK6.txt 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423-JDK6.txt 2008-11-13 06:38:21 UTC (rev 8716) @@ -1,46 +0,0 @@ -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/jbws2307/** - -# Exclude endpoints with AS5 @SecurityDomain -org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.* - -# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* - -# [JBWS-1841] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws2183/** - -# [JBWS-2131] NoSuchElementException during wsdl generation at deploy -org/jboss/test/ws/jaxws/jbws1702/** - -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/jbws2000/** -org/jboss/test/ws/jaxws/samples/xop/** - -# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed -org/jboss/test/ws/jaxws/jbws2241/** - -# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2329] Failed to deploy service with multiple bindings -org/jboss/test/ws/jaxws/jbws2278/** - -# [JBWS-2347] Rewrite @WebFault related tests -org/jboss/test/ws/jaxws/jbws1904/** -org/jboss/test/ws/jaxws/webfault/** - -# [JBWS-2348] Fix jbws1969 testcase -org/jboss/test/ws/jaxws/jbws1969/** - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** - -# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 -org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* Deleted: stack/metro/trunk/modules/testsuite/test-excludes-jboss424-JDK6.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss424-JDK6.txt 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424-JDK6.txt 2008-11-13 06:38:21 UTC (rev 8716) @@ -1,46 +0,0 @@ -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/jbws2307/** - -# Exclude endpoints with AS5 @SecurityDomain -org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.* - -# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* - -# [JBWS-1841] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws2183/** - -# [JBWS-2131] NoSuchElementException during wsdl generation at deploy -org/jboss/test/ws/jaxws/jbws1702/** - -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/jbws2000/** -org/jboss/test/ws/jaxws/samples/xop/** - -# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed -org/jboss/test/ws/jaxws/jbws2241/** - -# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2329] Failed to deploy service with multiple bindings -org/jboss/test/ws/jaxws/jbws2278/** - -# [JBWS-2347] Rewrite @WebFault related tests -org/jboss/test/ws/jaxws/jbws1904/** -org/jboss/test/ws/jaxws/webfault/** - -# [JBWS-2348] Fix jbws1969 testcase -org/jboss/test/ws/jaxws/jbws1969/** - -# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 -org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** Deleted: stack/metro/trunk/modules/testsuite/test-excludes-jboss500-JDK6.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss500-JDK6.txt 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500-JDK6.txt 2008-11-13 06:38:21 UTC (rev 8716) @@ -1,45 +0,0 @@ -# Exclude endpoints with AS42 @SecurityDomain -org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.* - -# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime -org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.* - -# [JBMETA-141] Implement getChildren() in VirtualFileAdaptor -org/jboss/test/ws/jaxws/jbws2206/** - -# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws2183/** - -# [JBWS-2131] NoSuchElementException during wsdl generation at deploy -org/jboss/test/ws/jaxws/jbws1702/** - -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/samples/xop/** -org/jboss/test/ws/jaxws/jbws2000/** - -# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2329] Failed to deploy service with multiple bindings -org/jboss/test/ws/jaxws/jbws2278/** - -# [JBWS-2347] Rewrite @WebFault related tests -org/jboss/test/ws/jaxws/jbws1904/** -org/jboss/test/ws/jaxws/webfault/** - -# [JBWS-2348] Fix jbws1969 testcase -org/jboss/test/ws/jaxws/jbws1969/** - -# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable -org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** Deleted: stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt 2008-11-13 06:38:21 UTC (rev 8716) @@ -1,39 +0,0 @@ -# Exclude endpoints with AS42 @SecurityDomain -org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.* - -# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws2183/** - -# [JBWS-2131] NoSuchElementException during wsdl generation at deploy -org/jboss/test/ws/jaxws/jbws1702/** - -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/samples/xop/** -org/jboss/test/ws/jaxws/jbws2000/** - -# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2329] Failed to deploy service with multiple bindings -org/jboss/test/ws/jaxws/jbws2278/** - -# [JBWS-2347] Rewrite @WebFault related tests -org/jboss/test/ws/jaxws/jbws1904/** -org/jboss/test/ws/jaxws/webfault/** - -# [JBWS-2348] Fix jbws1969 testcase -org/jboss/test/ws/jaxws/jbws1969/** - -# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable -org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2008-11-12 17:56:34 UTC (rev 8715) +++ stack/metro/trunk/pom.xml 2008-11-13 06:38:21 UTC (rev 8716) @@ -479,33 +479,6 @@ </profile>  - <profile> - <id>jdk16</id> - <activation> - <jdk>1.6</jdk> - </activation> - <properties> - <excludeFileSuffix>-JDK6</excludeFileSuffix> - </properties> - </profile> - -  - <profile> - <id>not_jdk16</id> - <activation> - <jdk>!1.6</jdk> - </activation> - <properties> - <excludeFileSuffix></excludeFileSuffix> - </properties> - </profile> - -

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8715 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP/src: test/java/org/jboss/test/ws/tools and 16 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-11-12 12:56:34 -0500 (Wed, 12 Nov 2008) New Revision: 8715 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2389/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/Lookup.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupDetails.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupName.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponse.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/wstools-config.xml Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/Lookup.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupDetails.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupName.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponse.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/wstools-config.xml Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1079/anonymous-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml Log: [JBPAPP-1386] WSDL To Java - Anonymous types nested within anonymous types generated JAX-RPC mapping does not match generated source. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-11-12 17:48:18 UTC (rev 8714) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-11-12 17:56:34 UTC (rev 8715) @@ -100,7 +100,7 @@ private String typeNamespace; private String serviceName = null; private String packageName = null; - private Map<String, String> namespacePackageMap = new HashMap<String,String>(); + private Map<String, String> namespacePackageMap = new HashMap<String, String>(); private Set<String> registeredTypes = new HashSet<String>(); private Set<String> registeredExceptions = new HashSet<String>(); @@ -718,10 +718,11 @@ XSComplexTypeDefinition xc = (XSComplexTypeDefinition)xt; XSTypeDefinition baseType = xc.getBaseType(); short der = xc.getDerivationMethod(); + String typeQName = ""; if ((baseType != null) && !utils.isBaseTypeIgnorable(baseType, xc)) { - addJavaXMLTypeMap(baseType, baseType.getName(), "", "", jwm, skipWrapperArray); //Recurse for base types + addJavaXMLTypeMap(baseType, baseType.getName(), "", "", jwm, skipWrapperArray); //Recurse for base types } // handleContentTypeElementsWithDerivationNone @@ -749,15 +750,17 @@ javaType = getJavaTypeAsString(null, new QName(tempName), xt.getNamespace(), false, true); StringBuilder temp = new StringBuilder(); if (containingType != null && containingType.length() > 0) - temp.append(">").append(containingType); + temp.append(containingType); temp.append(">").append(name); localName = temp.toString(); jxtm.setAnonymousTypeQName(new QName(xt.getNamespace(), localName, "typeNS")); + typeQName = localName; } else { javaType = getJavaTypeAsString(null, new QName(localName), xt.getNamespace(), false, true); jxtm.setRootTypeQName(new QName(xt.getNamespace(), xt.getName(), "typeNS")); + typeQName = xc.getName(); } if (typeNamespace == null) @@ -794,7 +797,15 @@ } if (xm != null) - addGroup(xm, name, xc.getName(), jwm); + { + String container = containingElement; + if (container == null || container.length() == 0) + { + container = name; + } + + addGroup(xm, container, typeQName, jwm); + } } // Add enum simpleType support @@ -816,7 +827,7 @@ XSElementDeclaration xe = (XSElementDeclaration)xsterm; VariableMapping vm = new VariableMapping(jxtm); String name = xe.getName(); - + // JBWS-1170 Convert characters which are illegal in Java identifiers vm.setJavaVariableName(ToolsUtils.convertInvalidCharacters(Introspector.decapitalize(name))); vm.setXmlElementName(name); @@ -924,7 +935,8 @@ { jtype = JavaUtils.getSourceName(javaType); } - else jtype = javaType.getName(); + else + jtype = javaType.getName(); } return jtype + arraySuffix; Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2389 (from rev 8702, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java 2008-11-11 14:36:09 UTC (rev 8702) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,108 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.jbws2389; - -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-2389 - * - * WSDL To Java - WSDL To Java - Anonymous types - * nested within anonymous types not being processed correctly. - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 10, 2008 - */ -public class JBWS2389TestCase extends JBossWSTest -{ - - public void testDocumentLiteral() throws Exception - { - generateScenario("doclit"); - } - - protected void generateScenario(final String scenario) throws Exception - { - File resourceDir = createResourceFile("tools/jbws2389/" + scenario); - String toolsDir = resourceDir.getAbsolutePath(); - - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; - new WSTools().generate(args); - - String[] expectedFiles = resourceDir.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/jbws2389/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws2389"); - 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_CP/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java (from rev 8702, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2389/JBWS2389TestCase.java 2008-11-12 17:56:34 UTC (rev 8715) @@ -0,0 +1,109 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws2389; + +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-2389 + * + * WSDL To Java - WSDL To Java - Anonymous types + * nested within anonymous types not being processed correctly. + * + * @author darran.lofthouse(a)jboss.com + * @since Nov 10, 2008 + */ +public class JBWS2389TestCase extends JBossWSTest +{ + + public void testDocumentLiteral() throws Exception + { + generateScenario("doclit"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws2389/" + scenario; + String toolsDir = "tools/jbws2389/" + 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/jbws2389/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws2389"); + 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(); + } + +} Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1079/anonymous-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1079/anonymous-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1079/anonymous-mapping.xml 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,77 +1,76 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1079</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1079</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1079</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1079/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1079/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1079/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1079/types">typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1079.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1079">serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1079.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1079">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1079">bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1079.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1079">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1079.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1079">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1079</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1079/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1079</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1079</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1079.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1079.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1079.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1079.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1079'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1079.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1079'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1079'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1079.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1079'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1079.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1079'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,110 +1,96 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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.jbws1260.Telephone</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Telephone</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>digits</java-variable-name> - <xml-element-name>digits</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Title</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Title</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>text</java-variable-name> - <xml-element-name>text</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - -  -  -  - - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <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.jbws1260.Title</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Title</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>text</java-variable-name> + <xml-element-name>text</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Telephone</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Telephone</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>digits</java-variable-name> + <xml-element-name>digits</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,83 +1,82 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <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.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,79 +1,78 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <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.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <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.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <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.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,87 +1,86 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,92 +1,78 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <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.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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> - -  -  -  - - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <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.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <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.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,71 +1,70 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <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.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,87 +1,86 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <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>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,100 +1,86 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - -  -  -  - - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <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>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,79 +1,78 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,79 +1,78 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2008-11-12 17:56:34 UTC (rev 8715) @@ -18,7 +18,7 @@ </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:>Person>request</anonymous-type-qname> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:Person>request</anonymous-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>surname</java-variable-name> @@ -36,7 +36,7 @@ </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:>TelephoneNumber>response</anonymous-type-qname> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:TelephoneNumber>response</anonymous-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>number</java-variable-name> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389 (from rev 8702, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389) Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit (from rev 8702, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/Lookup.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java 2008-11-11 14:36:09 UTC (rev 8702) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/Lookup.java 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * 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.jbws2389; - - -public class Lookup -{ - -protected org.jboss.test.ws.jbws2389.LookupDetails details; -public Lookup(){} - -public Lookup(org.jboss.test.ws.jbws2389.LookupDetails details){ -this.details=details; -} -public org.jboss.test.ws.jbws2389.LookupDetails getDetails() { return details ;} - -public void setDetails(org.jboss.test.ws.jbws2389.LookupDetails details){ this.details=details; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/Lookup.java (from rev 8702, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/Lookup.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/Lookup.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/Lookup.java 2008-11-12 17:56:34 UTC (rev 8715) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * 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.jbws2389; + + +public class Lookup +{ + +protected org.jboss.test.ws.jbws2389.LookupDetails details; +public Lookup(){} + +public Lookup(org.jboss.test.ws.jbws2389.LookupDetails details){ +this.details=details; +} +public org.jboss.test.ws.jbws2389.LookupDetails getDetails() { return details ;} + +public void setDetails(org.jboss.test.ws.jbws2389.LookupDetails details){ this.details=details; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupDetails.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java 2008-11-11 14:36:09 UTC (rev 8702) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupDetails.java 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * 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.jbws2389; - - -public class LookupDetails -{ - -protected org.jboss.test.ws.jbws2389.LookupName name; -public LookupDetails(){} - -public LookupDetails(org.jboss.test.ws.jbws2389.LookupName name){ -this.name=name; -} -public org.jboss.test.ws.jbws2389.LookupName getName() { return name ;} - -public void setName(org.jboss.test.ws.jbws2389.LookupName name){ this.name=name; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupDetails.java (from rev 8702, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupDetails.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupDetails.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupDetails.java 2008-11-12 17:56:34 UTC (rev 8715) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * 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.jbws2389; + + +public class LookupDetails +{ + +protected org.jboss.test.ws.jbws2389.LookupName name; +public LookupDetails(){} + +public LookupDetails(org.jboss.test.ws.jbws2389.LookupName name){ +this.name=name; +} +public org.jboss.test.ws.jbws2389.LookupName getName() { return name ;} + +public void setName(org.jboss.test.ws.jbws2389.LookupName name){ this.name=name; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupName.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java 2008-11-11 14:36:09 UTC (rev 8702) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupName.java 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * 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.jbws2389; - - -public class LookupName -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public LookupName(){} - -public LookupName(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupName.java (from rev 8702, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupName.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupName.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupName.java 2008-11-12 17:56:34 UTC (rev 8715) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * 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.jbws2389; + + +public class LookupName +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public LookupName(){} + +public LookupName(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponse.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java 2008-11-11 14:36:09 UTC (rev 8702) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponse.java 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * 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.jbws2389; - - -public class LookupResponse -{ - -protected org.jboss.test.ws.jbws2389.LookupResponseDetails details; -public LookupResponse(){} - -public LookupResponse(org.jboss.test.ws.jbws2389.LookupResponseDetails details){ -this.details=details; -} -public org.jboss.test.ws.jbws2389.LookupResponseDetails getDetails() { return details ;} - -public void setDetails(org.jboss.test.ws.jbws2389.LookupResponseDetails details){ this.details=details; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponse.java (from rev 8702, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponse.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponse.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponse.java 2008-11-12 17:56:34 UTC (rev 8715) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * 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.jbws2389; + + +public class LookupResponse +{ + +protected org.jboss.test.ws.jbws2389.LookupResponseDetails details; +public LookupResponse(){} + +public LookupResponse(org.jboss.test.ws.jbws2389.LookupResponseDetails details){ +this.details=details; +} +public org.jboss.test.ws.jbws2389.LookupResponseDetails getDetails() { return details ;} + +public void setDetails(org.jboss.test.ws.jbws2389.LookupResponseDetails details){ this.details=details; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java 2008-11-11 14:36:09 UTC (rev 8702) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * 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.jbws2389; - - -public class LookupResponseDetails -{ - -protected org.jboss.test.ws.jbws2389.LookupResponseNumber number; -public LookupResponseDetails(){} - -public LookupResponseDetails(org.jboss.test.ws.jbws2389.LookupResponseNumber number){ -this.number=number; -} -public org.jboss.test.ws.jbws2389.LookupResponseNumber getNumber() { return number ;} - -public void setNumber(org.jboss.test.ws.jbws2389.LookupResponseNumber number){ this.number=number; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java (from rev 8702, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponseDetails.java 2008-11-12 17:56:34 UTC (rev 8715) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * 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.jbws2389; + + +public class LookupResponseDetails +{ + +protected org.jboss.test.ws.jbws2389.LookupResponseNumber number; +public LookupResponseDetails(){} + +public LookupResponseDetails(org.jboss.test.ws.jbws2389.LookupResponseNumber number){ +this.number=number; +} +public org.jboss.test.ws.jbws2389.LookupResponseNumber getNumber() { return number ;} + +public void setNumber(org.jboss.test.ws.jbws2389.LookupResponseNumber number){ this.number=number; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java 2008-11-11 14:36:09 UTC (rev 8702) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * 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.jbws2389; - - -public class LookupResponseNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public LookupResponseNumber(){} - -public LookupResponseNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java (from rev 8702, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/LookupResponseNumber.java 2008-11-12 17:56:34 UTC (rev 8715) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * 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.jbws2389; + + +public class LookupResponseNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public LookupResponseNumber(){} + +public LookupResponseNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl 2008-11-11 14:36:09 UTC (rev 8702) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws2389' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws2389/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws2389' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws2389/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws2389/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <element name='lookup'> - <complexType> - <sequence> - <element name='Details'> - <complexType> - <sequence> - <element name='Name'> - <complexType> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - </element> - - <element name='lookupResponse'> - <complexType> - <sequence> - <element name='Details'> - <complexType> - <sequence> - <element name='Number'> - <complexType> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - </element> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl (from rev 8702, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/PhoneBook.wsdl 2008-11-12 17:56:34 UTC (rev 8715) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws2389' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws2389/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws2389' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws2389/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws2389/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <element name='lookup'> + <complexType> + <sequence> + <element name='Details'> + <complexType> + <sequence> + <element name='Name'> + <complexType> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + </element> + </sequence> + </complexType> + </element> + </sequence> + </complexType> + </element> + + <element name='lookupResponse'> + <complexType> + <sequence> + <element name='Details'> + <complexType> + <sequence> + <element name='Number'> + <complexType> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + </element> + </sequence> + </complexType> + </element> + </sequence> + </complexType> + </element> + + </schema> + </types> + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java 2008-11-11 14:36:09 UTC (rev 8702) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue Nov 11 13:48:53 GMT 2008 - * - * 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.jbws2389; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws2389.LookupResponse lookup(org.jboss.test.ws.jbws2389.Lookup lookup) throws java.rmi.RemoteException; -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java (from rev 8702, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/PhoneBook_PortType.java 2008-11-12 17:56:34 UTC (rev 8715) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue Nov 11 13:48:53 GMT 2008 + * + * 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.jbws2389; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws2389.LookupResponse lookup(org.jboss.test.ws.jbws2389.Lookup lookup) throws java.rmi.RemoteException; +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml 2008-11-11 14:36:09 UTC (rev 8702) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,103 +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.jbws2389</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws2389/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws2389</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws2389</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws2389.Lookup</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>details</java-variable-name> - <xml-element-name>Details</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws2389.LookupDetails</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup>Details</anonymous-type-qname> - <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.jbws2389.LookupName</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup>Details>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws2389.LookupResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>details</java-variable-name> - <xml-element-name>Details</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws2389.LookupResponseDetails</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse>Details</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws2389.LookupResponseNumber</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse>Details>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws2389.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws2389'>serviceNS:PhoneBook</wsdl-service-name> - <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.jbws2389.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws2389'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws2389'>bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws2389.Lookup</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2389'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <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.jbws2389.LookupResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2389'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <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: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml (from rev 8702, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/jaxrpc-mapping.xml 2008-11-12 17:56:34 UTC (rev 8715) @@ -0,0 +1,103 @@ +<?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.jbws2389</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws2389/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws2389</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws2389</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.Lookup</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>details</java-variable-name> + <xml-element-name>Details</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.LookupDetails</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup>Details</anonymous-type-qname> + <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.jbws2389.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookup>Details>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.LookupResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>details</java-variable-name> + <xml-element-name>Details</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.LookupResponseDetails</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse>Details</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws2389.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2389/types'>typeNS:>lookupResponse>Details>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws2389.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws2389'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws2389.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws2389'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws2389'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws2389.Lookup</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2389'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <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.jbws2389.LookupResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2389'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <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: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/wstools-config.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml 2008-11-11 14:36:09 UTC (rev 8702) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/wstools-config.xml 2008-11-12 17:56:34 UTC (rev 8715) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="${test.resources.directory}/tools/jbws2389/doclit/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/wstools-config.xml (from rev 8702, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws2389/doclit/wstools-config.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/wstools-config.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2389/doclit/wstools-config.xml 2008-11-12 17:56:34 UTC (rev 8715) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws2389/doclit/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8714 - in stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260: scenario_AF and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-11-12 12:48:18 -0500 (Wed, 12 Nov 2008) New Revision: 8714 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml Log: [JBWS-2389] WSDL To Java - Anonymous types nested within anonymous types generated JAX-RPC mapping does not match generated source. Correct <anonymous-type-qname> entries for a couple of tests in the testsuite. Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml 2008-11-12 17:10:02 UTC (rev 8713) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AA/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) @@ -1,110 +1,96 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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.jbws1260.Telephone</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Telephone</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>digits</java-variable-name> - <xml-element-name>digits</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Title</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Title</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>text</java-variable-name> - <xml-element-name>text</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - -  -  -  - - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <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.jbws1260.Title</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Title</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>text</java-variable-name> + <xml-element-name>text</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Telephone</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Telephone</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>digits</java-variable-name> + <xml-element-name>digits</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml 2008-11-12 17:10:02 UTC (rev 8713) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) @@ -1,83 +1,82 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <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.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml 2008-11-12 17:10:02 UTC (rev 8713) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_E/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) @@ -1,79 +1,78 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <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.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <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.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <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.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml 2008-11-12 17:10:02 UTC (rev 8713) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_F/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) @@ -1,87 +1,86 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml 2008-11-12 17:10:02 UTC (rev 8713) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_I/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) @@ -1,92 +1,78 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <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.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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> - -  -  -  - - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <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.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <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.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml 2008-11-12 17:10:02 UTC (rev 8713) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_L/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) @@ -1,71 +1,70 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <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.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml 2008-11-12 17:10:02 UTC (rev 8713) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_O/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) @@ -1,87 +1,86 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <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>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml 2008-11-12 17:10:02 UTC (rev 8713) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_R/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) @@ -1,100 +1,86 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - -  -  -  - - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <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>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml 2008-11-12 17:10:02 UTC (rev 8713) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_U/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) @@ -1,79 +1,78 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml 2008-11-12 17:10:02 UTC (rev 8713) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml 2008-11-12 17:48:18 UTC (rev 8714) @@ -1,79 +1,78 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1260</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:>Person>Name</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <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.jbws1260.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>postcode</java-variable-name> - <xml-attribute-name>postcode</xml-attribute-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <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.jbws1260.LookupName</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>Number</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?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.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person</root-type-qname> + <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.jbws1260.LookupName</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:Person>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>postcode</java-variable-name> + <xml-attribute-name>postcode</xml-attribute-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1260'>serviceNS:PhoneBook</wsdl-service-name> + <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.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1260'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1260'>bindingNS:PhoneBookBinding</wsdl-binding> + <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.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</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.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1260'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</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

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8713 - stack/metro/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-12 12:10:02 -0500 (Wed, 12 Nov 2008) New Revision: 8713 Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422-JDK6.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss423-JDK6.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss424-JDK6.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt Log: [JBWS-2343][JBWS-2397] Updating excludes for AS 4.2.x Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422-JDK6.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss422-JDK6.txt 2008-11-12 16:54:18 UTC (rev 8712) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422-JDK6.txt 2008-11-12 17:10:02 UTC (rev 8713) @@ -8,6 +8,9 @@ # UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* +# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail +org/jboss/test/ws/jaxws/jbws1762/** + # [JBWS-1813] context-root from jboss.xml org/jboss/test/ws/jaxws/jbws1813/** @@ -35,23 +38,6 @@ # [JBWS-2329] Failed to deploy service with multiple bindings org/jboss/test/ws/jaxws/jbws2278/** -# [JBWS-2343] Enable tests requiring atp/wsgen on client side -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1357/** -org/jboss/test/ws/jaxws/jbws1422/** -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1529/** -org/jboss/test/ws/jaxws/jbws1566/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1733/** -org/jboss/test/ws/jaxws/jbws1762/** -org/jboss/test/ws/jaxws/jbws1797/** -org/jboss/test/ws/jaxws/jbws1799/** -org/jboss/test/ws/jaxws/jbws1845/** -org/jboss/test/ws/jaxws/jbws1872/** -org/jboss/test/ws/jaxws/jbws2218/** -org/jboss/test/ws/jaxws/jbws2250/** - # [JBWS-2347] Rewrite @WebFault related tests org/jboss/test/ws/jaxws/jbws1904/** org/jboss/test/ws/jaxws/webfault/** @@ -59,5 +45,8 @@ # [JBWS-2348] Fix jbws1969 testcase org/jboss/test/ws/jaxws/jbws1969/** +# [JBWS-2397] Fix jbws1797 testcase +org/jboss/test/ws/jaxws/jbws1797/** + # [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-11-12 16:54:18 UTC (rev 8712) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-11-12 17:10:02 UTC (rev 8713) @@ -8,6 +8,9 @@ # UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* +# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail +org/jboss/test/ws/jaxws/jbws1762/** + # [JBWS-1813] context-root from jboss.xml org/jboss/test/ws/jaxws/jbws1813/** @@ -35,23 +38,6 @@ # [JBWS-2329] Failed to deploy service with multiple bindings org/jboss/test/ws/jaxws/jbws2278/** -# [JBWS-2343] Enable tests requiring atp/wsgen on client side -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1357/** -org/jboss/test/ws/jaxws/jbws1422/** -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1529/** -org/jboss/test/ws/jaxws/jbws1566/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1733/** -org/jboss/test/ws/jaxws/jbws1762/** -org/jboss/test/ws/jaxws/jbws1797/** -org/jboss/test/ws/jaxws/jbws1799/** -org/jboss/test/ws/jaxws/jbws1845/** -org/jboss/test/ws/jaxws/jbws1872/** -org/jboss/test/ws/jaxws/jbws2218/** -org/jboss/test/ws/jaxws/jbws2250/** - # [JBWS-2347] Rewrite @WebFault related tests org/jboss/test/ws/jaxws/jbws1904/** org/jboss/test/ws/jaxws/webfault/** @@ -59,5 +45,8 @@ # [JBWS-2348] Fix jbws1969 testcase org/jboss/test/ws/jaxws/jbws1969/** +# [JBWS-2397] Fix jbws1797 testcase +org/jboss/test/ws/jaxws/jbws1797/** + # [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423-JDK6.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss423-JDK6.txt 2008-11-12 16:54:18 UTC (rev 8712) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423-JDK6.txt 2008-11-12 17:10:02 UTC (rev 8713) @@ -32,23 +32,6 @@ # [JBWS-2329] Failed to deploy service with multiple bindings org/jboss/test/ws/jaxws/jbws2278/** -# [JBWS-2343] Enable tests requiring atp/wsgen on client side -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1357/** -org/jboss/test/ws/jaxws/jbws1422/** -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1529/** -org/jboss/test/ws/jaxws/jbws1566/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1733/** -org/jboss/test/ws/jaxws/jbws1762/** -org/jboss/test/ws/jaxws/jbws1797/** -org/jboss/test/ws/jaxws/jbws1799/** -org/jboss/test/ws/jaxws/jbws1845/** -org/jboss/test/ws/jaxws/jbws1872/** -org/jboss/test/ws/jaxws/jbws2218/** -org/jboss/test/ws/jaxws/jbws2250/** - # [JBWS-2347] Rewrite @WebFault related tests org/jboss/test/ws/jaxws/jbws1904/** org/jboss/test/ws/jaxws/webfault/** @@ -56,5 +39,8 @@ # [JBWS-2348] Fix jbws1969 testcase org/jboss/test/ws/jaxws/jbws1969/** +# [JBWS-2397] Fix jbws1797 testcase +org/jboss/test/ws/jaxws/jbws1797/** + # [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-11-12 16:54:18 UTC (rev 8712) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-11-12 17:10:02 UTC (rev 8713) @@ -32,23 +32,6 @@ # [JBWS-2329] Failed to deploy service with multiple bindings org/jboss/test/ws/jaxws/jbws2278/** -# [JBWS-2343] Enable tests requiring atp/wsgen on client side -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1357/** -org/jboss/test/ws/jaxws/jbws1422/** -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1529/** -org/jboss/test/ws/jaxws/jbws1566/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1733/** -org/jboss/test/ws/jaxws/jbws1762/** -org/jboss/test/ws/jaxws/jbws1797/** -org/jboss/test/ws/jaxws/jbws1799/** -org/jboss/test/ws/jaxws/jbws1845/** -org/jboss/test/ws/jaxws/jbws1872/** -org/jboss/test/ws/jaxws/jbws2218/** -org/jboss/test/ws/jaxws/jbws2250/** - # [JBWS-2347] Rewrite @WebFault related tests org/jboss/test/ws/jaxws/jbws1904/** org/jboss/test/ws/jaxws/webfault/** @@ -56,5 +39,8 @@ # [JBWS-2348] Fix jbws1969 testcase org/jboss/test/ws/jaxws/jbws1969/** +# [JBWS-2397] Fix jbws1797 testcase +org/jboss/test/ws/jaxws/jbws1797/** + # [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss424-JDK6.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss424-JDK6.txt 2008-11-12 16:54:18 UTC (rev 8712) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424-JDK6.txt 2008-11-12 17:10:02 UTC (rev 8713) @@ -32,23 +32,6 @@ # [JBWS-2329] Failed to deploy service with multiple bindings org/jboss/test/ws/jaxws/jbws2278/** -# [JBWS-2343] Enable tests requiring atp/wsgen on client side -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1357/** -org/jboss/test/ws/jaxws/jbws1422/** -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1529/** -org/jboss/test/ws/jaxws/jbws1566/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1733/** -org/jboss/test/ws/jaxws/jbws1762/** -org/jboss/test/ws/jaxws/jbws1797/** -org/jboss/test/ws/jaxws/jbws1799/** -org/jboss/test/ws/jaxws/jbws1845/** -org/jboss/test/ws/jaxws/jbws1872/** -org/jboss/test/ws/jaxws/jbws2218/** -org/jboss/test/ws/jaxws/jbws2250/** - # [JBWS-2347] Rewrite @WebFault related tests org/jboss/test/ws/jaxws/jbws1904/** org/jboss/test/ws/jaxws/webfault/** @@ -58,3 +41,6 @@ # [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* + +# [JBWS-2397] Fix jbws1797 testcase +org/jboss/test/ws/jaxws/jbws1797/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-11-12 16:54:18 UTC (rev 8712) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-11-12 17:10:02 UTC (rev 8713) @@ -32,23 +32,6 @@ # [JBWS-2329] Failed to deploy service with multiple bindings org/jboss/test/ws/jaxws/jbws2278/** -# [JBWS-2343] Enable tests requiring atp/wsgen on client side -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1357/** -org/jboss/test/ws/jaxws/jbws1422/** -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1529/** -org/jboss/test/ws/jaxws/jbws1566/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1733/** -org/jboss/test/ws/jaxws/jbws1762/** -org/jboss/test/ws/jaxws/jbws1797/** -org/jboss/test/ws/jaxws/jbws1799/** -org/jboss/test/ws/jaxws/jbws1845/** -org/jboss/test/ws/jaxws/jbws1872/** -org/jboss/test/ws/jaxws/jbws2218/** -org/jboss/test/ws/jaxws/jbws2250/** - # [JBWS-2347] Rewrite @WebFault related tests org/jboss/test/ws/jaxws/jbws1904/** org/jboss/test/ws/jaxws/webfault/** @@ -58,3 +41,6 @@ # [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* + +# [JBWS-2397] Fix jbws1797 testcase +org/jboss/test/ws/jaxws/jbws1797/**

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8712 - in stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools: jbws1873/doclit and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-11-12 11:54:18 -0500 (Wed, 12 Nov 2008) New Revision: 8712 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1079/anonymous-mapping.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml Log: [JBWS-2389] WSDL To Java - Anonymous types nested within anonymous types generated JAX-RPC mapping does not match generated source. Correct <anonymous-type-qname> entries for a couple of tests in the testsuite. Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1079/anonymous-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1079/anonymous-mapping.xml 2008-11-12 15:42:46 UTC (rev 8711) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1079/anonymous-mapping.xml 2008-11-12 16:54:18 UTC (rev 8712) @@ -1,77 +1,76 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1079</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1079</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1079</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1079/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.LookupResponseNumber</java-type> - <anonymous-type-qname>http://test.jboss.org/ws/jbws1079/types:>TelephoneNumber>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1079/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1079/types">typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1079.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1079">serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1079.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1079">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1079">bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1079.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1079">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1079.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1079">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1079</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1079/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1079</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1079</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1079.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1079.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1079.LookupResponseNumber</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1079.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1079'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1079.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1079'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1079'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1079.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1079'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1079.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1079'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <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 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2008-11-12 15:42:46 UTC (rev 8711) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws1873/doclit/jaxrpc-mapping.xml 2008-11-12 16:54:18 UTC (rev 8712) @@ -18,7 +18,7 @@ </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:>Person>request</anonymous-type-qname> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:Person>request</anonymous-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>surname</java-variable-name> @@ -36,7 +36,7 @@ </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:>TelephoneNumber>response</anonymous-type-qname> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1873/types'>typeNS:TelephoneNumber>response</anonymous-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>number</java-variable-name>

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8711 - stack/metro/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-12 10:42:46 -0500 (Wed, 12 Nov 2008) New Revision: 8711 Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt Log: [JBWS-2343][JBWS-2397] Updating excludes for AS 5 trunk Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt 2008-11-12 15:13:43 UTC (rev 8710) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt 2008-11-12 15:42:46 UTC (rev 8711) @@ -25,24 +25,6 @@ # [JBWS-2329] Failed to deploy service with multiple bindings org/jboss/test/ws/jaxws/jbws2278/** -# [JBWS-2343] Enable tests requiring atp/wsgen on client side -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1357/** -org/jboss/test/ws/jaxws/jbws1422/** -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1529/** -org/jboss/test/ws/jaxws/jbws1566/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1733/** -org/jboss/test/ws/jaxws/jbws1762/** -org/jboss/test/ws/jaxws/jbws1797/** -org/jboss/test/ws/jaxws/jbws1799/** -org/jboss/test/ws/jaxws/jbws1845/** -org/jboss/test/ws/jaxws/jbws1872/** -org/jboss/test/ws/jaxws/jbws2218/** -org/jboss/test/ws/jaxws/jbws2241/** -org/jboss/test/ws/jaxws/jbws2250/** - # [JBWS-2347] Rewrite @WebFault related tests org/jboss/test/ws/jaxws/jbws1904/** org/jboss/test/ws/jaxws/webfault/** @@ -53,3 +35,5 @@ # [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* +# [JBWS-2397] Fix jbws1797 testcase +org/jboss/test/ws/jaxws/jbws1797/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-12 15:13:43 UTC (rev 8710) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-12 15:42:46 UTC (rev 8711) @@ -25,29 +25,6 @@ # [JBWS-2329] Failed to deploy service with multiple bindings org/jboss/test/ws/jaxws/jbws2278/** -# [JBWS-2343] Enable tests requiring atp/wsgen on client side -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1357/** -org/jboss/test/ws/jaxws/jbws1422/** -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1529/** -org/jboss/test/ws/jaxws/jbws1566/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1733/** -org/jboss/test/ws/jaxws/jbws1762/** -org/jboss/test/ws/jaxws/jbws1797/** -org/jboss/test/ws/jaxws/jbws1799/** -org/jboss/test/ws/jaxws/jbws1845/** -org/jboss/test/ws/jaxws/jbws1872/** -org/jboss/test/ws/jaxws/jbws2218/** -org/jboss/test/ws/jaxws/jbws2241/** -org/jboss/test/ws/jaxws/jbws2250/** - -# [JBWS-2344][JBWS-2342] These tests currently run fine with JDK6 only -org/jboss/test/ws/jaxws/holder/** -org/jboss/test/ws/jaxws/jbws1822/** -org/jboss/test/ws/jaxws/jbws860/** - # [JBWS-2347] Rewrite @WebFault related tests org/jboss/test/ws/jaxws/jbws1904/** org/jboss/test/ws/jaxws/webfault/** @@ -58,3 +35,5 @@ # [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* +# [JBWS-2397] Fix jbws1797 testcase +org/jboss/test/ws/jaxws/jbws1797/**

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8710 - in stack/metro/trunk: src/main/distro and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-11-12 10:13:43 -0500 (Wed, 12 Nov 2008) New Revision: 8710 Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/metro/trunk/src/main/distro/build-project-gen.xml stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2376] fixing metro deployment macros Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-12 15:04:31 UTC (rev 8709) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-12 15:13:43 UTC (rev 8710) @@ -24,28 +24,28 @@ </patternset> <patternset id="jbossws.client.patternset"> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/jaxb-xjc.jar"/> - <include name="**/jaxws-tools.jar"/> - <include name="**/jaxws-rt.jar"/> - <include name="**/jaxws-api.jar"/> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> - <include name="**/jbossws-metro-client.jar"/> - <include name="**/jbossws-metro-wsit-rt.jar"/> - <include name="**/jbossws-metro-wsit-tools.jar"/> - <include name="**/jbossws-spi.jar"/> - <include name="**/policy.jar"/> - <include name="**/streambuffer.jar"/> - <include name="**/stax-api.jar"/> - <include name="**/stax-ex.jar"/> - <include name="**/jsr181-api.jar"/> - <include name="**/saaj-api.jar"/> - <include name="**/saaj-impl.jar"/> - <include name="**/stax-api.jar"/> - <include name="**/wsdl4j.jar"/> - <include name="**/wstx.jar"/> + <include name="**/sun-jaxb/lib/jaxb-api.jar"/> + <include name="**/sun-jaxb/lib/jaxb-impl.jar"/> + <include name="**/sun-jaxb/lib/jaxb-xjc.jar"/> + <include name="**/sun-jaxws/lib/jaxws-tools.jar"/> + <include name="**/sun-jaxws/lib/jaxws-rt.jar"/> + <include name="**/sun-jaxws/lib/jaxws-api.jar"/> + <include name="**/org/jboss/ws/lib/jbossws-common.jar"/> + <include name="**/org/jboss/ws/lib/jbossws-framework.jar"/> + <include name="**/org/jboss/ws/lib/jbossws-spi.jar"/> + <include name="**/org/jboss/ws/metro/lib/jbossws-metro-client.jar"/> + <include name="**/com/sun/xml/ws/lib/policy.jar"/> + <include name="**/org/jboss/ws/metro/lib/jbossws-metro-wsit-rt.jar"/> + <include name="**/org/jboss/ws/metro/lib/jbossws-metro-wsit-tools.jar"/> + <include name="**/com/sun/xml/stream/buffer/lib/streambuffer.jar"/> + <include name="**/stax-api/lib/stax-api.jar"/> + <include name="**/org/jvnet/staxex/lib/stax-ex.jar"/> + <include name="**/javax/jws/lib/jsr181-api.jar"/> + <include name="**/javax/xml/soap/lib/saaj-api.jar"/> + <include name="**/com/sun/xml/messaging/saaj/lib/saaj-impl.jar"/> + <include name="**/stax-api/lib/stax-api.jar"/> + <include name="**/ibm-wsdl4j/lib/wsdl4j.jar"/> + <include name="**/woodstox/lib/wstx.jar"/> </patternset> <patternset id="jbossws.lib.patternset"> @@ -53,52 +53,47 @@ </patternset> <patternset id="jbossws.lib.endorsed.patternset"> - <include name="**/jboss-jaxrpc.jar"/> - <include name="**/jboss-jaxws.jar"/> - <include name="**/jboss-jaxws-ext.jar"/> - <include name="**/jboss-saaj.jar"/> - <include name="**/jaxb-api.jar"/> + <include name="**/sun-jaxb/lib/jaxb-api.jar"/> </patternset> <patternset id="jbossws.server.lib.patternset"> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> - <include name="**/jbossws-spi.jar"/> - <include name="**/jaxws-api.jar"/> - <include name="**/jsr181-api.jar"/> - <include name="**/saaj-api.jar"/> - <include name="**/stax-api.jar"/> + <include name="**/org/jboss/ws/lib/jbossws-common.jar"/> + <include name="**/org/jboss/ws/lib/jbossws-framework.jar"/> + <include name="**/org/jboss/ws/lib/jbossws-spi.jar"/> + <include name="**/sun-jaxws/lib/jaxws-api.jar"/> + <include name="**/javax/jws/lib/jsr181-api.jar"/> + <include name="**/javax/xml/soap/lib/saaj-api.jar"/> + <include name="**/stax-api/lib/stax-api.jar"/> </patternset> <patternset id="jbossws.service.lib.patternset"> - <include name="**/FastInfoset.jar"/> - <include name="**/http.jar"/> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/jaxb-xjc.jar"/> - <include name="**/jaxrpc-api.jar"/> - <include name="**/jaxws-local-transport.jar"/> - <include name="**/jaxws-rt.jar"/> - <include name="**/jaxws-tools.jar"/> - <include name="**/jbossws-metro-client.jar"/> - <include name="**/jbossws-metro-server.jar"/> - <include name="**/jbossws-metro-wsit-rt.jar"/> - <include name="**/jbossws-metro-wsit-tools.jar"/> - <include name="**/jsr181-api.jar"/> - <include name="**/jsr250-api.jar"/> - <include name="**/mimepull.jar"/> - <include name="**/policy.jar"/> - <include name="**/resolver.jar"/> - <include name="**/saaj-api.jar"/> - <include name="**/saaj-impl.jar"/> - <include name="**/stax-ex.jar"/> - <include name="**/stax-utils.jar"/> - <include name="**/streambuffer.jar"/> - <include name="**/txnannprocessor.jar"/> - <include name="**/wsdl4j.jar"/> - <include name="**/wstx.jar"/> - <include name="**/xmlsec.jar"/> - <include name="**/xws-security.jar"/> + <include name="**/com/sun/xml/fastinfoset/lib/FastInfoset.jar"/> + <include name="**/com/sun/xml/ws/lib/http.jar"/> + <include name="**/sun-jaxb/lib/jaxb-api.jar"/> + <include name="**/sun-jaxb/lib/jaxb-impl.jar"/> + <include name="**/sun-jaxb/lib/jaxb-xjc.jar"/> + <include name="**/javax/xml/lib/jaxrpc-api.jar"/> + <include name="**/com/sun/xml/ws/lib/jaxws-local-transport.jar"/> + <include name="**/sun-jaxws/lib/jaxws-rt.jar"/> + <include name="**/sun-jaxws/lib/jaxws-tools.jar"/> + <include name="**/org/jboss/ws/metro/lib/jbossws-metro-client.jar"/> + <include name="**/org/jboss/ws/metro/lib/jbossws-metro-server.jar"/> + <include name="**/org/jboss/ws/metro/lib/jbossws-metro-wsit-rt.jar"/> + <include name="**/org/jboss/ws/metro/lib/jbossws-metro-wsit-tools.jar"/> + <include name="**/javax/jws/lib/jsr181-api.jar"/> + <include name="**/javax/annotation/lib/jsr250-api.jar"/> + <include name="**/com/sun/xml/ws/lib/policy.jar"/> + <include name="**/org/jvnet/staxex/lib/mimepull.jar"/> + <include name="**/com/sun/org/apache/xml/internal/lib/resolver.jar"/> + <include name="**/javax/xml/soap/lib/saaj-api.jar"/> + <include name="**/com/sun/xml/messaging/saaj/lib/saaj-impl.jar"/> + <include name="**/org/jvnet/staxex/lib/stax-ex.jar"/> + <include name="**/com/sun/xml/stream/buffer/lib/streambuffer.jar"/> + <include name="**/com/sun/xml/wsit/lib/txnannprocessor.jar"/> + <include name="**/ibm-wsdl4j/lib/wsdl4j.jar"/> + <include name="**/woodstox/lib/wstx.jar"/> + <include name="**/com/sun/xml/wsit/lib/xmlsec.jar"/> + <include name="**/com/sun/xml/wsit/lib/xws-security.jar"/> </patternset>  @@ -143,10 +138,10 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.lib.patternset"/> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/stax-api.jar"/> - <include name="**/wstx.jar"/> + <include name="**/sun-jaxb/lib/jaxb-api.jar"/> + <include name="**/sun-jaxb/lib/jaxb-impl.jar"/> + <include name="**/stax-api/lib/stax-api.jar"/> + <include name="**/woodstox/lib/wstx.jar"/> </fileset> </copy> </sequential> @@ -182,7 +177,7 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> - <include name="**/jbossws-(a){jbossid}.jar"/> + <include name="**/org/jboss/ws/lib/jbossws-(a){jbossid}.jar"/> </fileset> </copy> </sequential> @@ -199,7 +194,7 @@ <patternset refid="jbossws.client.patternset"/>   - <include name="**/jbossws-(a){jbossid}.jar"/> + <include name="**/org/jboss/ws/lib/jbossws-(a){jbossid}.jar"/>  </fileset> </copy> @@ -219,7 +214,7 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.server.lib.patternset"/> - <include name="**/jbossws-(a){jbossid}.jar"/> + <include name="**/org/jboss/ws/lib/jbossws-(a){jbossid}.jar"/> </fileset> </copy> </sequential> @@ -250,13 +245,13 @@ <mkdir dir="@{targetdir}"/> <unzip dest="@{targetdir}"> <fileset dir="@{thirdpartydir}"> - <include name="**/juddi-service.sar"/> + <include name="**/org/jboss/jaxr/lib/juddi-service.sar"/> </fileset> </unzip> <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> - <include name="**/juddi.jar"/> - <include name="**/scout.jar"/> + <include name="**/juddi/lib/juddi.jar"/> + <include name="**/apache-scout/lib/scout.jar"/> </fileset> </copy> </sequential> @@ -276,15 +271,15 @@ <copy todir="@{targetdir}" flatten="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.service.lib.patternset"/> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/stax-api.jar"/> - <include name="**/wstx.jar"/> + <include name="**/sun-jaxb/lib/jaxb-api.jar"/> + <include name="**/sun-jaxb/lib/jaxb-impl.jar"/> + <include name="**/stax-api/lib/stax-api.jar"/> + <include name="**/woodstox/lib/wstx.jar"/> </fileset> </copy> <unzip dest="@{targetdir}/jbossws-management.war"> <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-metro-management.war"/> + <include name="**/org/jboss/ws/metro/lib/jbossws-metro-management.war"/> </fileset> </unzip> <copy todir="@{targetdir}/jbossws.beans"> @@ -307,7 +302,7 @@ <mkdir dir="@{targetdir}"/> <unzip dest="@{targetdir}/jbossws-management.war"> <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-metro-management.war"/> + <include name="**/org/jboss/ws/metro/lib/jbossws-metro-management.war"/> </fileset> </unzip> </sequential> @@ -336,11 +331,11 @@ </copy> <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> + <include name="**/org/jboss/ws/lib/jbossws-common.jar"/> + <include name="**/org/jboss/ws/lib/jbossws-framework.jar"/>   - <include name="**/jbossws-(a){jbossid}.jar"/> + <include name="**/org/jboss/ws/lib/jbossws-(a){jbossid}.jar"/>  </fileset> </copy> Modified: stack/metro/trunk/src/main/distro/build-project-gen.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-project-gen.xml 2008-11-12 15:04:31 UTC (rev 8709) +++ stack/metro/trunk/src/main/distro/build-project-gen.xml 2008-11-12 15:13:43 UTC (rev 8710) @@ -22,7 +22,7 @@ </filterset> <path id="jbws-ant.path"> - <pathelement location="${thirdparty.dir}/jbossws-common.jar" /> + <pathelement location="${jboss.client}/jbossws-common.jar" /> </path> <taskdef name="pathFixer" classname="org.jboss.ws.tools.ant.FixPathTask" classpathref="jbws-ant.path"/> <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="jbws-ant.path"/> Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-12 15:04:31 UTC (rev 8709) +++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-12 15:13:43 UTC (rev 8710) @@ -1,12 +1,12 @@ <assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - + <id>deploy-artifacts</id> <formats> <format>dir</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> - + <moduleSets> <moduleSet> <includes> @@ -14,50 +14,201 @@ <include>org.jboss.ws.metro:jbossws-metro-server</include> </includes> <binaries> - <outputDirectory>lib</outputDirectory> + <outputDirectory>lib/org/jboss/ws/metro/lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <includeDependencies>false</includeDependencies> <unpack>false</unpack> <dependencySets> <dependencySet> + <outputDirectory>lib/com/sun/xml/wsit/lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> <includes> + <include>*:txnannprocessor:jar</include> + <include>*:xmlsec:jar</include> + <include>*:xws-security:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib/com/sun/org/apache/xml/internal/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>*:resolver:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib/com/sun/xml/stream/buffer/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>*:streambuffer:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib/javax/jws/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>*:jsr181-api:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib/javax/annotation/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>*:jsr250-api:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib/javax/xml/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>*:jaxrpc-api:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib/com/sun/xml/messaging/saaj/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>*:saaj-impl:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib/javax/xml/soap/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>*:saaj-api:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib/com/sun/xml/ws/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>*:policy:jar</include> + <include>*:http:jar</include> + <include>*:jaxws-local-transport:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib/junit/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>*:junit:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib/ibm-wsdl4j/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>*:wsdl4j:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib/com/sun/xml/fastinfoset/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> <include>*:FastInfoset:jar</include> - <include>*:http:jar</include> - <include>*:jaxb-api:jar</include> - <include>*:jaxb-impl:jar</include> - <include>*:jaxb-xjc:jar</include> - <include>*:jaxrpc-api:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib/sun-jaxws/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> <include>*:jaxws-api:jar</include> - <include>*:jaxws-local-transport:jar</include> <include>*:jaxws-rt:jar</include> <include>*:jaxws-tools:jar</include> - <include>*:jbossws-common:jar</include> - <include>*:jbossws-spi:jar</include> - <include>*:jsr181-api:jar</include> - <include>*:jsr250-api:jar</include> - <include>*:mimepull:jar</include> - <include>*:policy:jar</include> - <include>*:resolver:jar</include> - <include>*:saaj-api:jar</include> - <include>*:saaj-impl:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib/stax-api/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> <include>*:stax-api:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib/org/jvnet/staxex/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> <include>*:stax-ex:jar</include> - <include>*:streambuffer:jar</include> - <include>*:txnannprocessor:jar</include> - <include>*:wsdl4j:jar</include> - <include>*:xmlsec:jar</include> - <include>*:xws-security:jar</include> - <include>*:junit:jar</include> + <include>*:mimepull:jar</include> </includes> </dependencySet> <dependencySet> + <outputDirectory>lib/org/jboss/ws/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>*:jbossws-common:jar</include> + <include>*:jbossws-spi:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib/woodstox/lib</outputDirectory> <outputFileNameMapping>wstx.jar</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> <includes> <include>*:wstx-lgpl:jar</include> </includes> </dependencySet> + <dependencySet> + <outputDirectory>lib/sun-jaxb/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>*:jaxb-api:jar</include> + <include>*:jaxb-impl:jar</include> + <include>*:jaxb-xjc:jar</include> + </includes> + </dependencySet> </dependencySets> </binaries> </moduleSet> @@ -66,28 +217,55 @@ <include>org.jboss.ws.metro:jbossws-metro-management</include> </includes> <binaries> - <outputDirectory>lib</outputDirectory> + <outputDirectory>lib/org/jboss/ws/metro/lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <includeDependencies>false</includeDependencies> <unpack>false</unpack> - <dependencySets> + <dependencySets> <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>lib/org/jboss/jaxr/lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>runtime</scope> <unpack>false</unpack> <includes> - <include>*:jbossws-framework:jar</include> - <include>*:jbossws-jboss422:jar</include> - <include>*:jbossws-jboss423:jar</include> <include>*:juddi-service:sar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib/apache-scout/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> <include>*:scout:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib/juddi/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> <include>*:juddi:jar</include> </includes> </dependencySet> <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>lib/org/jboss/ws/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>*:jbossws-framework:jar</include> + <include>*:jbossws-jboss422:jar</include> + <include>*:jbossws-jboss423:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib/org/jboss/ws/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss424.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>runtime</scope> @@ -99,7 +277,7 @@   <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>lib/org/jboss/ws/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss500.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>runtime</scope> @@ -109,7 +287,7 @@ </includes> </dependencySet> <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>lib/org/jboss/ws/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>runtime</scope> @@ -122,22 +300,8 @@ </dependencySets> </binaries> </moduleSet> -  </moduleSets> - + <fileSets>  <fileSet> @@ -145,12 +309,11 @@ <outputDirectory>bin</outputDirectory> <includes> <include>wsconsume.*</include> - <include>wsprovide.*</include> + <include>wsprovide.*</include> </includes> </fileSet> - -  - <fileSet> +  + <fileSet> <directory>modules/server/target/resources</directory> <outputDirectory>resources</outputDirectory> <includes> @@ -158,18 +321,18 @@ </includes> </fileSet> </fileSets> - -  + <files> <file> - <outputDirectory>lib</outputDirectory> + <outputDirectory>lib/org/jboss/ws/metro/lib</outputDirectory> <source>modules/wsit/target/jbossws-metro-wsit-${project.version}-rt.jar</source> <destName>jbossws-metro-wsit-rt.jar</destName> </file> <file> - <outputDirectory>lib</outputDirectory> + <outputDirectory>lib/org/jboss/ws/metro/lib</outputDirectory> <source>modules/wsit/target/jbossws-metro-wsit-${project.version}-tools.jar</source> <destName>jbossws-metro-wsit-tools.jar</destName> </file> </files> + </assembly>

16 years, 1 month

1
0
0 / 0

← Newer
1
...
8
9
10
11
12
13
14
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits November 2008