Author: deepal
Date: Thu Jul 13 01:37:15 2006
New Revision: 421544
URL: http://svn.apache.org/viewvc?rev=421544&view=rev
Log:
-fixing bug in handling elementfromdefault in RPCMessageReceiver
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java
webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCInOutAsyncMessageReceiver.java
webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCMessageReceiver.java
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java?rev=421544&r1=421543&r2=421544&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
(original)
+++
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
Thu Jul 13 01:37:15 2006
@@ -144,7 +144,8 @@
objArray, service.isElementFormDefault());
envelope.getBody().addChild(bodyChild);
} else {
- RPCUtil.processResponse(fac, resObject, bodyContent, ns,
envelope, method);
+ RPCUtil.processResponse(fac, resObject, bodyContent, ns,
+ envelope, method, service.isElementFormDefault());
}
}
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?rev=421544&r1=421543&r2=421544&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
(original)
+++
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
Thu Jul 13 01:37:15 2006
@@ -153,7 +153,8 @@
objArray, service.isElementFormDefault());
envelope.getBody().addChild(bodyChild);
} else {
- RPCUtil.processResponse(fac, resObject, bodyContent, ns,
envelope, method);
+ RPCUtil.processResponse(fac, resObject, bodyContent, ns,
+ envelope, method, service.isElementFormDefault());
}
}
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java?rev=421544&r1=421543&r2=421544&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java
(original)
+++
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java
Thu Jul 13 01:37:15 2006
@@ -41,29 +41,45 @@
OMElement bodyContent,
OMNamespace ns,
SOAPEnvelope envelope,
- Method method) {
+ Method method, boolean qualified) {
if (resObject != null) {
//simple type
if (resObject instanceof OMElement) {
OMElement result = (OMElement) resObject;
bodyContent = fac.createOMElement(
method.getName() + "Response", ns);
- OMElement resWrapper = fac.createOMElement(RETURN_WRAPPER,
ns.getName(),
- ns.getPrefix());
+ OMElement resWrapper;
+ if (qualified) {
+ resWrapper = fac.createOMElement(RETURN_WRAPPER,
ns.getName(),
+ ns.getPrefix());
+ } else {
+ resWrapper = fac.createOMElement(RETURN_WRAPPER, null);
+ }
resWrapper.addChild(result);
bodyContent.addChild(resWrapper);
} else if (SimpleTypeMapper.isSimpleType(resObject)) {
bodyContent = fac.createOMElement(
method.getName() + "Response", ns);
- OMElement child = fac.createOMElement(RETURN_WRAPPER, ns);
+ OMElement child;
+ if (qualified) {
+ child = fac.createOMElement(RETURN_WRAPPER, ns);
+ } else {
+ child = fac.createOMElement(RETURN_WRAPPER, null);
+ }
child.addChild(fac.createOMText(child,
SimpleTypeMapper.getStringValue(resObject)));
bodyContent.addChild(child);
} else {
bodyContent = fac.createOMElement(
method.getName() + "Response", ns);
// Java Beans
+ QName returnWrapper;
+ if (qualified) {
+ returnWrapper = new QName(ns.getName(), RETURN_WRAPPER,
ns.getPrefix());
+ } else {
+ returnWrapper = new QName(RETURN_WRAPPER);
+ }
XMLStreamReader xr = BeanUtil.getPullParser(resObject,
- new QName(ns.getName(), RETURN_WRAPPER,
ns.getPrefix()));
+ returnWrapper);
StAXOMBuilder stAXOMBuilder =
OMXMLBuilderFactory.createStAXOMBuilder(
OMAbstractFactory.getOMFactory(), new
StreamWrapper(xr));
Modified:
webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCInOutAsyncMessageReceiver.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCInOutAsyncMessageReceiver.java?rev=421544&r1=421543&r2=421544&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCInOutAsyncMessageReceiver.java
(original)
+++
webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCInOutAsyncMessageReceiver.java
Thu Jul 13 01:37:15 2006
@@ -118,7 +118,8 @@
service.isElementFormDefault());
envelope.getBody().addChild(bodyChild);
} else {
- RPCUtil.processResponse(fac, resObject, bodyContent, ns,
envelope, method);
+ RPCUtil.processResponse(fac, resObject, bodyContent, ns,
+ envelope, method, service.isElementFormDefault());
}
outMessage.setEnvelope(envelope);
Modified:
webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCMessageReceiver.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCMessageReceiver.java?rev=421544&r1=421543&r2=421544&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCMessageReceiver.java
(original)
+++
webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCMessageReceiver.java
Thu Jul 13 01:37:15 2006
@@ -31,10 +31,8 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.engine.DependencyManager;
-import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
import org.apache.axis2.rpc.receivers.RPCUtil;
import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.axis2.wsdl.util.CommandLineOptionConstants;
import javax.xml.namespace.QName;
import java.lang.reflect.Method;
@@ -125,11 +123,12 @@
QName resName = new QName(service.getSchematargetNamespace(),
method.getName() + "Response",
service.getSchematargetNamespacePrefix());
- OMElement bodyChild = RPCUtil.getResponseElement(resName,
(Object[]) resObject ,
+ OMElement bodyChild = RPCUtil.getResponseElement(resName,
(Object[]) resObject,
service.isElementFormDefault());
envelope.getBody().addChild(bodyChild);
} else {
- RPCUtil.processResponse(fac, resObject, bodyContent, ns,
envelope, method );
+ RPCUtil.processResponse(fac, resObject, bodyContent, ns,
envelope,
+ method, service.isElementFormDefault());
}
outMessage.setEnvelope(envelope);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
