dims 02/03/08 11:29:43
Modified: java/src/org/apache/axis/message RPCElement.java
java/src/org/apache/axis/wsdl/toJava SymbolTable.java
Log:
Thanks Glen. Rolling back my changes....Sorry.
Revision Changes Path
1.41 +2 -2 xml-axis/java/src/org/apache/axis/message/RPCElement.java
Index: RPCElement.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/RPCElement.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- RPCElement.java 8 Mar 2002 17:22:13 -0000 1.40
+++ RPCElement.java 8 Mar 2002 19:29:43 -0000 1.41
@@ -99,8 +99,8 @@
// IF we're doc/literal... we can't count on the element name
// being the method name.
- elementIsFirstParam = ( (operation.getStyle() ==
ServiceDesc.STYLE_DOCUMENT) ||
- (operation.getStyle() ==
ServiceDesc.STYLE_WRAPPED));
+ elementIsFirstParam = (operation.getStyle() ==
+ ServiceDesc.STYLE_DOCUMENT);
}
}
1.41 +17 -9 xml-axis/java/src/org/apache/axis/wsdl/toJava/SymbolTable.java
Index: SymbolTable.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/SymbolTable.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- SymbolTable.java 8 Mar 2002 17:22:13 -0000 1.40
+++ SymbolTable.java 8 Mar 2002 19:29:43 -0000 1.41
@@ -1120,15 +1120,23 @@
if (node == null)
continue; // ??? Skip this part, something is wrong
-
- if (typeName != null) {
- v.add(getType(typeName));
- v.add(partName);
- } else if (elementName != null) {
- Element element = getElement(elementName);
- element.setIsReferenced(true);
- v.add(element);
- v.add(partName);
+
+ // Get the nested type entries.
+ Vector vTypes =
+ SchemaUtils.getComplexElementTypesAndNames(node, this);
+
+ if (vTypes != null) {
+ // add the elements in this list
+ v.addAll(vTypes);
+ } else {
+ // XXX - This should be a SOAPElement/SOAPBodyElement
+ if (typeName != null) {
+ v.add(getType(typeName));
+ v.add(partName);
+ } else if (elementName != null) {
+ v.add(getElement(elementName));
+ v.add(partName);
+ }
}
} // while
