You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pr...@apache.org on 2008/03/20 14:24:55 UTC
svn commit: r639283 - in
/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws:
context/WebServiceContextImpl.java server/endpoint/EndpointImpl.java
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