gdaniels 2003/03/09 20:48:15
Modified: java/test/wsdl/interop3/docLit
WSDLInteropTestDocLitPortBindingImpl.java
DocLitTestCase.java
java/src/org/apache/axis/wsdl/toJava
JavaBeanHelperWriter.java
Log:
Some fixes for interop3 doc lit test - need to get these building during
the normal build process.
Improve comments a little in JavaBeanHelperWriter
Revision Changes Path
1.7 +1 -1
xml-axis/java/test/wsdl/interop3/docLit/WSDLInteropTestDocLitPortBindingImpl.java
Index: WSDLInteropTestDocLitPortBindingImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/interop3/docLit/WSDLInteropTestDocLitPortBindingImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WSDLInteropTestDocLitPortBindingImpl.java 8 Jul 2002 15:31:26 -0000 1.6
+++ WSDLInteropTestDocLitPortBindingImpl.java 10 Mar 2003 04:48:15 -0000 1.7
@@ -12,7 +12,7 @@
return echoStringParam;
}
- public test.wsdl.interop3.docLit.xsd.ArrayOfstring_Literal
echoStringArray(test.wsdl.interop3.docLit.xsd.ArrayOfstring_Literal
echoStringArrayParam) throws java.rmi.RemoteException {
+ public test.wsdl.interop3.docLit.xsd.ArrayOfstring_literal
echoStringArray(test.wsdl.interop3.docLit.xsd.ArrayOfstring_literal
echoStringArrayParam) throws java.rmi.RemoteException {
return echoStringArrayParam;
}
1.7 +2 -2 xml-axis/java/test/wsdl/interop3/docLit/DocLitTestCase.java
Index: DocLitTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/interop3/docLit/DocLitTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DocLitTestCase.java 8 Jul 2002 15:31:26 -0000 1.6
+++ DocLitTestCase.java 10 Mar 2003 04:48:15 -0000 1.7
@@ -1,7 +1,7 @@
package test.wsdl.interop3.docLit;
-import test.wsdl.interop3.docLit.xsd.ArrayOfstring_Literal;
+import test.wsdl.interop3.docLit.xsd.ArrayOfstring_literal;
import test.wsdl.interop3.docLit.xsd.SOAPStruct;
import java.net.URL;
@@ -52,7 +52,7 @@
String str = "Hello there!";
String [] strArray = new String [] { "1", "two", "trois" };
- ArrayOfstring_Literal param = new ArrayOfstring_Literal();
+ ArrayOfstring_literal param = new ArrayOfstring_literal();
param.setString(strArray);
assertEquals("echoString results differ", binding.echoString(str), str);
1.38 +5 -1
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java
Index: JavaBeanHelperWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- JavaBeanHelperWriter.java 6 Mar 2003 04:36:55 -0000 1.37
+++ JavaBeanHelperWriter.java 10 Mar 2003 04:48:15 -0000 1.38
@@ -279,9 +279,13 @@
if (elemType.getDimensions().length() > 1 &&
(elemType.getClass() == DefinedType.class)) {
- // SOAP array, don't write type.
+ // If we have a DefinedType with dimensions, it must
+ // be a SOAP array derived type. In this case, use
+ // the refType's QName for the metadata.
xmlType = elemType.getRefType().getQName();
} else {
+ // Otherwise, use the type at the end of the ref
+ // chain.
while (elemType.getRefType() != null) {
elemType = elemType.getRefType();
}
