gdaniels 2002/07/03 13:22:42
Modified: java/src/org/apache/axis/wsdl/fromJava Types.java
Log:
Merge fix from beta-3 - don't write Holder types to schema, write
the held type.
Revision Changes Path
1.43 +6 -3 xml-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java
Index: Types.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Types.java 3 Jul 2002 17:50:36 -0000 1.42
+++ Types.java 3 Jul 2002 20:22:42 -0000 1.43
@@ -59,7 +59,6 @@
import org.apache.axis.AxisFault;
import org.apache.axis.AxisProperties;
import org.apache.axis.Constants;
-import org.apache.axis.wsdl.toJava.Utils;
import org.apache.axis.encoding.Serializer;
import org.apache.axis.encoding.SerializerFactory;
import org.apache.axis.encoding.SimpleType;
@@ -79,6 +78,7 @@
import javax.wsdl.Definition;
import javax.xml.namespace.QName;
+import javax.xml.rpc.holders.Holder;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
@@ -160,6 +160,9 @@
if (type.getName().equals("void")) {
return null;
}
+ if (Holder.class.isAssignableFrom(type)) {
+ type = JavaUtils.getHolderValueType(type);
+ }
if (isSimpleType(type)) {
javax.xml.namespace.QName typeQName = getTypeQName(type);
// Still need to write any element declaration...
@@ -850,8 +853,8 @@
/**
* isBeanCompatible
- * @param type Class
- * @param boolean issueMessages if not compatible
+ * @param javaType Class
+ * @param issueErrors if true, issue messages if not compatible
* Returns true if it appears that this class is a bean and
* can be mapped to a complexType
*/
