[jbossws-commits] JBossWS SVN: r2229 - in branches/jbossws-1.2.0: jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client and 12 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-01-31 19:52:54 -0500 (Wed, 31 Jan 2007) New Revision: 2229 Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/TestServicePortType.wsdl branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar/TestService.wsdl branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/wstools-config.xml Removed: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/TestService.wsdl branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/wstools-config.xml Modified: branches/jbossws-1.2.0/integration-jboss42/build.xml branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceFactoryImpl.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/webservices.xml Log: Fix CTS regression wsdl-publish-location Modified: branches/jbossws-1.2.0/integration-jboss42/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-02-01 00:43:43 UTC (rev 2228) +++ branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-02-01 00:52:54 UTC (rev 2229) @@ -49,7 +49,6 @@ <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss42.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/ws/integration/jboss42/**"/> - <exclude name="org/jboss/ws/integration/jboss42/*EJB3.java"/> <classpath refid="jboss42.integration.classpath"/> <classpath path="${core.output.classes14.dir}"/> <classpath path="${core.output.classes.dir}"/> Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceFactoryImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceFactoryImpl.java 2007-02-01 00:43:43 UTC (rev 2228) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceFactoryImpl.java 2007-02-01 00:52:54 UTC (rev 2229) @@ -106,7 +106,7 @@ */ public Service createService(QName serviceName) throws ServiceException { - return new ServiceImpl(serviceName, null); + return new ServiceImpl(serviceName); } /** @@ -154,7 +154,7 @@ */ public Service createService(URL wsdlURL, QName serviceName, URL mappingURL, URL securityURL) throws ServiceException { - ServiceImpl service = new ServiceImpl(serviceName, wsdlURL, mappingURL, securityURL, null); + ServiceImpl service = new ServiceImpl(serviceName, wsdlURL, mappingURL, securityURL); return service; } } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-02-01 00:43:43 UTC (rev 2228) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-02-01 00:52:54 UTC (rev 2229) @@ -91,9 +91,8 @@ /** * Construct a Service without WSDL meta data */ - ServiceImpl(QName serviceName, UnifiedServiceRefMetaData usrMetaData) + ServiceImpl(QName serviceName) { - this.usrMetaData = usrMetaData; UnifiedMetaData wsMetaData = new UnifiedMetaData(new ResourceLoaderAdapter()); serviceMetaData = new ServiceMetaData(wsMetaData, serviceName); handlerRegistry = new HandlerRegistryImpl(serviceMetaData); @@ -102,10 +101,9 @@ /** * Construct a Service that has access to some WSDL meta data */ - ServiceImpl(QName serviceName, URL wsdlURL, URL mappingURL, URL securityURL, UnifiedServiceRefMetaData usrMetaData) + ServiceImpl(QName serviceName, URL wsdlURL, URL mappingURL, URL securityURL) { this.wsdlLocation = wsdlURL; - this.usrMetaData = usrMetaData; JAXRPCClientMetaDataBuilder builder = new JAXRPCClientMetaDataBuilder(); ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-02-01 00:43:43 UTC (rev 2228) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-02-01 00:52:54 UTC (rev 2229) @@ -150,7 +150,7 @@ else { log.debug("Create jaxrpc service with no wsdl"); - jaxrpcService = new ServiceImpl(new QName(Constants.NS_JBOSSWS_URI, "AnonymousService"), usrMetaData); + jaxrpcService = new ServiceImpl(new QName(Constants.NS_JBOSSWS_URI, "AnonymousService")); } // Set any service level properties Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java 2007-02-01 00:43:43 UTC (rev 2228) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java 2007-02-01 00:52:54 UTC (rev 2229) @@ -42,6 +42,7 @@ import org.jboss.util.NotImplementedException; import org.jboss.ws.Constants; import org.jboss.ws.WSException; +import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; import org.jboss.ws.core.utils.DOMUtils; import org.jboss.ws.core.utils.IOUtils; import org.jboss.ws.core.utils.ResourceURL; @@ -71,12 +72,9 @@ { this.udi = udi; - String archiveName = udi.simpleName; - if (archiveName.endsWith(".jar") || archiveName.endsWith(".ejb3")) - expLocation = "META-INF/wsdl/"; - else if (archiveName.endsWith(".war")) + if (udi.type == DeploymentType.JAXRPC_JSE || udi.type == DeploymentType.JAXWS_JSE) expLocation = "WEB-INF/wsdl/"; - else throw new WSException("Can only publish wsdl from WAR or JAR deployment"); + else expLocation = "META-INF/wsdl/"; } /** Publish the deployed wsdl file to the data directory @@ -88,59 +86,52 @@ // For each service for (ServiceMetaData serviceMetaData : wsMetaData.getServices()) { - String wsdlPath = serviceMetaData.getWsdlLocation().toExternalForm(); - log.debug("Publish WSDL file: " + wsdlPath); + File targetFile = getPublishLocation(deploymentName, serviceMetaData); + targetFile.getParentFile().mkdirs(); - if (wsdlPath != null) + // Get the wsdl definition and write it to the wsdl publish location + try { - File targetFile = getPublishLocation(deploymentName, serviceMetaData); - targetFile.getParentFile().mkdirs(); + Writer fWriter = IOUtils.getCharsetFileWriter(targetFile, Constants.DEFAULT_XML_CHARSET); + WSDLDefinitions wsdlDefinitions = serviceMetaData.getWsdlDefinitions(); + new WSDLWriter(wsdlDefinitions).write(fWriter, Constants.DEFAULT_XML_CHARSET); - // Get the wsdl definition and write it to the wsdl publish location - try - { - Writer fWriter = IOUtils.getCharsetFileWriter(targetFile, Constants.DEFAULT_XML_CHARSET); - WSDLDefinitions wsdlDefinitions = serviceMetaData.getWsdlDefinitions(); - new WSDLWriter(wsdlDefinitions).write(fWriter, Constants.DEFAULT_XML_CHARSET); + URL wsdlPublishURL = targetFile.toURL(); + serviceMetaData.setWsdlLocation(wsdlPublishURL); + log.info("WSDL published to: " + wsdlPublishURL); - URL wsdlPublishURL = targetFile.toURL(); - log.info("WSDL published to: " + wsdlPublishURL); + // delete wsdl temp file + ServerConfigFactory factory = ServerConfigFactory.getInstance(); + ServerConfig config = factory.getServerConfig(); + if (targetFile.getAbsolutePath().startsWith(config.getServerTempDir().getAbsolutePath())) + targetFile.delete(); - // delete wsdl temp file - ServerConfigFactory factory = ServerConfigFactory.getInstance(); - ServerConfig config = factory.getServerConfig(); - if (wsdlPath.startsWith(config.getServerTempDir().toURL().toExternalForm())) - { - new File(wsdlPath).delete(); - } + // udpate the wsdl file location + serviceMetaData.setWsdlLocation(wsdlPublishURL); - // udpate the wsdl file location - serviceMetaData.setWsdlLocation(wsdlPublishURL); + // Process the wsdl imports + Definition wsdl11Definition = wsdlDefinitions.getWsdlOneOneDefinition(); + if (wsdl11Definition != null) + { + publishWsdlImports(targetFile.toURL(), wsdl11Definition); - // Process the wsdl imports - Definition wsdl11Definition = wsdlDefinitions.getWsdlOneOneDefinition(); - if (wsdl11Definition != null) - { - publishWsdlImports(targetFile.toURL(), wsdl11Definition); - - // Publish XMLSchema imports - Document document = wsdlDefinitions.getWsdlDocument(); - publishSchemaImports(targetFile.toURL(), document.getDocumentElement()); - } - else - { - throw new NotImplementedException("WSDL-2.0 imports"); - } + // Publish XMLSchema imports + Document document = wsdlDefinitions.getWsdlDocument(); + publishSchemaImports(targetFile.toURL(), document.getDocumentElement()); } - catch (RuntimeException rte) + else { - throw rte; + throw new NotImplementedException("WSDL-2.0 imports"); } - catch (Exception e) - { - throw new WSException("Cannot publish wsdl to: " + targetFile, e); - } } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception e) + { + throw new WSException("Cannot publish wsdl to: " + targetFile, e); + } } } @@ -281,6 +272,17 @@ */ private File getPublishLocation(String archiveName, ServiceMetaData serviceMetaData) throws IOException { + String wsdlLocation = null; + if (serviceMetaData.getWsdlLocation() != null) + wsdlLocation = serviceMetaData.getWsdlLocation().toExternalForm(); + else if (serviceMetaData.getWsdlFile() != null) + wsdlLocation = serviceMetaData.getWsdlFile(); + + if (wsdlLocation == null) + throw new IllegalStateException("Cannot obtain wsdl location for: " + serviceMetaData.getServiceName()); + + log.debug("Publish WSDL file: " + wsdlLocation); + // Only file URLs are supported in <wsdl-publish-location> String publishLocation = serviceMetaData.getWsdlPublishLocation(); boolean predefinedLocation = publishLocation != null && publishLocation.startsWith("file:"); @@ -304,10 +306,9 @@ } File wsdlFile; - String wsdlLocation = serviceMetaData.getWsdlLocation().toExternalForm(); - if (wsdlLocation.startsWith(expLocation)) + if (wsdlLocation.indexOf(expLocation) >= 0) { - wsdlLocation = wsdlLocation.substring(expLocation.length()); + wsdlLocation = wsdlLocation.substring(wsdlLocation.indexOf(expLocation) + expLocation.length()); wsdlFile = new File(locationFile + "/" + wsdlLocation); } else if (wsdlLocation.startsWith("vfsfile:") || wsdlLocation.startsWith("file:") || wsdlLocation.startsWith("jar:")) @@ -319,7 +320,7 @@ { throw new WSException("Invalid wsdlFile '" + wsdlLocation + "', expected in: " + expLocation); } - + return wsdlFile; } } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-02-01 00:43:43 UTC (rev 2228) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-02-01 00:52:54 UTC (rev 2229) @@ -85,12 +85,11 @@ serviceMetaData.setWebserviceDescriptionName(wsdMetaData.getWebserviceDescriptionName()); wsMetaData.addService(serviceMetaData); - // Set wsdl location + // Set wsdl file String wsdlFile = wsdMetaData.getWsdlFile(); - URL wsdlLocation = udi.getMetaDataFileURL(wsdlFile); + serviceMetaData.setWsdlFile(wsdlFile); // Unmarshall the WSDL - serviceMetaData.setWsdlLocation(wsdlLocation); WSDLDefinitions wsdlDefinitions = serviceMetaData.getWsdlDefinitions(); // Unmarshall the jaxrpc-mapping.xml Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-01 00:43:43 UTC (rev 2228) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-01 00:52:54 UTC (rev 2229) @@ -24,6 +24,7 @@ // $Id$ import java.io.IOException; +import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -36,6 +37,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; +import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.jaxrpc.TypeMappingImpl; import org.jboss.ws.core.jaxrpc.TypeMappingRegistryImpl; import org.jboss.ws.core.jaxrpc.Use; @@ -72,6 +74,7 @@ private String serviceRefName; private String wsdName; private URL wsdlLocation; + private String wsdlFile; private URL mappingLocation; private String handlerChain; private String wsdlPublishLocation; @@ -132,6 +135,16 @@ this.wsdName = wsdName; } + public String getWsdlFile() + { + return wsdlFile; + } + + public void setWsdlFile(String wsdlFile) + { + this.wsdlFile = wsdlFile; + } + public URL getWsdlLocation() { return wsdlLocation; @@ -255,17 +268,46 @@ */ public WSDLDefinitions getWsdlDefinitions() { + URL wsdlURL = wsdlLocation; + if (wsdlURL == null && wsdlFile != null) + { + // Try wsdlFile as URL + try + { + wsdlURL = new URL(wsdlFile); + } + catch (MalformedURLException e) + { + // ignore + } + + // Try wsdlFile as child from root + if (wsdlURL == null) + { + try + { + UnifiedVirtualFile vfsRoot = getUnifiedMetaData().getRootFile(); + wsdlURL = vfsRoot.findChild(wsdlFile).toURL(); + } + catch (IOException ex) + { + throw new IllegalStateException("Cannot find wsdl: " + wsdlFile); + } + } + } + WSDLDefinitions wsdlDefinitions = null; - if (wsdlLocation != null) + if (wsdlURL != null) { - wsdlDefinitions = (WSDLDefinitions)wsMetaData.getWSDLDefinition(wsdlLocation.toExternalForm()); + wsdlDefinitions = (WSDLDefinitions)wsMetaData.getWSDLDefinition(wsdlURL.toExternalForm()); if (wsdlDefinitions == null) { WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - wsdlDefinitions = factory.parse(wsdlLocation); - wsMetaData.addWSDLDefinition(wsdlLocation.toExternalForm(), wsdlDefinitions); + wsdlDefinitions = factory.parse(wsdlURL); + wsMetaData.addWSDLDefinition(wsdlURL.toExternalForm(), wsdlDefinitions); } } + return wsdlDefinitions; } Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-01 00:43:43 UTC (rev 2228) +++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-01 00:52:54 UTC (rev 2229) @@ -3173,6 +3173,20 @@ </metainf> </jar> + <!-- jaxrpc-wsdlpublish --> + <war warfile="${tests.output.dir}/libs/jaxrpc-wsdlpublish.war" webxml="${tests.output.dir}/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsdlpublish/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="jboss-web.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <!-- jaxrpc-wsse-account-signup.war --> <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -3564,6 +3578,7 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <!-- jaxrpc-xop-doclit with handlers --> <war warfile="${tests.output.dir}/libs/jaxrpc-xop-doclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -3609,7 +3624,6 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> @@ -3641,7 +3655,6 @@ <include name="webservices.xml"/> </webinf> </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit_handler-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.java 2007-02-01 00:52:54 UTC (rev 2229) @@ -0,0 +1,31 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.wsdlpublish; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +public interface TestEndpoint extends Remote +{ + String echoSimple(String inStr) throws RemoteException; + +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java 2007-02-01 00:52:54 UTC (rev 2229) @@ -0,0 +1,62 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.wsdlpublish; + +import java.io.File; +import java.net.URL; + +import org.jboss.logging.Logger; +import org.jboss.ws.WSException; +import org.jboss.ws.core.server.ServerConfig; +import org.jboss.ws.core.server.ServerConfigFactory; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; + +public class TestEndpointImpl implements TestEndpoint +{ + private Logger log = Logger.getLogger(TestEndpointImpl.class); + + public String echoSimple(String inStr) + { + // Get the server data dir + ServerConfigFactory factory = ServerConfigFactory.getInstance(); + ServerConfig serverConfig = factory.getServerConfig(); + File dataDir = serverConfig.getServerDataDir(); + + // Parse the wsdl from the expected publish location + // Append the portType name to the return string + try + { + URL wsdlURL = new File(dataDir.getAbsolutePath() + "/wsdl/some-wsdl-location/foo/bar/TestService.wsdl").toURL(); + WSDLDefinitions wsdl = WSDLDefinitionsFactory.newInstance().parse(wsdlURL); + inStr += ":" + wsdl.getInterfaces()[0].getName(); + } + catch (Exception ex) + { + WSException.rethrow(ex); + } + + log.info("echoSimple: " + inStr); + + return inStr; + } +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2007-02-01 00:52:54 UTC (rev 2229) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.wsdlpublish; + +import java.io.File; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; + +/** + * Test <wsdl-publish-location> + * + * @author Thomas.Diesler(a)jboss.org + * @since 31-Jan-2007 + */ +public class WsdlPublishTestCase extends JBossWSTest +{ + public static Test suite() throws Exception + { + return JBossWSTestSetup.newTestSetup(WsdlPublishTestCase.class, "jaxrpc-wsdlpublish.war"); + } + + public void testClientProxy() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-wsdlpublish?wsdl"); + URL mappingURL = new File("resources/jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml").toURL(); + QName serviceName = new QName("http://org.jboss.test.ws/wsdlpublish", "TestService"); + Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL); + + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String resStr = port.echoSimple("Hello"); + assertEquals("Hello:TestEndpoint", resStr); + } +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish (from rev 2217, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/jbws812) Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF (from rev 2228, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/jbws812/WEB-INF) Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/jbws812/WEB-INF/jaxrpc-mapping.xml 2007-02-01 00:43:43 UTC (rev 2228) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml 2007-02-01 00:52:54 UTC (rev 2229) @@ -1,20 +1,20 @@ -<?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'> +<?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.jbws812</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws812/types</namespaceURI> + <package-type>org.jboss.test.ws.jaxrpc.wsdlpublish</package-type> + <namespaceURI>http://org.jboss.test.ws/wsdlpublish/types</namespaceURI> </package-mapping> <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws812.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws812'>serviceNS:TestService</wsdl-service-name> + <service-interface>org.jboss.test.ws.jaxrpc.wsdlpublish.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/wsdlpublish'>serviceNS:TestService</wsdl-service-name> <port-mapping> <port-name>TestEndpointPort</port-name> <java-port-name>TestEndpointPort</java-port-name> </port-mapping> </service-interface-mapping> <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws812.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws812'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws812'>bindingNS:TestEndpointBinding</wsdl-binding> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.wsdlpublish.TestEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/wsdlpublish'>portTypeNS:TestEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/wsdlpublish'>bindingNS:TestEndpointBinding</wsdl-binding> <service-endpoint-method-mapping> <java-method-name>echoSimple</java-method-name> <wsdl-operation>echoSimple</wsdl-operation> @@ -22,14 +22,14 @@ <param-position>0</param-position> <param-type>java.lang.String</param-type> <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws812'>wsdlMsgNS:TestEndpoint_echoSimple</wsdl-message> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/wsdlpublish'>wsdlMsgNS:TestEndpoint_echoSimple</wsdl-message> <wsdl-message-part-name>String_1</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws812'>wsdlMsgNS:TestEndpoint_echoSimpleResponse</wsdl-message> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/wsdlpublish'>wsdlMsgNS:TestEndpoint_echoSimpleResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml 2007-02-01 00:52:54 UTC (rev 2229) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <wsdl-publish-location>file:@wsdl-publish-location@/some-wsdl-location</wsdl-publish-location> + </webservice-description> +</jboss-web> Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/jbws812/WEB-INF/web.xml 2007-02-01 00:43:43 UTC (rev 2228) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml 2007-02-01 00:52:54 UTC (rev 2229) @@ -7,7 +7,7 @@ <servlet> <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws812.TestEndpointImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxrpc.wsdlpublish.TestEndpointImpl</servlet-class> </servlet> <servlet-mapping> <servlet-name>TestEndpoint</servlet-name> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/jbws812/WEB-INF/webservices.xml 2007-02-01 00:43:43 UTC (rev 2228) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/webservices.xml 2007-02-01 00:52:54 UTC (rev 2229) @@ -1,19 +1,15 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws812' 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'> +<webservices 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_web_services_1_1.xsd'> <webservice-description> <webservice-description-name>TestService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> + <wsdl-file>WEB-INF/wsdl/foo/bar/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component> - <port-component-name>TestEndpointPort</port-component-name> - <wsdl-port>impl:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws812.TestEndpoint</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestEndpoint</servlet-link> - </service-impl-bean> - <handler> - <handler-name>ServerHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.jbws812.ServerHandler</handler-class> - </handler> + <port-component-name>TestEndpointPort</port-component-name> + <wsdl-port xmlns:portNS='http://org.jboss.test.ws/wsdlpublish'>portNS:TestEndpointPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.wsdlpublish.TestEndpoint</service-endpoint-interface> + <service-impl-bean> + <servlet-link>TestEndpoint</servlet-link> + </service-impl-bean> </port-component> </webservice-description> </webservices> \ No newline at end of file Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/jbws812/WEB-INF/wsdl/TestService.wsdl 2007-02-01 00:43:43 UTC (rev 2228) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/TestService.wsdl 2007-02-01 00:52:54 UTC (rev 2229) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws812' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws812' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='TestEndpoint_echoSimple'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoSimpleResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='TestEndpoint'> - <operation name='echoSimple' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echoSimple'/> - <output message='tns:TestEndpoint_echoSimpleResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echoSimple'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws/jbws812' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws/jbws812' use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/TestServicePortType.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/TestServicePortType.wsdl (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/TestServicePortType.wsdl 2007-02-01 00:52:54 UTC (rev 2229) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestServicePortType' targetNamespace='http://org.jboss.test.ws/wsdlpublish' xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/wsdlpublish' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <types/> + + <message name='TestEndpoint_echoSimple'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoSimpleResponse'> + <part name='result' type='xsd:string'/> + </message> + + <portType name='TestEndpoint'> + <operation name='echoSimple' parameterOrder='String_1'> + <input message='tns:TestEndpoint_echoSimple'/> + <output message='tns:TestEndpoint_echoSimpleResponse'/> + </operation> + </portType> + +</definitions> \ No newline at end of file Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/TestServicePortType.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar/TestService.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar/TestService.wsdl (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar/TestService.wsdl 2007-02-01 00:52:54 UTC (rev 2229) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/wsdlpublish' xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/wsdlpublish' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <import namespace="http://org.jboss.test.ws/wsdlpublish" location="../../foo/TestServicePortType.wsdl"/> + + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echoSimple'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws/wsdlpublish' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws/wsdlpublish' use='literal'/> + </output> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/WEB-INF/wsdl/foo/bar/TestService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/wstools-config.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/jbws812/wstools-config.xml 2007-01-31 15:40:31 UTC (rev 2217) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/wstools-config.xml 2007-02-01 00:52:54 UTC (rev 2229) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools -cp ../../../../output/classes -dest ./WEB-INF -config wstools-config.xml ---> - -<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="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws812.TestEndpoint" style="rpc"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws812" type-namespace="http://org.jboss.test.ws/jbws812/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> -</configuration> - -<!-- - <handler> - <handler-name>ServerHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.jbws812.ServerHandler</handler-class> - </handler> ---> \ No newline at end of file Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/wstools-config.xml (from rev 2228, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/jbws812/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/wsdlpublish/wstools-config.xml 2007-02-01 00:52:54 UTC (rev 2229) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + wstools -cp ../../../../output/classes -dest ./WEB-INF -config wstools-config.xml +--> + +<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="TestService" endpoint="org.jboss.test.ws.jaxrpc.wsdlpublish.TestEndpoint" style="rpc"> + </service> + <namespaces target-namespace="http://org.jboss.test.ws/wsdlpublish" type-namespace="http://org.jboss.test.ws/wsdlpublish/types"/> + <mapping file="jaxrpc-mapping.xml"/> + <webservices servlet-link="TestEndpoint"/> + </java-wsdl> +</configuration>