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 he...@apache.org on 2005/06/23 06:21:00 UTC

svn commit: r193070 - /webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java

Author: hemapani
Date: Wed Jun 22 21:20:58 2005
New Revision: 193070

URL: http://svn.apache.org/viewcvs?rev=193070&view=rev
Log:
fix the versonning support in the Message Reciver

Modified:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java?rev=193070&r1=193069&r2=193070&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java Wed Jun 22 21:20:58 2005
@@ -28,10 +28,14 @@
 import org.apache.axis.om.OMNamespace;
 import org.apache.axis.soap.SOAPEnvelope;
 import org.apache.axis.soap.SOAPFactory;
+import org.apache.axis.soap.impl.llom.soap11.SOAP11Constants;
+import org.apache.axis.soap.impl.llom.soap12.SOAP12Constants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.wsdl.WSDLService;
 
+import com.ibm.wsdl.extensions.soap.SOAPConstants;
+
 /**
  * This is a Simple java Provider.
  */
@@ -127,8 +131,15 @@
                 newmsgContext.setEnvelope(envelope);
             } else if((parameters != null)
                     && (parameters.length == 0)){
-            	SOAPEnvelope envelope = null;
-
+                        SOAPFactory fac = null;
+                String nsURI = msgContext.getEnvelope().getNamespace().getName();
+                if(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(nsURI)){
+                    fac = OMAbstractFactory.getSOAP12Factory();
+                }else{
+                    fac = OMAbstractFactory.getSOAP11Factory();
+                }
+                
+                SOAPEnvelope envelope = fac.getDefaultEnvelope();
                 String style = msgContext.getOperationContext().getAxisOperation().getStyle();
 
                 if (WSDLService.STYLE_DOC.equals(style)) {
@@ -137,7 +148,6 @@
 
                     // invoke the WebService
                     OMElement result = (OMElement) method.invoke(obj, parms);
-                    envelope = OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
                     envelope.getBody().setFirstChild(result);
 
                 } else if (WSDLService.STYLE_RPC.equals(style)) {
@@ -146,8 +156,6 @@
 
                     // invoke the WebService
                     OMElement result = (OMElement) method.invoke(obj, parms);
-                    SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
-                    envelope = fac.getDefaultEnvelope();
 
                     OMNamespace ns = fac.createOMNamespace("http://soapenc/", "res");
                     OMElement responseMethodName = fac.createOMElement(methodName + "Response", ns);