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 ke...@apache.org on 2007/04/05 07:17:53 UTC
svn commit: r525703 - in
/webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2:
description/AxisBinding.java description/AxisBindingOperation.java
description/AxisService.java util/WSDLSerializationUtil.java
Author: keithc
Date: Wed Apr 4 22:17:52 2007
New Revision: 525703
URL: http://svn.apache.org/viewvc?view=rev&rev=525703
Log:
Fixing the malformed XML in the WSDL error message
Fixing issues with ?wsdl2 (SOAP bindings not serialized correctly)
Modified:
webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisService.java
webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
Modified: webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisBinding.java?view=diff&rev=525703&r1=525702&r2=525703
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisBinding.java (original)
+++ webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisBinding.java Wed Apr 4 22:17:52 2007
@@ -19,6 +19,7 @@
package org.apache.axis2.description;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.util.WSDLSerializationUtil;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axiom.om.OMElement;
@@ -125,7 +126,8 @@
bindingElement.addAttribute(omFactory.createOMAttribute(WSDL2Constants.INTERFACE_LOCAL_NAME, null,
tns.getPrefix() + ":" + interfaceName));
- if (WSDL2Constants.URI_WSDL2_SOAP.equals(type)) {
+ if (WSDL2Constants.URI_WSDL2_SOAP.equals(type) || Constants.URI_SOAP11_HTTP.equals(type) ||
+ Constants.URI_SOAP12_HTTP.equals(type)) {
// SOAP Binding specific properties
property = (String) options.get(WSDL2Constants.ATTR_WSOAP_VERSION);
if (property != null) {
Modified: webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java?view=diff&rev=525703&r1=525702&r2=525703
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java (original)
+++ webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java Wed Apr 4 22:17:52 2007
@@ -19,6 +19,7 @@
package org.apache.axis2.description;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.util.WSDLSerializationUtil;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.engine.AxisConfiguration;
@@ -124,7 +125,8 @@
null, tns.getPrefix() + ":" +
this.name.getLocalPart()));
- if (WSDL2Constants.URI_WSDL2_SOAP.equals(type)) {
+ if (WSDL2Constants.URI_WSDL2_SOAP.equals(type) || Constants.URI_SOAP11_HTTP.equals(type) ||
+ Constants.URI_SOAP12_HTTP.equals(type)) {
// SOAP Binding specific properties
property = (String) this.options.get(WSDL2Constants.ATTR_WSOAP_ACTION);
if (property != null) {
Modified: webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=525703&r1=525702&r2=525703
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/description/AxisService.java Wed Apr 4 22:17:52 2007
@@ -1004,7 +1004,7 @@
String wsdlntfound = "<error>" +
"<description>Unable to generate WSDL 1.1 for this service</description>" +
"<reason>If you wish Axis2 to automatically generate the WSDL 1.1, then please +" +
- "set useOriginalwsdl as false in your services.xml" +
+ "set useOriginalwsdl as false in your services.xml</reason>" +
"</error>";
out.write(wsdlntfound.getBytes());
out.flush();
Modified: webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java?view=diff&rev=525703&r1=525702&r2=525703
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java (original)
+++ webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java Wed Apr 4 22:17:52 2007
@@ -314,17 +314,20 @@
/**
* Adds the namespaces to the given OMElement
+ *
* @param descriptionElement - The OMElement that the namespaces should be added to
- * @param nameSpaceMap - The namespaceMap
+ * @param nameSpaceMap - The namespaceMap
*/
public static void populateNamespaces(OMElement descriptionElement, Map nameSpaceMap) {
- Iterator keys = nameSpaceMap.keySet().iterator();
- while (keys.hasNext()) {
- String key = (String) keys.next();
- if ("".equals(key)) {
- descriptionElement.declareDefaultNamespace((String) nameSpaceMap.get(key));
- } else {
- descriptionElement.declareNamespace((String) nameSpaceMap.get(key), key);
+ if (nameSpaceMap != null) {
+ Iterator keys = nameSpaceMap.keySet().iterator();
+ while (keys.hasNext()) {
+ String key = (String) keys.next();
+ if ("".equals(key)) {
+ descriptionElement.declareDefaultNamespace((String) nameSpaceMap.get(key));
+ } else {
+ descriptionElement.declareNamespace((String) nameSpaceMap.get(key), key);
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org