svn commit: r523164 - in /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2: description/AxisService2WSDL2.java util/WSDLSerializationUtil.java

[keithc]

Author: keithc
Date: Tue Mar 27 21:21:35 2007
New Revision: 523164

URL: http://svn.apache.org/viewvc?view=rev&rev=523164
Log:
Fixe for Axis2-2406


Modified:
    
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL2.java
    
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java

Modified: 
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL2.java
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL2.java?view=diff&rev=523164&r1=523163&r2=523164
==============================================================================
--- 
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL2.java
 (original)
+++ 
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL2.java
 Tue Mar 27 21:21:35 2007
@@ -45,6 +45,8 @@
         // Declare all the defined namespaces in the document
         WSDLSerializationUtil.populateNamespaces(descriptionElement, 
nameSpacesMap);
 
+        descriptionElement.declareNamespace(axisService.getTargetNamespace(), 
axisService.getTargetNamespacePrefix());
+
         // Need to add the targetnamespace as an attribute according to the 
wsdl 2.0 spec
         OMAttribute targetNamespace = omFactory
                 .createOMAttribute(WSDL2Constants.TARGET_NAMESPACE, null,

Modified: 
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java?view=diff&rev=523164&r1=523163&r2=523164
==============================================================================
--- 
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
 (original)
+++ 
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
 Tue Mar 27 21:21:35 2007
@@ -251,7 +251,7 @@
         }
         OMElement serviceElement = null;
         for (int i = 0; i < eprs.length; i++) {
-            serviceElement = 
omFactory.createOMElement(WSDL2Constants.ENDPOINT_LOCAL_NAME, null);
+            serviceElement = 
omFactory.createOMElement(WSDL2Constants.SERVICE_LOCAL_NAME, null);
             
serviceElement.addAttribute(omFactory.createOMAttribute(WSDL2Constants.ATTRIBUTE_NAME,
                                                                     null, 
axisService.getName()));
             serviceElement.addAttribute(omFactory.createOMAttribute(
@@ -287,8 +287,8 @@
                     WSDL2Constants.ATTRIBUTE_NAME, null,
                     WSDL2Constants.DEFAULT_HTTP_ENDPOINT_NAME));
             httpEndpointElement.addAttribute(omFactory.createOMAttribute(
-                    WSDL2Constants.BINDING_LOCAL_NAME, null, 
axisService.getName() +
-                    Java2WSDLConstants.HTTP_BINDING));
+                    WSDL2Constants.BINDING_LOCAL_NAME, null,
+                    tns.getPrefix() + ":" + axisService.getName() + 
Java2WSDLConstants.HTTP_BINDING));
             httpEndpointElement.addAttribute(
                     
omFactory.createOMAttribute(WSDL2Constants.ATTRIBUTE_ADDRESS, null, eprs[i]));
             serviceElement.addChild(httpEndpointElement);



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]