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 2007/11/26 12:14:02 UTC
svn commit: r598225 - in /webservices/axis2/branches/java/jaxws21/modules:
jaxws/src/org/apache/axis2/jaxws/ jaxws/src/org/apache/axis2/jaxws/context/
jaxws/src/org/apache/axis2/jaxws/context/utils/
jaxws/src/org/apache/axis2/jaxws/spi/ kernel/src/org/...
Author: pradine
Date: Mon Nov 26 03:13:56 2007
New Revision: 598225
URL: http://svn.apache.org/viewvc?rev=598225&view=rev
Log:
Improve use of the wsdl location property.
Modified:
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/WebServiceContextImpl.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/addressing/metadata/WSDLLocation.java
Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java?rev=598225&r1=598224&r2=598225&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java Mon Nov 26 03:13:56 2007
@@ -249,8 +249,9 @@
QName service = endpointDesc.getServiceQName();
QName port = endpointDesc.getPortQName();
URL wsdlURL = ((ServiceDescriptionWSDL) endpointDesc.getServiceDescription()).getWSDLLocation();
+ String wsdlLocation = (wsdlURL != null) ? wsdlURL.toString() : null;
- epr = EndpointReferenceUtils.createAxis2EndpointReference(address, service, port, wsdlURL.toString(), addressingNamespace);
+ epr = EndpointReferenceUtils.createAxis2EndpointReference(address, service, port, wsdlLocation, addressingNamespace);
}
return epr;
Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/WebServiceContextImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/WebServiceContextImpl.java?rev=598225&r1=598224&r2=598225&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/WebServiceContextImpl.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/WebServiceContextImpl.java Mon Nov 26 03:13:56 2007
@@ -108,9 +108,10 @@
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, wsdlURI.toString(), addressingNamespace);
+ EndpointReferenceUtils.createAxis2EndpointReference(null, service, endpoint, wsdlLocation, addressingNamespace);
try {
EndpointReferenceUtils.addReferenceParameters(axis2EPR, referenceParameters);
Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java?rev=598225&r1=598224&r2=598225&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java Mon Nov 26 03:13:56 2007
@@ -81,7 +81,7 @@
catch (URISyntaxException ex) {
// TODO: NLS/RAS
log.warn("Unable to convert WSDL location URL to URI. URL: " +
- wsdlLocation.toString() + "; Service: " + sd.getServiceQName(), ex);
+ wsdlLocation.toString() + "; Service: " + description.getServiceQName(), ex);
}
soapMessageContext
.put(javax.xml.ws.handler.MessageContext.WSDL_DESCRIPTION, wsdlLocationURI);
@@ -90,11 +90,11 @@
}
soapMessageContext
- .put(javax.xml.ws.handler.MessageContext.WSDL_SERVICE, sd.getServiceQName());
+ .put(javax.xml.ws.handler.MessageContext.WSDL_SERVICE, description.getServiceQName());
soapMessageContext
.setScope(javax.xml.ws.handler.MessageContext.WSDL_SERVICE, Scope.APPLICATION);
if (log.isDebugEnabled()) {
- log.debug("WSDL_SERVICE :" + sd.getServiceQName());
+ log.debug("WSDL_SERVICE :" + description.getServiceQName());
}
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java?rev=598225&r1=598224&r2=598225&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/Provider.java Mon Nov 26 03:13:56 2007
@@ -120,10 +120,19 @@
org.apache.axis2.jaxws.spi.ServiceDelegate serviceDelegate = null;
try {
- ServiceName serviceName = EndpointReferenceHelper.getServiceNameMetadata(axis2EPR, addressingNamespace);
- WSDLLocation wsdlLocation = EndpointReferenceHelper.getWSDLLocationMetadata(axis2EPR, addressingNamespace);
+ ServiceName serviceName =
+ EndpointReferenceHelper.getServiceNameMetadata(axis2EPR, addressingNamespace);
+ WSDLLocation wsdlLocation =
+ EndpointReferenceHelper.getWSDLLocationMetadata(axis2EPR, addressingNamespace);
+ URL wsdlLocationURL = null;
- serviceDelegate = new org.apache.axis2.jaxws.spi.ServiceDelegate(new URL(wsdlLocation.getURL()), serviceName.getName(), Service.class);
+ if (wsdlLocation.getLocation() != null)
+ wsdlLocationURL = new URL(wsdlLocation.getLocation());
+ else
+ wsdlLocationURL = new URL(axis2EPR.getAddress() + "?wsdl");
+
+ serviceDelegate =
+ new org.apache.axis2.jaxws.spi.ServiceDelegate(wsdlLocationURL, serviceName.getName(), Service.class);
}
catch (Exception e) {
//TODO NLS enable.
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/addressing/metadata/WSDLLocation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/addressing/metadata/WSDLLocation.java?rev=598225&r1=598224&r2=598225&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/addressing/metadata/WSDLLocation.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/addressing/metadata/WSDLLocation.java Mon Nov 26 03:13:56 2007
@@ -46,10 +46,10 @@
public void setTargetNamespace(String targetNamespace) {
this.targetNamespace = targetNamespace;
}
- public String getURL() {
+ public String getLocation() {
return wsdlURL;
}
- public void setURL(String wsdlURL) {
+ public void setLocation(String wsdlURL) {
this.wsdlURL = wsdlURL;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org