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 ja...@apache.org on 2005/06/28 15:58:14 UTC
svn commit: r202187 - in
/webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers:
AbstractMessageReceiver.java RawXMLINOutMessageReceiver.java
Author: jaliya
Date: Tue Jun 28 06:58:12 2005
New Revision: 202187
URL: http://svn.apache.org/viewcvs?rev=202187&view=rev
Log:
Fix the SOAP version in AbstractMessageReceiver
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageReceiver.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java?rev=202187&r1=202186&r2=202187&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java Tue Jun 28 06:58:12 2005
@@ -34,7 +34,8 @@
public static final String SERVICE_CLASS = "ServiceClass";
public static final String SCOPE = "scope";
- SOAPFactory fac;
+ protected SOAPFactory fac;
+
/**
* Method makeNewServiceObject
@@ -108,5 +109,9 @@
} else {
return makeNewServiceObject(msgContext);
}
+ }
+
+ public SOAPFactory getSOAPFactory(){
+ return fac;
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageReceiver.java?rev=202187&r1=202186&r2=202187&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageReceiver.java Tue Jun 28 06:58:12 2005
@@ -23,13 +23,9 @@
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.DependencyManager;
import org.apache.axis.engine.MessageReceiver;
-import org.apache.axis.om.OMAbstractFactory;
import org.apache.axis.om.OMElement;
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;
@@ -107,7 +103,7 @@
// invoke the WebService
OMElement result = (OMElement) method.invoke(obj, parms);
- envelope = fac.getDefaultEnvelope();
+ envelope = getSOAPFactory().getDefaultEnvelope();
envelope.getBody().setFirstChild(result);
} else if (WSDLService.STYLE_RPC.equals(style)) {
@@ -116,10 +112,10 @@
// invoke the WebService
OMElement result = (OMElement) method.invoke(obj, parms);
- envelope = fac.getDefaultEnvelope();
+ envelope = getSOAPFactory().getDefaultEnvelope();
- OMNamespace ns = fac.createOMNamespace("http://soapenc/", "res");
- OMElement responseMethodName = fac.createOMElement(methodName + "Response", ns);
+ OMNamespace ns = getSOAPFactory().createOMNamespace("http://soapenc/", "res");
+ OMElement responseMethodName = getSOAPFactory().createOMElement(methodName + "Response", ns);
responseMethodName.addChild(result);
envelope.getBody().addChild(responseMethodName);
} else {
@@ -128,7 +124,7 @@
newmsgContext.setEnvelope(envelope);
} else if ((parameters != null) && (parameters.length == 0)) {
- SOAPEnvelope envelope = fac.getDefaultEnvelope();
+ SOAPEnvelope envelope = getSOAPFactory().getDefaultEnvelope();
String style = msgContext.getOperationContext().getAxisOperation().getStyle();
if (WSDLService.STYLE_DOC.equals(style)) {
@@ -146,8 +142,8 @@
// invoke the WebService
OMElement result = (OMElement) method.invoke(obj, parms);
- OMNamespace ns = fac.createOMNamespace("http://soapenc/", "res");
- OMElement responseMethodName = fac.createOMElement(methodName + "Response", ns);
+ OMNamespace ns = getSOAPFactory().createOMNamespace("http://soapenc/", "res");
+ OMElement responseMethodName = getSOAPFactory().createOMElement(methodName + "Response", ns);
responseMethodName.addChild(result);
envelope.getBody().addChild(responseMethodName);
} else {