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 11:20:33 UTC
svn commit: r375560 - 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/
wsdl/src/org/apache/axis2/wsdl/builder/
Author: deepal
Date: Tue Feb 7 02:20:31 2006
New Revision: 375560
URL: http://svn.apache.org/viewcvs?rev=375560&view=rev
Log:
-revert back some RPC changes
- removed schema.setElementFormDefault(new XmlSchemaForm(XmlSchemaForm.QUALIFIED));
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/wsdl/src/org/apache/axis2/wsdl/builder/SchemaGenerator.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=375560&r1=375559&r2=375560&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 02:20:31 2006
@@ -60,23 +60,20 @@
}
if (SimpleTypeMapper.isSimpleType(ptype)) {
Object value = propDesc.getReadMethod().invoke(beanObject, null);
- object.add(new QName(beanName.getNamespaceURI(),
- propDesc.getName(), beanName.getPrefix()));
+ object.add(propDesc.getName());
object.add(value.toString());
} else if (ptype.isArray()) {
Object value [] = (Object[]) propDesc.getReadMethod().invoke(beanObject, null);
if (SimpleTypeMapper.isSimpleType(ptype.getComponentType())) {
for (int j = 0; j < value.length; j++) {
Object o = value[j];
- object.add(new QName(beanName.getNamespaceURI(),
- propDesc.getName(), beanName.getPrefix()));
+ object.add(propDesc.getName());
object.add(o.toString());
}
} else {
for (int j = 0; j < value.length; j++) {
Object o = value[j];
- object.add(new QName(beanName.getNamespaceURI(),
- propDesc.getName(), beanName.getPrefix()));
+ object.add(new QName(propDesc.getName()));
object.add(o);
}
}
@@ -91,12 +88,10 @@
for (int j = 0; j < objList.size(); j++) {
Object o = objList.get(j);
if (SimpleTypeMapper.isSimpleType(o)) {
- object.add(new QName(beanName.getNamespaceURI(),
- propDesc.getName(), beanName.getPrefix()));
- object.add(o.toString());
+ object.add(propDesc.getName());
+ object.add(o);
} else {
- object.add(new QName(beanName.getNamespaceURI(),
- propDesc.getName(), beanName.getPrefix()));
+ object.add(new QName(propDesc.getName()));
object.add(o);
}
}
@@ -149,7 +144,7 @@
Iterator elements = beanElement.getChildren();
while (elements.hasNext()) {
OMElement parts = (OMElement) elements.next();
- // if parts/@href != null then need to find element with id and deserialize.
+ // if parts/@href != null then need to find element with id and deserialize.
// before that first check whether we already have it in the hashtable
String partsLocalName = parts.getLocalName();
PropertyDescriptor prty = (PropertyDescriptor) properties.get(partsLocalName.toLowerCase());
@@ -348,11 +343,6 @@
ArrayList objects;
objects = new ArrayList();
int argCount = 0;
-// QName elemntName = null;
-// if (partName != null) {
-// elemntName = new QName(nameSpace, partName, nameSpaceprefix);
-// }
-
for (int i = 0; i < args.length; i++) {
Object arg = args[i];
if (arg == null) {
@@ -365,14 +355,14 @@
if (partName == null) {
objects.add("arg" + argCount);
} else {
- objects.add(new QName(opName.getNamespaceURI(), partName, opName.getPrefix()));
+ objects.add(partName);
}
objects.add(arg.toString());
} else {
if (partName == null) {
objects.add(new QName("arg" + argCount));
} else {
- objects.add(new QName(opName.getNamespaceURI(), partName, opName.getPrefix()));
+ objects.add(new QName(partName));
}
if (arg instanceof OMElement) {
OMFactory fac = OMAbstractFactory.getOMFactory();
@@ -381,8 +371,7 @@
wrappingElement = fac.createOMElement("arg" + argCount, null);
wrappingElement.addChild((OMElement) arg);
} else {
- wrappingElement = fac.createOMElement(opName.getNamespaceURI(),
- partName, opName.getPrefix());
+ wrappingElement = fac.createOMElement(partName, null);
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=375560&r1=375559&r2=375560&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 02:20:31 2006
@@ -56,7 +56,7 @@
* @return Response OMElement
*/
public OMElement invokeBlocking(QName opName, Object [] args) throws AxisFault {
- OMElement omElement = BeanUtil.getOMElement(opName, args,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);
+ 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);
+ 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=375560&r1=375559&r2=375560&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 02:20:31 2006
@@ -145,7 +145,7 @@
} else if (SimpleTypeMapper.isSimpleType(resObject)) {
bodyContent = fac.createOMElement(
method.getName() + "Response", ns);
- OMElement child = fac.createOMElement(RETURN_WRAPPER, ns);
+ OMElement child = fac.createOMElement(RETURN_WRAPPER, null);
child.addChild(fac.createText(child, SimpleTypeMapper.getStringValue(resObject)));
bodyContent.addChild(child);
} else {
@@ -153,7 +153,7 @@
method.getName() + "Response", ns);
// Java Beans
XMLStreamReader xr = BeanUtil.getPullParser(resObject,
- new QName(ns.getName(),RETURN_WRAPPER,ns.getPrefix()));
+ new QName(RETURN_WRAPPER));
StAXOMBuilder stAXOMBuilder =
OMXMLBuilderFactory.createStAXOMBuilder(
OMAbstractFactory.getOMFactory(), xr);
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/SchemaGenerator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/SchemaGenerator.java?rev=375560&r1=375559&r2=375560&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/SchemaGenerator.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/SchemaGenerator.java Tue Feb 7 02:20:31 2006
@@ -69,7 +69,7 @@
XmlSchemaCollection schemaCollection = new XmlSchemaCollection();
schema = new XmlSchema(this.schemaTargetNameSpace, schemaCollection);
- schema.setElementFormDefault(new XmlSchemaForm(XmlSchemaForm.QUALIFIED));
+// schema.setElementFormDefault(new XmlSchemaForm(XmlSchemaForm.QUALIFIED));
schema.setPrefixToNamespaceMap(prefixmap);
this.typeTable = new TypeTable();