Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 60110 invoked from network); 20 Mar 2008 13:25:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Mar 2008 13:25:23 -0000 Received: (qmail 3792 invoked by uid 500); 20 Mar 2008 13:25:20 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 3647 invoked by uid 500); 20 Mar 2008 13:25:19 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 3636 invoked by uid 500); 20 Mar 2008 13:25:19 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 3633 invoked by uid 99); 20 Mar 2008 13:25:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Mar 2008 06:25:19 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Mar 2008 13:24:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3E59E1A9832; Thu, 20 Mar 2008 06:24:57 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r639283 - in /webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws: context/WebServiceContextImpl.java server/endpoint/EndpointImpl.java Date: Thu, 20 Mar 2008 13:24:55 -0000 To: axis2-cvs@ws.apache.org From: pradine@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080320132457.3E59E1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pradine Date: Thu Mar 20 06:24:55 2008 New Revision: 639283 URL: http://svn.apache.org/viewvc?rev=639283&view=rev Log: Only add the WSDL location to endpoint references created by a web service if it is explicitly specified by the user, e.g. by using the W3CEndpointReferenceBuilder. Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/WebServiceContextImpl.java webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/endpoint/EndpointImpl.java Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/WebServiceContextImpl.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/WebServiceContextImpl.java?rev=639283&r1=639282&r2=639283&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/WebServiceContextImpl.java (original) +++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/WebServiceContextImpl.java Thu Mar 20 06:24:55 2008 @@ -31,7 +31,6 @@ import javax.xml.ws.WebServiceContext; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.wsaddressing.W3CEndpointReference; -import java.net.URI; import java.security.Principal; public class WebServiceContextImpl implements WebServiceContext { @@ -106,11 +105,9 @@ if (soapMessageContext != null) { QName service = (QName) soapMessageContext.get(MessageContext.WSDL_SERVICE); QName endpoint = (QName) soapMessageContext.get(MessageContext.WSDL_PORT); - URI wsdlURI = (URI) soapMessageContext.get(MessageContext.WSDL_DESCRIPTION); - String wsdlLocation = (wsdlURI != null) ? wsdlURI.toString() : null; org.apache.axis2.addressing.EndpointReference axis2EPR = - EndpointReferenceUtils.createAxis2EndpointReference(null, service, endpoint, wsdlLocation, addressingNamespace); + EndpointReferenceUtils.createAxis2EndpointReference(null, service, endpoint, null, addressingNamespace); try { EndpointReferenceUtils.addReferenceParameters(axis2EPR, referenceParameters); Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/endpoint/EndpointImpl.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/endpoint/EndpointImpl.java?rev=639283&r1=639282&r2=639283&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/endpoint/EndpointImpl.java (original) +++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/endpoint/EndpointImpl.java Thu Mar 20 06:24:55 2008 @@ -28,7 +28,6 @@ import org.apache.axis2.jaxws.description.DescriptionFactory; import org.apache.axis2.jaxws.description.EndpointDescription; import org.apache.axis2.jaxws.description.ServiceDescription; -import org.apache.axis2.jaxws.description.ServiceDescriptionWSDL; import org.apache.axis2.jaxws.i18n.Messages; import org.apache.axis2.transport.http.HTTPWorkerFactory; import org.apache.axis2.transport.http.server.SimpleHttpServer; @@ -229,13 +228,12 @@ String address = endpointDesc.getEndpointAddress(); QName serviceName = endpointDesc.getServiceQName(); QName portName = endpointDesc.getPortQName(); - String wsdlLocation = ((ServiceDescriptionWSDL) endpointDesc.getServiceDescription()).getWSDLLocation(); if (!BindingUtils.isSOAPBinding(binding.getBindingID())) throw new UnsupportedOperationException("This method is unsupported for the binding: " + binding.getBindingID()); org.apache.axis2.addressing.EndpointReference axis2EPR = - EndpointReferenceUtils.createAxis2EndpointReference(address, serviceName, portName, wsdlLocation, addressingNamespace); + EndpointReferenceUtils.createAxis2EndpointReference(address, serviceName, portName, null, addressingNamespace); try { EndpointReferenceUtils.addReferenceParameters(axis2EPR, referenceParameters); --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org