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/01/19 06:08:36 UTC
svn commit: r370375 - in /webservices/axis2/trunk/java/modules:
adb/src/org/apache/axis2/databinding/utils/
codegen/src/org/apache/axis2/rpc/client/
codegen/src/org/apache/axis2/rpc/receivers/
core/src/org/apache/axis2/client/ core/src/org/apache/axis2...
Author: deepal
Date: Wed Jan 18 21:08:18 2006
New Revision: 370375
URL: http://svn.apache.org/viewcvs?rev=370375&view=rev
Log:
-fixing some problem when in BeanUtil (serializing OMElement[])
- There was a problem in stub , invalid soap action coping in Message context
- fix a bug in RequestURIBasedDispatcher.java , which does not reset opname and service name , that it create problem in next time
- fixing unnecessary value setting in DeploymentEngine
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
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.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=370375&r1=370374&r2=370375&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 Wed Jan 18 21:08:18 2006
@@ -22,6 +22,7 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMAttribute;
import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMFactory;
import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
import org.apache.axis2.om.impl.llom.factory.OMXMLBuilderFactory;
@@ -322,21 +323,45 @@
return retObjs;
}
- public static OMElement getOMElement(QName opName, Object [] args) {
+ public static OMElement getOMElement(QName opName, Object [] args, String partName) {
ArrayList objects;
objects = new ArrayList();
int argCount = 0;
for (int i = 0; i < args.length; i++) {
Object arg = args[i];
+ if (arg == null) {
+ continue;
+ }
//todo if the request parameter has name other than argi (0<i<n) , there should be a
//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)) {
- objects.add("arg" + argCount);
+ if (partName == null) {
+ objects.add("arg" + argCount);
+ } else {
+ objects.add(partName);
+ }
objects.add(arg.toString());
} else {
- objects.add(new QName("arg" + argCount));
- objects.add(arg);
+ if (partName == null) {
+ objects.add(new QName("arg" + argCount));
+ } else {
+ objects.add(new QName(partName));
+ }
+ if (arg instanceof OMElement) {
+ OMFactory fac = OMAbstractFactory.getOMFactory();
+ OMElement wrappingElement;
+ if (partName == null) {
+ wrappingElement = fac.createOMElement("arg" + argCount, null);
+ wrappingElement.addChild((OMElement) arg);
+ } else {
+ wrappingElement = fac.createOMElement(partName, null);
+ wrappingElement.addChild((OMElement) arg);
+ }
+ objects.add(wrappingElement);
+ } else {
+ objects.add(arg);
+ }
}
argCount ++;
}
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=370375&r1=370374&r2=370375&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 Wed Jan 18 21:08:18 2006
@@ -56,7 +56,7 @@
* @return Response OMElement
*/
public OMElement invokeBlocking(QName opName, Object [] args) throws AxisFault {
- OMElement omElement = BeanUtil.getOMElement(opName, args);
+ 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);
+ 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);
+ 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=370375&r1=370374&r2=370375&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 Wed Jan 18 21:08:18 2006
@@ -115,6 +115,7 @@
outMessage.setEnvelope(envelope);
} catch (Exception e) {
+ e.printStackTrace();
throw AxisFault.makeFault(e);
}
}
@@ -125,7 +126,7 @@
}
private OMElement getResponseElement(QName resname, Object [] objs) {
- return BeanUtil.getOMElement(resname, objs);
+ return BeanUtil.getOMElement(resname, objs,RETURN_WRAPPER);
}
private void processResponse(SOAPFactory fac, Object resObject, OMElement bodyContent, OMNamespace ns, SOAPEnvelope envelope) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java?rev=370375&r1=370374&r2=370375&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java Wed Jan 18 21:08:18 2006
@@ -218,7 +218,7 @@
public String getSoapAction() {
if (soapAction == null && parent != null) {
- soapAction = parent.getSoapAction();
+ return parent.getSoapAction();
}
return (soapAction != null) ? soapAction : "";
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=370375&r1=370374&r2=370375&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Wed Jan 18 21:08:18 2006
@@ -86,9 +86,6 @@
throws DeploymentException {
if ((repositoryName == null || "".equals(repositoryName.trim())) &&
(xmlFile == null || "".equals(xmlFile.trim()))) {
- axis2repository = repositoryName;
- axis2_xml_file_name = xmlFile;
-
useDefault = true;
axis2repository = null;
log.info("nither repository location nor aixs2.xml are given ," +
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java?rev=370375&r1=370374&r2=370375&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java Wed Jan 18 21:08:18 2006
@@ -48,9 +48,7 @@
public AxisOperation findOperation(AxisService service, MessageContext messageContext)
throws AxisFault {
log.debug("Checking for Operation using target endpoint uri fragment : " + operationName);
-
EndpointReference toEPR = messageContext.getTo();
-
if ((toEPR != null) && (operationName == null)) {
String filePart = toEPR.getAddress();
String[] values = Utils.parseRequestURLForServiceAndOperation(filePart);
@@ -61,7 +59,9 @@
}
if (operationName != null) {
- return service.getOperation(operationName);
+ AxisOperation axisOperation = service.getOperation(operationName);
+ operationName = null;
+ return axisOperation;
}
return null;