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 de...@apache.org on 2006/03/07 10:03:34 UTC
svn commit: r383825 - in /webservices/axis2/trunk/java/modules:
core/src/org/apache/axis2/receivers/
core/src/org/apache/axis2/transport/http/
integration/test/org/apache/axis2/engine/
Author: deepal
Date: Tue Mar 7 01:03:33 2006
New Revision: 383825
URL: http://svn.apache.org/viewcvs?rev=383825&view=rev
Log:
-fixing 473
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/Echo.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java?rev=383825&r1=383824&r2=383825&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java Tue Mar 7 01:03:33 2006
@@ -26,7 +26,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.commons.om.OMElement;
-import org.apache.wsdl.WSDLService;
import java.lang.reflect.Method;
@@ -95,25 +94,11 @@
&& OMElement.class.getName().equals(parameters[0].getName())) {
OMElement methodElement = msgContext.getEnvelope().getBody().getFirstElement();
OMElement parmeter;
- String style = msgContext.getOperationContext().getAxisOperation().getStyle();
+ parmeter = methodElement;
+ Object[] parms = new Object[]{parmeter};
+ // Need not have a return here
+ method.invoke(obj, parms);
- if (WSDLService.STYLE_DOC.equals(style)) {
- parmeter = methodElement;
-
- Object[] parms = new Object[]{parmeter};
-
- // Need not have a return here
- method.invoke(obj, parms);
- } else if (WSDLService.STYLE_RPC.equals(style)) {
- parmeter = methodElement.getFirstElement();
-
- Object[] parms = new Object[]{parmeter};
-
- // invoke the WebService
- method.invoke(obj, parms);
- } else {
- throw new AxisFault(Messages.getMessage("unknownStyle", style));
- }
} else {
throw new AxisFault(Messages.getMessage("rawXmlProivdeIsLimited"));
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java?rev=383825&r1=383824&r2=383825&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java Tue Mar 7 01:03:33 2006
@@ -27,10 +27,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.commons.om.OMElement;
-import org.apache.ws.commons.om.OMNamespace;
import org.apache.ws.commons.soap.SOAPEnvelope;
import org.apache.ws.commons.soap.SOAPFactory;
-import org.apache.wsdl.WSDLService;
import java.lang.reflect.Method;
@@ -84,39 +82,13 @@
Method method = findOperation(opDesc, ImplClass);
if (method != null) {
- String style =
- msgContext.getOperationContext().getAxisOperation().getStyle();
Class[] parameters = method.getParameterTypes();
Object[] args;
if ((parameters == null) || (parameters.length == 0)) {
args = new Object[0];
} else if (parameters.length == 1) {
- OMElement omElement;
-
- if (WSDLService.STYLE_DOC.equals(style)) {
- omElement = msgContext.getEnvelope().getBody().getFirstElement();
- } else if (WSDLService.STYLE_RPC.equals(style)) {
- OMElement operationElement =
- msgContext.getEnvelope().getBody().getFirstElement();
-
- if (operationElement != null) {
- if ((operationElement.getLocalName() != null)
- && operationElement.getLocalName().startsWith(
- method.getName())) {
- omElement = operationElement.getFirstElement();
- } else {
- throw new AxisFault(Messages.getMessage("AandBdonotmatch",
- "Operation Name", "immediate child name",
- operationElement.getLocalName(), method.getName()));
- }
- } else {
- throw new AxisFault(Messages.getMessage("rpcNeedmatchingChild"));
- }
- } else {
- throw new AxisFault(Messages.getMessage("unknownStyle", style));
- }
-
+ OMElement omElement = msgContext.getEnvelope().getBody().getFirstElement();
args = new Object[]{omElement};
} else {
throw new AxisFault(Messages.getMessage("rawXmlProivdeIsLimited"));
@@ -130,14 +102,7 @@
OMElement bodyContent;
SOAPFactory fac = getSOAPFactory(msgContext);
- if (WSDLService.STYLE_RPC.equals(style)) {
- OMNamespace ns = fac.createOMNamespace("http://soapenc/", "res");
- bodyContent = fac.createOMElement(method.getName() + "Response",
- ns);
- bodyContent.addChild(result);
- } else {
- bodyContent = result;
- }
+ bodyContent = result;
SOAPEnvelope envelope = fac.getDefaultEnvelope();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?rev=383825&r1=383824&r2=383825&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java Tue Mar 7 01:03:33 2006
@@ -71,7 +71,8 @@
SOAPFactory soapFactory = new SOAP11Factory();
SOAPEnvelope envelope = soapFactory.getDefaultEnvelope();
OMNamespace omNs = soapFactory.createOMNamespace(values[0], "services");
- OMNamespace defualtNs = new OMNamespaceImpl("", null, soapFactory);
+ //OMNamespace defualtNs = new OMNamespaceImpl("", null, soapFactory);
+ OMNamespace defualtNs = soapFactory.createOMNamespace("", null);
OMElement opElement = soapFactory.createOMElement(operation, omNs);
Iterator it = map.keySet().iterator();
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/Echo.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/Echo.java?rev=383825&r1=383824&r2=383825&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/Echo.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/Echo.java Tue Mar 7 01:03:33 2006
@@ -50,7 +50,7 @@
}
public OMElement echoMTOMtoBase64(OMElement omEle) {
- OMText omText = (OMText) omEle.getFirstOMChild();
+ OMText omText = (OMText) (omEle.getFirstElement()).getFirstOMChild();
omText.setOptimize(false);
return omEle;
}