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 di...@apache.org on 2003/11/04 19:07:22 UTC
cvs commit: ws-axis/java/src/org/apache/axis/wsdl/symbolTable SchemaUtils.java
dims 2003/11/04 10:07:22
Modified: java/src/org/apache/axis Constants.java
java/src/org/apache/axis/encoding
DefaultTypeMappingImpl.java
java/src/org/apache/axis/wsdl/symbolTable SchemaUtils.java
Log:
Fix for Bug 24382 - axis doesn't support anySimpleType for its default type mapping\
from iasandcb@apache-korea.org (Ias)
Revision Changes Path
1.127 +1 -0 ws-axis/java/src/org/apache/axis/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/Constants.java,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- Constants.java 27 Oct 2003 13:27:18 -0000 1.126
+++ Constants.java 4 Nov 2003 18:07:22 -0000 1.127
@@ -556,6 +556,7 @@
public static final QName XSD_DECIMAL = new QName(URI_DEFAULT_SCHEMA_XSD, "decimal");
public static final QName XSD_BASE64 = new QName(URI_DEFAULT_SCHEMA_XSD, "base64Binary");
public static final QName XSD_HEXBIN = new QName(URI_DEFAULT_SCHEMA_XSD, "hexBinary");
+ public static final QName XSD_ANYSIMPLETYPE = new QName(URI_DEFAULT_SCHEMA_XSD, "anySimpleType");
public static final QName XSD_ANYTYPE = new QName(URI_DEFAULT_SCHEMA_XSD, "anyType");
public static final QName XSD_ANY = new QName(URI_DEFAULT_SCHEMA_XSD, "any");
public static final QName XSD_QNAME = new QName(URI_DEFAULT_SCHEMA_XSD, "QName");
1.72 +3 -0 ws-axis/java/src/org/apache/axis/encoding/DefaultTypeMappingImpl.java
Index: DefaultTypeMappingImpl.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/encoding/DefaultTypeMappingImpl.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- DefaultTypeMappingImpl.java 22 Apr 2003 19:34:24 -0000 1.71
+++ DefaultTypeMappingImpl.java 4 Nov 2003 18:07:22 -0000 1.72
@@ -267,6 +267,9 @@
myRegister(Constants.XSD_ANYTYPE, java.lang.Object.class,
null, null);
+ // anySimpleType is mapped to java.lang.String according to JAX-RPC 1.1 spec.
+ myRegisterSimple(Constants.XSD_ANYSIMPLETYPE, java.lang.String.class);
+
// See the SchemaVersion classes for where the registration of
// dateTime (for 2001) and timeInstant (for 1999 & 2000) happen.
myRegister(Constants.XSD_DATE, java.sql.Date.class,
1.30 +10 -10 ws-axis/java/src/org/apache/axis/wsdl/symbolTable/SchemaUtils.java
Index: SchemaUtils.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/symbolTable/SchemaUtils.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- SchemaUtils.java 4 Nov 2003 13:26:21 -0000 1.29
+++ SchemaUtils.java 4 Nov 2003 18:07:22 -0000 1.30
@@ -54,20 +54,19 @@
*/
package org.apache.axis.wsdl.symbolTable;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.holders.BooleanHolder;
-import javax.xml.rpc.holders.IntHolder;
-
import org.apache.axis.Constants;
import org.apache.axis.utils.JavaUtils;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.holders.BooleanHolder;
+import javax.xml.rpc.holders.IntHolder;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.Vector;
+
/**
* This class contains static utility methods specifically for schema type queries.
*
@@ -1647,7 +1646,8 @@
"decimal", "float", "double", "boolean", "time", "dateTime", "duration",
"date", "gMonth", "gYear", "gYearMonth", "gDay", "gMonthDay", "Name",
"QName", "NCName", "anyURI", "language", "ID", "IDREF", "IDREFS",
- "ENTITY", "ENTITIES", "NOTATION", "NMTOKEN", "NMTOKENS"
+ "ENTITY", "ENTITIES", "NOTATION", "NMTOKEN", "NMTOKENS",
+ "anySimpleType"
};
/** Field schemaTypeSet */