Author: thomas.diesler(a)jboss.com Date: 2006-11-21 07:38:04 -0500 (Tue, 21 Nov 2006) New Revision: 1488 Removed: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/PingMsg.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/PingMsgResponse.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/TestService_PortType.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/TestService_Service.java trunk/src/test/java/org/jboss/test/ws/tools/jsr181/ trunk/src/test/resources/jaxrpc/jbws718/WEB-INF/jaxrpc-mapping.xml trunk/src/test/resources/jaxrpc/jbws718/WEB-INF/webservices.xml trunk/src/test/resources/jaxrpc/jbws718/org/ trunk/src/test/resources/jaxrpc/jbws807/org/ Modified: trunk/.classpath trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesMetaData.java trunk/src/main/java/org/jboss/ws/soap/SOAPPartImpl.java trunk/src/main/java/org/jboss/ws/tools/Configuration.java trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java trunk/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java trunk/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.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/metadata/ReflectiveMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java trunk/src/main/resources/schema/jbossws-tool_1_0.xsd trunk/src/test/build.xml trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java trunk/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomArrays/CustomArrayJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Inheritance/InheritanceJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/PublicPrivate/PublicPrivateJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardArrays/StandardArraysJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardHolders/StandardHoldersJava2WSDLTestCase.java trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/UserException/UserExceptionJava2WSDLTestCase.java trunk/src/test/resources/jaxrpc/jbws718/wstools-config.xml trunk/src/test/resources/jaxrpc/jbws807/wstools-config.xml trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml trunk/src/test/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml Log: [JBWS-812] SOAPPart.setContent() does not handle non-element nodes [JBWS-762] DOMUtils.parse skips peer comments on Document node [JBWS-779] Add webservices.xml support to wsdlTojava [JBWS-353] Adapt Tools to use the new Schema configuration(JBWS-322) [JBWS-509] WSDL 2.0 support in tools is broken, fix or remove it [JBWS-550] Use AnnotationMetaDataBuilder in tools Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/.classpath 2006-11-21 12:38:04 UTC (rev 1488) @@ -16,7 +16,6 @@ <classpathentry kind="lib" path="thirdparty/junit.jar"/> <classpathentry kind="lib" path="thirdparty/concurrent.jar"/> <classpathentry kind="lib" path="thirdparty/javassist.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry kind="lib" path="thirdparty/jboss-xml-binding.jar"/> <classpathentry kind="lib" path="thirdparty/policy-1.0.jar"/> <classpathentry kind="lib" path="thirdparty/stax-api-1.0.jar"/> @@ -32,5 +31,6 @@ <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -264,9 +264,9 @@ return oneWay; } - public void setOneWayOperation(boolean oneWayOperation) + public void setOneWay(boolean oneWay) { - this.oneWay = oneWayOperation; + this.oneWay = oneWay; assertOneWayOperation(); } Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -193,7 +193,7 @@ // Set the operation MEP if (Constants.WSDL20_PATTERN_IN_ONLY.equals(wsdlOperation.getPattern())) - opMetaData.setOneWayOperation(true); + opMetaData.setOneWay(true); // Set the operation SOAPAction WSDLBinding wsdlBinding = wsdlDefinitions.getBindingByInterfaceName(wsdlInterface.getQName()); Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -161,7 +161,7 @@ // Set the operation MEP if (Constants.WSDL20_PATTERN_IN_ONLY.equals(wsdlOperation.getPattern())) - opMetaData.setOneWayOperation(true); + opMetaData.setOneWay(true); // Set the operation SOAPAction WSDLBinding wsdlBinding = wsdlDefinitions.getBindingByInterfaceName(wsdlInterface.getQName()); Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -466,7 +466,7 @@ } OperationMetaData opMetaData = new OperationMetaData(epMetaData, new QName(targetNS, operationName), javaName); - opMetaData.setOneWayOperation(method.isAnnotationPresent(Oneway.class)); + opMetaData.setOneWay(method.isAnnotationPresent(Oneway.class)); opMetaData.setSOAPAction(soapAction); epMetaData.addOperation(opMetaData); Modified: trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesMetaData.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesMetaData.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -47,9 +47,10 @@ // The URL to the webservices.xml descriptor private URL descriptorURL; - /** - * Construct webservices meta data, with a given resource class loader. - */ + public WebservicesMetaData() + { + } + public WebservicesMetaData(URL descriptorURL) { this.descriptorURL = descriptorURL; Modified: trunk/src/main/java/org/jboss/ws/soap/SOAPPartImpl.java =================================================================== --- trunk/src/main/java/org/jboss/ws/soap/SOAPPartImpl.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/soap/SOAPPartImpl.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -157,7 +157,13 @@ if (source instanceof DOMSource) { DOMSource domSource = (DOMSource)source; - domElement = (Element)domSource.getNode(); + Node node = domSource.getNode(); + if (node instanceof Document) + domElement = ((Document)node).getDocumentElement(); + else if (node instanceof Element) + domElement = (Element)node; + else + throw new SOAPException("Unsupported DOMSource node: " + node); } else if (source instanceof StreamSource) { Modified: trunk/src/main/java/org/jboss/ws/tools/Configuration.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/Configuration.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/tools/Configuration.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -35,9 +35,9 @@ */ public class Configuration { - private JavaToWSDLConfig j2wc = null; - private WSDLToJavaConfig w2jc = null; - private GlobalConfig globalConfig = null; + private JavaToWSDLConfig j2wc; + private WSDLToJavaConfig w2jc; + private GlobalConfig globalConfig; public Configuration() { @@ -87,56 +87,33 @@ */ public class JavaToWSDLConfig { - /** - * Is a jax-rpc mapping file needed? - */ - public boolean mappingFileNeeded = false; - /** - * Name of the jax-rpc mapping file - */ - public String mappingFileName = null; - /** - * Need webservices.xml file? - */ - public boolean wsxmlFileNeeded = false; - /** - * Target Namespace - */ - public String targetNamespace = null; - /** - * Type Namespace - */ - public String typeNamespace = null; - /** - * Service Name - */ - public String serviceName = null; - /** - * Endpoint Name - */ - public String endpointName = null; - - /** - * Style of WSDL. {"rpc","doc"} - */ + // Is a jaxrpc-mapping file needed? + public boolean mappingFileNeeded; + // Name of the jaxrpc-mapping file + public String mappingFileName; + // Need webservices.xml file? + public boolean wsxmlFileNeeded; + // Target Namespace + public String targetNamespace; + // Type Namespace + public String typeNamespace; + // Service Name + public String serviceName; + // Endpoint Name + public String endpointName; + // Style of WSDL. {"rpc","doc"} public String wsdlStyle = "document"; - + // Parameter style {"wrapped", "bare"} public String parameterStyle = "wrapped"; - /** - * WSDL Version {"1.1","2.0"} - */ + // WSDL Version {"1.1","2.0"} public String wsdlVersion = "1.1"; - /** - * Should Schema be included in the wsdl - */ + // Should Schema be included in the wsdl public boolean includeSchemaInWSDL = true; - public boolean restrictSchemaToTargetNS = false; + public boolean restrictSchemaToTargetNS; + public String servletLink; + public String ejbLink; + public boolean wsxmlFileAppend; - public String servletLink = null; - public String ejbLink = null; - - public boolean wsxmlFileAppend = false; - public Map<String, List<OperationConfig>> operations = new HashMap<String, List<OperationConfig>>(); public OperationConfig createOperationConfig() @@ -145,7 +122,7 @@ } /**Configuration at the operation level*/ - /*public OperationConfig opConfig = null; + /*public OperationConfig opConfig; public OperationConfig getOperationConfig(boolean createNew) { @@ -160,10 +137,16 @@ */ public class WSDLToJavaConfig { - public String wsdlLocation = null; - public boolean unwrap = false; - public boolean mappingFileNeeded = false; - public String mappingFileName = null; + public String wsdlLocation; + public boolean unwrap; + // Is a jaxrpc-mapping file needed? + public boolean mappingFileNeeded; + // Name of the jaxrpc-mapping file + public String mappingFileName; + // Need webservices.xml file? + public boolean wsxmlFileNeeded; + public String servletLink; + public String ejbLink; } /** @@ -183,7 +166,7 @@ public String name; public boolean isOneWay = false; public List<ParameterConfig> params = new ArrayList<ParameterConfig>(); - public QName returnXmlName = null; + public QName returnXmlName; public ParameterConfig createParameterConfig() { Modified: trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -194,10 +194,15 @@ } + public Map<String, String> getNamespacePackageMap() + { + return namespacePackageMap; + } + /* (non-Javadoc) * @see org.jboss.ws.tools.WSDLToJavaIntf#setPackageNamespaceMap(java.util.Map) */ - public void setPackageNamespaceMap(Map<String, String> map) + public void setNamespacePackageMap(Map<String, String> map) { //Lets convert the package->namespace map to namespace->package map Set keys = map.keySet(); @@ -552,26 +557,33 @@ private void createSEIFile(WSDLInterface intf, File loc) throws IOException { - String fname = utils.chopPortType(intf.getName().toString()); - //Check if the portType name conflicts with a service name - if(wsdl.getService(new NCName(fname)) != null ) - fname += "_PortType"; + String seiName = getServiceEndpointInterfaceName(intf); StringBuilder buf = new StringBuilder(); utils.writeJbossHeader(buf); buf.append("package " + seiPkgName + ";" + newline); - buf.append("public interface " + fname + " extends java.rmi.Remote" + newline + "{" + newline); + buf.append("public interface " + seiName + " extends java.rmi.Remote" + newline + "{" + newline); appendMethods(intf, buf); buf.append("}" + newline); - File sei = utils.createPhysicalFile(loc, fname); + File sei = utils.createPhysicalFile(loc, seiName); FileWriter writer = new FileWriter(sei); writer.write(buf.toString()); writer.flush(); writer.close(); } + public String getServiceEndpointInterfaceName(WSDLInterface wsdlInterface) + { + String seiName = utils.chopPortType(wsdlInterface.getName().toString()); + //Check if the portType name conflicts with a service name + if (wsdl.getService(new NCName(seiName)) != null) + seiName += "_PortType"; + + return seiName; + } + private void createSEI(File loc, WSDLDefinitions wsdl) { WSDLInterface[] intarr = wsdl.getInterfaces(); Modified: trunk/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/tools/WSDotXMLCreator.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -180,7 +180,7 @@ private WebservicesMetaData constructWSMetaData() { - WebservicesMetaData wm = new WebservicesMetaData(null); + WebservicesMetaData wm = new WebservicesMetaData(); WebserviceDescriptionMetaData wsdm = new WebserviceDescriptionMetaData(wm); populateWebserviceDescriptionMetaData(wsdm); wm.addWebserviceDescription(wsdm); 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 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/tools/config/ToolsSchemaConfigReader.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -266,7 +266,14 @@ wsdl2jc.mappingFileNeeded = true; wsdl2jc.mappingFileName = attrs.getValue(FILE_ATTRIBUTE); } - + else if (WEBSERVICES_TAG.equals(localName)) + { + wsdl2jc.wsxmlFileNeeded = true; + wsdl2jc.servletLink = getOptionalAttribute(attrs, SERVLET_LINK_ATTRIBUTE, null); + wsdl2jc.ejbLink = getOptionalAttribute(attrs, EJB_LINK_ATTRIBUTE, null); + if (wsdl2jc.ejbLink == null && wsdl2jc.servletLink == null) + throw new WSException("Either servletLink or ejbLink should be specified"); + } return wsdl2jc; } 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 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -36,8 +36,6 @@ import javax.xml.namespace.QName; import org.jboss.logging.Logger; -import org.jboss.ws.utils.DOMUtils; -import org.jboss.ws.utils.DOMWriter; import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.jaxrpc.LiteralTypeMapping; @@ -52,7 +50,6 @@ import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping; import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLException; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.tools.Configuration; import org.jboss.ws.tools.JavaToWSDL; @@ -67,6 +64,8 @@ import org.jboss.ws.tools.client.ServiceCreator; import org.jboss.ws.tools.interfaces.WSDotXMLCreatorIntf; import org.jboss.ws.tools.mapping.MappingFileGenerator; +import org.jboss.ws.utils.DOMUtils; +import org.jboss.ws.utils.DOMWriter; import org.jboss.ws.utils.IOUtils; import org.jboss.ws.utils.JavaUtils; @@ -142,27 +141,6 @@ writer.close(); } - // MappingFileGenerator mgf = new MappingFileGenerator(wsdl,jwsdl.getTypeMapping() ); - // mgf.setPackageName(endpointClass.getPackage().getName()); - // mgf.setServiceEndpointInterface(endpointClass); - // mgf.setServiceName(j2wc.serviceName); - // mgf.setTypeNamespace(j2wc.typeNamespace); - // //mgf.generate(); - // JavaWsdlMapping jwm = mgf.generate(); - // fw = new FileWriter(outDir + "/" + j2wc.mappingFileName); - // fw.write(DOMWriter.printNode(DOMUtils.parse(jwm.serialize()), true)); - // fw.close(); - // - // //Generate the Request/Response structures also - // if(j2wc.wsdlStyle.equals("document")) - // { - // String seiName = endpointClass.getName(); - // mgf.generateJavaSourceFileForRequestResponseStruct(new File(outDir), - // jwm.getServiceEndpointInterfaceMapping(seiName), - // WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()),j2wc.typeNamespace ); - // } - // } - //Generate the webservices.xml file if (j2wc.wsxmlFileNeeded) { @@ -194,8 +172,7 @@ } } - private void createWrapperTypes(JavaToWSDLConfig j2wc, String outDir, UnifiedMetaData wsMetaData, JavaWsdlMapping mapping, Class endpointClass) - throws IOException + private void createWrapperTypes(JavaToWSDLConfig j2wc, String outDir, UnifiedMetaData wsMetaData, JavaWsdlMapping mapping, Class endpointClass) throws IOException { Map<QName, JavaXmlTypeMapping> index = indexMappingTypes(mapping); @@ -320,13 +297,14 @@ wsdl = wsdlToJava.convertWSDL2Java(wsdlURL); if (glc != null) - wsdlToJava.setPackageNamespaceMap(glc.packageNamespaceMap); + wsdlToJava.setNamespacePackageMap(glc.packageNamespaceMap); wsdlToJava.setUnwrap(w2jc.unwrap); wsdlToJava.generateSEI(wsdl, new File(outDir)); //Generate the Service File this.generateServiceFile(getPackageName(wsdl, glc), wsdl, outDir); + //Generate the Mapping File if (w2jc.mappingFileNeeded) { @@ -342,19 +320,56 @@ writer.write(DOMWriter.printNode(DOMUtils.parse(jwm.serialize()), true)); writer.close(); } + + //Generate the webservices.xml file + if (w2jc.wsxmlFileNeeded) + { + String seiName = "mypackage.MyServiceEndpointInterface"; + String serviceName = "MyServiceName"; + + if (wsdl.getServices().length == 1) + serviceName = wsdl.getServices()[0].getName().toString(); + + if (wsdl.getInterfaces().length == 1) + { + String seiPackage = wsdlToJava.getNamespacePackageMap().get(wsdl.getTargetNamespace()); + seiName = seiPackage + "." + wsdlToJava.getServiceEndpointInterfaceName(wsdl.getInterfaces()[0]); + } + + WSDotXMLCreatorIntf wscr = new WSDotXMLCreator(); + wscr.setTargetNamespace(wsdl.getTargetNamespace()); + wscr.setSeiName(seiName); + wscr.setServiceName(serviceName); + WSDLService wsdlService = wsdl.getService(new NCName(serviceName)); + String portName = wsdlService.getEndpoints()[0].getName().toString(); + wscr.setPortName(portName); + + String wsdlShortName = wsdlURL.getPath(); + wsdlShortName = wsdlShortName.substring(wsdlShortName.lastIndexOf("/")); + + if (w2jc.servletLink != null) + { + wscr.setMappingFile("WEB-INF/" + w2jc.mappingFileName); + wscr.setWsdlFile("WEB-INF/wsdl" + wsdlShortName); + wscr.setServletLink(w2jc.servletLink); + } + else + { + wscr.setMappingFile("META-INF/" + w2jc.mappingFileName); + wscr.setWsdlFile("META-INF/wsdl" + wsdlShortName); + wscr.setEjbLink(w2jc.ejbLink); + } + wscr.generateWSXMLDescriptor(new File(outDir + "/webservices.xml")); + } } - catch (MalformedURLException e) + catch (RuntimeException rte) { - throw new WSException(e); + throw rte; } - catch (WSDLException e) + catch (Exception ex) { - throw new WSException(e); + throw new WSException(ex); } - catch (IOException e) - { - throw new WSException(e); - } } //PRIVATE METHODS 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 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/tools/interfaces/WSDLToJavaIntf.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -91,7 +91,7 @@ * * @param map */ - public void setPackageNamespaceMap(Map<String,String> map); + public void setNamespacePackageMap(Map<String,String> map); /** * The client can provide a type mapping 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 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -146,7 +146,7 @@ OperationMetaData om = getOperationMetaData(m); OperationConfig opc = getOperationConfig(methodname, m.getParameterTypes()); if (opc != null) - om.setOneWayOperation(opc.isOneWay); + om.setOneWay(opc.isOneWay); ParameterMetaData wrappedParameter = null; List<WrappedParameter> wrappedParameters = null; Modified: trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -135,7 +135,7 @@ //Oneway annotation Oneway ow = m.getAnnotation(Oneway.class); if(ow != null) - om.setOneWayOperation(true); + om.setOneWay(true); Class ret = m.getReturnType(); ParameterMetaData retPmd = getParameterMetaDataForReturnType(ret, om, 1); Modified: trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java =================================================================== --- trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -106,6 +106,13 @@ this.out = new PrintWriter(w); } + public DOMWriter(Writer w, String charsetName) + { + this.out = new PrintWriter(w); + this.charsetName = charsetName; + this.writeXMLDeclaration = true; + } + public DOMWriter(OutputStream stream) { try @@ -194,9 +201,9 @@ * Set wheter the XML declaration should be written. * The default is false. */ - public DOMWriter setWriteXMLDeclaration(boolean writeXMLDeclaration) + public DOMWriter setWriteXMLDeclaration(boolean flag) { - this.writeXMLDeclaration = writeXMLDeclaration; + this.writeXMLDeclaration = flag; return this; } @@ -223,7 +230,10 @@ if (charsetName != null) out.print(" encoding='" + charsetName + "'"); - out.println("?>"); + out.print("?>"); + if (prettyprint) + out.println(); + wroteXMLDeclaration = true; } Modified: trunk/src/main/resources/schema/jbossws-tool_1_0.xsd =================================================================== --- trunk/src/main/resources/schema/jbossws-tool_1_0.xsd 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/main/resources/schema/jbossws-tool_1_0.xsd 2006-11-21 12:38:04 UTC (rev 1488) @@ -225,6 +225,11 @@ <xs:documentation>Specifies the JSR-109 mapping file to generate.</xs:documentation> </xs:annotation> </xs:element> + <xs:element name="webservices" type="ns1:wsxmlType" minOccurs="0"> + <xs:annotation> + <xs:documentation>Used to generate the JSR-109 webservices.xml file</xs:documentation> + </xs:annotation> + </xs:element> </xs:sequence> <xs:attribute name="file" type="xs:anyURI" use="required"> <xs:annotation> Modified: trunk/src/test/build.xml =================================================================== --- trunk/src/test/build.xml 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/build.xml 2006-11-21 12:38:04 UTC (rev 1488) @@ -305,6 +305,7 @@ <classpath location="${build.test.dir}"/> </taskdef> <mkdir dir="${build.test.dir}/wstools/java"/> + <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" config="${test.resources.dir}/jaxrpc/jbws718/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/> @@ -326,6 +327,7 @@ <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF" config="${test.resources.dir}/jaxws/samples/wsaddressing/wstools-config.xml"/> <move todir="${build.test.dir}/wstools/java"> + <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" includes="org/**"/> <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> </move> </target> Modified: trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -23,6 +23,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.StringWriter; import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPMessage; @@ -30,6 +31,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.utils.DOMUtils; import org.jboss.ws.utils.DOMWriter; +import org.w3c.dom.Document; import org.w3c.dom.Element; /** @@ -191,4 +193,24 @@ assertEquals(expStr, wasStr); } + + // [JBWS-762] DOMUtils.parse skips peer comments on Document node + public void testDocumentComments() throws Exception + { + String expStr = + "<?xml version='1.0' encoding='UTF-8'?>" + + "<!-- Some root comment -->" + + "<root>" + + "<!-- Some element comment -->" + + "<element>some value</element>" + + "</root>"; + + + Document doc = DOMUtils.parse(expStr).getOwnerDocument(); + StringWriter strwr = new StringWriter(); + new DOMWriter(strwr, "UTF-8").print(doc); + String wasStr = strwr.toString(); + + assertEquals(expStr, wasStr); + } } Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/PingMsg.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/PingMsg.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/PingMsg.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -1,24 +0,0 @@ -/* - * JBoss, the OpenSource EJB server - * Distributable under LGPL license. See terms of license at gnu.org. - */ -//Auto Generated by jbossws - Please do not edit!!! - - -package org.jboss.test.ws.jaxrpc.jbws718; - - -public class PingMsg -{ - - protected java.lang.String message; - public PingMsg(){} - - public PingMsg(java.lang.String message){ - this.message=message; - } - public java.lang.String getMessage() { return message ;} - - public void setMessage(java.lang.String message){ this.message=message; } - -} Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/PingMsgResponse.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/PingMsgResponse.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/PingMsgResponse.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -1,15 +0,0 @@ -/* - * JBoss, the OpenSource EJB server - * Distributable under LGPL license. See terms of license at gnu.org. - */ -//Auto Generated by jbossws - Please do not edit!!! - - -package org.jboss.test.ws.jaxrpc.jbws718; - - -public class PingMsgResponse -{ - public PingMsgResponse(){ - } -} Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/TestService_PortType.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/TestService_PortType.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/TestService_PortType.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -1,12 +0,0 @@ -/* - * JBoss, the OpenSource EJB server - * Distributable under LGPL license. See terms of license at gnu.org. - */ -//Auto Generated by jbossws - Please do not edit!!! - -package org.jboss.test.ws.jaxrpc.jbws718; -public interface TestService_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jaxrpc.jbws718.PingMsgResponse ping(org.jboss.test.ws.jaxrpc.jbws718.PingMsg pingMsg) throws java.rmi.RemoteException; -} Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/TestService_Service.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/TestService_Service.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws718/TestService_Service.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -1,19 +0,0 @@ -/* -* JBoss, the OpenSource EJB server -* Distributable under LGPL license. See terms of license at gnu.org. -*/ - -//Auto Generated by jbossws - Please do not edit!!! - -package org.jboss.test.ws.jaxrpc.jbws718; - - -import javax.xml.rpc.ServiceException; - - -public interface TestService_Service extends javax.xml.rpc.Service -{ - - public org.jboss.test.ws.jaxrpc.jbws718.TestService_PortType getTestServicePort() throws ServiceException; - -} Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -93,8 +93,7 @@ public void testMSFTElementScan() throws Exception { System.out.println("FIXME: [JBWS-1313] Fix XOP tests in trunk"); - if (true) - return; + if (true) return; SchemaUtils utils = SchemaUtils.getInstance(); File f = new File("resources/jaxrpc/xop/schema.xsd"); Modified: trunk/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -231,7 +231,7 @@ File wsdlfix = new File(expPath); Element exp = DOMUtils.parse(wsdlfix.toURL().openStream()); File wsdlFile = new File(genpath); - assertNotNull("Generated WSDL File exists?", wsdlFile); + assertTrue("Generated WSDL File exists", wsdlFile.exists()); Element was = DOMUtils.parse(wsdlFile.toURL().openStream()); //assertEquals(exp,was); //Now that we have figured out that the wsdl files are well formed, Modified: trunk/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/assertions/Jaxrpc20AssertionsTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -29,7 +29,6 @@ import org.jboss.test.ws.tools.sei.assertions.AssertReturnTypeExtendRemote; import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.JavaToWSDL; @@ -80,7 +79,7 @@ jwsdl.setServiceName(WSDLUtils.getInstance().getJustClassName(seiClass) + "Service"); try { - WSDLDefinitions wsdl = jwsdl.generate(loadClass(seiName)); + jwsdl.generate(loadClass(seiName)); fail("Test should have failed"); } catch (WSException is) @@ -108,7 +107,7 @@ jwsdl.setServiceName(WSDLUtils.getInstance().getJustClassName(seiClass) + "Service"); try { - WSDLDefinitions wsdl = jwsdl.generate(loadClass(seiName)); + jwsdl.generate(loadClass(seiName)); fail("Test should have failed"); } catch (IllegalArgumentException iae) Modified: trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -190,6 +190,7 @@ JaxrpcMappingValidator mv = new JaxrpcMappingValidator(); //assertTrue(mv.validate(fix,gen)); + System.out.println("FIXME: [JBWS-1291] Fix JaxrpcMappingValidator"); } /** Modified: trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -58,8 +58,7 @@ checkWSDLToJava(config); } - // JBWS-719 - // Enable schema validation on wstools config + // [JBWS-719] Enable schema validation on wstools config public void testInvalidConfig() throws IOException, ClassNotFoundException { String[] args = new String[] { "-dest", "tools/globalconfig", "-config", "resources/tools/config/invalidConfig.xml" }; Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomArrays/CustomArrayJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomArrays/CustomArrayJava2WSDLTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/CustomArrays/CustomArrayJava2WSDLTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -37,11 +37,6 @@ return base; } - public String getFixMe() - { - return null; - } - public String getWSDLName() { return base + "Service.wsdl"; Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Inheritance/InheritanceJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Inheritance/InheritanceJava2WSDLTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Inheritance/InheritanceJava2WSDLTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -38,11 +38,6 @@ return base; } - public String getFixMe() - { - return null; - } - public String getWSDLName() { return base + "Service.wsdl"; Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -64,7 +64,6 @@ String[] args = new String[] { "-dest", out_dir, "-config", configloc }; WSTools tools = new WSTools(); tools.generate(args); - semanticallyValidateWSDL(wsdlFix, out_dir + "/wsdl/" + getWSDLName()); } } Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -37,13 +37,12 @@ { return base; } - - @Override + protected String getFixMe() { - return null; + return "FIXME: [JBWS-1394] Fix OneWayJava2WSDLTestCase in trunk"; } - + public String getWSDLName() { return base + "Service.wsdl"; Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/PublicPrivate/PublicPrivateJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/PublicPrivate/PublicPrivateJava2WSDLTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/PublicPrivate/PublicPrivateJava2WSDLTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -39,11 +39,6 @@ return base; } - public String getFixMe() - { - return null; - } - public String getWSDLName() { return base + "Service.wsdl"; Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardArrays/StandardArraysJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardArrays/StandardArraysJava2WSDLTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardArrays/StandardArraysJava2WSDLTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -38,11 +38,6 @@ return base; } - public String getFixMe() - { - return null; - } - public String getWSDLName() { return base + "Service.wsdl"; Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardHolders/StandardHoldersJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardHolders/StandardHoldersJava2WSDLTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/StandardHolders/StandardHoldersJava2WSDLTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -38,11 +38,6 @@ return base; } - public String getFixMe() - { - return null; - } - public String getWSDLName() { return base + "Service.wsdl"; Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/UserException/UserExceptionJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/UserException/UserExceptionJava2WSDLTestCase.java 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/UserException/UserExceptionJava2WSDLTestCase.java 2006-11-21 12:38:04 UTC (rev 1488) @@ -38,11 +38,6 @@ return base; } - public String getFixMe() - { - return null; - } - public String getWSDLName() { return base + "Service.wsdl"; Deleted: trunk/src/test/resources/jaxrpc/jbws718/WEB-INF/jaxrpc-mapping.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws718/WEB-INF/jaxrpc-mapping.xml 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/resources/jaxrpc/jbws718/WEB-INF/jaxrpc-mapping.xml 2006-11-21 12:38:04 UTC (rev 1488) @@ -1,51 +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.jaxrpc.jbws718</package-type> - <namespaceURI>http://jboss.org/test/ws/jbws718</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws718.PingMsg</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/jbws718'>typeNS:&gt... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws718.PingMsgResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/jbws718'>typeNS:&gt... - <qname-scope>complexType</qname-scope> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws718.TestService_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/jbws718'>serviceNS:T... - <port-mapping> - <port-name>TestServicePort</port-name> - <java-port-name>TestServicePort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws718.TestService_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/jbws718'>portTypeNS... - <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/jbws718'>bindingNS:T... - <service-endpoint-method-mapping> - <java-method-name>ping</java-method-name> - <wsdl-operation>ping</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.jbws718.PingMsg</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/jbws718'>wsdlMsgNS:P... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.jbws718.PingMsgResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/jbws718'>wsdlMsgNS:P... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Deleted: trunk/src/test/resources/jaxrpc/jbws718/WEB-INF/webservices.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws718/WEB-INF/webservices.xml 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/resources/jaxrpc/jbws718/WEB-INF/webservices.xml 2006-11-21 12:38:04 UTC (rev 1488) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<webservices xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:impl="http://jboss.org/test/ws/jbws718" - 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_web_services_1_1.xsd" - version="1.1"> - - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestServicePort</port-component-name> - <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws718.TestService_PortType</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestService</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> Modified: trunk/src/test/resources/jaxrpc/jbws718/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws718/wstools-config.xml 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/resources/jaxrpc/jbws718/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) @@ -9,8 +9,12 @@ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <wsdl-java file="WEB-INF/wsdl/TestService.wsdl"> + <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"> <mapping file="jaxrpc-mapping.xml" /> + <webservices servlet-link="TestService" /> </wsdl-java> </configuration> Modified: trunk/src/test/resources/jaxrpc/jbws807/wstools-config.xml =================================================================== --- trunk/src/test/resources/jaxrpc/jbws807/wstools-config.xml 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/resources/jaxrpc/jbws807/wstools-config.xml 2006-11-21 12:38:04 UTC (rev 1488) @@ -9,6 +9,9 @@ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + <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"> <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> Modified: trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml =================================================================== --- trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/resources/tools/jbws-211/jbosswsConfig/CustomHolders/CustomHoldersConfig.xml 2006-11-21 12:38:04 UTC (rev 1488) @@ -1,12 +1,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"> - <java-wsdl> - <service name="CustomHoldersService" - endpoint="org.jboss.test.ws.tools.jbws_211.sei.CustomHolders.CustomHoldersSEI" - style="rpc" - /> - <namespaces target-namespace="http://org.jboss.ws" - type-namespace="http://org.jboss.ws/types"/> - </java-wsdl> +<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"> + <java-wsdl> + <service name="CustomHoldersService" endpoint="org.jboss.test.ws.tools.jbws_211.sei.CustomHolders.CustomHoldersSEI" style="rpc"/> + <namespaces target-namespace="http://org.jboss.ws" type-namespace="http://org.jboss.ws/types"/> + </java-wsdl> </configuration> Modified: trunk/src/test/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml =================================================================== --- trunk/src/test/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml 2006-11-21 11:34:09 UTC (rev 1487) +++ trunk/src/test/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml 2006-11-21 12:38:04 UTC (rev 1488) @@ -1,15 +1,9 @@ -<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"> - <java-wsdl> - <service name="OneWayService" - endpoint="org.jboss.test.ws.tools.jbws_211.sei.OneWay.TestOneWaySEI" - style="rpc"> - <operation name="oneWayOperation" one-way="true"> - <parameter type="java.lang.String"/> - </operation> - </service> - <namespaces target-namespace="http://org.jboss.ws" - type-namespace="http://org.jboss.ws/types"/> - </java-wsdl> +<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"> + <java-wsdl> + <service name="OneWayService" endpoint="org.jboss.test.ws.tools.jbws_211.sei.OneWay.TestOneWaySEI" style="rpc"> + <operation name="oneWayOperation" one-way="true"/> + </service> + <namespaces target-namespace="http://org.jboss.ws" type-namespace="http://org.jboss.ws/types"/> + </java-wsdl> </configuration>