Author: darran.lofthouse(a)jboss.com Date: 2008-08-04 09:08:09 -0400 (Mon, 04 Aug 2008) New Revision: 8006 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1217/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/BaseException.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/Test.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/TestException.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/wstools-config.xml Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/BaseException.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/Test.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/TestException.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/wstools-config.xml 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/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/MappingFileGeneratorHelper.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/test/resources/tools/jbws1441/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml Log: [JBPAPP-904] WSDLtoJava Namespace to package mapping does not support multiple namespaces. 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-08-04 12:45:05 UTC (rev 8005) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2008-08-04 13:08:09 UTC (rev 8006) @@ -205,7 +205,7 @@ if (namespacePackageMap == null) namespacePackageMap = new HashMap<String, String>(); String pkg = iter.next(); - namespacePackageMap.put(map.get(pkg), pkg); + namespacePackageMap.put(pkg, map.get(pkg)); } } @@ -326,7 +326,6 @@ JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); QName faultXMLName = intfFault.getElement(); QName faultXMLType = intfFault.getXmlType(); - XSElementDeclaration xe = xsmodel.getElementDeclaration(faultXMLName.getLocalPart(), faultXMLName.getNamespaceURI()); XSTypeDefinition xt = xe.getTypeDefinition(); if (!xt.getAnonymous()) @@ -338,7 +337,8 @@ if (cl == null) { String faultTypeName = (!xt.getAnonymous()) ? faultXMLType.getLocalPart() : faultXMLName.getLocalPart(); - buf.append(seiPkgName + "." + JavaUtils.capitalize(faultTypeName)); + String packageName = getPackageName(xt.getNamespace()); + buf.append(packageName + "." + JavaUtils.capitalize(faultTypeName)); } else buf.append(cl.getName()); buf.append(","); @@ -534,7 +534,6 @@ if (unwrappedElement) { buf.append(tempBuf); - // We need a wrapper class generated generateJavaSource(wrapper, WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()), containingElement); @@ -639,11 +638,12 @@ className = className.substring(1); className = ToolsUtils.convertInvalidCharacters(className); className = utils.firstLetterUpperCase(className); - className = seiPkgName + "." + className + arraySuffix; + String packageName = getPackageName(xt.getNamespace()); + className = packageName + "." + className + arraySuffix; if (holder) { - className = holderWriter.getOrCreateHolder(className, getLocationForJavaGeneration()); + className = holderWriter.getOrCreateHolder(className, getLocationForJavaGeneration(packageName)); } buf.append(className); @@ -763,7 +763,8 @@ className = className.substring(1); className = ToolsUtils.convertInvalidCharacters(className); className = utils.firstLetterUpperCase(className); - return seiPkgName + "." + className + arraySuffix; + String packageName = getPackageName(xt.getNamespace()); + return packageName + "." + className + arraySuffix; } if (cls.isArray()) @@ -807,9 +808,9 @@ return paramName; } - private File getLocationForJavaGeneration() + private File getLocationForJavaGeneration(String packageName) { - return new File(this.directoryToGenerate + "/" + seiPkgName.replace(".", "/")); + return new File(this.directoryToGenerate + "/" + packageName.replace('.', '/')); } private void generateJavaSource(XSComplexTypeDefinition xt, JBossXSModel xsmodel, String containingElement) throws IOException @@ -819,10 +820,17 @@ private void generateJavaSource(XSComplexTypeDefinition xt, JBossXSModel xsmodel, String containingElement, boolean exception) throws IOException { - XSDTypeToJava xtj = new XSDTypeToJava(generateSerializableTypes); + XSDTypeToJava xtj = new XSDTypeToJava(namespacePackageMap, generateSerializableTypes); xtj.setTypeMapping(this.typeMapping); - xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, getLocationForJavaGeneration(), seiPkgName, xsmodel, exception); + String targetNS = wsdl.getTargetNamespace(); + String tgtNS = xt.getNamespace(); + String packName = getPackageName(tgtNS); + if(!tgtNS.equals(targetNS)) + { + File dir = utils.createPackage(this.directoryToGenerate, packName); + } + xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, this.directoryToGenerate, packName, xsmodel, exception); } public void setParameterStyle(String paramStyle) @@ -830,4 +838,19 @@ this.parameterStyle = paramStyle; } + private String getPackageName(String targetNamespace) + { + //Get it from global config + if (namespacePackageMap != null) + { + String pkg = namespacePackageMap.get(targetNamespace); + if (pkg != null) + { + return pkg; + } + } + //return NamespacePackageMapping.getJavaPackageName(targetNamespace); + //Default behaviour will always generate all classes in the SEI package only + return seiPkgName; + } } 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-08-04 12:45:05 UTC (rev 8005) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/XSDToJava.java 2008-08-04 13:08:09 UTC (rev 8006) @@ -55,7 +55,8 @@ /** * Utility class that converts a XSD Type into a Java class */ - protected XSDTypeToJava xsdJava = new XSDTypeToJava(false); + protected final XSDTypeToJava xsdJava = new XSDTypeToJava(null, false); + /* * @see org.jboss.ws.tools.interfaces.JavaToXSDIntf#generateSEI(java.lang.String, java.io.File, java.lang.String, boolean) @@ -66,9 +67,7 @@ { XSLoader xsloader = SchemaUtils.getInstance().getXSLoader(); XSModel xsmodel = xsloader.loadURI(schemaFile); - - if (createPackageDir) dirloc = utils.createPackage(dirloc.getAbsolutePath(), packageName); - generateJavaSource(xsmodel, dirloc, packageName); + generateJavaSource(xsmodel, dirloc, packageName, createPackageDir); } @@ -79,7 +78,10 @@ boolean createPackageDir) throws IOException { - if (createPackageDir) dirloc = utils.createPackage(dirloc.getAbsolutePath(), packageName); + if (createPackageDir) + { + utils.createPackage(dirloc.getAbsolutePath(), packageName); + } generateJavaSource(xsmodel, dirloc, packageName); } @@ -102,7 +104,7 @@ String nsuri = type.getNamespace(); String tname = type.getName(); if (Constants.NS_SCHEMA_XSD.equals(nsuri) && "anyType".equals(tname)) continue; - xsdJava.createJavaFile(ctype, dirloc, packageName, xsmodel); + xsdJava.createJavaFile(ctype, dirloc.getPath(), packageName, xsmodel); } else if (type instanceof XSSimpleTypeDefinition) { @@ -111,7 +113,7 @@ String nsuri = type.getNamespace(); String tname = type.getName(); if (Constants.NS_SCHEMA_XSD.equals(nsuri) && "anyType".equals(tname)) continue; - xsdJava.createJavaFile(stype, dirloc, packageName, xsmodel); + xsdJava.createJavaFile(stype, dirloc.getPath(), packageName, xsmodel); } } @@ -152,7 +154,7 @@ String str = "Method should be used for anon complex types only"; if (type.getName() != null) throw new IllegalArgumentException(str); - xsdJava.createJavaFile(type,outerElementName, loc,pkgname,schema, false); + xsdJava.createJavaFile(type,outerElementName,loc.getPath(),pkgname,schema, false); } } 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-08-04 12:45:05 UTC (rev 8005) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2008-08-04 13:08:09 UTC (rev 8006) @@ -71,13 +71,15 @@ //Additional variables protected String containingElement = ""; protected String fname = ""; - protected File loc = null; + protected String loc = null; protected String pkgname = ""; private Set<String> generatedFiles = new HashSet<String>(); protected boolean serializableTypes; + protected Map<String, String> namespacePackageMap = null; + /** * List that is used for exception inheritance case wherein the variables * obtained from the base class go into the generated constructor alone and @@ -85,12 +87,13 @@ */ private Map<String, List> typeNameToBaseVARList = new HashMap<String, List>(); - public XSDTypeToJava(boolean serializableTypes) + public XSDTypeToJava(Map<String, String> map, boolean serializableTypes) { + this.namespacePackageMap = map; this.serializableTypes = serializableTypes; } - public void createJavaFile(XSComplexTypeDefinition type, File loc, String pkgname, XSModel schema) throws IOException + public void createJavaFile(XSComplexTypeDefinition type, String loc, String pkgname, XSModel schema) throws IOException { if (typeMapping == null) throw new WSException("TypeMapping has not been set"); @@ -103,7 +106,7 @@ createJavaFile(type, schema, false); } - public void createJavaFile(XSComplexTypeDefinition type, String containingElement, File loc, String pkgname, XSModel schema, boolean isExceptionType) + public void createJavaFile(XSComplexTypeDefinition type, String containingElement, String loc, String pkgname, XSModel schema, boolean isExceptionType) throws IOException { if (typeMapping == null) @@ -118,7 +121,7 @@ createJavaFile(type, schema, isExceptionType); } - public void createJavaFile(XSSimpleTypeDefinition type, File loc, String pkgname, XSModel schema) throws IOException + public void createJavaFile(XSSimpleTypeDefinition type, String loc, String pkgname, XSModel schema) throws IOException { if (typeMapping == null) throw new WSException("TypeMapping has not been set"); @@ -156,9 +159,16 @@ vars = this.getVARList(type, schema, isExceptionType); if (baseName == null && isExceptionType) + { baseName = "Exception"; - jwriter.createJavaFile(loc, fname, pkgname, vars, null, baseName, isExceptionType, serializableTypes, typeNameToBaseVARList); - + } + else if (baseName != null) + { + baseName = getPackageName(baseType.getNamespace()) + "." + baseName; + } + String packageName = getPackageName(type.getNamespace()); + jwriter.createJavaFile(getLocationForJavaGeneration(packageName), fname, packageName, vars, null, baseName, isExceptionType, serializableTypes, + typeNameToBaseVARList); } public void createJavaFile(XSSimpleTypeDefinition xsSimple, XSModel schema) throws IOException @@ -175,7 +185,8 @@ if (slist != null && slist.getLength() > 0) { //Enumerated List - jwriter.createJavaFileForEnumeratedValues(fname, slist, loc, pkgname, xsSimple); + String packageName = getPackageName(xsSimple.getNamespace()); + jwriter.createJavaFileForEnumeratedValues(fname, slist, getLocationForJavaGeneration(packageName), packageName, xsSimple); } else { @@ -272,6 +283,16 @@ this.typeMapping = tm; } + public Map<String, String> getNamespacePackageMap() + { + return namespacePackageMap; + } + + public void setNamespacePackageMap(Map<String, String> map) + { + this.namespacePackageMap = map; + } + //PRIVATE METHODS private void handleContentTypeElementsWithDerivationRestriction(XSComplexTypeDefinition type, XSModel schema, List vars, XSParticle xsparticle) throws IOException @@ -429,7 +450,7 @@ XSSimpleTypeDefinition xstype = att.getTypeDefinition(); QName qn = SchemaUtils.handleSimpleType(xstype); boolean primitive = obj.getRequired(); - VAR v = createVAR(qn, att.getName(), pkgname, primitive); + VAR v = createVAR(qn, att.getName(), getPackageName(xstype.getNamespace()), primitive); if (vars == null) vars = new ArrayList(); vars.add(v); @@ -569,7 +590,7 @@ { // it is a composite type QName qn = new QName(origType.getNamespace(), origType.getName()); - VAR vr = createVAR(qn, elem, (XSComplexTypeDefinition)xstypedef, tname, pkgname, arrayType); + VAR vr = createVAR(qn, elem, (XSComplexTypeDefinition)xstypedef, tname, getPackageName(origType.getNamespace()), arrayType); vars.add(vr); return vars; } @@ -608,7 +629,7 @@ this.fname = tempfname; // Bypass rest of processing QName anonqn = new QName(anonName); - VAR vr = createVAR(anonqn, elem, xsc, tname, pkgname, arrayType); + VAR vr = createVAR(anonqn, elem, xsc, tname, getPackageName(xsc.getNamespace()), arrayType); vars.add(vr); return vars; } @@ -647,7 +668,7 @@ this.fname = temp; } - VAR v = createVAR(qn, elem, xstypedef, tname, pkgname, arrayType); + VAR v = createVAR(qn, elem, xstypedef, tname, getPackageName(xstypedef.getNamespace()), arrayType); vars.add(v); } return vars; @@ -768,4 +789,25 @@ isArrayType = arrayType; } } + + private File getLocationForJavaGeneration(String packageName) + { + File locdir = new File(this.loc); + locdir = wsdlUtils.createPackage(locdir.getAbsolutePath(), packageName); + return locdir; + } + + private String getPackageName(String targetNamespace) + { + //Get it from global config + if (namespacePackageMap != null) + { + String pkg = namespacePackageMap.get(targetNamespace); + if (pkg != null) + { + return pkg; + } + } + return this.pkgname; + } } 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-08-04 12:45:05 UTC (rev 8005) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2008-08-04 13:08:09 UTC (rev 8006) @@ -255,7 +255,7 @@ { String pkgname = attrs.getValue(PACKAGE_ATTRIBUTE); String ns = attrs.getValue(NAMESPACE_ATTRIBUTE); - globalc.packageNamespaceMap.put(pkgname, ns); + globalc.packageNamespaceMap.put(ns, pkgname); } return globalc; } 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-08-04 12:45:05 UTC (rev 8005) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-08-04 13:08:09 UTC (rev 8006) @@ -23,8 +23,10 @@ import java.beans.Introspector; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import javax.xml.namespace.QName; @@ -76,6 +78,7 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; import org.jboss.ws.tools.HeaderUtil; +import org.jboss.ws.tools.NamespacePackageMapping; import org.jboss.ws.tools.RPCSignature; import org.jboss.ws.tools.ToolsUtils; import org.jboss.ws.tools.WSToolsConstants; @@ -97,6 +100,7 @@ private String typeNamespace; private String serviceName = null; private String packageName = null; + private Map<String, String> namespacePackageMap = new HashMap<String,String>(); private Set<String> registeredTypes = new HashSet<String>(); private Set<String> registeredExceptions = new HashSet<String>(); @@ -107,11 +111,13 @@ private String parameterStyle; - public MappingFileGeneratorHelper(WSDLDefinitions wsdl, String sname, String pname, Class seiClass, LiteralTypeMapping ltm, String paramStyle) + public MappingFileGeneratorHelper(WSDLDefinitions wsdl, String sname, Map<String, String> map, Class seiClass, LiteralTypeMapping ltm, String paramStyle) { this.wsdlDefinitions = wsdl; this.serviceName = sname; - this.packageName = pname; + String targetNS = wsdl.getTargetNamespace(); + packageName = NamespacePackageMapping.getJavaPackageName(targetNS); + this.namespacePackageMap = map; this.typeMapping = ltm; this.wsdlStyle = utils.getWSDLStyle(wsdl); @@ -150,7 +156,7 @@ String prefix = WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_SERVICE_PREFIX; ServiceInterfaceMapping sim = new ServiceInterfaceMapping(jwm); String className = ToolsUtils.firstLetterUpperCase(javaServiceName); - sim.setServiceInterface(packageName + "." + className); + sim.setServiceInterface(getPackageName(targetNS) + "." + className); sim.setWsdlServiceName(new QName(targetNS, serviceName, prefix)); WSDLEndpoint[] endpoints = ser.getEndpoints(); @@ -198,7 +204,7 @@ ServiceEndpointInterfaceMapping seim = new ServiceEndpointInterfaceMapping(jwm); String className = ToolsUtils.firstLetterUpperCase(javaPortName); - seim.setServiceEndpointInterface(packageName + "." + className); + seim.setServiceEndpointInterface(getPackageName(targetNS) + "." + className); seim.setWsdlPortType(new QName(targetNS, portName, "portTypeNS")); seim.setWsdlBinding(new QName(targetNS, bindName, "bindingNS")); constructServiceEndpointMethodMapping(seim, wsdlintf); @@ -317,11 +323,15 @@ //Check it is a holder. if (wiop.getInputByPartName(xmlName.getLocalPart()) == null) { - + String nameSpace = null; + if (xt != null) + { + nameSpace = xt.getNamespace(); + } if (xt instanceof XSSimpleTypeDefinition) xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); - String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive); + String javaType = getJavaTypeAsString(xmlName, xmlType, nameSpace, array, primitive); if ((isDocStyle() == false && "void".equals(javaType)) == false) { @@ -458,12 +468,20 @@ QName xmlType = returnParameter.getType(); XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); + String nameSpace = null; + if (xt != null) + { + nameSpace = xt.getNamespace(); + } if (xt instanceof XSSimpleTypeDefinition) + { xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); + } WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm); - wrvm.setMethodReturnValue(getJavaTypeAsString(xmlName, xmlType, false, true)); + wrvm.setMethodReturnValue(getJavaTypeAsString(xmlName, xmlType, nameSpace, false, true)); QName messageName = WSDLUtils.getWsdl11Output(wiop).getMessageName(); + wrvm.setWsdlMessage(new QName(messageName.getNamespaceURI(), messageName.getLocalPart(), WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_WSDL_MESSAGE_NS)); wrvm.setWsdlMessagePartName(partName); semm.setWsdlReturnValueMapping(wrvm); @@ -527,7 +545,7 @@ XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); addJavaXMLTypeMap(xt, xmlName.getLocalPart(), "", "", jwm, true); - String exceptionType = getJavaTypeAsString(null, xmlType, false, true); + String exceptionType = getJavaTypeAsString(null, xmlType, xt.getNamespace(), false, true); if (registeredExceptions.contains(exceptionType) == false) { @@ -696,9 +714,17 @@ if (xt instanceof XSComplexTypeDefinition) { - XSModelGroup xm = null; XSComplexTypeDefinition xc = (XSComplexTypeDefinition)xt; + XSTypeDefinition baseType = xc.getBaseType(); + short der = xc.getDerivationMethod(); + + if ((baseType != null) && !utils.isBaseTypeIgnorable(baseType, xc)) + { + addJavaXMLTypeMap(baseType, baseType.getName(), "", "", jwm, skipWrapperArray); //Recurse for base types + } + + // handleContentTypeElementsWithDerivationNone if (xc.getContentType() != XSComplexTypeDefinition.CONTENTTYPE_EMPTY) { XSParticle xp = xc.getParticle(); @@ -720,7 +746,7 @@ if (localName == null) { String tempName = containingElement + ToolsUtils.firstLetterUpperCase(name); - javaType = getJavaTypeAsString(null, new QName(tempName), false, true); + javaType = getJavaTypeAsString(null, new QName(tempName), xt.getNamespace(), false, true); StringBuilder temp = new StringBuilder(); if (containingType != null && containingType.length() > 0) temp.append(">").append(containingType); @@ -730,7 +756,7 @@ } else { - javaType = getJavaTypeAsString(null, new QName(localName), false, true); + javaType = getJavaTypeAsString(null, new QName(localName), xt.getNamespace(), false, true); jxtm.setRootTypeQName(new QName(xt.getNamespace(), xt.getName(), "typeNS")); } @@ -782,12 +808,15 @@ { XSTerm xsterm = ((XSParticle)xo.item(i)).getTerm(); if (xsterm instanceof XSModelGroup) + { addVariableMappingMap((XSModelGroup)xsterm, jxtm, javaType); + } else if (xsterm instanceof XSElementDeclaration) { 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); @@ -841,7 +870,7 @@ } } - private String getJavaTypeAsString(QName xmlName, QName xmlType, boolean array, boolean primitive) + private String getJavaTypeAsString(QName xmlName, QName xmlType, String targetNS, boolean array, boolean primitive) { String jtype = null; @@ -886,7 +915,7 @@ if (className.charAt(0) == '>') className = className.substring(1); className = ToolsUtils.convertInvalidCharacters(className); - jtype = packageName + "." + utils.firstLetterUpperCase(className); + jtype = getPackageName(targetNS) + "." + utils.firstLetterUpperCase(className); } else { @@ -934,7 +963,7 @@ String targetNS = wsdlDefinitions.getTargetNamespace(); MethodParamPartsMapping mppm = new MethodParamPartsMapping(semm); mppm.setParamPosition(paramPosition); - String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive); + String javaType = getJavaTypeAsString(xmlName, xmlType, xmlType.getNamespaceURI(), array, primitive); mppm.setParamType(javaType); //WSDL Message Mapping @@ -946,4 +975,19 @@ mppm.setWsdlMessageMapping(wmm); return mppm; } + + private String getPackageName(String targetNamespace) + { + //Get it from global config + if (namespacePackageMap != null) + { + String pkg = namespacePackageMap.get(targetNamespace); + if (pkg != null) + { + return pkg; + } + } + //Default behaviour will always generate all classes in the SEI package only + return packageName; + } } 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-08-04 12:45:05 UTC (rev 8005) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2008-08-04 13:08:09 UTC (rev 8006) @@ -310,7 +310,8 @@ if (w2jc.mappingFileNeeded) { MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new LiteralTypeMapping()); - mgf.setPackageName(getPackageName(wsdl, glc)); + if (glc != null && glc.packageNamespaceMap != null) + mgf.setNamespacePackageMap(glc.packageNamespaceMap); mgf.setServiceName(wsdl.getServices()[0].getName().getLocalPart()); mgf.setParameterStyle(w2jc.parameterStyle); @@ -399,21 +400,16 @@ private String getPackageName(WSDLDefinitions wsdl, GlobalConfig glc) { String targetNamespace = wsdl.getTargetNamespace(); - //Get it from global config + //Get it from global config if it is overriden if (glc != null && glc.packageNamespaceMap != null) { - Map<String, String> map = glc.packageNamespaceMap; - Iterator<String> iter = map.keySet().iterator(); - while (iter.hasNext()) + String pkg = glc.packageNamespaceMap.get(targetNamespace); + if (pkg != null) { - String pkg = (String)iter.next(); - String ns = map.get(pkg); - if (ns.equals(targetNamespace)) - return pkg; + return pkg; } } - - return NamespacePackageMapping.getJavaPackageName(wsdl.getTargetNamespace()); + return NamespacePackageMapping.getJavaPackageName(targetNamespace); } private void createDir(String path) 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-08-04 12:45:05 UTC (rev 8005) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2008-08-04 13:08:09 UTC (rev 8006) @@ -24,7 +24,11 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; import java.util.List; +import java.util.Map; +import java.util.Set; import javax.xml.rpc.encoding.TypeMapping; @@ -42,6 +46,7 @@ import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.tools.JavaWriter; +import org.jboss.ws.tools.NamespacePackageMapping; import org.jboss.ws.tools.XSDTypeToJava; import org.jboss.ws.tools.XSDTypeToJava.VAR; import org.jboss.ws.tools.helpers.MappingFileGeneratorHelper; @@ -68,9 +73,9 @@ protected WSDLDefinitions wsdlDefinitions; /** - * Package Name to override + * Package Names to override */ - protected String packageName; + protected Map<String, String> namespacePackageMap = new HashMap<String,String>(); /** * Service Name @@ -78,6 +83,11 @@ protected String serviceName; /** + * SEI Package Name to override + */ + protected String packageName; + + /** * Service Endpoint Interface (if available). * <br/> Will be available for server side generation (Java -> WSDL) */ @@ -93,6 +103,8 @@ public MappingFileGenerator(WSDLDefinitions wsdl, TypeMapping typeM) { this.wsdlDefinitions = wsdl; + String targetNS = wsdl.getTargetNamespace(); + packageName = NamespacePackageMapping.getJavaPackageName(targetNS); this.typeMapping = (LiteralTypeMapping)typeM; } @@ -122,6 +134,17 @@ this.packageName = packageName; } + public Map<String, String> getNamespacePackageMap() + { + return namespacePackageMap; + } + + + public void setNamespacePackageMap(Map<String, String> map) + { + namespacePackageMap = map; + } + /** * @return @see #serviceName */ @@ -156,7 +179,7 @@ */ public JavaWsdlMapping generate() throws IOException { - MappingFileGeneratorHelper helper = new MappingFileGeneratorHelper(this.wsdlDefinitions, this.serviceName, this.packageName, this.serviceEndpointInterface, + MappingFileGeneratorHelper helper = new MappingFileGeneratorHelper(this.wsdlDefinitions, this.serviceName, this.namespacePackageMap, this.serviceEndpointInterface, this.typeMapping, this.parameterStyle); JavaWsdlMapping jwm = new JavaWsdlMapping(); @@ -182,9 +205,23 @@ //Construct package mapping //Check if the user has provided a typeNamespace if (typeNamespace != null && typeNamespace.equals(targetNS) == false || isServerSideGeneration()) - jwm.addPackageMapping(helper.constructPackageMapping(jwm, packageName, typeNamespace)); - jwm.addPackageMapping(helper.constructPackageMapping(jwm, packageName, targetNS)); + jwm.addPackageMapping(helper.constructPackageMapping(jwm, getPackageName(typeNamespace), typeNamespace)); + jwm.addPackageMapping(helper.constructPackageMapping(jwm, getPackageName(targetNS), targetNS)); + if (namespacePackageMap != null) + { + Set<String> keys = namespacePackageMap.keySet(); + Iterator<String> iter = keys.iterator(); + while (iter != null && iter.hasNext()) + { + String ns = iter.next(); + if (jwm.getPackageNameForNamespaceURI(ns) == null) + { + jwm.addPackageMapping(helper.constructPackageMapping(jwm, namespacePackageMap.get(ns), ns)); + } + } + } + return jwm; } @@ -193,4 +230,19 @@ { return this.serviceEndpointInterface != null; } + + private String getPackageName(String targetNamespace) + { + //Get it from global config + if (namespacePackageMap != null) + { + String pkg = namespacePackageMap.get(targetNamespace); + if (pkg != null) + { + return pkg; + } + } + //Default behaviour will always generate all classes in the SEI package only + return packageName; + } } Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1217 (from rev 8005, stack/native/branches/dlofthouse/JBPAPP-904/src/test/java/org/jboss/test/ws/tools/jbws1217) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-904/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-08-04 12:45:05 UTC (rev 8005) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-08-04 13:08:09 UTC (rev 8006) @@ -1,64 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.tools.jbws1217; - -import java.io.File; - -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; - -/** - * JBWS-1217 - Test the support of multiple namespace to multiple - * package generation of tools. - * - * @author mageshbk(a)jboss.com - * @since 02 Jan 2008 - */ -public class JBWS1217TestCase extends JBossWSTest -{ - public final void testMultiplePackageNameSpace() throws Exception - { - String resourceDir = "resources/tools/jbws1217"; - String toolsDir = "tools/jbws1217"; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - - compareSource(resourceDir + "/Test.java", toolsDir + "/org/jboss/test/ws/jbws1217/Test.java"); - compareSource(resourceDir + "/TestException.java", toolsDir + "/org/jboss/test/ws/jbws1217/exception/TestException.java"); - compareSource(resourceDir + "/BaseException.java", toolsDir + "/org/jboss/test/ws/jbws1217/base/BaseException.java"); - - 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/jbws1217/JBWS1217TestCase.java (from rev 8005, stack/native/branches/dlofthouse/JBPAPP-904/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-08-04 13:08:09 UTC (rev 8006) @@ -0,0 +1,64 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.tools.jbws1217; + +import java.io.File; + +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; + +/** + * JBWS-1217 - Test the support of multiple namespace to multiple + * package generation of tools. + * + * @author mageshbk(a)jboss.com + * @since 02 Jan 2008 + */ +public class JBWS1217TestCase extends JBossWSTest +{ + public final void testMultiplePackageNameSpace() throws Exception + { + String resourceDir = "resources/tools/jbws1217"; + String toolsDir = "tools/jbws1217"; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + + compareSource(resourceDir + "/Test.java", toolsDir + "/org/jboss/test/ws/jbws1217/Test.java"); + compareSource(resourceDir + "/TestException.java", toolsDir + "/org/jboss/test/ws/jbws1217/exception/TestException.java"); + compareSource(resourceDir + "/BaseException.java", toolsDir + "/org/jboss/test/ws/jbws1217/base/BaseException.java"); + + 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/jbws1217 (from rev 8005, stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/BaseException.java =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/BaseException.java 2008-08-04 12:45:05 UTC (rev 8005) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/BaseException.java 2008-08-04 13:08:09 UTC (rev 8006) @@ -1,18 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Mar 12 14:18:42 IST 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.jbws1217.base; - - -public class BaseException - extends Exception{ -public BaseException(){ -} -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/BaseException.java (from rev 8005, stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/BaseException.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/BaseException.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/BaseException.java 2008-08-04 13:08:09 UTC (rev 8006) @@ -0,0 +1,18 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Mar 12 14:18:42 IST 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.jbws1217.base; + + +public class BaseException + extends Exception{ +public BaseException(){ +} +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl 2008-08-04 12:45:05 UTC (rev 8005) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl 2008-08-04 13:08:09 UTC (rev 8006) @@ -1,144 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws.jbws1217' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://com.other.base' xmlns:ns2='http://com.other.exception' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws.jbws1217' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://com.other.exception' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns2='http://com.other.base' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://com.other.exception' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <import namespace='http://com.other.base'/> - <complexType name='TestException'> - <complexContent> - <extension base='ns2:BaseException'> - <sequence/> - </extension> - </complexContent> - </complexType> - <element name='TestException' type='tns:TestException'/> - </schema> - <schema targetNamespace='http://com.other.base' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns1='http://com.other.exception' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://com.other.base' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <import namespace='http://com.other.exception'/> - <complexType name='BaseException'> - <sequence/> - </complexType> - <complexType name='BaseException.Array'> - <sequence> - <element maxOccurs='unbounded' minOccurs='0' name='value' nillable='true' type='tns:BaseException'/> - </sequence> - </complexType> - <element name='BaseException' type='tns:BaseException'/> - </schema> - </types> - <message name='Test_getException' xmlns='http://schemas.xmlsoap.org/wsdl/'/> - <message name='Test_getExceptionResponse'> - <part name='result' type='ns1:BaseException'/> - </message> - <message name='TestException'> - <part element='ns2:TestException' name='TestException'/> - </message> - <message name='Test_getExceptions'/> - <message name='Test_getExceptionsResponse'> - <part name='result' type='ns1:BaseException.Array'/> - </message> - <message name='Test_setException'> - <part name='BaseException_1' type='ns1:BaseException'/> - </message> - <message name='Test_setExceptionResponse'/> - <message name='Test_setExceptions'> - <part name='arrayOfBaseException_1' type='ns1:BaseException.Array'/> - </message> - <message name='Test_setExceptionsResponse'/> - <message name='Test_testException'/> - <message name='Test_testExceptionResponse'/> - <portType name='Test'> - <operation name='getException'> - <input message='tns:Test_getException'/> - <output message='tns:Test_getExceptionResponse'/> - <fault message='tns:TestException' name='TestException'/> - </operation> - <operation name='getExceptions'> - <input message='tns:Test_getExceptions'/> - <output message='tns:Test_getExceptionsResponse'/> - <fault message='tns:TestException' name='TestException'/> - </operation> - <operation name='setException' parameterOrder='BaseException_1'> - <input message='tns:Test_setException'/> - <output message='tns:Test_setExceptionResponse'/> - <fault message='tns:TestException' name='TestException'/> - </operation> - <operation name='setExceptions' parameterOrder='arrayOfBaseException_1'> - <input message='tns:Test_setExceptions'/> - <output message='tns:Test_setExceptionsResponse'/> - <fault message='tns:TestException' name='TestException'/> - </operation> - <operation name='testException'> - <input message='tns:Test_testException'/> - <output message='tns:Test_testExceptionResponse'/> - <fault message='tns:TestException' name='TestException'/> - </operation> - </portType> - <binding name='TestBinding' type='tns:Test'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='getException'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </output> - <fault name='TestException'> - <soap:fault name='TestException' use='literal'/> - </fault> - </operation> - <operation name='getExceptions'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </output> - <fault name='TestException'> - <soap:fault name='TestException' use='literal'/> - </fault> - </operation> - <operation name='setException'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </output> - <fault name='TestException'> - <soap:fault name='TestException' use='literal'/> - </fault> - </operation> - <operation name='setExceptions'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </output> - <fault name='TestException'> - <soap:fault name='TestException' use='literal'/> - </fault> - </operation> - <operation name='testException'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> - </output> - <fault name='TestException'> - <soap:fault name='TestException' use='literal'/> - </fault> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestBinding' name='TestPort'> - <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/jbws1217/MultiplePackageNamespace.wsdl (from rev 8005, stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/MultiplePackageNamespace.wsdl 2008-08-04 13:08:09 UTC (rev 8006) @@ -0,0 +1,144 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws.jbws1217' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://com.other.base' xmlns:ns2='http://com.other.exception' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws.jbws1217' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://com.other.exception' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns2='http://com.other.base' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://com.other.exception' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <import namespace='http://com.other.base'/> + <complexType name='TestException'> + <complexContent> + <extension base='ns2:BaseException'> + <sequence/> + </extension> + </complexContent> + </complexType> + <element name='TestException' type='tns:TestException'/> + </schema> + <schema targetNamespace='http://com.other.base' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:ns1='http://com.other.exception' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://com.other.base' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <import namespace='http://com.other.exception'/> + <complexType name='BaseException'> + <sequence/> + </complexType> + <complexType name='BaseException.Array'> + <sequence> + <element maxOccurs='unbounded' minOccurs='0' name='value' nillable='true' type='tns:BaseException'/> + </sequence> + </complexType> + <element name='BaseException' type='tns:BaseException'/> + </schema> + </types> + <message name='Test_getException' xmlns='http://schemas.xmlsoap.org/wsdl/'/> + <message name='Test_getExceptionResponse'> + <part name='result' type='ns1:BaseException'/> + </message> + <message name='TestException'> + <part element='ns2:TestException' name='TestException'/> + </message> + <message name='Test_getExceptions'/> + <message name='Test_getExceptionsResponse'> + <part name='result' type='ns1:BaseException.Array'/> + </message> + <message name='Test_setException'> + <part name='BaseException_1' type='ns1:BaseException'/> + </message> + <message name='Test_setExceptionResponse'/> + <message name='Test_setExceptions'> + <part name='arrayOfBaseException_1' type='ns1:BaseException.Array'/> + </message> + <message name='Test_setExceptionsResponse'/> + <message name='Test_testException'/> + <message name='Test_testExceptionResponse'/> + <portType name='Test'> + <operation name='getException'> + <input message='tns:Test_getException'/> + <output message='tns:Test_getExceptionResponse'/> + <fault message='tns:TestException' name='TestException'/> + </operation> + <operation name='getExceptions'> + <input message='tns:Test_getExceptions'/> + <output message='tns:Test_getExceptionsResponse'/> + <fault message='tns:TestException' name='TestException'/> + </operation> + <operation name='setException' parameterOrder='BaseException_1'> + <input message='tns:Test_setException'/> + <output message='tns:Test_setExceptionResponse'/> + <fault message='tns:TestException' name='TestException'/> + </operation> + <operation name='setExceptions' parameterOrder='arrayOfBaseException_1'> + <input message='tns:Test_setExceptions'/> + <output message='tns:Test_setExceptionsResponse'/> + <fault message='tns:TestException' name='TestException'/> + </operation> + <operation name='testException'> + <input message='tns:Test_testException'/> + <output message='tns:Test_testExceptionResponse'/> + <fault message='tns:TestException' name='TestException'/> + </operation> + </portType> + <binding name='TestBinding' type='tns:Test'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='getException'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </output> + <fault name='TestException'> + <soap:fault name='TestException' use='literal'/> + </fault> + </operation> + <operation name='getExceptions'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </output> + <fault name='TestException'> + <soap:fault name='TestException' use='literal'/> + </fault> + </operation> + <operation name='setException'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </output> + <fault name='TestException'> + <soap:fault name='TestException' use='literal'/> + </fault> + </operation> + <operation name='setExceptions'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </output> + <fault name='TestException'> + <soap:fault name='TestException' use='literal'/> + </fault> + </operation> + <operation name='testException'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws.jbws1217' use='literal'/> + </output> + <fault name='TestException'> + <soap:fault name='TestException' use='literal'/> + </fault> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestBinding' name='TestPort'> + <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/jbws1217/Test.java =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/Test.java 2008-08-04 12:45:05 UTC (rev 8005) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/Test.java 2008-08-04 13:08:09 UTC (rev 8006) @@ -1,19 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Mar 12 14:18:42 IST 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.jbws1217; -public interface Test extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1217.base.BaseException getException() throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; - public org.jboss.test.ws.jbws1217.base.BaseException[] getExceptions() throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; - public void setException(org.jboss.test.ws.jbws1217.base.BaseException baseException_1) throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; - public void setExceptions(org.jboss.test.ws.jbws1217.base.BaseException[] arrayOfBaseException_1) throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; - public void testException() throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/Test.java (from rev 8005, stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/Test.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/Test.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/Test.java 2008-08-04 13:08:09 UTC (rev 8006) @@ -0,0 +1,19 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Mar 12 14:18:42 IST 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.jbws1217; +public interface Test extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1217.base.BaseException getException() throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; + public org.jboss.test.ws.jbws1217.base.BaseException[] getExceptions() throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; + public void setException(org.jboss.test.ws.jbws1217.base.BaseException baseException_1) throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; + public void setExceptions(org.jboss.test.ws.jbws1217.base.BaseException[] arrayOfBaseException_1) throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; + public void testException() throws org.jboss.test.ws.jbws1217.exception.TestException, java.rmi.RemoteException; +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/TestException.java =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/TestException.java 2008-08-04 12:45:05 UTC (rev 8005) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/TestException.java 2008-08-04 13:08:09 UTC (rev 8006) @@ -1,18 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Wed Mar 12 14:18:42 IST 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.jbws1217.exception; - - -public class TestException - extends org.jboss.test.ws.jbws1217.base.BaseException{ -public TestException(){ -} -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/TestException.java (from rev 8005, stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/TestException.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/TestException.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/TestException.java 2008-08-04 13:08:09 UTC (rev 8006) @@ -0,0 +1,18 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Wed Mar 12 14:18:42 IST 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.jbws1217.exception; + + +public class TestException + extends org.jboss.test.ws.jbws1217.base.BaseException{ +public TestException(){ +} +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml 2008-08-04 12:45:05 UTC (rev 8005) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml 2008-08-04 13:08:09 UTC (rev 8006) @@ -1,89 +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.jbws1217.base</package-type> - <namespaceURI>http://com.other.base</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1217</package-type> - <namespaceURI>http://org.jboss.test.ws.jbws1217</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1217.exception</package-type> - <namespaceURI>http://com.other.exception</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1217.base.BaseException</java-type> - <root-type-qname xmlns:typeNS='http://com.other.base'>typeNS:BaseException</root-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1217.exception.TestException</java-type> - <root-type-qname xmlns:typeNS='http://com.other.exception'>typeNS:TestException</root-type-qname> - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <exception-mapping> - <exception-type>org.jboss.test.ws.jbws1217.exception.TestException</exception-type> - <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws.jbws1217'>exMsgNS:TestException</wsdl-message> - </exception-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1217.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws.jbws1217'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestPort</port-name> - <java-port-name>TestPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1217.Test</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws.jbws1217'>portTypeNS:Test</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws.jbws1217'>bindingNS:TestBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>getException</java-method-name> - <wsdl-operation>getException</wsdl-operation> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1217.base.BaseException</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_getExceptionResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - <service-endpoint-method-mapping> - <java-method-name>getExceptions</java-method-name> - <wsdl-operation>getExceptions</wsdl-operation> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1217.base.BaseException[]</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_getExceptionsResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - <service-endpoint-method-mapping> - <java-method-name>setException</java-method-name> - <wsdl-operation>setException</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1217.base.BaseException</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_setException</wsdl-message> - <wsdl-message-part-name>BaseException_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - </service-endpoint-method-mapping> - <service-endpoint-method-mapping> - <java-method-name>setExceptions</java-method-name> - <wsdl-operation>setExceptions</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1217.base.BaseException[]</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_setExceptions</wsdl-message> - <wsdl-message-part-name>arrayOfBaseException_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - </service-endpoint-method-mapping> - <service-endpoint-method-mapping> - <java-method-name>testException</java-method-name> - <wsdl-operation>testException</wsdl-operation> - </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/jbws1217/jaxrpc-mapping.xml (from rev 8005, stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/jaxrpc-mapping.xml 2008-08-04 13:08:09 UTC (rev 8006) @@ -0,0 +1,89 @@ +<?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.jbws1217.base</package-type> + <namespaceURI>http://com.other.base</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1217</package-type> + <namespaceURI>http://org.jboss.test.ws.jbws1217</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1217.exception</package-type> + <namespaceURI>http://com.other.exception</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1217.base.BaseException</java-type> + <root-type-qname xmlns:typeNS='http://com.other.base'>typeNS:BaseException</root-type-qname> + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1217.exception.TestException</java-type> + <root-type-qname xmlns:typeNS='http://com.other.exception'>typeNS:TestException</root-type-qname> + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> + <exception-mapping> + <exception-type>org.jboss.test.ws.jbws1217.exception.TestException</exception-type> + <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws.jbws1217'>exMsgNS:TestException</wsdl-message> + </exception-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1217.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws.jbws1217'>serviceNS:TestService</wsdl-service-name> + <port-mapping> + <port-name>TestPort</port-name> + <java-port-name>TestPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1217.Test</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws.jbws1217'>portTypeNS:Test</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws.jbws1217'>bindingNS:TestBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>getException</java-method-name> + <wsdl-operation>getException</wsdl-operation> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1217.base.BaseException</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_getExceptionResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + <service-endpoint-method-mapping> + <java-method-name>getExceptions</java-method-name> + <wsdl-operation>getExceptions</wsdl-operation> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1217.base.BaseException[]</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_getExceptionsResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + <service-endpoint-method-mapping> + <java-method-name>setException</java-method-name> + <wsdl-operation>setException</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1217.base.BaseException</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_setException</wsdl-message> + <wsdl-message-part-name>BaseException_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + </service-endpoint-method-mapping> + <service-endpoint-method-mapping> + <java-method-name>setExceptions</java-method-name> + <wsdl-operation>setExceptions</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1217.base.BaseException[]</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws.jbws1217'>wsdlMsgNS:Test_setExceptions</wsdl-message> + <wsdl-message-part-name>arrayOfBaseException_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + </service-endpoint-method-mapping> + <service-endpoint-method-mapping> + <java-method-name>testException</java-method-name> + <wsdl-operation>testException</wsdl-operation> + </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/jbws1217/wstools-config.xml =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/wstools-config.xml 2008-08-04 12:45:05 UTC (rev 8005) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/wstools-config.xml 2008-08-04 13:08:09 UTC (rev 8006) @@ -1,10 +0,0 @@ -<configuration xmlns="http://www.jboss.org/jbossws-tools"> - <global> - <package-namespace package="org.jboss.test.ws.jbws1217.exception" namespace="http://com.other.exception"/> - <package-namespace package="org.jboss.test.ws.jbws1217.base" namespace="http://com.other.base"/> - <package-namespace package="org.jboss.test.ws.jbws1217" namespace="http://org.jboss.test.ws.jbws1217"/> - </global> - <wsdl-java location="resources/tools/jbws1217/MultiplePackageNamespace.wsdl"> - <mapping file="jaxrpc-mapping.xml" /> - </wsdl-java> -</configuration> \ No newline at end of file Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/wstools-config.xml (from rev 8005, stack/native/branches/dlofthouse/JBPAPP-904/src/test/resources/tools/jbws1217/wstools-config.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/wstools-config.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1217/wstools-config.xml 2008-08-04 13:08:09 UTC (rev 8006) @@ -0,0 +1,10 @@ +<configuration xmlns="http://www.jboss.org/jbossws-tools"> + <global> + <package-namespace package="org.jboss.test.ws.jbws1217.exception" namespace="http://com.other.exception"/> + <package-namespace package="org.jboss.test.ws.jbws1217.base" namespace="http://com.other.base"/> + <package-namespace package="org.jboss.test.ws.jbws1217" namespace="http://org.jboss.test.ws.jbws1217"/> + </global> + <wsdl-java location="resources/tools/jbws1217/MultiplePackageNamespace.wsdl"> + <mapping file="jaxrpc-mapping.xml" /> + </wsdl-java> +</configuration> \ No newline at end of file Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml 2008-08-04 12:45:05 UTC (rev 8005) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml 2008-08-04 13:08:09 UTC (rev 8006) @@ -8,6 +8,11 @@ <package-type>org.jboss.test.ws.jbws1441</package-type> <namespaceURI>http://test.jboss.org/ws/jbws1441/types</namespaceURI> </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1441.AbstractType</java-type> + <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1441/types">typeN... + <qname-scope>complexType</qname-scope> + </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jbws1441.TelephoneNumber</java-type> <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1441/types">typeN... Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml 2008-08-04 12:45:05 UTC (rev 8005) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1881/doclit/jaxrpc-mapping.xml 2008-08-04 13:08:09 UTC (rev 8006) @@ -8,6 +8,15 @@ <namespaceURI>http://test.jboss.org/ws/jbws1881</namespaceURI> </package-mapping> <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1881.Base</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1881/types'>typeNS:... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>id</java-variable-name> + <xml-element-name>id</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> <java-type>org.jboss.test.ws.jbws1881.Person</java-type> <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1881/types'>typeNS:... <qname-scope>complexType</qname-scope>