You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2008/07/29 16:52:21 UTC
svn commit: r680721 - in
/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl:
EndpointDescriptionImpl.java ServiceDescriptionImpl.java
Author: damrhei
Date: Tue Jul 29 07:52:20 2008
New Revision: 680721
URL: http://svn.apache.org/viewvc?rev=680721&view=rev
Log:
Small change to DBC WSDL handling
Modified:
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java?rev=680721&r1=680720&r2=680721&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java Tue Jul 29 07:52:20 2008
@@ -1871,7 +1871,10 @@
private WsdlComposite generateWSDL(DescriptionBuilderComposite dbc) {
WsdlComposite wsdlComposite = null;
- Definition defn = dbc.getWsdlDefinition();
+ Definition defn = dbc.getWsdlDefinition(getServiceQName());
+ if(defn == null) {
+ defn = dbc.getWsdlDefinition();
+ }
if (defn == null || !isAxisServiceBuiltFromWSDL) {
//Invoke the callback for generating the wsdl
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java?rev=680721&r1=680720&r2=680721&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java Tue Jul 29 07:52:20 2008
@@ -1386,7 +1386,11 @@
// TODO: Validate on the class that a public constructor exists
// TODO: Validate on the class that a finalize() method does not exist
if (!DescriptionUtils.isEmpty(composite.getWebServiceAnnot().wsdlLocation())) {
- if (composite.getWsdlDefinition() == null && composite.getWsdlURL() == null) {
+ if (composite.getWsdlDefinition(getServiceQName()) == null
+ &&
+ composite.getWsdlDefinition() == null
+ &&
+ composite.getWsdlURL() == null) {
throw ExceptionFactory.makeWebServiceException(
Messages.getMessage("validateIntegrityErr7",composite.getClassName(),
composite.getWebServiceAnnot().wsdlLocation()));