[jbossws-commits] JBossWS SVN: r6144 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP/src: main/java/org/jboss/ws/tools/config and 8 other directories.

Author: darran.lofthouse(a)jboss.com Date: 2008-03-27 16:47:25 -0400 (Thu, 27 Mar 2008) New Revision: 6144 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1278/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/Person.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/PhoneBook.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/PhoneBookPort.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/TelephoneNumber.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/wstools-config.xml Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/Person.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/PhoneBook.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/PhoneBookPort.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/TelephoneNumber.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/wstools-config.xml Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/Configuration.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/JavaWriter.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/WSDLToJava.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/XSDToJava.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/resources/schema/jbossws-tool_1_0.xsd Log: [JBPAPP-696] WSDL To Java, add a configuration option so all generated types can implement java.io.Serializable. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/Configuration.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/Configuration.java 2008-03-27 19:42:02 UTC (rev 6143) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/Configuration.java 2008-03-27 20:47:25 UTC (rev 6144) @@ -140,6 +140,8 @@ public String wsdlLocation; // Parameter style {"wrapped", "bare"} public String parameterStyle = "wrapped"; + // Should generated types be Serializable? + public boolean serializableTypes; // Is a jaxrpc-mapping file needed? public boolean mappingFileNeeded; // Name of the jaxrpc-mapping file Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/JavaWriter.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/JavaWriter.java 2008-03-27 19:42:02 UTC (rev 6143) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/JavaWriter.java 2008-03-27 20:47:25 UTC (rev 6144) @@ -192,7 +192,7 @@ * @throws IOException */ public void createJavaFile(File location, String filename, String packageName, List<VAR> vars, List<String> importList, String baseTypeName, - boolean isExceptionType, Map<String, List> typeNameToBaseVARList) throws IOException + boolean isExceptionType, boolean isSerializable, Map<String, List> typeNameToBaseVARList) throws IOException { File newLoc = null; if (needToCreatePackageStructure(location, packageName)) @@ -217,6 +217,8 @@ buffer.append(newline).append("public class ").append(classname).append(newline); if (baseTypeName != null && baseTypeName.length() > 0) buffer.append(" extends ").append(baseTypeName); + if (isSerializable) + buffer.append(" implements java.io.Serializable"); buffer.append("{").append(newline); createVariables(buffer, vars, isExceptionType); createCTR(buffer, classname, vars, isExceptionType, typeNameToBaseVARList); Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-03-27 19:42:02 UTC (rev 6143) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-03-27 20:47:25 UTC (rev 6144) @@ -96,6 +96,7 @@ protected boolean annotate = false; protected Map<String, String> namespacePackageMap = null; + protected boolean generateSerializableTypes = false; protected HolderWriter holderWriter = new HolderWriter(); @@ -207,6 +208,16 @@ namespacePackageMap.put(map.get(pkg), pkg); } } + + public boolean isGenerateSerializableTypes() + { + return generateSerializableTypes; + } + + public void setGenerateSerializableTypes(boolean generateSerializableTypes) + { + this.generateSerializableTypes = generateSerializableTypes; + } public void setTypeMapping(LiteralTypeMapping tm) { @@ -807,7 +818,8 @@ private void generateJavaSource(XSComplexTypeDefinition xt, JBossXSModel xsmodel, String containingElement, boolean exception) throws IOException { - XSDTypeToJava xtj = new XSDTypeToJava(); + XSDTypeToJava xtj = new XSDTypeToJava(generateSerializableTypes); + xtj.setTypeMapping(this.typeMapping); xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, getLocationForJavaGeneration(), seiPkgName, xsmodel, exception); } Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/XSDToJava.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/XSDToJava.java 2008-03-27 19:42:02 UTC (rev 6143) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/XSDToJava.java 2008-03-27 20:47:25 UTC (rev 6144) @@ -55,11 +55,8 @@ /** * Utility class that converts a XSD Type into a Java class */ - protected XSDTypeToJava xsdJava = new XSDTypeToJava(); + protected XSDTypeToJava xsdJava = new XSDTypeToJava(false); - private LiteralTypeMapping typeMapping = null; - - /* * @see org.jboss.ws.tools.interfaces.JavaToXSDIntf#generateSEI(java.lang.String, java.io.File, java.lang.String, boolean) */ @@ -105,7 +102,6 @@ String nsuri = type.getNamespace(); String tname = type.getName(); if (Constants.NS_SCHEMA_XSD.equals(nsuri) && "anyType".equals(tname)) continue; - checkXSDTypeToJava(); xsdJava.createJavaFile(ctype, dirloc, packageName, xsmodel); } else if (type instanceof XSSimpleTypeDefinition) @@ -115,7 +111,6 @@ String nsuri = type.getNamespace(); String tname = type.getName(); if (Constants.NS_SCHEMA_XSD.equals(nsuri) && "anyType".equals(tname)) continue; - checkXSDTypeToJava(); xsdJava.createJavaFile(stype, dirloc, packageName, xsmodel); } } @@ -147,7 +142,7 @@ */ public void setTypeMapping(LiteralTypeMapping tm) { - this.typeMapping = tm; + xsdJava.setTypeMapping(tm); } private void createJavaFile(XSComplexTypeDefinition type, File loc, @@ -157,16 +152,9 @@ String str = "Method should be used for anon complex types only"; if (type.getName() != null) throw new IllegalArgumentException(str); - checkXSDTypeToJava(); xsdJava.createJavaFile(type,outerElementName, loc,pkgname,schema, false); } - private void checkXSDTypeToJava() - { - if(xsdJava == null) - xsdJava = new XSDTypeToJava(); - xsdJava.setTypeMapping(typeMapping); - } } Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2008-03-27 19:42:02 UTC (rev 6143) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2008-03-27 20:47:25 UTC (rev 6144) @@ -76,6 +76,8 @@ private Set<String> generatedFiles = new HashSet<String>(); + protected boolean serializableTypes; + /** * List that is used for exception inheritance case wherein the variables * obtained from the base class go into the generated constructor alone and @@ -83,8 +85,9 @@ */ private Map<String, List> typeNameToBaseVARList = new HashMap<String, List>(); - public XSDTypeToJava() + public XSDTypeToJava(boolean serializableTypes) { + this.serializableTypes = serializableTypes; } public void createJavaFile(XSComplexTypeDefinition type, File loc, String pkgname, XSModel schema) throws IOException @@ -154,7 +157,8 @@ if (baseName == null && isExceptionType) baseName = "Exception"; - jwriter.createJavaFile(loc, fname, pkgname, vars, null, baseName, isExceptionType, typeNameToBaseVARList); + jwriter.createJavaFile(loc, fname, pkgname, vars, null, baseName, isExceptionType, serializableTypes, typeNameToBaseVARList); + } public void createJavaFile(XSSimpleTypeDefinition xsSimple, XSModel schema) throws IOException Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2008-03-27 19:42:02 UTC (rev 6143) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2008-03-27 20:47:25 UTC (rev 6144) @@ -81,6 +81,7 @@ private static final String RETURN_XML_NAME_ATTRIBUTE = "return-xml-name"; private static final String ONEWAY_ATTRIBUTE = "one-way"; private static final String PARAMETER_STYLE_ATTRIBUTE = "parameter-style"; + private static final String SERIALIZABLE_TYPES_ATTRIBUTE = "serializable-types"; private static final String STYLE_ATTRIBUTE = "style"; private static final String ENDPOINT_ATTRIBUTE = "endpoint"; private static final String NAME_ATTRIBUTE = "name"; @@ -179,7 +180,10 @@ String paramStyle = attrs.getValue(PARAMETER_STYLE_ATTRIBUTE); if (paramStyle != null) wsdl2jc.parameterStyle = paramStyle; - + String serializableTypes = attrs.getValue(SERIALIZABLE_TYPES_ATTRIBUTE); + if ("true".equals(serializableTypes) || "1".equals(serializableTypes)) + wsdl2jc.serializableTypes = true; + return wsdl2jc; } else if (GLOBAL_TAG.equals(localName)) Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2008-03-27 19:42:02 UTC (rev 6143) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2008-03-27 20:47:25 UTC (rev 6144) @@ -64,9 +64,10 @@ import org.jboss.ws.tools.interfaces.WebservicesXMLCreator; import org.jboss.ws.tools.mapping.MappingFileGenerator; import org.jboss.ws.tools.wsdl.WSDLWriter; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.DOMWriter; +import org.jboss.wsf.common.IOUtils; import org.jboss.wsf.common.JavaUtils; -import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.common.*; /** * Helper class used by the cmd line tool "jbossws" @@ -225,7 +226,7 @@ } JavaWriter writer = new JavaWriter(); - writer.createJavaFile(new File(outDir), name + ".java", packageName, vars, null, null, false, null); + writer.createJavaFile(new File(outDir), name + ".java", packageName, vars, null, null, false, false, null); JavaXmlTypeMapping type = mappingIndex.get(parameter.getXmlType()); if (type == null) @@ -262,6 +263,7 @@ WSDLToJava wsdlToJava = new WSDLToJava(); wsdlToJava.setTypeMapping(new LiteralTypeMapping()); + wsdlToJava.setGenerateSerializableTypes(w2jc.serializableTypes); WSDLDefinitions wsdl = null; try @@ -401,7 +403,7 @@ if (glc != null && glc.packageNamespaceMap != null) { Map<String, String> map = glc.packageNamespaceMap; - Iterator iter = map.keySet().iterator(); + Iterator<String> iter = map.keySet().iterator(); while (iter.hasNext()) { String pkg = (String)iter.next(); Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2008-03-27 19:42:02 UTC (rev 6143) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2008-03-27 20:47:25 UTC (rev 6144) @@ -188,43 +188,6 @@ return jwm; } - public void generateJavaSourceFileForRequestResponseStruct(File location, ServiceEndpointInterfaceMapping seim, JBossXSModel xsmodel, String typeNamespace) - throws IOException - { - WSDLUtils utils = WSDLUtils.getInstance(); - XSDTypeToJava xst = new XSDTypeToJava(); - xst.setTypeMapping(this.typeMapping); - xst.setPackageName(this.packageName); - ServiceEndpointMethodMapping[] mapArr = seim.getServiceEndpointMethodMappings(); - int len = mapArr != null ? mapArr.length : 0; - for (int i = 0; i < len; i++) - { - ServiceEndpointMethodMapping mm = mapArr[i]; - String opname = mm.getJavaMethodName(); - String sei = seim.getServiceEndpointInterface(); - String plainClassName = utils.getJustClassName(sei); - String classname = plainClassName + "_" + opname + "_RequestStruct"; - List<VAR> listInputs = new ArrayList<VAR>(); - MethodParamPartsMapping[] mppmarr = mm.getMethodParamPartsMappings(); - int lenmppmarr = mppmarr != null ? mppmarr.length : 0; - for (int j = 0; j < lenmppmarr; j++) - { - listInputs.addAll(xst.getVARList((XSComplexTypeDefinition)xsmodel.getTypeDefinition(opname, typeNamespace), xsmodel, false)); - } - JavaWriter jw = new JavaWriter(); - jw.createJavaFile(location, classname, packageName, listInputs, null, null, false, null); - classname = plainClassName + "_" + opname + "_ResponseStruct"; - XSTypeDefinition xt = xsmodel.getTypeDefinition(opname + "Response", typeNamespace); - List<VAR> listOutputs = new ArrayList<VAR>(); - if (xt instanceof XSSimpleTypeDefinition) - { - listOutputs.add(new VAR(Constants.DEFAULT_RPC_RETURN_NAME, xt.getName(), false)); - } - else listOutputs.addAll(xst.getVARList((XSComplexTypeDefinition)xt, xsmodel, false)); - jw.createJavaFile(location, classname, packageName, listOutputs, null, null, false, null); - } - } - //PRIVATE METHODS private boolean isServerSideGeneration() { Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/resources/schema/jbossws-tool_1_0.xsd =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/resources/schema/jbossws-tool_1_0.xsd 2008-03-27 19:42:02 UTC (rev 6143) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/resources/schema/jbossws-tool_1_0.xsd 2008-03-27 20:47:25 UTC (rev 6144) @@ -247,6 +247,11 @@ </xs:restriction> </xs:simpleType> </xs:attribute> + <xs:attribute name="serializable-types" type="xs:boolean" use="optional"> + <xs:annotation> + <xs:documentation>Should generated types implement java.io.Serializable, default to false.</xs:documentation> + </xs:annotation> + </xs:attribute> </xs:complexType> <xs:complexType name="parameterType"> <xs:attribute name="type" use="required"> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1278 (from rev 6142, stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1278) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-03-27 19:25:42 UTC (rev 6142) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-03-27 20:47:25 UTC (rev 6144) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.tools.jbws1278; - -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 feature: - - * - * @see http://jira.jboss.com/jira/browse/JBWS-1278 - * - * @author darran.lofthouse(a)jboss.com - * @since Mar 15, 2008 - */ -public class JBWS1278TestCase extends JBossWSTest -{ - - public void testDocumentLiteral() throws Exception - { - generateScenario("doclit"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1278/" + scenario; - String toolsDir = "tools/jbws1278/" + 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/jbws1278/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1278"); - 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/jbws1278/JBWS1278TestCase.java (from rev 6142, stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-03-27 20:47:25 UTC (rev 6144) @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.tools.jbws1278; + +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 feature: - + * + * @see http://jira.jboss.com/jira/browse/JBWS-1278 + * + * @author darran.lofthouse(a)jboss.com + * @since Mar 15, 2008 + */ +public class JBWS1278TestCase extends JBossWSTest +{ + + public void testDocumentLiteral() throws Exception + { + generateScenario("doclit"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1278/" + scenario; + String toolsDir = "tools/jbws1278/" + 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/jbws1278/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1278"); + 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/resources/tools/jbws1278 (from rev 6142, stack/native/trunk/src/test/resources/tools/jbws1278) Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit (from rev 6142, stack/native/trunk/src/test/resources/tools/jbws1278/doclit) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/Person.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1278/doclit/Person.java 2008-03-27 19:25:42 UTC (rev 6142) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/Person.java 2008-03-27 20:47:25 UTC (rev 6144) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Mar 27 15:40:15 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.jbws1278; - - -public class Person implements java.io.Serializable -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(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/jbws1278/doclit/Person.java (from rev 6142, stack/native/trunk/src/test/resources/tools/jbws1278/doclit/Person.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/Person.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/Person.java 2008-03-27 20:47:25 UTC (rev 6144) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Mar 27 15:40:15 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.jbws1278; + + +public class Person implements java.io.Serializable +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(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/jbws1278/doclit/PhoneBook.wsdl =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1278/doclit/PhoneBook.wsdl 2008-03-27 19:25:42 UTC (rev 6142) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/PhoneBook.wsdl 2008-03-27 20:47:25 UTC (rev 6144) @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1278' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1278/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1278' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1278/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1278/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - - <portType name='PhoneBookPort'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBookPort'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal' parts='parameters'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - - <service name='PhoneBookService'> - <port binding='tns:PhoneBookBinding' name='PhoneBook'> - <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/jbws1278/doclit/PhoneBook.wsdl (from rev 6142, stack/native/trunk/src/test/resources/tools/jbws1278/doclit/PhoneBook.wsdl) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/PhoneBook.wsdl (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/PhoneBook.wsdl 2008-03-27 20:47:25 UTC (rev 6144) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1278' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1278/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1278' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1278/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1278/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + + <portType name='PhoneBookPort'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBookPort'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal' parts='parameters'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + + <service name='PhoneBookService'> + <port binding='tns:PhoneBookBinding' name='PhoneBook'> + <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/jbws1278/doclit/PhoneBookPort.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1278/doclit/PhoneBookPort.java 2008-03-27 19:25:42 UTC (rev 6142) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/PhoneBookPort.java 2008-03-27 20:47:25 UTC (rev 6144) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Mar 27 15:40:15 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.jbws1278; -public interface PhoneBookPort extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1278.TelephoneNumber lookup(org.jboss.test.ws.jbws1278.Person lookup) throws java.rmi.RemoteException; -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/PhoneBookPort.java (from rev 6142, stack/native/trunk/src/test/resources/tools/jbws1278/doclit/PhoneBookPort.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/PhoneBookPort.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/PhoneBookPort.java 2008-03-27 20:47:25 UTC (rev 6144) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Mar 27 15:40:15 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.jbws1278; +public interface PhoneBookPort extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1278.TelephoneNumber lookup(org.jboss.test.ws.jbws1278.Person lookup) throws java.rmi.RemoteException; +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/TelephoneNumber.java =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1278/doclit/TelephoneNumber.java 2008-03-27 19:25:42 UTC (rev 6142) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/TelephoneNumber.java 2008-03-27 20:47:25 UTC (rev 6144) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Mar 27 15:40:15 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.jbws1278; - - -public class TelephoneNumber implements java.io.Serializable -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(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/jbws1278/doclit/TelephoneNumber.java (from rev 6142, stack/native/trunk/src/test/resources/tools/jbws1278/doclit/TelephoneNumber.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/TelephoneNumber.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/TelephoneNumber.java 2008-03-27 20:47:25 UTC (rev 6144) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Mar 27 15:40:15 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.jbws1278; + + +public class TelephoneNumber implements java.io.Serializable +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(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/jbws1278/doclit/jaxrpc-mapping.xml =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1278/doclit/jaxrpc-mapping.xml 2008-03-27 19:25:42 UTC (rev 6142) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/jaxrpc-mapping.xml 2008-03-27 20:47:25 UTC (rev 6144) @@ -1,67 +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.jbws1278</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1278/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1278</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1278</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1278.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1278/types'>typeNS:... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1278.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1278/types'>typeNS:... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1278.PhoneBookService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1278'>serviceNS:... - <port-mapping> - <port-name>PhoneBook</port-name> - <java-port-name>PhoneBook</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1278.PhoneBookPort</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1278'>portTypeN... - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1278'>bindingNS:... - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1278.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1278'>wsdlMsgNS:... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1278.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1278'>wsdlMsgNS:... - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/jaxrpc-mapping.xml (from rev 6142, stack/native/trunk/src/test/resources/tools/jbws1278/doclit/jaxrpc-mapping.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/jaxrpc-mapping.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/jaxrpc-mapping.xml 2008-03-27 20:47:25 UTC (rev 6144) @@ -0,0 +1,67 @@ +<?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.jbws1278</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1278/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1278</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1278</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1278.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1278/types'>typeNS:... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1278.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1278/types'>typeNS:... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1278.PhoneBookService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1278'>serviceNS:... + <port-mapping> + <port-name>PhoneBook</port-name> + <java-port-name>PhoneBook</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1278.PhoneBookPort</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1278'>portTypeN... + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1278'>bindingNS:... + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1278.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1278'>wsdlMsgNS:... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1278.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1278'>wsdlMsgNS:... + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/wstools-config.xml =================================================================== --- stack/native/trunk/src/test/resources/tools/jbws1278/doclit/wstools-config.xml 2008-03-27 19:25:42 UTC (rev 6142) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/wstools-config.xml 2008-03-27 20:47:25 UTC (rev 6144) @@ -1,7 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1278/doclit/PhoneBook.wsdl" - parameter-style="bare" - serializable-types="true"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/wstools-config.xml (from rev 6142, stack/native/trunk/src/test/resources/tools/jbws1278/doclit/wstools-config.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/wstools-config.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1278/doclit/wstools-config.xml 2008-03-27 20:47:25 UTC (rev 6144) @@ -0,0 +1,7 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1278/doclit/PhoneBook.wsdl" + parameter-style="bare" + serializable-types="true"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>