Author: thomas.diesler(a)jboss.com Date: 2006-10-24 04:33:04 -0400 (Tue, 24 Oct 2006) New Revision: 1294 Added: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java Modified: branches/tdiesler/trunk/.classpath branches/tdiesler/trunk/build.xml branches/tdiesler/trunk/src/main/etc/jbossws-component-info.xml branches/tdiesler/trunk/src/main/etc/jbossws14-component-info.xml branches/tdiesler/trunk/src/main/java/javax/xml/ws/spi/Provider.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerDelegateJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerResolverImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/PortInfoImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java Log: partial commit Modified: branches/tdiesler/trunk/.classpath =================================================================== --- branches/tdiesler/trunk/.classpath 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/.classpath 2006-10-24 08:33:04 UTC (rev 1294) @@ -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"/> @@ -29,5 +28,6 @@ <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/> <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-common.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/build.xml =================================================================== --- branches/tdiesler/trunk/build.xml 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/build.xml 2006-10-24 08:33:04 UTC (rev 1294) @@ -222,6 +222,7 @@ <fileset dir="${build.classes.dir}"> <include name="javax/jws/**"/> <include name="javax/xml/ws/**"/> + <include name="org/jboss/ws/integration/jboss/WebServiceRefDeployer.class"/> </fileset> </jar> @@ -231,7 +232,6 @@ <fileset dir="${build.classes.dir}"> <include name="org/jboss/ws/**"/> <exclude name="org/jboss/ws/integration/**"/> - <exclude name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/> </fileset> <fileset dir="${build.resources.dir}"> <include name="schema/**"/> @@ -244,7 +244,6 @@ <fileset dir="${build.classes.dir}"> <include name="org/jboss/ws/integration/*.class"/> <include name="org/jboss/ws/integration/jboss/**"/> - <include name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/> </fileset> </jar> @@ -357,7 +356,6 @@ <fileset dir="${build.classes14.dir}"> <include name="org/jboss/ws/**"/> <exclude name="org/jboss/ws/integration/**"/> - <exclude name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/> </fileset> <fileset dir="${build.resources.dir}"> <include name="schema/**"/> @@ -370,7 +368,6 @@ <fileset dir="${build.classes14.dir}"> <include name="org/jboss/ws/integration/*.class"/> <include name="org/jboss/ws/integration/jboss/**"/> - <include name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/> </fileset> </jar> Modified: branches/tdiesler/trunk/src/main/etc/jbossws-component-info.xml =================================================================== --- branches/tdiesler/trunk/src/main/etc/jbossws-component-info.xml 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/etc/jbossws-component-info.xml 2006-10-24 08:33:04 UTC (rev 1294) @@ -5,8 +5,11 @@ version=&quot;@repository.id(a)&quot; description="JBossWS an implementation of J2EE Web Services"> + <artifact id="jboss-jaxrpc.jar"/> + <artifact id="jboss-jaxws.jar"/> + <artifact id="jboss-saaj.jar"/> + <artifact id="jbossws-client.jar"/> <artifact id="jbossws.sar"/> - <artifact id="jbossws-client.jar"/> <import componentref="apache-xmlsec"> <compatible version="@apache-xmlsec@"/> @@ -25,8 +28,11 @@ </import> <export> + <include input="jboss-jaxrpc.jar"/> + <include input="jboss-jaxws.jar"/> + <include input="jboss-saaj.jar"/> + <include input="jbossws-client.jar"/> <include input="jbossws.sar"/> - <include input="jbossws-client.jar"/> </export> </component> Modified: branches/tdiesler/trunk/src/main/etc/jbossws14-component-info.xml =================================================================== --- branches/tdiesler/trunk/src/main/etc/jbossws14-component-info.xml 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/etc/jbossws14-component-info.xml 2006-10-24 08:33:04 UTC (rev 1294) @@ -5,8 +5,11 @@ version=&quot;@repository.id(a)&quot; description="JBossWS an implementation of J2EE Web Services"> + <artifact id="jboss-jaxrpc.jar"/> + <artifact id="jboss-jaxws.jar"/> + <artifact id="jboss-saaj.jar"/> + <artifact id="jbossws14-client.jar"/> <artifact id="jbossws14.sar"/> - <artifact id="jbossws14-client.jar"/> <import componentref="apache-xmlsec"> <compatible version="@apache-xmlsec@"/> @@ -28,8 +31,11 @@ </import> <export> + <include input="jboss-jaxrpc.jar"/> + <include input="jboss-jaxws.jar"/> + <include input="jboss-saaj.jar"/> + <include input="jbossws14-client.jar"/> <include input="jbossws14.sar"/> - <include input="jbossws14-client.jar"/> </export> </component> Modified: branches/tdiesler/trunk/src/main/java/javax/xml/ws/spi/Provider.java =================================================================== --- branches/tdiesler/trunk/src/main/java/javax/xml/ws/spi/Provider.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/javax/xml/ws/spi/Provider.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -67,7 +67,7 @@ } } - public abstract ServiceDelegate createServiceDelegate(URL url, QName qname, Class class1); + public abstract ServiceDelegate createServiceDelegate(URL url, QName serviceName, Class class1); /** * Creates an endpoint object with the provided binding and implementation object. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -67,19 +67,19 @@ /** Build from WSDL and jaxrpc-mapping.xml */ - public ServiceMetaData buildMetaData(QName serviceQName, URL wsdlURL) + public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL) { if (wsdlURL == null) throw new IllegalArgumentException("Invalid wsdlURL: " + wsdlURL); - log.debug("START buildMetaData: [service=" + serviceQName + "]"); + log.debug("START buildMetaData: [service=" + serviceName + "]"); try { UnifiedMetaData wsMetaData = new UnifiedMetaData(); wsMetaData.setResourceLoader(resourceLoader); wsMetaData.setClassLoader(classLoader); - ServiceMetaData serviceMetaData = new ServiceMetaData(wsMetaData, serviceQName); + ServiceMetaData serviceMetaData = new ServiceMetaData(wsMetaData, serviceName); wsMetaData.addService(serviceMetaData); serviceMetaData.setWsdlFile(wsdlURL.toExternalForm()); @@ -107,24 +107,24 @@ private void buildMetaDataInternal(ServiceMetaData serviceMetaData, WSDLDefinitions wsdlDefinitions) throws IOException { - QName serviceQName = serviceMetaData.getQName(); + QName serviceName = serviceMetaData.getServiceName(); // Get the WSDL service WSDLService wsdlService = null; - if (serviceQName == null) + if (serviceName == null) { if (wsdlDefinitions.getServices().length != 1) throw new IllegalArgumentException("Expected a single service element"); wsdlService = wsdlDefinitions.getServices()[0]; - serviceMetaData.setQName(wsdlService.getQName()); + serviceMetaData.setServiceName(wsdlService.getQName()); } else { - wsdlService = wsdlDefinitions.getService(new NCName(serviceQName.getLocalPart())); + wsdlService = wsdlDefinitions.getService(new NCName(serviceName.getLocalPart())); } if (wsdlService == null) - throw new IllegalArgumentException("Cannot obtain wsdl service: " + serviceQName); + throw new IllegalArgumentException("Cannot obtain wsdl service: " + serviceName); // Build endpoint meta data for (WSDLEndpoint wsdlEndpoint : wsdlService.getEndpoints()) Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -148,7 +148,7 @@ private void buildMetaDataInternal(ServiceMetaData serviceMetaData, WSDLDefinitions wsdlDefinitions, JavaWsdlMapping javaWsdlMapping, UnifiedServiceRefMetaData serviceRefMetaData) throws IOException { - QName serviceQName = serviceMetaData.getQName(); + QName serviceQName = serviceMetaData.getServiceName(); // Get the WSDL service WSDLService wsdlService = null; @@ -158,7 +158,7 @@ throw new IllegalArgumentException("Expected a single service element"); wsdlService = wsdlDefinitions.getServices()[0]; - serviceMetaData.setQName(wsdlService.getQName()); + serviceMetaData.setServiceName(wsdlService.getQName()); } else { Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -126,7 +126,7 @@ throw new WSException("Cannot find port in wsdl: " + portName); // set service name - serviceMetaData.setQName(wsdlEndpoint.getWsdlService().getQName()); + serviceMetaData.setServiceName(wsdlEndpoint.getWsdlService().getQName()); QName interfaceQName = wsdlEndpoint.getInterface().getQName(); ServerEndpointMetaData sepMetaData = new ServerEndpointMetaData(serviceMetaData, portName, interfaceQName, Type.JAXRPC); Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -885,7 +885,7 @@ { try { - String serviceName = serviceMetaData.getQName().getLocalPart(); + String serviceName = serviceMetaData.getServiceName().getLocalPart(); WSDLGenerator generator = new JAXBWSDLGenerator(getJAXBContext(epMetaData)); WSDLDefinitions wsdlDefinitions = generator.generate(serviceMetaData); Added: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -0,0 +1,76 @@ +/* + * 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.ws.integration.jboss; + +// $Id$ + +import java.lang.reflect.Constructor; +import java.net.URL; + +import javax.naming.Context; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceRef; + +import org.jboss.logging.Logger; +import org.jboss.naming.Util; +import org.jboss.ws.deployment.JAXWSClientMetaDataBuilder; + +/** + * Binds a JAXWS Service object into JNDI + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Oct-2006 + */ +public class WebServiceRefDeployer +{ + // provide logging + private static Logger log = Logger.getLogger(WebServiceRefDeployer.class); + + private WebServiceRefDeployer() + { + // Hide ctor + } + + public static void setupWebServiceRef(Context jndiCtx, String jndiName, Class type, WebServiceRef ref) throws Exception + { + String wsdlLocation = ref.wsdlLocation(); + log.debug("setupWebServiceRef [jndi=" + jndiName + ",type=" + type + ",wsdl=" + wsdlLocation + "]"); + + if (Service.class.isAssignableFrom(type) == false) + throw new IllegalArgumentException("WebServiceRef type '" + type + "' is not assignable to javax.xml.ws.Service"); + + Service service; + if (wsdlLocation.length() > 0) + { + Constructor ctor = type.getConstructor(new Class[]{URL.class, QName.class}); + URL wsdlURL = new URL(wsdlLocation); + service = (Service)ctor.newInstance(new Object[]{wsdlURL, null}); + } + else + { + service = (Service)type.newInstance(); + } + + Util.bind(jndiCtx, jndiName, service); + } +} Property changes on: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -292,7 +292,7 @@ if (wrappedParameters == null) throw new WSException("Cannot generate a type when their is no wrapped parameters"); - String serviceName = serviceMetaData.getQName().getLocalPart(); + String serviceName = serviceMetaData.getServiceName().getLocalPart(); String parameterName = pmd.getXmlName().getLocalPart(); String endpointName = endpointMetaData.getQName().getLocalPart(); String packageName = endpointMetaData.getServiceEndpointInterface().getPackage().getName(); Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -135,7 +135,7 @@ */ public QName getServiceName() { - return serviceMetaData.getQName(); + return serviceMetaData.getServiceName(); } /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerDelegateJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerDelegateJAXWS.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerDelegateJAXWS.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -135,7 +135,7 @@ private PortInfo getPortInfo(EndpointMetaData epMetaData) { - QName serviceName = epMetaData.getServiceMetaData().getQName(); + QName serviceName = epMetaData.getServiceMetaData().getServiceName(); QName portName = epMetaData.getQName(); String bindingId = epMetaData.getBindingId(); PortInfo info = new PortInfoImpl(serviceName, portName, bindingId); Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerResolverImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerResolverImpl.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerResolverImpl.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -206,7 +206,7 @@ UnifiedMetaData wsMetaData = epMetaData.getServiceMetaData().getUnifiedMetaData(); for (ServiceMetaData smd : wsMetaData.getServices()) { - QName qname = smd.getQName(); + QName qname = smd.getServiceName(); String nsURI = qname.getNamespaceURI(); String localPart = qname.getLocalPart(); if (nsURI.equals(namespaceURI) && localPart.startsWith(localPattern)) @@ -220,7 +220,7 @@ UnifiedMetaData wsMetaData = epMetaData.getServiceMetaData().getUnifiedMetaData(); for (ServiceMetaData smd : wsMetaData.getServices()) { - QName qname = smd.getQName(); + QName qname = smd.getServiceName(); if (services.equals(qname)) { infos.add(new PortInfoImpl(qname, null, null)); Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/PortInfoImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/PortInfoImpl.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/PortInfoImpl.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -45,7 +45,7 @@ public PortInfoImpl(EndpointMetaData epMetaData) { - this.serviceName = epMetaData.getServiceMetaData().getQName(); + this.serviceName = epMetaData.getServiceMetaData().getServiceName(); this.portName = epMetaData.getQName(); this.bindingID = epMetaData.getBindingId(); } Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -86,9 +86,6 @@ public ServiceDelegateImpl(URL wsdlURL, QName serviceName) { - if (serviceName == null) - throw new IllegalArgumentException("Illegal null service name"); - JAXWSClientMetaDataBuilder builder = new JAXWSClientMetaDataBuilder(); ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); @@ -223,7 +220,7 @@ @Override public QName getServiceName() { - return serviceMetaData.getQName(); + return serviceMetaData.getServiceName(); } /** Returns an Iterator for the list of QNames of service endpoints grouped by this service */ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -68,7 +68,7 @@ // The service endpoints private Map<QName, EndpointMetaData> endpoints = new LinkedHashMap<QName, EndpointMetaData>(); - private QName qname; + private QName serviceName; private String wsdName; private String wsdlFile; private String jaxrpcMappingFile; @@ -88,10 +88,10 @@ // The security configuration private WSSecurityConfiguration securityConfiguration; - public ServiceMetaData(UnifiedMetaData wsMetaData, QName name) + public ServiceMetaData(UnifiedMetaData wsMetaData, QName serviceName) { this.wsMetaData = wsMetaData; - this.qname = name; + this.serviceName = serviceName; this.types = new TypesMetaData(this); } @@ -100,14 +100,14 @@ return wsMetaData; } - public void setQName(QName name) + public void setServiceName(QName serviceName) { - this.qname = name; + this.serviceName = serviceName; } - public QName getQName() + public QName getServiceName() { - return qname; + return serviceName; } public String getWebserviceDescriptionName() @@ -371,14 +371,14 @@ /** Assert that the given namespace is the WSDL's target namespace */ public void assertTargetNamespace(String targetNS) { - if (getQName().getNamespaceURI().equals(targetNS) == false) + if (getServiceName().getNamespaceURI().equals(targetNS) == false) throw new WSException("Requested namespace is not WSDL target namespace: " + targetNS); } public String toString() { StringBuilder buffer = new StringBuilder("\nServiceMetaData:"); - buffer.append("\n qname=" + qname); + buffer.append("\n qname=" + serviceName); buffer.append("\n wsdName=" + wsdName); buffer.append("\n wsdlFile=" + wsdlFile); buffer.append("\n jaxrpcFile=" + jaxrpcMappingFile); Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -195,7 +195,7 @@ */ private void buildServiceMapping(EndpointMetaData endpoint) { - QName origQName = endpoint.getServiceMetaData().getQName(); + QName origQName = endpoint.getServiceMetaData().getServiceName(); String serviceInterfaceName = endpoint.getServiceEndpointInterface().getPackage().getName() + "." + origQName.getLocalPart(); QName serviceQName = new QName(origQName.getNamespaceURI(), origQName.getLocalPart(), "serviceNS"); Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -277,8 +277,8 @@ { WSDLService wsdlService = new WSDLService(wsdl); - wsdlService.setQName(service.getQName()); - wsdlService.setName(new NCName(service.getQName().getLocalPart())); + wsdlService.setQName(service.getServiceName()); + wsdlService.setName(new NCName(service.getServiceName().getLocalPart())); wsdl.addService(wsdlService); EndpointMetaData endpoint = null; @@ -308,7 +308,7 @@ wsdl.setWsdlNamespace(Constants.NS_WSDL11); // One WSDL per service - String ns = service.getQName().getNamespaceURI(); + String ns = service.getServiceName().getNamespaceURI(); wsdl.setTargetNamespace(ns); wsdl.registerNamespaceURI(ns, "tns"); wsdl.registerNamespaceURI(Constants.NS_SOAP11, "soap"); Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -25,7 +25,7 @@ public class ApplicationClient { - @WebServiceRef(wsdlLocation = "resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl") + @WebServiceRef public TestEndpointService service; public static void main(String[] args)