You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2006/07/11 10:06:23 UTC
svn commit: r420757 - in /webservices/axis2/trunk/java/modules:
adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java
integration/test/org/apache/axis2/engine/WSDLClientTest.java
Author: deepal
Date: Tue Jul 11 01:06:22 2006
New Revision: 420757
URL: http://svn.apache.org/viewvc?rev=420757&view=rev
Log:
- fixing namespace ignorance problem in RPC Message receiver
Modified:
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=420757&r1=420756&r2=420757&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Tue Jul 11 01:06:22 2006
@@ -40,7 +40,7 @@
public class BeanUtil {
-
+
private static int nsCount = 1;
/**
@@ -454,7 +454,7 @@
}
}
- public static OMElement getOMElement(QName opName, Object [] args, String partName) {
+ public static OMElement getOMElement(QName opName, Object [] args, QName partName) {
ArrayList objects;
objects = new ArrayList();
int argCount = 0;
@@ -503,7 +503,7 @@
if (partName == null) {
objects.add(new QName("arg" + argCount));
} else {
- objects.add(new QName(partName));
+ objects.add(partName);
}
if (arg instanceof OMElement) {
OMFactory fac = OMAbstractFactory.getOMFactory();
@@ -533,7 +533,7 @@
stAXOMBuilder.setDoDebug(true);
return stAXOMBuilder.getDocumentElement();
}
-
+
public static String getUniquePrifix() {
return "ns" + nsCount++;
}
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=420757&r1=420756&r2=420757&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 Tue Jul 11 01:06:22 2006
@@ -48,13 +48,14 @@
OMElement result = (OMElement) resObject;
bodyContent = fac.createOMElement(
method.getName() + "Response", ns);
- OMElement resWrapper = fac.createOMElement(RETURN_WRAPPER, null);
+ OMElement resWrapper = fac.createOMElement(RETURN_WRAPPER,ns.getName(),
+ ns.getPrefix());
resWrapper.addChild(result);
bodyContent.addChild(resWrapper);
} else if (SimpleTypeMapper.isSimpleType(resObject)) {
bodyContent = fac.createOMElement(
method.getName() + "Response", ns);
- OMElement child = fac.createOMElement(RETURN_WRAPPER, null);
+ OMElement child = fac.createOMElement(RETURN_WRAPPER, ns);
child.addChild(fac.createOMText(child, SimpleTypeMapper.getStringValue(resObject)));
bodyContent.addChild(child);
} else {
@@ -62,7 +63,7 @@
method.getName() + "Response", ns);
// Java Beans
XMLStreamReader xr = BeanUtil.getPullParser(resObject,
- new QName(RETURN_WRAPPER));
+ new QName(ns.getName(), RETURN_WRAPPER, ns.getPrefix()));
StAXOMBuilder stAXOMBuilder =
OMXMLBuilderFactory.createStAXOMBuilder(
OMAbstractFactory.getOMFactory(), new StreamWrapper(xr));
@@ -83,7 +84,8 @@
}
public static OMElement getResponseElement(QName resname, Object [] objs) {
- return BeanUtil.getOMElement(resname, objs, RETURN_WRAPPER);
+ return BeanUtil.getOMElement(resname, objs,
+ new QName(resname.getNamespaceURI(), RETURN_WRAPPER, resname.getPrefix()));
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java?rev=420757&r1=420756&r2=420757&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java Tue Jul 11 01:06:22 2006
@@ -5,6 +5,7 @@
import junit.framework.TestSuite;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.description.AxisService;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org