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/02/07 09:01:30 UTC
svn commit: r375538 - in /webservices/axis2/trunk/java/modules:
adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
codegen/src/org/apache/axis2/rpc/client/RPCServiceClient.java
codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
Author: deepal
Date: Tue Feb 7 00:01:28 2006
New Revision: 375538
URL: http://svn.apache.org/viewcvs?rev=375538&view=rev
Log:
-fixing bean utils problems after code gen changes
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/client/RPCServiceClient.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=375538&r1=375537&r2=375538&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 Feb 7 00:01:28 2006
@@ -344,16 +344,14 @@
return retObjs;
}
- public static OMElement getOMElement(QName opName, Object [] args, String partName,
- String nameSpace,
- String nameSpaceprefix) {
+ public static OMElement getOMElement(QName opName, Object [] args, String partName) {
ArrayList objects;
objects = new ArrayList();
int argCount = 0;
- QName elemntName = null;
- if (partName != null) {
- elemntName = new QName(nameSpace, partName, nameSpaceprefix);
- }
+// QName elemntName = null;
+// if (partName != null) {
+// elemntName = new QName(nameSpace, partName, nameSpaceprefix);
+// }
for (int i = 0; i < args.length; i++) {
Object arg = args[i];
@@ -364,26 +362,27 @@
//way to do that , to solve that problem we need to have RPCRequestParameter
//note that The value of request parameter can either be simple type or JavaBean
if (SimpleTypeMapper.isSimpleType(arg)) {
- if (elemntName == null) {
+ if (partName == null) {
objects.add("arg" + argCount);
} else {
- objects.add(elemntName);
+ objects.add(new QName(opName.getNamespaceURI(), partName, opName.getPrefix()));
}
objects.add(arg.toString());
} else {
- if (elemntName == null) {
+ if (partName == null) {
objects.add(new QName("arg" + argCount));
} else {
- objects.add(elemntName);
+ objects.add(new QName(opName.getNamespaceURI(), partName, opName.getPrefix()));
}
if (arg instanceof OMElement) {
OMFactory fac = OMAbstractFactory.getOMFactory();
OMElement wrappingElement;
- if (elemntName == null) {
+ if (partName == null) {
wrappingElement = fac.createOMElement("arg" + argCount, null);
wrappingElement.addChild((OMElement) arg);
} else {
- wrappingElement = fac.createOMElement(partName, nameSpace, nameSpaceprefix);
+ wrappingElement = fac.createOMElement(opName.getNamespaceURI(),
+ partName, opName.getPrefix());
wrappingElement.addChild((OMElement) arg);
}
objects.add(wrappingElement);
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCServiceClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCServiceClient.java?rev=375538&r1=375537&r2=375538&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCServiceClient.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCServiceClient.java Tue Feb 7 00:01:28 2006
@@ -56,7 +56,7 @@
* @return Response OMElement
*/
public OMElement invokeBlocking(QName opName, Object [] args) throws AxisFault {
- OMElement omElement = BeanUtil.getOMElement(opName, args,null, null, null);
+ OMElement omElement = BeanUtil.getOMElement(opName, args,null);
return super.sendReceive(omElement);
}
@@ -77,7 +77,7 @@
*/
public Object[] invokeBlocking(QName opName, Object [] args, Object [] returnTypes) throws AxisFault {
- OMElement omElement = BeanUtil.getOMElement(opName, args,null, null, null);
+ OMElement omElement = BeanUtil.getOMElement(opName, args,null);
OMElement response = super.sendReceive(omElement);
return BeanUtil.deserialize(response, returnTypes);
}
@@ -96,7 +96,7 @@
Object [] args,
Callback callback)
throws AxisFault {
- OMElement omElement = BeanUtil.getOMElement(opName, args,null, null, null);
+ OMElement omElement = BeanUtil.getOMElement(opName, args,null);
//call the underline implementation
super.sendReceiveNonblocking(omElement, callback);
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?rev=375538&r1=375537&r2=375538&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 Tue Feb 7 00:01:28 2006
@@ -131,7 +131,7 @@
}
private OMElement getResponseElement(QName resname, Object [] objs) {
- return BeanUtil.getOMElement(resname, objs, RETURN_WRAPPER, null, null);
+ return BeanUtil.getOMElement(resname, objs, RETURN_WRAPPER);
}
private void processResponse(SOAPFactory fac, Object resObject,