[jbossws-commits] JBossWS SVN: r1489 - in trunk/src: main/java/org/jboss/ws/jaxrpc main/java/org/jboss/ws/server main/java/org/jboss/ws/tools main/java/org/jboss/ws/tools/config main/java/org/jboss/ws/tools/helpers main/java/org/jboss/ws/tools/interfaces main/java/org/jboss/ws/tools/mapping main/java/org/jboss/ws/tools/metadata main/java/org/jboss/ws/tools/schema main/resources/schema test/resources/jaxrpc/jbws718 test/resources/jaxrpc/jbws807 test/resources/jaxrpc/jbws958 test/resources/jaxrpc/samples/wsbp

Author: thomas.diesler(a)jboss.com Date: 2006-11-21 12:37:18 -0500 (Tue, 21 Nov 2006) New Revision: 1489 Added: trunk/src/test/resources/jaxrpc/jbws718/null trunk/src/test/resources/jaxrpc/jbws718/webservices.xml Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java trunk/src/main/java/org/jboss/ws/server/ServiceEndpoint.java trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java trunk/src/main/java/org/jboss/ws/tools/Configuration.java trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL.java trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java trunk/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java trunk/src/main/java/org/jboss/ws/tools/interfaces/WSDLToJavaIntf.java trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java trunk/src/main/resources/schema/jbossws-tool_1_0.xsd trunk/src/test/resources/jaxrpc/jbws718/wstools-config.xml trunk/src/test/resources/jaxrpc/jbws807/wstools-config.xml trunk/src/test/resources/jaxrpc/jbws958/wstools-config.xml trunk/src/test/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml trunk/src/test/resources/jaxws/samples/jsr181ejb/wstools-config.xml trunk/src/test/resources/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml trunk/src/test/resources/jaxws/samples/jsr181pojo/wstools-config.xml trunk/src/test/resources/jaxws/samples/wsaddressing/wstools-config.xml trunk/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml trunk/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml trunk/src/test/resources/tools/config/wsdl2java.xml trunk/src/test/resources/tools/config/wsdl2javaglobal.xml trunk/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml trunk/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml trunk/src/test/resources/tools/jbws1170/wstools-config.xml trunk/src/test/resources/tools/jbws1253/wstools-config.xml trunk/src/test/resources/tools/testsuite-configs/jbws153-config.xml trunk/src/test/resources/tools/testsuite-configs/jbws349-config.xml trunk/src/test/resources/tools/testsuite-configs/jbws381-config.xml trunk/src/test/resources/tools/testsuite-configs/jbws484-config.xml trunk/src/test/resources/tools/testsuite-configs/samples-client-config.xml trunk/src/test/resources/tools/testsuite-configs/ws4eesimple-client-config.xml Log: [JBWS-1299] Add support for wsdl-java@parameter-style [JBWS-1182] Change wsdl-java@file to wsdl-java@location Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java =================================================================== --- trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -284,7 +284,7 @@ String endpointName = endpointMetaData.getQName().getLocalPart(); String packageName = endpointMetaData.getServiceEndpointInterface().getPackage().getName(); - String wrapperName = packageName + ".__JBossWS_" + serviceName + "_" + endpointName + "_" + parameterName; + String wrapperName = packageName + "._JBossWS_" + serviceName + "_" + endpointName + "_" + parameterName; log.debug("Generating wrapper: " + wrapperName); Class wrapperType; Modified: trunk/src/main/java/org/jboss/ws/server/ServiceEndpoint.java =================================================================== --- trunk/src/main/java/org/jboss/ws/server/ServiceEndpoint.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/server/ServiceEndpoint.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -83,6 +83,11 @@ this.seMetrics = new ServiceEndpointMetrics(seInfo.getServiceEndpointID()); } + public State getState() + { + return seInfo.getState(); + } + public ServiceEndpointInfo getServiceEndpointInfo() { return seInfo; Modified: trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java =================================================================== --- trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -558,8 +558,9 @@ ServiceEndpoint wsEndpoint = (ServiceEndpoint)ctor.newInstance(new Object[] { seInfo }); wsEndpoint.create(); - // Register the port component with the MBeanServer + // Register the endpoint with the MBeanServer registry.put(sepID, wsEndpoint); + log.debug("WebService created: " + sepID); } @@ -600,6 +601,8 @@ throw new WSException("Cannot find service endpoint: " + sepID); wsEndpoint.destroy(); + + // Remove the endpoint from the MBeanServer registry.remove(sepID); ServiceEndpointInfo seInfo = wsEndpoint.getServiceEndpointInfo(); Modified: trunk/src/main/java/org/jboss/ws/tools/Configuration.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/Configuration.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/Configuration.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -138,7 +138,8 @@ public class WSDLToJavaConfig { public String wsdlLocation; - public boolean unwrap; + // Parameter style {"wrapped", "bare"} + public String parameterStyle = "wrapped"; // Is a jaxrpc-mapping file needed? public boolean mappingFileNeeded; // Name of the jaxrpc-mapping file Modified: trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -40,6 +40,9 @@ import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.Configuration.OperationConfig; import org.jboss.ws.tools.metadata.ToolsUnifiedMetaDataBuilder; +import org.jboss.ws.utils.DOMUtils; +import org.jboss.ws.utils.DOMWriter; +import org.w3c.dom.Element; /** * Generates a WSDL for a service endpoint. @@ -334,9 +337,19 @@ if (wsdlDefinitions == null) throw new WSException("Cannot generate WSDL definitions"); + // Debug the generated wsdl StringWriter sw = new StringWriter(); wsdlDefinitions.write(sw, Constants.DEFAULT_XML_CHARSET); - log.debug(sw.toString()); + log.debug("Generated WSDL:\n" + sw.toString()); + + // Debug the generated mapping file + String jaxrpcMappingStr = null; + if (javaWsdlMapping != null) + { + Element root = DOMUtils.parse(javaWsdlMapping.serialize()); + jaxrpcMappingStr = DOMWriter.printNode(root, true); + } + log.debug("Generated Mapping:\n" + jaxrpcMappingStr); } catch (RuntimeException rte) { Modified: trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -25,22 +25,17 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.namespace.QName; import javax.xml.rpc.encoding.TypeMapping; import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.metadata.EndpointMetaData; -import org.jboss.ws.metadata.FaultMetaData; -import org.jboss.ws.metadata.OperationMetaData; -import org.jboss.ws.metadata.ParameterMetaData; import org.jboss.ws.metadata.ServiceMetaData; import org.jboss.ws.metadata.UnifiedMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLUtils; -import org.jboss.ws.metadata.wsdl.XSModelTypes; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.tools.helpers.JavaToWSDLHelper; Modified: trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -26,9 +26,7 @@ import java.io.IOException; import java.net.URL; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.Set; @@ -38,7 +36,6 @@ import org.apache.xerces.xs.XSComplexTypeDefinition; import org.apache.xerces.xs.XSElementDeclaration; import org.apache.xerces.xs.XSModelGroup; -import org.apache.xerces.xs.XSObject; import org.apache.xerces.xs.XSObjectList; import org.apache.xerces.xs.XSParticle; import org.apache.xerces.xs.XSSimpleTypeDefinition; @@ -53,7 +50,6 @@ import org.jboss.ws.metadata.wsdl.WSDLException; import org.jboss.ws.metadata.wsdl.WSDLInterface; import org.jboss.ws.metadata.wsdl.WSDLInterfaceFault; -import org.jboss.ws.metadata.wsdl.WSDLInterfaceMessageReference; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationInput; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutfault; @@ -108,9 +104,8 @@ private String directoryToGenerate = ""; private String style; + private String parameterStyle; - private boolean unwrap = false; - public WSDLToJava() { } @@ -266,6 +261,11 @@ { return Constants.DOCUMENT_LITERAL.equals(style); } + + private boolean isWrapped() + { + return "wrapped".equals(parameterStyle) && Constants.DOCUMENT_LITERAL.equals(style); + } private void unwrapRequest(StringBuilder buf, XSTypeDefinition xt) throws IOException { @@ -274,6 +274,8 @@ XSComplexTypeDefinition wrapper = (XSComplexTypeDefinition)xt; XSParticle particle = wrapper.getParticle(); + if (particle == null) + throw new WSException("Attempt to unwrap a request type with no particles"); XSTerm term = particle.getTerm(); if (term instanceof XSModelGroup == false) throw new WSException("Expected model group, could not unwrap"); @@ -322,6 +324,8 @@ XSComplexTypeDefinition wrapper = (XSComplexTypeDefinition)xt; XSParticle particle = wrapper.getParticle(); + if (particle == null) + throw new WSException("Attempt to unwrap a response type with no particles"); XSTerm term = particle.getTerm(); if (term instanceof XSModelGroup == false) throw new WSException("Expected model group, could not unwrap"); @@ -485,7 +489,7 @@ JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); - if (unwrap) + if (isWrapped()) { unwrapRequest(paramBuffer, xt); } @@ -503,7 +507,7 @@ JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); - if (unwrap) + if (isWrapped()) { returnType = unwrapResponse(xt); } @@ -608,6 +612,9 @@ { JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); + if (isWrapped()) + return unwrapResponse(xt); + boolean primitive = true; WrappedArray wrappedArray = new WrappedArray(xt); String arraySuffix = ""; @@ -709,13 +716,8 @@ xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, getLocationForJavaGeneration(), seiPkgName, xsmodel, exception); } - public boolean isUnwrap() + public void setParameterStyle(String paramStyle) { - return unwrap; + this.parameterStyle = paramStyle; } - - public void setUnwrap(boolean unwrap) - { - this.unwrap = unwrap; - } } Modified: trunk/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -84,8 +84,8 @@ private static final String STYLE_ATTRIBUTE = "style"; private static final String ENDPOINT_ATTRIBUTE = "endpoint"; private static final String NAME_ATTRIBUTE = "name"; + private static final String LOCATION_ATTRIBUTE = "location"; private static final String FILE_ATTRIBUTE = "file"; - private static final String UNWRAP_ATTRIBUTE = "unwrap"; // provide logging private static final Logger log = Logger.getLogger(ToolsSchemaConfigReader.class); @@ -175,10 +175,10 @@ else if (WSDL_JAVA_TAG.equals(localName)) { WSDLToJavaConfig wsdl2jc = config.getWSDLToJavaConfig(true); - wsdl2jc.wsdlLocation = attrs.getValue(FILE_ATTRIBUTE); - String unwrap = attrs.getValue(UNWRAP_ATTRIBUTE); - if (unwrap != null) - wsdl2jc.unwrap = "true".equals(unwrap) || "1".equals(unwrap); + wsdl2jc.wsdlLocation = attrs.getValue(LOCATION_ATTRIBUTE); + String paramStyle = attrs.getValue(PARAMETER_STYLE_ATTRIBUTE); + if (paramStyle != null) + wsdl2jc.parameterStyle = paramStyle; return wsdl2jc; } @@ -264,7 +264,7 @@ if (MAPPING_TAG.equals(localName)) { wsdl2jc.mappingFileNeeded = true; - wsdl2jc.mappingFileName = attrs.getValue(FILE_ATTRIBUTE); + wsdl2jc.mappingFileName = getOptionalAttribute(attrs, FILE_ATTRIBUTE, "jaxrpc-mapping.xml"); } else if (WEBSERVICES_TAG.equals(localName)) { Modified: trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -143,7 +143,6 @@ public void generateTypesForXSD(ParameterMetaData pmd) throws IOException { //Types always deals with TypeNamespace - SchemaCreatorIntf sc = javaToXSD.getSchemaCreator(); QName xmlType = pmd.getXmlType(); if(xmlType.getNamespaceURI().equals(Constants.NS_SCHEMA_XSD) == false) generateType(xmlType, pmd.getJavaType(), buildElementNameMap(pmd)); Modified: trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -22,13 +22,7 @@ package org.jboss.ws.tools.helpers; import java.beans.Introspector; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Set; import javax.xml.namespace.QName; @@ -97,8 +91,6 @@ private WSDLDefinitions wsdlDefinitions = null; private String serviceName = null; private String packageName = null; - private Class serviceEndpointInterface = null; - private String typeNamespace = null; private Set<String> registeredTypes = new HashSet<String>(); @@ -107,20 +99,18 @@ private WSDLUtils utils = WSDLUtils.getInstance(); - private boolean unwrap = false; + private String parameterStyle; public MappingFileGeneratorHelper(WSDLDefinitions wsdl, String sname, - String pname, Class seiClass, String tns,LiteralTypeMapping ltm, boolean unwrap) + String pname, Class seiClass, String tns,LiteralTypeMapping ltm, String parameterStyle) { this.wsdlDefinitions = wsdl; this.serviceName = sname; this.packageName = pname; - this.serviceEndpointInterface = seiClass; - this.typeNamespace = tns; this.typeMapping = ltm; this.wsdlStyle = utils.getWSDLStyle(wsdl); - this.unwrap = unwrap; + this.parameterStyle = parameterStyle; checkEssentials(); } @@ -218,7 +208,7 @@ ServiceEndpointMethodMapping semm = new ServiceEndpointMethodMapping(seim); semm.setJavaMethodName(ToolsUtils.firstLetterLowerCase(opname)); semm.setWsdlOperation(opname); - semm.setWrappedElement(shouldUnwrap()); + semm.setWrappedElement(isWrapped()); if (isDocStyle()) constructDOCParameters(semm, wiop); @@ -240,7 +230,7 @@ String partName = win.getPartName(); String wsdlMessageName = win.getMessageName().getLocalPart(); - if (shouldUnwrap()) + if (isWrapped()) { JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); @@ -259,7 +249,7 @@ QName xmlType = output.getXMLType(); QName messageName = output.getMessageName(); - if (shouldUnwrap()) + if (isWrapped()) { JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); @@ -780,9 +770,9 @@ return javaType; } - private boolean shouldUnwrap() + private boolean isWrapped() { - return unwrap && Constants.DOCUMENT_LITERAL.equals(wsdlStyle); + return "wrapped".equals(parameterStyle) && Constants.DOCUMENT_LITERAL.equals(wsdlStyle); } private MethodParamPartsMapping getMethodParamPartsMapping(ServiceEndpointMethodMapping semm, Modified: trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -299,7 +299,7 @@ if (glc != null) wsdlToJava.setNamespacePackageMap(glc.packageNamespaceMap); - wsdlToJava.setUnwrap(w2jc.unwrap); + wsdlToJava.setParameterStyle(w2jc.parameterStyle); wsdlToJava.generateSEI(wsdl, new File(outDir)); //Generate the Service File @@ -311,7 +311,7 @@ MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new LiteralTypeMapping()); mgf.setPackageName(getPackageName(wsdl, glc)); mgf.setServiceName(wsdl.getServices()[0].getName().toString()); - mgf.setUnwrap(w2jc.unwrap); + mgf.setParameterStyle(w2jc.parameterStyle); //mgf.generate(); JavaWsdlMapping jwm = mgf.generate(); Modified: trunk/src/main/java/org/jboss/ws/tools/interfaces/WSDLToJavaIntf.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/interfaces/WSDLToJavaIntf.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/interfaces/WSDLToJavaIntf.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -99,8 +99,6 @@ */ public void setTypeMapping(LiteralTypeMapping typeMapping); - public boolean isUnwrap(); + public void setParameterStyle(String paramStyle); - public void setUnwrap(boolean unwrap); - } Modified: trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -93,7 +93,7 @@ */ protected LiteralTypeMapping typeMapping = null; - protected boolean unwrap = false; + protected String parameterStyle; public MappingFileGenerator(WSDLDefinitions wsdl, TypeMapping typeM) { @@ -156,16 +156,11 @@ this.typeNamespace = typeNamespace; } - public boolean isUnwrap() + public void setParameterStyle(String paramStyle) { - return unwrap; + this.parameterStyle = paramStyle; } - public void setUnwrap(boolean unwrap) - { - this.unwrap = unwrap; - } - /** * Method that generates the jaxrpc mapping metadata * <dt>Guidance:<dd> @@ -177,8 +172,8 @@ */ public JavaWsdlMapping generate() throws IOException { - MappingFileGeneratorHelper helper = new MappingFileGeneratorHelper(this.wsdlDefinitions, this.serviceName, this.packageName, this.serviceEndpointInterface, - this.typeNamespace, this.typeMapping, this.unwrap); + MappingFileGeneratorHelper helper = new MappingFileGeneratorHelper(wsdlDefinitions, serviceName, packageName, serviceEndpointInterface, + typeNamespace, typeMapping, parameterStyle); String targetNS = wsdlDefinitions.getTargetNamespace(); if (typeNamespace == null) typeNamespace = targetNS; Modified: trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -151,7 +151,6 @@ ParameterMetaData wrappedParameter = null; List<WrappedParameter> wrappedParameters = null; - if (om.isDocumentWrapped()) { QName xmlName = new QName(tmd.typeNamespace, om.getQName().getLocalPart()); Modified: trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2006-11-21 17:37:18 UTC (rev 1489) @@ -347,6 +347,7 @@ JBossXSModelGroup group = (JBossXSModelGroup)complexType.getParticle().getTerm(); group.setParticles(particles); + log.debug("generateNewType: " + sutils.write(complexType)); return complexType; } Modified: trunk/src/main/resources/schema/jbossws-tool_1_0.xsd =================================================================== --- trunk/src/main/resources/schema/jbossws-tool_1_0.xsd 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/main/resources/schema/jbossws-tool_1_0.xsd 2006-11-21 17:37:18 UTC (rev 1489) @@ -231,15 +231,21 @@ </xs:annotation> </xs:element> </xs:sequence> - <xs:attribute name="file" type="xs:anyURI" use="required"> + <xs:attribute name="location" type="xs:anyURI" use="required"> <xs:annotation> <xs:documentation>Specifies the location of the WSDL file as a URL. The URL may be either absolute or relative to the current directory. Remote protocols such as http are supported.</xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="unwrap" type="xs:boolean" use="optional" default="false"> + <xs:attribute name="parameter-style" use="optional" default="wrapped"> <xs:annotation> - <xs:documentation>Whether to unwrap a document/literal webservice reques and response message. This is intended to be used on a service that follows the "wrapped" convention.</xs:documentation> + <xs:documentation>The parameter style convention to use when using document/literal. The "bare" convention requires that the Java method have a single parameter that represents the full request message body, and a single return value that represents the full response message body. The "wrapped" convention allows any Java method signature because it wraps all parameter in a single schema type.</xs:documentation> </xs:annotation> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="bare"/> + <xs:enumeration value="wrapped"/> + </xs:restriction> + </xs:simpleType> </xs:attribute> </xs:complexType> <xs:complexType name="parameterType"> Copied: trunk/src/test/resources/jaxrpc/jbws718/null (from rev 1217, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws718/null) Copied: trunk/src/test/resources/jaxrpc/jbws718/webservices.xml (from rev 1217, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws718/webservices.xml) Modified: trunk/src/test/resources/jaxrpc/jbws718/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws718/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxrpc/jbws718/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -12,7 +12,8 @@ <global> <package-namespace package="org.jboss.test.ws.jaxrpc.jbws718" namespace="http://jboss.org/test/ws/jbws718"/> </global> - <wsdl-java file="resources/jaxrpc/jbws718/WEB-INF/wsdl/TestService.wsdl"> + + <wsdl-java location="resources/jaxrpc/jbws718/WEB-INF/wsdl/TestService.wsdl" parameter-style="bare"> <mapping file="jaxrpc-mapping.xml" /> <webservices servlet-link="TestService" /> </wsdl-java> Modified: trunk/src/test/resources/jaxrpc/jbws807/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws807/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxrpc/jbws807/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -12,7 +12,7 @@ <global> <package-namespace package="org.jboss.test.ws.jaxrpc.jbws807" namespace="http://jboss.org/test/ws/jbws807"/> </global> - <wsdl-java file="WEB-INF/wsdl/TestService.wsdl"> + <wsdl-java location="WEB-INF/wsdl/TestService.wsdl"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> Modified: trunk/src/test/resources/jaxrpc/jbws958/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws958/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxrpc/jbws958/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -12,7 +12,7 @@ <global> <package-namespace package="org.jboss.test.ws.jaxrpc.jbws958" namespace="http://services.iplsprovisioning.tsi.com"/> </global> - <wsdl-java file="resources/jaxrpc/jbws958/WEB-INF/wsdl/IPLSProvisioning.wsdl"> + <wsdl-java location="resources/jaxrpc/jbws958/WEB-INF/wsdl/IPLSProvisioning.wsdl"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> Modified: trunk/src/test/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxrpc/samples/wsbpel/hello/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -4,7 +4,7 @@ <package-namespace package="org.jboss.test.ws.jaxrpc.samples.wsbpel.hello" namespace="http://jbpm.org/examples/hello" /> </global> - <wsdl-java file="wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl/service.wsdl"> + <wsdl-java location="wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl/service.wsdl"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> </configuration> \ No newline at end of file Modified: trunk/src/test/resources/jaxws/samples/jsr181ejb/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxws/samples/jsr181ejb/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxws/samples/jsr181ejb/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -11,7 +11,7 @@ <global> <package-namespace package="org.jboss.test.ws.jaxws.samples.jsr181ejb" namespace="http://org.jboss.ws/samples/jsr181ejb"/> </global> - <wsdl-java file="resources/jaxws/samples/jsr181ejb/META-INF/wsdl/TestService.wsdl"> + <wsdl-java location="resources/jaxws/samples/jsr181ejb/META-INF/wsdl/TestService.wsdl"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> Modified: trunk/src/test/resources/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -11,7 +11,7 @@ <global> <package-namespace package="org.jboss.test.ws.jaxws.samples.jsr181pojo.docwrapped" namespace="http://org.jboss.ws/samples/jsr181pojo/docwrapped"/> </global> - <wsdl-java unwrap="true" file="resources/jaxws/samples/jsr181pojo/docwrapped/META-INF/wsdl/TestService.wsdl"> + <wsdl-java parameter-style="wrapped" location="resources/jaxws/samples/jsr181pojo/docwrapped/META-INF/wsdl/TestService.wsdl"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> Modified: trunk/src/test/resources/jaxws/samples/jsr181pojo/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxws/samples/jsr181pojo/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxws/samples/jsr181pojo/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -11,7 +11,7 @@ <global> <package-namespace package="org.jboss.test.ws.jaxws.samples.jsr181pojo" namespace="http://org.jboss.ws/samples/jsr181pojo"/> </global> - <wsdl-java file="resources/jaxws/samples/jsr181pojo/META-INF/wsdl/TestService.wsdl"> + <wsdl-java location="resources/jaxws/samples/jsr181pojo/META-INF/wsdl/TestService.wsdl"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> Modified: trunk/src/test/resources/jaxws/samples/wsaddressing/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxws/samples/wsaddressing/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxws/samples/wsaddressing/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -11,7 +11,7 @@ <global> <package-namespace package="org.jboss.test.ws.jaxws.samples.wsaddressing" namespace="http://org.jboss.ws/samples/wsaddressing"/> </global> - <wsdl-java file="resources/jaxws/samples/wsaddressing/META-INF/wsdl/TestService.wsdl"> + <wsdl-java location="resources/jaxws/samples/wsaddressing/META-INF/wsdl/TestService.wsdl"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> Modified: trunk/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -11,7 +11,7 @@ <global> <package-namespace package="org.jboss.test.ws.jaxws.wsaddressing.replyto" namespace="http://org.jboss.ws/addressing/replyto"/> </global> - <wsdl-java file="http://localhost:8080/jaxws-wsaddressing-initial/InitialService?wsdl"> + <wsdl-java location="http://localhost:8080/jaxws-wsaddressing-initial/InitialService?wsdl"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> Modified: trunk/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -11,7 +11,7 @@ <global> <package-namespace package="org.jboss.test.ws.jaxws.wsaddressing.replyto" namespace="http://org.jboss.ws/addressing/replyto"/> </global> - <wsdl-java file="http://localhost:8080/jaxws-wsaddressing-replyto/ReplyToService?wsdl"> + <wsdl-java location="http://localhost:8080/jaxws-wsaddressing-replyto/ReplyToService?wsdl"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> Modified: trunk/src/test/resources/tools/config/wsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/config/wsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/config/wsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -3,5 +3,5 @@ <configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <wsdl-java file="dummylocation"/> + <wsdl-java location="dummylocation"/> </configuration> Modified: trunk/src/test/resources/tools/config/wsdl2javaglobal.xml =================================================================== --- trunk/src/test/resources/tools/config/wsdl2javaglobal.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/config/wsdl2javaglobal.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.ws" namespace="http://org.jboss.ws"/> </global> - <wsdl-java file="resources/tools/wsdlfixture/StandardJavaTypesService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/wsdlfixture/StandardJavaTypesService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws-206/jbosswsConfig/Attachment/Attachmentwsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.webservice.attachment" namespace="http://org.jboss.ws/attachment"/> </global> - <wsdl-java file="resources/tools/jbws-206/wsdlFixture/Attachment/AttachmentService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/jbws-206/wsdlFixture/Attachment/AttachmentService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws-206/jbosswsConfig/InOutParameters/InOutParameterswsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.webservice.inoutparameters" namespace="http://org.jboss.ws/holder"/> </global> - <wsdl-java file="resources/tools/jbws-206/wsdlFixture/InOutParameters/InOutParametersService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/jbws-206/wsdlFixture/InOutParameters/InOutParametersService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OneWay/OneWaywsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.webservice.oneway" namespace="http://org.jboss.ws"/> </global> - <wsdl-java file="resources/tools/jbws-206/wsdlFixture/OneWay/OneWayService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/jbws-206/wsdlFixture/OneWay/OneWayService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws-206/jbosswsConfig/OutParameters/OutParameterswsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.webservice.outparameters" namespace="http://org.jboss.ws/holder"/> </global> - <wsdl-java file="resources/tools/jbws-206/wsdlFixture/OutParameters/OutParametersService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/jbws-206/wsdlFixture/OutParameters/OutParametersService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserException/UserExceptionwsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.webservice.userexception" namespace="http://org.jboss.ws"/> </global> - <wsdl-java file="resources/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/jbws-206/wsdlFixture/UserException/UserExceptionService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserExceptionInheritance/UserExceptionInheritancewsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.webservice.userexceptioninheritance" namespace="http://org.jboss.ws"/> </global> - <wsdl-java file="resources/tools/jbws-206/wsdlFixture/UserExceptionInheritance/UserExceptionInheritanceService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/jbws-206/wsdlFixture/UserExceptionInheritance/UserExceptionInheritanceService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws-206/jbosswsConfig/UserTypes/UserTypeswsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.webservice.usertypes" namespace="http://org.jboss.ws"/> </global> - <wsdl-java file="resources/tools/jbws-206/wsdlFixture/UserTypes/ComplexTypesService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/jbws-206/wsdlFixture/UserTypes/ComplexTypesService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImport/WsdlImportwsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.webservice.wsdlimport" namespace="http://jboss.org/wsdlimport"/> </global> - <wsdl-java file="resources/tools/jbws-206/wsdlFixture/WsdlImport/WsdlImportService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/jbws-206/wsdlFixture/WsdlImport/WsdlImportService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml =================================================================== --- trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws-206/jbosswsConfig/WsdlImportWithUserTypes/WsdlImportWithUserTypeswsdl2java.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -5,5 +5,5 @@ <global> <package-namespace package="org.jboss.test.webservice.wsdlimportwithusertypes" namespace="http://org.jboss.ws"/> </global> - <wsdl-java file="resources/tools/jbws-206/wsdlFixture/WsdlImportWithUserTypes/ComplexTypesService_RPC_11.wsdl"/> + <wsdl-java location="resources/tools/jbws-206/wsdlFixture/WsdlImportWithUserTypes/ComplexTypesService_RPC_11.wsdl"/> </configuration> Modified: trunk/src/test/resources/tools/jbws1170/wstools-config.xml =================================================================== --- trunk/src/test/resources/tools/jbws1170/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws1170/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -1,5 +1,5 @@ <configuration> - <wsdl-java file="resources/tools/jbws1170/HyphenatedElementName.wsdl"> + <wsdl-java location="resources/tools/jbws1170/HyphenatedElementName.wsdl" parameter-style="bare"> <mapping file="wrapper-mapping.xml"/> </wsdl-java> </configuration> Modified: trunk/src/test/resources/tools/jbws1253/wstools-config.xml =================================================================== --- trunk/src/test/resources/tools/jbws1253/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/jbws1253/wstools-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -1,5 +1,5 @@ <configuration> - <wsdl-java file="resources/tools/jbws1253/MyPortTypeService.wsdl"> + <wsdl-java location="resources/tools/jbws1253/MyPortTypeService.wsdl" parameter-style="bare"> <mapping file="myporttype-mapping.xml"/> </wsdl-java> </configuration> Modified: trunk/src/test/resources/tools/testsuite-configs/jbws153-config.xml =================================================================== --- trunk/src/test/resources/tools/testsuite-configs/jbws153-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/testsuite-configs/jbws153-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -2,7 +2,7 @@ <configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <wsdl-java file="c:/devel/jboss-head/testsuite/src/resources/webservice/jbws153/WEB-INF/wsdl/OrderSOAP.wsdl"> + <wsdl-java location="c:/devel/jboss-head/testsuite/src/resources/webservice/jbws153/WEB-INF/wsdl/OrderSOAP.wsdl"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> </configuration> Modified: trunk/src/test/resources/tools/testsuite-configs/jbws349-config.xml =================================================================== --- trunk/src/test/resources/tools/testsuite-configs/jbws349-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/testsuite-configs/jbws349-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -2,7 +2,7 @@ <configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <wsdl-java file="c:/devel/jboss-head/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/ServiceFacade.wsdl"> + <wsdl-java location="c:/devel/jboss-head/testsuite/src/resources/webservice/jbws349/WEB-INF/wsdl/ServiceFacade.wsdl"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> </configuration> Modified: trunk/src/test/resources/tools/testsuite-configs/jbws381-config.xml =================================================================== --- trunk/src/test/resources/tools/testsuite-configs/jbws381-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/testsuite-configs/jbws381-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -2,7 +2,7 @@ <configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <wsdl-java file="c:/devel/jboss-head/testsuite/src/resources/webservice/jbws381/WEB-INF/wsdl/WeatherForecast.wsdl"> + <wsdl-java location="c:/devel/jboss-head/testsuite/src/resources/webservice/jbws381/WEB-INF/wsdl/WeatherForecast.wsdl"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> </configuration> Modified: trunk/src/test/resources/tools/testsuite-configs/jbws484-config.xml =================================================================== --- trunk/src/test/resources/tools/testsuite-configs/jbws484-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/testsuite-configs/jbws484-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -6,7 +6,7 @@ <package-namespace package="org.jboss.test.ws.jbws484" namespace="http://idm.vignette.com/"/> </global> - <wsdl-java file="c:/devel/jboss-head/testsuite/src/resources/webservice/jbws484/WEB-INF/wsdl/TestService.wsdl"> + <wsdl-java location="c:/devel/jboss-head/testsuite/src/resources/webservice/jbws484/WEB-INF/wsdl/TestService.wsdl"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> </configuration> Modified: trunk/src/test/resources/tools/testsuite-configs/samples-client-config.xml =================================================================== --- trunk/src/test/resources/tools/testsuite-configs/samples-client-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/testsuite-configs/samples-client-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -2,7 +2,7 @@ <configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <wsdl-java file="c:/devel/jboss-head/testsuite/src/resources/webservice/samples/server-ejb-sec/META-INF/wsdl/OrganizationService.wsdl"> + <wsdl-java location="c:/devel/jboss-head/testsuite/src/resources/webservice/samples/server-ejb-sec/META-INF/wsdl/OrganizationService.wsdl"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> </configuration> Modified: trunk/src/test/resources/tools/testsuite-configs/ws4eesimple-client-config.xml =================================================================== --- trunk/src/test/resources/tools/testsuite-configs/ws4eesimple-client-config.xml 2006-11-21 12:38:04 UTC (rev 1488) +++ trunk/src/test/resources/tools/testsuite-configs/ws4eesimple-client-config.xml 2006-11-21 17:37:18 UTC (rev 1489) @@ -2,7 +2,7 @@ <configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <wsdl-java file="../../output-tests/resources/testsuite/ws4eesimple/WEB-INF/wsdl/HelloService.wsdl"> + <wsdl-java location="../../output-tests/resources/testsuite/ws4eesimple/WEB-INF/wsdl/HelloService.wsdl"> <mapping file="jaxrpc-mapping.xml"/> </wsdl-java> </configuration>