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/05/21 15:21:18 UTC
svn commit: r658675 - in
/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description:
builder/WsdlComposite.java impl/EndpointDescriptionImpl.java
Author: damrhei
Date: Wed May 21 06:21:18 2008
New Revision: 658675
URL: http://svn.apache.org/viewvc?rev=658675&view=rev
Log:
Allow WsdlGenerator to set the WSDL file name for the root WSDL definition.
Modified:
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WsdlComposite.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WsdlComposite.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WsdlComposite.java?rev=658675&r1=658674&r2=658675&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WsdlComposite.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WsdlComposite.java Wed May 21 06:21:18 2008
@@ -48,8 +48,7 @@
/** @return Returns the root WSDL Definition */
public Definition getRootWsdlDefinition() {
-
- return wsdlDefinitionsMap.get(getWsdlFileName().toLowerCase());
+ return wsdlDefinitionsMap.get(getWsdlFileName());
}
/** @return Returns the wsdlFileName. */
@@ -72,7 +71,7 @@
*/
public void setWsdlFileName(String wsdlFileName) {
this.wsdlFileName = wsdlFileName;
- }
+ }
}
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=658675&r1=658674&r2=658675&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 Wed May 21 06:21:18 2008
@@ -1874,9 +1874,13 @@
dbc.getCustomWsdlGenerator().generateWsdl(implName, this);
if (wsdlComposite != null) {
- wsdlComposite.setWsdlFileName(
- (this.getAnnoWebServiceServiceName() + ".wsdl").toLowerCase());
-
+ if(wsdlComposite.getWsdlFileName() == null
+ ||
+ "".equals(wsdlComposite.getWsdlFileName())) {
+ wsdlComposite.setWsdlFileName(
+ (this.getAnnoWebServiceServiceName() + ".wsdl").toLowerCase());
+ }
+
Definition wsdlDef = wsdlComposite.getRootWsdlDefinition();
try {